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

Commit 9bf193b5 authored by Stepan Moskovchenko's avatar Stepan Moskovchenko
Browse files

ARM: dts: msm: Remove duplicate I2C controller on 8994 



Commit c6e4e229 ('ARM: dts:
msm: Enable BLSP11 for I2C usage') added a duplicate I2C
controller. Specifically, the newly-added i2c_11 device has
the same hardware resources as the already existing i2c_5
device. Remove the duplicate device to avoid confusion.

This reverts commit c6e4e229.

Change-Id: I01a61f7801a32aa3778bc6049389410ea9af5c00
Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
parent 3511ae2a

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

+0 −17
Original line number Diff line number Diff line
@@ -406,23 +406,6 @@ 
			};

		};



		pmx_i2c_11 {

			qcom,pins = <&gp 83>, <&gp 84>; /* SDA, SCL */

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

			qcom,pin-func = <3>;

			label = "pmx_i2c_11";



			i2c_11_active: i2c_11_active {

				drive-strength = <2>;

				bias-disable;

			};



			i2c_11_sleep: i2c_11_sleep {

				drive-strength = <2>;

				bias-disable;

			};

		};



		pmx_rd_nfc_int{

			qcom,pins = <&gp 29>;

			qcom,pin-func = <0>;

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

+0 −26
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
		i2c6 = &i2c_6; /* I2C6 NFC qup6 device */

		i2c2 = &i2c_2;

		i2c5 = &i2c_5;

		i2c11 = &i2c_11;

		spi0 = &spi_0;

	};
@@ -2218,31 +2217,6 @@ 
		qcom,master-id = <86>;

	};



	i2c_11: i2c@f9967000 { /* BLSP2 QUP5 */

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

		#address-cells = <1>;

		#size-cells = <0>;

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

		reg = <0xf9967000 0x1000>,

		      <0xf9944000 0x19000>;

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

		interrupts = <0 105 0>, <0 239 0>;

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

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

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

		clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,

			 <&clock_gcc clk_gcc_blsp2_qup5_i2c_apps_clk>;



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

		pinctrl-0 = <&i2c_11_active>;

		pinctrl-1 = <&i2c_11_sleep>;

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

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

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

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

		qcom,master-id = <84>;

	};



	sound {

		compatible = "qcom,msm8994-asoc-snd";

		qcom,model = "msm8994-tomtom-snd-card";