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

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

Merge "leds: leds-qpnp: Fix using deprecated APIs for getting PWM device"

parents 19dd5839 5e0f3eee

Documentation/devicetree/bindings/leds/leds-qpnp.txt

+12 −12
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ Required properties for RGB led: 
- qcom,mode: mode the led should operate in, options "pwm" and "lpg". "manual" mode is not supported for RGB led.



Required properties for PWM mode only:

- qcom,pwm-channel: pwm channel the led will operate on

- pwms: Use the phandle of pwm device

- qcom,pwm-us: time the pwm device will modulate at (us)



Required properties for LPG mode only:

- qcom,pwm-channel: pwm channel the led will operate on

- pwms: Use the phandle of pwm device

- qcom,pwm-us: time the pwm device will modulate at (us)

- qcom,duty-pcts: array of values for duty cycle to go through

- qcom,start-idx: starting point duty-pcts array
@@ -100,11 +100,11 @@ Optional properties for MPP LED: 
- qcom,mpp-power-min-voltage - minimum voltage for MPP LED regulator. This should not be specified when no regulator is in use.



Required properties for PWM mode only:

- qcom,pwm-channel: pwm channel the led will operate on

- pwms: Use the phandle of pwm device

- qcom,pwm-us: time the pwm device will modulate at (us)



Required properties for LPG mode only:

- qcom,pwm-channel: pwm channel the led will operate on

- pwms: Use the phandle of pwm device

- qcom,pwm-us: time the pwm device will modulate at (us)

- qcom,duty-pcts: array of values for duty cycle to go through

- qcom,start-idx: starting point duty-pcts array
@@ -129,11 +129,11 @@ Optional properties for keypad backlight: 
- qcom,always-on: specify if the module has to be always on



Required properties for PWM mode only:

- qcom,pwm-channel: pwm channel the led will operate on

- pwms: Use the phandle of pwm device

- qcom,pwm-us: time the pwm device will modulate at (us)



Required properties for LPG mode only:

- qcom,pwm-channel: pwm channel the led will operate on

- pwms: Use the phandle of pwm device

- qcom,pwm-us: time the pwm device will modulate at (us)

- qcom,duty-pcts: array of values for duty cycle to go through

- qcom,start-idx: starting point duty-pcts array
@@ -201,7 +201,7 @@ Example: 
			qcom,mode = "pwm";

			qcom,source-sel = <8>;

			qcom,mode-ctrl = <0x60>;

			qcom,pwm-channel = <0>;

			pwms = <&pm8941_pwm_1 0 0>;

			qcom,pwm-us = <1000>;

		};

	};
@@ -213,7 +213,7 @@ Example: 
			linux,name = "led:rgb_red";

			qcom,mode = "pwm";

			qcom,pwm-us = <1000>;

			qcom,pwm-channel = <6>;

			pwms = <&pm8941_pwm_7 0 0>;

			qcom,max-current = <12>;

			qcom,default-state = "off";

			qcom,id = <3>;
@@ -224,7 +224,7 @@ Example: 
			label = "rgb";

			linux,name = "led:rgb_green";

			qcom,mode = "lpg";

			qcom,pwm-channel = <5>;

			pwms = <&pm8941_pwm_6 0 0>;

			qcom,pwm-us = <1000>;

			qcom,duty-ms = <20>;

			qcom,start-idx = <1>;
@@ -242,7 +242,7 @@ Example: 
			label = "rgb";

			linux,name = "led:rgb_blue";

			qcom,mode = "pwm";

			qcom,pwm-channel = <4>;

			pwms = <&pm8941_pwm_5 0 0>;

			qcom,start-idx = <1>;

			qcom,idx-len = <10>;

			qcom,duty-pcts = [00 19 32 4B 64
@@ -312,7 +312,7 @@ Example: 
			label = "kpdbl";

			linux,name = "kpdbl-pwm-1";

			qcom,mode = <0>;

			qcom,pwm-channel = <8>;

			pwms = <&pm8941_pwm_9 0 0>;

			qcom,pwm-us = <1000>;

			qcom,id = <7>;

			qcom,max-current = <20>;
@@ -325,7 +325,7 @@ Example: 
			label = "kpdbl";

			linux,name = "kpdbl-lut-2";

			qcom,mode = <1>;

			qcom,pwm-channel = <9>;

			pwms = <&pm8941_pwm_10 0 0>;

			qcom,pwm-us = <1000>;

			qcom,start-idx = <1>;

			qcom,duty-pcts = [00 00 00 00 64

arch/arm/boot/dts/qcom/msm-pm8110.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ 
			status = "disabled";

		};



		pwm@bc00 {

		pm8110_pwm_1: pwm@bc00 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xbc00 0x100>;

			reg-names = "qpnp-lpg-channel-base";

arch/arm/boot/dts/qcom/msm-pm8226.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ 
			label = "wled";

		};



		pwm@b100 {

		pm8226_pwm_1: pwm@b100 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xb100 0x100>,

			      <0xb042 0x7e>;
@@ -836,7 +836,7 @@ 
			#pwm-cells = <2>;

		};



		pwm@b600 {

		pm8226_pwm_6: pwm@b600 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xb600 0x100>,

			      <0xb042 0x7e>;

arch/arm/boot/dts/qcom/msm-pm8941.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -1401,7 +1401,7 @@ 
		#pwm-cells = <2>;

	};



	pwm@b500 {

	pm8941_pwm_5: pwm@b500 {

		compatible = "qcom,qpnp-pwm";

		reg = <0xb500 0x100>,

		      <0xb042 0x7e>;
@@ -1412,7 +1412,7 @@ 
		#pwm-cells = <2>;

	};



	pwm@b600 {

	pm8941_pwm_6: pwm@b600 {

		compatible = "qcom,qpnp-pwm";

		reg = <0xb600 0x100>,

		      <0xb042 0x7e>;
@@ -1423,7 +1423,7 @@ 
		#pwm-cells = <2>;

	};



	pwm@b700 {

	pm8941_pwm_7: pwm@b700 {

		compatible = "qcom,qpnp-pwm";

		reg = <0xb700 0x100>,

		      <0xb042 0x7e>;
@@ -1445,7 +1445,7 @@ 
		#pwm-cells = <2>;

	};



	pwm@e400 {

	pm8941_pwm_9: pwm@e400 {

		compatible = "qcom,qpnp-pwm";

		reg = <0xe400 0x100>,

		      <0xe342 0x1e>;
@@ -1456,7 +1456,7 @@ 
		#pwm-cells = <2>;

	};



	pwm@e500 {

	pm8941_pwm_10: pwm@e500 {

		compatible = "qcom,qpnp-pwm";

		reg = <0xe500 0x100>,

		      <0xe342 0x1e>;
@@ -1467,7 +1467,7 @@ 
		#pwm-cells = <2>;

	};



	pwm@e600 {

	pm8941_pwm_11: pwm@e600 {

		compatible = "qcom,qpnp-pwm";

		reg = <0xe600 0x100>,

		      <0xe342 0x1e>;
@@ -1478,7 +1478,7 @@ 
		#pwm-cells = <2>;

	};



	pwm@e700 {

	pm8941_pwm_12: pwm@e700 {

		compatible = "qcom,qpnp-pwm";

		reg = <0xe700 0x100>,

		      <0xe342 0x1e>;

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;



		pwm@b100 {

		pmi8994_pwm_1: pwm@b100 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xb100 0x100>,

			      <0xb042 0x7e>;
@@ -368,7 +368,7 @@ 
			#pwm-cells = <2>;

		};



		pwm@b200 {

		pmi8994_pwm_2: pwm@b200 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xb200 0x100>,

			      <0xb042 0x7e>;
@@ -379,7 +379,7 @@ 
			#pwm-cells = <2>;

		};



		pwm@b300 {

		pmi8994_pwm_3: pwm@b300 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xb300 0x100>,

			      <0xb042 0x7e>;
@@ -464,7 +464,7 @@ 
				label = "rgb";

				qcom,id = <3>;

				qcom,mode = "pwm";

				qcom,pwm-channel = <2>;

				pwms = <&pmi8994_pwm_3 0 0>;

				qcom,pwm-us = <1000>;

				qcom,max-current = <12>;

				qcom,default-state = "off";
@@ -477,7 +477,7 @@ 
				label = "rgb";

				qcom,id = <4>;

				qcom,mode = "pwm";

				qcom,pwm-channel = <1>;

				pwms = <&pmi8994_pwm_2 0 0>;

				qcom,pwm-us = <1000>;

				qcom,max-current = <12>;

				qcom,default-state = "off";
@@ -489,7 +489,7 @@ 
				label = "rgb";

				qcom,id = <5>;

				qcom,mode = "pwm";

				qcom,pwm-channel = <0>;

				pwms = <&pmi8994_pwm_1 0 0>;

				qcom,pwm-us = <1000>;

				qcom,max-current = <12>;

				qcom,default-state = "off";