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

Commit a95db79a 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: correct the I2C pin config for msmthorium"

parents 9794e5c3 9379037f

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

+6 −6
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 


		};



		i2c2 {

			i2c2_default: i2c2_default {

		i2c_2 {

			i2c_2_active: i2c_2_active {

				/* active state */

				mux {

					pins = "gpio6", "gpio7";
@@ -65,7 +65,7 @@ 
				};

			};



			i2c2_sleep: i2c2_sleep {

			i2c_2_sleep: i2c_2_sleep {

				/* suspended state */

				mux {

					pins = "gpio6", "gpio7";
@@ -80,8 +80,8 @@ 
			};

		};



		i2c5 {

			i2c5_default: i2c5_default {

		i2c_5 {

			i2c_5_active: i2c_5_active {

				/* active state */

				mux {

					pins = "gpio18", "gpio19";
@@ -95,7 +95,7 @@ 
				};

			};



			i2c5_sleep: i2c5_sleep {

			i2c_5_sleep: i2c_5_sleep {

				/* suspended state */

				mux {

					pins = "gpio18", "gpio19";

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

+7 −7
Original line number Diff line number Diff line
@@ -261,9 +261,9 @@ 
		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			<&clock_gcc clk_gcc_blsp1_qup2_i2c_apps_clk>;



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

		pinctrl-0 = <&i2c2_default>;

		pinctrl-1 = <&i2c2_sleep>;

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

		pinctrl-0 = <&i2c_2_active>;

		pinctrl-1 = <&i2c_2_sleep>;

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

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

		qcom,master-id = <86>;
@@ -286,12 +286,12 @@ 
		clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,

			<&clock_gcc clk_gcc_blsp2_qup1_i2c_apps_clk>;



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

		pinctrl-0 = <&i2c5_default>;

		pinctrl-1 = <&i2c5_sleep>;

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

		pinctrl-0 = <&i2c_5_active>;

		pinctrl-1 = <&i2c_5_sleep>;

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

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

		qcom,master-id = <86>;

		qcom,master-id = <84>;

		dmas = <&dma_blsp2 4 64 0x20000020 0x20>,

			<&dma_blsp2 5 32 0x20000020 0x20>;

		dma-names = "tx", "rx";