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

Commit 6ca79566 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: Configure I2C on BLSP1 QUP2 for 8939"

parents 9e666c3e 55ad73d2

arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -151,5 +151,22 @@ 
				drive-strength = <2>; /* 2 MA */

			};

		};

		pmx_i2c_0 {

			/* CLK, DATA */

			qcom,pins = <&gp 7>, <&gp 6>;

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <3>;

			label = "pmx_i2c_0";



			i2c_0_active: i2c_0_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable;         /* No PULL */

			};



			i2c_0_sleep: i2c_0_sleep {

				drive-strength = <2>; /* 2 MA */

				bias-disable;	      /* No PULL */

			};

		};

	};

};

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

+24 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
		smd11 = &smdtty_data11;

		smd21 = &smdtty_data21;

		smd36 = &smdtty_loopback;

		i2c0 = &i2c_0;

	};



	cpus {
@@ -604,6 +605,29 @@ 
		clock-names = "core_clk", "iface_clk";

	};



	i2c_0: i2c@78b6000 { /* BLSP1 QUP2 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr", "bam_phys_addr";

		reg = <0x78b6000 0x600>,

		      <0x7884000 0x23000>;

		interrupt-names = "qup_irq", "bam_irq";

		interrupts = <0 96 0>, <0 238 0>;

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			 <&clock_gcc clk_gcc_blsp1_qup2_i2c_apps_clk>;

		clock-names = "iface_clk", "core_clk";

		qcom,clk-freq-out = <100000>;

		qcom,clk-freq-in  = <19200000>;

		pinctrl-names = "i2c_active", "i2c_sleep";

		pinctrl-0 = <&i2c_0_active>;

		pinctrl-1 = <&i2c_0_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,bam-pipe-idx-cons = <6>;

		qcom,bam-pipe-idx-prod = <7>;

		qcom,master-id = <86>;

	};

	spmi_bus: qcom,spmi@200f000 {

		compatible = "qcom,spmi-pmic-arb";

		reg = <0x200f000 0x1000>,