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

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

Merge "ARM: arm: dts: move pmic vibrator dts entry for 8916 mtp/cdp"

parents fc0c93bc 2cf132a6

arch/arm/boot/dts/qcom/msm8916-cdp.dts

+0 −10
Original line number Diff line number Diff line
@@ -19,13 +19,3 @@ 
	compatible = "qcom,msm8916-cdp", "qcom,msm8916", "qcom,cdp";

	qcom,board-id = <1 0>;

};
 


&spmi_bus {

	qcom,pm8916@1 {

		qcom,vibrator@c000 {

			status = "okay";

			qcom,vib-timeout-ms = <15000>;

			qcom,vib-vtg-level-mV = <3100>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8916-cdp.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -384,3 +384,13 @@ 
&qcom_seecom {

	status = "okay";

};



&spmi_bus {

	qcom,pm8916@1 {

		qcom,vibrator@c000 {

			status = "okay";

			qcom,vib-timeout-ms = <15000>;

			qcom,vib-vtg-level-mV = <3100>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8916-mtp.dts

+0 −10
Original line number Diff line number Diff line
@@ -54,13 +54,3 @@ 
		avago,ga_value = <48>;

	};

};
 


&spmi_bus {

	qcom,pm8916@1 {

		qcom,vibrator@c000 {

			status = "okay";

			qcom,vib-timeout-ms = <15000>;

			qcom,vib-vtg-level-mV = <3100>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8916-mtp.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -369,3 +369,13 @@ 
      pinctrl-6 = <&qdsd_clk_spmi &qdsd_cmd_spmi

                  &qdsd_data0_spmi &qdsd_data3_spmi>;

};



&spmi_bus {

	qcom,pm8916@1 {

		qcom,vibrator@c000 {

			status = "okay";

			qcom,vib-timeout-ms = <15000>;

			qcom,vib-vtg-level-mV = <3100>;

		};

	};

};