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

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

Merge changes I46140d3e,Iaae6f5b8,Ifbe4891e,I417896f0 into msm-4.14 

* changes:
  ARM: dts: msm: Specify HR_LED configuration for PM855B
  leds: qti-tri-led: Control BOB_CONFIG_EXT_CTRL2_FORCE_EN for HR_LED
  ARM: dts: msm: add SDAM2 device configuration in PM855
  defconfig: sdm855: Enable NVMEM_SPMI_SDAM support
parents 93b0e1f1 ff0ab49f

Documentation/devicetree/bindings/leds/leds-qti-tri-led.txt

+12 −0
Original line number Diff line number Diff line
@@ -13,6 +13,18 @@ Qualcomm Technologies, Inc. PMIC chips. 
	Value type: <prop-encoded-array>

	Definition: Register base of the TRI_LED module and length.



- nvmem-names:

	Usage: optional

	Value type: <string>

	Definition: Nvmem device name for SDAM to do PBS trigger. It must be

		defined as "pbs_sdam". This is required only for HR_LEDs.



- nvmem:

	Usage: optional

	Value type: <phandle>

	Definition: Phandle of the nvmem device name to access SDAM to do PBS

		trigger. This is required only for HR_LEDs.



Properties for child nodes:

- pwms:

	Usage: required

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

+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ 
			#gpio-cells = <2>;

			qcom,gpios-disallowed = <2 5 7 8>;

		};



		pm855_sdam_2: sdam@b100 {

			compatible = "qcom,spmi-sdam";

			reg = <0xb100 0x100>;

		};

	};



	qcom,pm855@1 {

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

+24 −0
Original line number Diff line number Diff line
@@ -266,6 +266,30 @@ 
		reg = <0x3 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm855b_pwm: qcom,pwms@b100 {

			compatible = "qcom,pwm-lpg";

			reg = <0xb100 0x200>;

			reg-names = "lpg-base";

			#pwm-cells = <2>;

		};



		pm855b_hr_led: qcom,leds@d000 {

			compatible = "qcom,tri-led";

			reg = <0xd000 0x100>;

			nvmem-names = "pbs_sdam";

			nvmem = <&pm855_sdam_2>;

			hr_led1 {

				label = "hr_led1";

				pwms = <&pm855b_pwm 0 1000000>;

				led-sources = <0>;

			};

			hr_led2 {

				label = "hr_led2";

				pwms = <&pm855b_pwm 1 1000000>;

				led-sources = <1>;

			};

		};

	};

};

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SENSORS_SSC=y

CONFIG_ESOC=y

CONFIG_ESOC_DEV=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SENSORS_SSC=y

CONFIG_ESOC=y

CONFIG_ESOC_DEV=y