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

Commit 69e20b29 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: set up gpio 14 and 15 for msm8926"

parents 13d67b0d 4da7c12c

arch/arm/boot/dts/qcom/msm8226.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ 
		qcom,i2c-bus-freq = <400000>;

		qcom,i2c-src-freq = <19200000>;

	};

	i2c@f9926000 { /* BLSP-1 QUP-4 */

	i2c_0: i2c@f9926000 { /* BLSP-1 QUP-4 */

		cell-index = <0>;

		compatible = "qcom,i2c-qup";

		reg = <0xf9926000 0x1000>;
@@ -1032,6 +1032,8 @@ 
		interrupts = <0 98 0>;

		interrupt-names = "qup_err_intr";

		qcom,i2c-bus-freq = <100000>;

		qcom,i2c-src-freq = <19200000>;

		qcom,master-id = <86>;

	};



	i2c@f9927000 { /* BLSP1 QUP5 */

arch/arm/boot/dts/qcom/msm8926.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ 
		      <224 0x10001>;

};



&i2c_0 {

	qcom,sda-gpio = <&msmgpio 14 0>;

	qcom,scl-gpio = <&msmgpio 15 0>;

};



&soc {

	qcom,mss@fc880000 {

		reg = <0xfc880000 0x100>,