Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6da6ebcb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I5676e568,Id8986ac7 into msm-4.14 

* changes:
  ARM: dts: msm: Specify RGB_LED configuration for PM855L
  defconfig: sdm855: Enable QTI_TRI_LED and PWM_QTI_LPG support
parents 921bd011 a3828831

arch/arm64/boot/dts/qcom/pm855l.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -226,6 +226,33 @@ 
			qcom,pmic-revid = <&pm855l_revid>;

			status = "disabled";

		};



		pm855l_lpg: qcom,pwms@b100 {

			compatible = "qcom,pwm-lpg";

			reg = <0xb100 0x300>;

			reg-names = "lpg-base";

			#pwm-cells = <2>;

		};



		pm855l_rgb_led: qcom,leds@d000 {

			compatible = "qcom,tri-led";

			reg = <0xd000 0x100>;

			red {

				label = "red";

				pwms = <&pm855l_lpg 0 1000000>;

				led-sources = <0>;

			};

			green {

				label = "green";

				pwms = <&pm855l_lpg 1 1000000>;

				led-sources = <1>;

			};

			blue {

				label = "blue";

				pwms = <&pm855l_lpg 2 1000000>;

				led-sources = <2>;

			};

		};

	};

};

arch/arm64/configs/sdm855-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -395,6 +395,8 @@ CONFIG_MMC_SDHCI_MSM=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_FLASH_V2=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

CONFIG_EDAC_KRYO_ARM64=y

CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
@@ -482,6 +484,7 @@ CONFIG_QCOM_DEVFREQ_DEVBW=y 
CONFIG_IIO=y

CONFIG_QCOM_SPMI_ADC5=y

CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_ARM_GIC_V3_ACL=y

CONFIG_QCOM_LLCC_PMU=y

CONFIG_RAS=y

arch/arm64/configs/sdm855_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ CONFIG_MMC_SDHCI_MSM=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_FLASH_V2=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

CONFIG_EDAC_KRYO_ARM64=y

CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
@@ -503,6 +505,7 @@ CONFIG_QCOM_DEVFREQ_DEVBW=y 
CONFIG_IIO=y

CONFIG_QCOM_SPMI_ADC5=y

CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QCOM_KGSL=y

CONFIG_ARM_GIC_V3_ACL=y

CONFIG_PHY_XGENE=y