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

Commit 6c3df4eb 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: Update PWM and coin cell device configurations for pm8916"

parents 691a1ce6 105dd8a1

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

+8 −5
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ 
					  "pm8916_mpp3", "pm8916_mpp4";

		};



		pm8916_coincell: qcom,coincell@2800 {

			compatible = "qcom,qpnp-coincell";

			reg = <0x2800 0x100>;

		};



		pm8916_rtc: qcom,pm8916_rtc {

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;
@@ -299,12 +304,10 @@ 
		#address-cells = <1>;

		#size-cells = <1>;



		pm8916_pwm: pwm@bc00 {

			compatible = "qcom,qpnp-pwm";

		pm8916_pwm: qcom,pwms@bc00 {

			compatible = "qcom,pwm-lpg";

			reg = <0xbc00 0x100>;

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

			qcom,channel-id = <0>;

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

			reg-names = "lpg-base";

			#pwm-cells = <2>;

		};

arch/arm64/boot/dts/qcom/qm215-qrd.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,18 @@ 
	status = "ok";

};



&pm8916_chg{

	status = "ok";

};



&pm8916_bms{

	status = "ok";

};



&pm8916_vib{

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";