Revert "ARM: midas: modem: sync GPIOs with Replicant 6.0"replicant-11-i9300-modem

This reverts commit ca793b3db5d6dd6d4acd92d772c9f9f80af8e2a0.

2 files changed, 4 insertions, 104 deletions

diff --git a/arch/arm/boot/dts/exynos4412-midas-3g.dtsi b/arch/arm/boot/dts/exynos4412-midas-3g.dtsi
index d32b1fc14a10..f658824e8cb1 100644
--- a/arch/arm/boot/dts/exynos4412-midas-3g.dtsi
+++ b/arch/arm/boot/dts/exynos4412-midas-3g.dtsi
@@ -12,8 +12,6 @@
 #include <dt-bindings/net/samsung_ipc.h>
 #include <dt-bindings/clock/maxim,max77686.h>
 
-#include "exynos4412.dtsi"
-
 / {
 	modem {
 		compatible = "samsung,sipc4-modem";
@@ -94,21 +92,6 @@
 
 	xmm6262 {
 		compatible = "samsung,modem-ctl";
-	        pinctrl-0 = <
-			&cp_on
-			&cp_reset
-			&ap_dump
-			&cp_dump
-			&phone_active
-			&reset_req
-			&pda_active
-			&link_active
-			&link_hostwake
-			&link_slavewake
-			&suspend_req
-		>;
-
-		pinctrl-names = "default";
 		cp-on-gpios = <&gpl2 5 GPIO_ACTIVE_HIGH>;
 		cp-reset-gpios = <&gpx3 2 GPIO_ACTIVE_HIGH>;
 		ap-dump-gpios = <&gpj0 1 GPIO_ACTIVE_HIGH>;
@@ -124,92 +107,5 @@
 		clocks = <&max77686 MAX77686_CLK_CP>;
 		clock-names = "cp_clk";
 	};
-};
-
-&pinctrl_0 {
-	pda_active: pda-active {
-		samsung,pins = "gpf1-6";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	link_active: link-active {
-		samsung,pins = "gpf1-1";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	ap_dump: ap-dump {
-		samsung,pins = "gpj0-1";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-};
-
-&pinctrl_1 {
-	cp_on: cp-on {
-		samsung,pins = "gpl2-5";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	cp_reset: cp-reset {
-		samsung,pins = "gpx3-2";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-		/* DRIVE_1X */
-	};
-
-	cp_dump: cp-dump {
-		samsung,pins = "gpx1-2";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	phone_active: phone-active {
-		samsung,pins = "gpx1-6";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	reset_req: reset-req {
-		samsung,pins = "gpm3-3";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	link_hostwake: link-hostwake {
-		/* TODO : CON value == 0xf */
-		samsung,pins = "gpx1-1";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	link_slavewake: link-slavewake {
-		samsung,pins = "gpx1-0";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		/* DRIVE_1X */
-	};
-
-	suspend_req: suspend-req {
-		samsung,pins = "gmp2-4";
-		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-		/* DRIVE_1X */
-	};
-};
-
-&sleep0 {
-	PIN_SLP(gpf1-6, OUT0, NONE); /* pda-active     */
-	PIN_SLP(gpf1-1, OUT0, NONE); /* link-active    */
-	PIN_SLP(gpj0-1, OUT0, NONE); /* ap-dump        */
-};
 
-&sleep1 {
-	PIN_SLP(gpx2-5, OUT0, NONE); /* cp-on          */
-	PIN_SLP(gpx3-2, OUT0, NONE); /* cd-reset       */
-	PIN_SLP(gpx1-2, OUT0, NONE); /* cd-dump        */
-	PIN_SLP(gpx1-6, OUT0, NONE); /* phone-active   */
-	PIN_SLP(gpm3-3, OUT0, NONE); /* reset-req      */
-	PIN_SLP(gpx1-1, OUT0, NONE); /* link-hostwake  */
-	PIN_SLP(gpx1-0, OUT0, NONE); /* link-slavewake */
-	PIN_SLP(gpm2-4, OUT0, NONE); /* suspend-req    */
 };
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
index e9eed951738a..e5ebf24fc254 100644
--- a/arch/arm/boot/dts/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -1095,10 +1095,12 @@
 		PIN_SLP(gpf0-7, INPUT, DOWN);
 
 		PIN_SLP(gpf1-0, INPUT, DOWN);
+		PIN_SLP(gpf1-1, INPUT, DOWN);
 		PIN_SLP(gpf1-2, INPUT, DOWN);
 		PIN_SLP(gpf1-3, INPUT, DOWN);
 		PIN_SLP(gpf1-4, INPUT, NONE);
 		PIN_SLP(gpf1-5, INPUT, NONE);
+		PIN_SLP(gpf1-6, INPUT, DOWN);
 		PIN_SLP(gpf1-7, PREV, NONE);
 
 		PIN_SLP(gpf2-0, PREV, NONE);
@@ -1240,10 +1242,12 @@
 		PIN_SLP(gpm2-1, INPUT, NONE);
 		PIN_SLP(gpm2-2, INPUT, DOWN);
 		PIN_SLP(gpm2-3, INPUT, DOWN);
+		PIN_SLP(gpm2-4, OUT0, DOWN);
 
 		PIN_SLP(gpm3-0, PREV, NONE);
 		PIN_SLP(gpm3-1, PREV, NONE);
 		PIN_SLP(gpm3-2, PREV, NONE);
+		PIN_SLP(gpm3-3, OUT1, NONE);
 		PIN_SLP(gpm3-4, INPUT, DOWN);
 		PIN_SLP(gpm3-5, INPUT, DOWN);
 		PIN_SLP(gpm3-6, INPUT, DOWN);