Merge "ARM: dts: enable gpios and mpps selectively for pm8994" (25972f4d) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/msm-pm8994.dtsi

+29 −0

Original line number	Diff line number	Diff line
		@@ -90,106 +90,127 @@
		gpio@c000 {
		reg = <0xc000 0x100>;
		qcom,pin-num = <1>;
		status = "disabled";
		};

		gpio@c100 {
		reg = <0xc100 0x100>;
		qcom,pin-num = <2>;
		status = "disabled";
		};

		gpio@c200 {
		reg = <0xc200 0x100>;
		qcom,pin-num = <3>;
		status = "disabled";
		};

		gpio@c300 {
		reg = <0xc300 0x100>;
		qcom,pin-num = <4>;
		status = "disabled";
		};

		gpio@c400 {
		reg = <0xc400 0x100>;
		qcom,pin-num = <5>;
		status = "disabled";
		};

		gpio@c500 {
		reg = <0xc500 0x100>;
		qcom,pin-num = <6>;
		status = "disabled";
		};

		gpio@c600 {
		reg = <0xc600 0x100>;
		qcom,pin-num = <7>;
		status = "disabled";
		};

		gpio@c700 {
		reg = <0xc700 0x100>;
		qcom,pin-num = <8>;
		status = "disabled";
		};

		gpio@c800 {
		reg = <0xc800 0x100>;
		qcom,pin-num = <9>;
		status = "disabled";
		};

		gpio@c900 {
		reg = <0xc900 0x100>;
		qcom,pin-num = <10>;
		status = "disabled";
		};

		gpio@ca00 {
		reg = <0xca00 0x100>;
		qcom,pin-num = <11>;
		status = "disabled";
		};

		gpio@cb00 {
		reg = <0xcb00 0x100>;
		qcom,pin-num = <12>;
		status = "disabled";
		};

		gpio@cc00 {
		reg = <0xcc00 0x100>;
		qcom,pin-num = <13>;
		status = "disabled";
		};

		gpio@cd00 {
		reg = <0xcd00 0x100>;
		qcom,pin-num = <14>;
		status = "disabled";
		};

		gpio@ce00 {
		reg = <0xce00 0x100>;
		qcom,pin-num = <15>;
		status = "disabled";
		};

		gpio@cf00 {
		reg = <0xcf00 0x100>;
		qcom,pin-num = <16>;
		status = "disabled";
		};

		gpio@d000 {
		reg = <0xd000 0x100>;
		qcom,pin-num = <17>;
		status = "disabled";
		};

		gpio@d100 {
		reg = <0xd100 0x100>;
		qcom,pin-num = <18>;
		status = "disabled";
		};

		gpio@d200 {
		reg = <0xd200 0x100>;
		qcom,pin-num = <19>;
		status = "disabled";
		};

		gpio@d300 {
		reg = <0xd300 0x100>;
		qcom,pin-num = <20>;
		status = "disabled";
		};

		gpio@d500 {
		reg = <0xd500 0x100>;
		qcom,pin-num = <22>;
		status = "disabled";
		};
		};

		@@ -205,41 +226,49 @@
		mpp@a000 {
		reg = <0xa000 0x100>;
		qcom,pin-num = <1>;
		status = "disabled";
		};

		mpp@a100 {
		reg = <0xa100 0x100>;
		qcom,pin-num = <2>;
		status = "disabled";
		};

		mpp@a200 {
		reg = <0xa200 0x100>;
		qcom,pin-num = <3>;
		status = "disabled";
		};

		mpp@a300 {
		reg = <0xa300 0x100>;
		qcom,pin-num = <4>;
		status = "disabled";
		};

		mpp@a400 {
		reg = <0xa400 0x100>;
		qcom,pin-num = <5>;
		status = "disabled";
		};

		mpp@a500 {
		reg = <0xa500 0x100>;
		qcom,pin-num = <6>;
		status = "disabled";
		};

		mpp@a600 {
		reg = <0xa600 0x100>;
		qcom,pin-num = <7>;
		status = "disabled";
		};

		mpp@a700 {
		reg = <0xa700 0x100>;
		qcom,pin-num = <8>;
		status = "disabled";
		};
		};

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

+14 −0

Original line number	Diff line number	Diff line
		@@ -39,51 +39,61 @@
		gpio@c000 {
		reg = <0xc000 0x100>;
		qcom,pin-num = <1>;
		status = "disabled";
		};

		gpio@c100 {
		reg = <0xc100 0x100>;
		qcom,pin-num = <2>;
		status = "disabled";
		};

		gpio@c200 {
		reg = <0xc200 0x100>;
		qcom,pin-num = <3>;
		status = "disabled";
		};

		gpio@c300 {
		reg = <0xc300 0x100>;
		qcom,pin-num = <4>;
		status = "disabled";
		};

		gpio@c400 {
		reg = <0xc400 0x100>;
		qcom,pin-num = <5>;
		status = "disabled";
		};

		gpio@c500 {
		reg = <0xc500 0x100>;
		qcom,pin-num = <6>;
		status = "disabled";
		};

		gpio@c600 {
		reg = <0xc600 0x100>;
		qcom,pin-num = <7>;
		status = "disabled";
		};

		gpio@c700 {
		reg = <0xc700 0x100>;
		qcom,pin-num = <8>;
		status = "disabled";
		};

		gpio@c800 {
		reg = <0xc800 0x100>;
		qcom,pin-num = <9>;
		status = "disabled";
		};

		gpio@c900 {
		reg = <0xc900 0x100>;
		qcom,pin-num = <10>;
		status = "disabled";
		};
		};

		@@ -99,21 +109,25 @@
		mpp@a000 {
		reg = <0xa000 0x100>;
		qcom,pin-num = <1>;
		status = "disabled";
		};

		mpp@a100 {
		reg = <0xa100 0x100>;
		qcom,pin-num = <2>;
		status = "disabled";
		};

		mpp@a200 {
		reg = <0xa200 0x100>;
		qcom,pin-num = <3>;
		status = "disabled";
		};

		mpp@a300 {
		reg = <0xa300 0x100>;
		qcom,pin-num = <4>;
		status = "disabled";
		};
		};

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -506,6 +506,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c300 { /* GPIO 4 */
		@@ -513,6 +514,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c400 { /* GPIO 5 */
		@@ -520,6 +522,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c600 { /* GPIO 7 */
		@@ -529,6 +532,7 @@
		qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */
		qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@c900 { /* GPIO 10 */
		@@ -538,6 +542,7 @@
		qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */
		qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@c700 { /* GPIO 8 */
		@@ -549,6 +554,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,out-strength = <1>; /* Low drive strength */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@c800 { /* GPIO 9 */
		@@ -559,6 +565,11 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,out-strength = <1>; /* High drive strength */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@cd00 { /* GPIO 14 */
		status = "okay";
		};

		gpio@ce00 { /* GPIO 15 */
		@@ -569,6 +580,7 @@
		qcom,out-strength = <1>;
		qcom,src-sel = <2>;
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@d100 { /* GPIO 18 */
		@@ -579,6 +591,7 @@
		qcom,src-sel = <3>; /* Function 2 */
		qcom,out-strength = <2>; /* Medium */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@d200 { /* GPIO 19 */
		@@ -588,6 +601,7 @@
		qcom,src-sel = <0>; /* GPIO */
		qcom,invert = <0>; /* Invert */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};
		};

		@@ -601,6 +615,7 @@
		qcom,vin-sel = <2>; /* S4 1.8V */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		mpp@a300 { /* MPP 4 */
		@@ -611,6 +626,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		qcom,invert = <0>;
		status = "okay";
		};
		};

		@@ -621,11 +637,13 @@
		qcom,vin-sel = <2>; /* S4 1.8V */
		qcom,src-sel = <7>; /* DTEST4 */
		qcom,master-en = <1>; /* Enable MPP */
		status = "okay";
		};
		mpp@a300 { /* MPP 4 */
		/* WLED FET */
		qcom,mode = <1>;
		qcom,master-en = <1>;
		status = "okay";
		};
		};

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -405,6 +405,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c300 { /* GPIO 4 */
		@@ -412,6 +413,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c400 { /* GPIO 5 */
		@@ -419,6 +421,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c600 { /* GPIO 7 */
		@@ -428,6 +431,7 @@
		qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */
		qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@c900 { /* GPIO 10 */
		@@ -437,6 +441,7 @@
		qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */
		qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@c700 { /* GPIO 8 */
		@@ -448,6 +453,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,out-strength = <1>; /* Low drive strength */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@c800 { /* GPIO 9 */
		@@ -458,6 +464,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,out-strength = <1>; /* High drive strength */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@ce00 { /* GPIO 15 */
		@@ -468,6 +475,7 @@
		qcom,out-strength = <1>;
		qcom,src-sel = <2>;
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@d100 { /* GPIO 18 */
		@@ -478,6 +486,7 @@
		qcom,src-sel = <3>; /* Function 2 */
		qcom,out-strength = <2>; /* Medium */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@d200 { /* GPIO 19 */
		@@ -487,6 +496,7 @@
		qcom,src-sel = <0>; /* GPIO */
		qcom,invert = <0>; /* Invert */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};
		};

		@@ -500,6 +510,7 @@
		qcom,vin-sel = <2>; /* S4 1.8V */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		mpp@a300 { /* MPP 4 */
		@@ -509,6 +520,7 @@
		qcom,vin-sel = <2>; /* S4 1.8V */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};
		};

		@@ -532,6 +544,7 @@
		/* WLED FET */
		qcom,mode = <1>;
		qcom,master-en = <1>;
		status = "okay";
		};
		};

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -578,6 +578,7 @@
		qcom,vin-sel = <2>; /* 1.8v */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@c100 { /* GPIO 2 */
		@@ -585,6 +586,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c200 { /* GPIO 3 */
		@@ -592,6 +594,7 @@
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c300 { /* GPIO 4 SMB_SUSP */
		@@ -599,6 +602,7 @@
		qcom,pull = <5>; /* No PULL */
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c400 { /* GPIO 5 DOCK DET*/
		@@ -607,6 +611,7 @@
		qcom,vin-sel = <2>; /* 1.8 */
		qcom,src-sel = <0>; /* CONSTANT */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		};

		gpio@c500 { /* GPIO 6 SMB STAT */
		@@ -615,6 +620,7 @@
		qcom,vin-sel = <0>; /* VPH */
		qcom,src-sel = <0>; /* CONSTANT */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		};

		gpio@c600 { /* GPIO 7 - NFC_PWR_REQ */
		@@ -623,6 +629,7 @@
		qcom,vin-sel = <2>; /* 1.8 */
		qcom,src-sel = <0>; /* CONSTANT */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		};

		gpio@c700 { /* GPIO 8 */
		@@ -634,6 +641,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,out-strength = <1>; /* Low drive strength */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@c800 { /* GPIO 9 */
		@@ -644,6 +652,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,out-strength = <1>; /* High drive strength */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@c900 { /* GPIO 10 - NFC_CLK_REQ */
		@@ -652,6 +661,7 @@
		qcom,vin-sel = <2>; /* 1.8 */
		qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		};

		gpio@cc00 { /* GPIO 13 docking station jack detect */
		@@ -660,6 +670,7 @@
		qcom,vin-sel = <2>; /* 1.8 */
		qcom,src-sel = <0>; /* CONSTANT */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		};

		gpio@ce00 { /* GPIO 15 */
		@@ -670,6 +681,7 @@
		qcom,out-strength = <1>;
		qcom,src-sel = <2>;
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@d200 { /* GPIO 19 */
		@@ -679,6 +691,7 @@
		qcom,src-sel = <0>; /* GPIO */
		qcom,invert = <0>; /* Invert */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		gpio@d300 { /* GPIO 20 */
		@@ -694,6 +707,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,invert = <0>; /* Invert */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		mpp@a400 { /* MPP 5 Ext Speaker Boost enable*/
		@@ -703,6 +717,7 @@
		qcom,vin-sel = <2>; /* 1.8 */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};

		mpp@a500 { /* MPP 6 Ethernet RESET */
		@@ -711,6 +726,7 @@
		qcom,vin-sel = <2>; /* 1.8 V */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};
		};

		@@ -721,6 +737,7 @@
		qcom,vin-sel = <2>; /* 1.8 */
		qcom,src-sel = <0>; /* CONSTANT */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		};

		gpio@c100 { /* GPIO 2 */
		@@ -730,6 +747,7 @@
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		qcom,master-en = <1>;
		status = "okay";
		};
		};

		@@ -741,6 +759,7 @@
		qcom,src-sel = <7>; /* DTEST4 */
		qcom,vin-sel = <0>; /* VPH_PWR */
		qcom,master-en = <1>; /* Enable MPP */
		status = "okay";
		};

		mpp@a100 { /* MPP 2 */