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

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

Merge "ARM: dts: msm: Add pwm-cells property to PWM devices"

parents f781821d 7611f9ea

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

+1 −0
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ 
			reg-names = "qpnp-lpg-channel-base";

			qcom,channel-id = <0>;

			qcom,supported-sizes = <6>, <9>;

			#pwm-cells = <2>;

		};

	};

};

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

+6 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ 
			qcom,channel-id = <0>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <0>;

			#pwm-cells = <2>;

		};



		pwm@b200 {
@@ -799,6 +800,7 @@ 
			qcom,channel-id = <1>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <1>;

			#pwm-cells = <2>;

		};



		pwm@b300 {
@@ -809,6 +811,7 @@ 
			qcom,channel-id = <2>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <2>;

			#pwm-cells = <2>;

		};



		pwm@b400 {
@@ -819,6 +822,7 @@ 
			qcom,channel-id = <3>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <3>;

			#pwm-cells = <2>;

		};



		pwm@b500 {
@@ -829,6 +833,7 @@ 
			qcom,channel-id = <4>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <4>;

			#pwm-cells = <2>;

		};



		pwm@b600 {
@@ -839,6 +844,7 @@ 
			qcom,channel-id = <5>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <5>;

			#pwm-cells = <2>;

		};



		regulator@8000 {

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

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ 
			reg-names = "qpnp-lpg-channel-base";

			qcom,channel-id = <0>;

			qcom,supported-sizes = <6>, <9>;

			#pwm-cells = <2>;

		};



		pm8916_vib: qcom,vibrator@c000 {

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

+12 −0
Original line number Diff line number Diff line
@@ -1365,6 +1365,7 @@ 
		qcom,channel-id = <0>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <0>;

		#pwm-cells = <2>;

	};



	pwm@b200 {
@@ -1375,6 +1376,7 @@ 
		qcom,channel-id = <1>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <1>;

		#pwm-cells = <2>;

	};



	pwm@b300 {
@@ -1385,6 +1387,7 @@ 
		qcom,channel-id = <2>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <2>;

		#pwm-cells = <2>;

	};



	pwm@b400 {
@@ -1395,6 +1398,7 @@ 
		qcom,channel-id = <3>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <3>;

		#pwm-cells = <2>;

	};



	pwm@b500 {
@@ -1405,6 +1409,7 @@ 
		qcom,channel-id = <4>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <4>;

		#pwm-cells = <2>;

	};



	pwm@b600 {
@@ -1415,6 +1420,7 @@ 
		qcom,channel-id = <5>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <5>;

		#pwm-cells = <2>;

	};



	pwm@b700 {
@@ -1425,6 +1431,7 @@ 
		qcom,channel-id = <6>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <6>;

		#pwm-cells = <2>;

	};



	pwm@b800 {
@@ -1435,6 +1442,7 @@ 
		qcom,channel-id = <7>;

		qcom,supported-sizes = <6>, <7>, <9>;

		qcom,ramp-index = <7>;

		#pwm-cells = <2>;

	};



	pwm@e400 {
@@ -1445,6 +1453,7 @@ 
		qcom,channel-id = <8>;

		qcom,supported-sizes = <7>, <8>;

		qcom,ramp-index = <0>;

		#pwm-cells = <2>;

	};



	pwm@e500 {
@@ -1455,6 +1464,7 @@ 
		qcom,channel-id = <9>;

		qcom,supported-sizes = <7>, <8>;

		qcom,ramp-index = <1>;

		#pwm-cells = <2>;

	};



	pwm@e600 {
@@ -1465,6 +1475,7 @@ 
		qcom,channel-id = <10>;

		qcom,supported-sizes = <7>, <8>;

		qcom,ramp-index = <2>;

		#pwm-cells = <2>;

	};



	pwm@e700 {
@@ -1475,5 +1486,6 @@ 
		qcom,channel-id = <11>;

		qcom,supported-sizes = <7>, <8>;

		qcom,ramp-index = <3>;

		#pwm-cells = <2>;

	};

};

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

+6 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ 
			qcom,channel-id = <0>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <0>;

			#pwm-cells = <2>;

			status = "disabled";

		};
@@ -352,6 +353,7 @@ 
			qcom,channel-id = <1>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <1>;

			#pwm-cells = <2>;

			status = "disabled";

		};
@@ -363,6 +365,7 @@ 
			qcom,channel-id = <2>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <2>;

			#pwm-cells = <2>;

			status = "disabled";

		};
@@ -374,6 +377,7 @@ 
			qcom,channel-id = <3>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <3>;

			#pwm-cells = <2>;

			status = "disabled";

		};
@@ -385,6 +389,7 @@ 
			qcom,channel-id = <4>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <4>;

			#pwm-cells = <2>;

			status = "disabled";

		};
@@ -396,6 +401,7 @@ 
			qcom,channel-id = <5>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <5>;

			#pwm-cells = <2>;

			status = "disabled";

		};

	};