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

Commit 4e479d98 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 i2c pinctrl names 8916"

parents 3cd91036 1c022578

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

+8 −15
Original line number Diff line number Diff line
@@ -217,29 +217,22 @@ 
			};

		};



		i2c0_active {



		pmx_i2c_0 {

			/* CLK, DATA */

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

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

			qcom,pin-func = <3>;

			label = "i2c0-active";

			/* active state */

			i2c_default: default {

			label = "pmx_i2c_0";



			i2c_0_active: i2c_0_active {

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

				bias-disable = <0>; /* No PULL */

			};

				bias-disable;         /* No PULL */

			};



		i2c0_suspend {

			/* CLK, DATA */

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

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

			qcom,pin-func = <0>;

			label = "i2c0-suspend";

			/*suspended state */

			i2c_sleep: sleep {

			i2c_0_sleep: i2c_0_sleep {

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

				bias-disable = <0>; /* No PULL */

				bias-disable;	      /* No PULL */

			};

		};

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

+3 −5
Original line number Diff line number Diff line
@@ -1197,8 +1197,6 @@ 


	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>;
@@ -1209,9 +1207,9 @@ 
		clock-names = "iface_clk", "core_clk";

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

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

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&i2c_default>;

		pinctrl-1 = <&i2c_sleep>;

		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>;