Revert "IKXCLOCK-1044 dts: omap3: minnow: enable OMAP offmode"

This reverts commit 6e5dd5ea0e49761f4c287539969a258e8d78d9ed.

2 files changed, 18 insertions, 63 deletions

diff --git a/arch/arm/boot/dts/omap3-minnow.dtsi b/arch/arm/boot/dts/omap3-minnow.dtsi
index 942ab0e2998..96ce2a23e04 100644
--- a/arch/arm/boot/dts/omap3-minnow.dtsi
+++ b/arch/arm/boot/dts/omap3-minnow.dtsi
@@ -239,17 +239,6 @@
 	};
 };
 
-&glbl_prm {
-	status = "ok";
-	sys_clk = "osc_sys_ck";
-	autoextclkmode = <2>;
-	sys_off_mode;
-	auto_off;
-	auto_retention;
-	offmodesetup_time = <25000>;
-	clksetup_time = <1000>;
-};
-
 &i2c1 {
 	clock-frequency = <400000>;
 
@@ -360,12 +349,10 @@
 		spi-cs-high;
 
 		register-init-data = <
-			0x25 0xF1 /* DEVCTRL2: enable SLEEP, INT push/pull
-					       2ms TSLOT, INT active high */
 			0x26 0x49 /* I2C_SPI_CFG: AVS ADDR = 0x13,
 					DCDC1, DCDC4 is AVS ctrl */
-			0x29 0x10 /* SET_OFF1: LDO5 */
-			0x2A 0x24 /* SET_OFF2: DCDC1, DCDC4 */
+			0x29 0x90 /* SET_OFF1: LDO5 off in sleep mode
+			                       LDO8 off in sleep mode */
 			0x2d 0x88 /* DISCHARGE1: Enable LDO4, LDO8 */
 		>;
 
@@ -532,9 +519,9 @@
 	board_pins: pinmux_board_pins {
 		pinctrl-single,pins = <
 			0x05a 0x004	/* GPMC_A9, MODE4 | OUTPUT */
-			0x08e 0x4104	/* GPMC_CLK, MODE4 | INPUT | OFFWAKEUP */
+			0x08e 0x104	/* GPMC_CLK, MODE4 | INPUT */
 			0x0a0 0x002	/* GPMC_WAIT2, MODE2 | OUTPUT */
-			0x0a2 0x4102	/* GPMC_WAIT3, MODE2 | INPUT | OFFWAKEUP */
+			0x0a2 0x102	/* GPMC_WAIT3, MODE2 | INPUT */
 			0x0ac 0x001	/* DSS_DATA0, MODE1 | OUTPUT */
 			0x0ae 0x001	/* DSS_DATA1, MODE1 | OUTPUT */
 			0x0b0 0x001	/* DSS_DATA2, MODE1 | OUTPUT */
@@ -546,18 +533,17 @@
 			0x0dc 0x004	/* CAM_HS, MODE4 | OUTPUT */
 			0x0ea 0x004	/* MUXCAM_D2, MODE4 | OUTPUT */
 			0x0e4 0x004	/* CAM_FLD, MODE4 | OUTPUT */
-			0x0e6 0x411c	/* CAM_D0, MODE4 | INPUT_PULLUP | OFFWAKEUP */
+			0x0e6 0x11c	/* CAM_D0, MODE4 | INPUT_PULLUP */
 			0x122 0x004	/* SIM_CLK, MODE4 | OUTPUT */
 			0x124 0x00f	/* SIM_PWRCTRL, MODE7 | PULLDOWN */
-			0x13e 0x00F     /* MCBSP3_DR, MODE7 | PULLDOWN */
-			0x144 0x4100	/* UART2_CTS, MODE0  | OUTPUT | OFFWAKEUP */
+			0x144 0x100	/* UART2_CTS, MODE0  | OUTPUT */
 			0x146 0x000	/* UART2_RTS, MODE0 | OUTPUT */
 			0x148 0x000	/* UART2_TX, MODE0 | OUTPUT */
 			0x14a 0x100	/* UART2_RX, MODE0 | INPUT */
 			0x168 0x104	/* MCBSP1_CLKX, MODE4 | INPUT */
-			0x16c 0x004	/* UART3_RTS, MODE4 | OUTPUT */
-			0x16e 0x4118    /* UART3_RX, MODEO | INPUT_PULLUP | OFFWAKEUP*/
-			0x170 0x000     /* UART3_TX, MODE0 | OUTPUT */
+			0x16c 0x004	/* UART3_RTS_SD, MODE4 | OUTPUT */
+			0x16e 0x118	/* UART3_RX, MODEO | INPUT_PULLUP */
+			0x170 0x000	/* UART3_TX, MODE0 | OUTPUT */
 			0x18e 0x118	/* I2C2_SCL, MODE0 | INPUT_PULLUP */
 			0x190 0x118	/* I2C2_SDA, MODE0 | INPUT_PULLUP */
 			0x192 0x118	/* I2C3_SCL, MODE0 | INPUT_PULLUP */
@@ -569,7 +555,7 @@
 			0x1a0 0x000	/* MCSPI1_CS1, MODE0 | OUTPUT */
 			0x1a4 0x004	/* MCSPI1_CS3, MODE4 | OUTPUT */
 			0x1ae 0x004	/* MCSPI2_CS1, MODE4 | OUTPUT */
-			0x1b0 0x4104	/* SYS_NIRQ, MODE4 | INPUT | OFFWAKEUP */
+			0x1b0 0x104	/* SYS_NIRQ, MODE4 | INPUT  */
 			0x1b2 0x004	/* SYS_CLKOUT2, MODE4 | OUTPUT  */
 			0x5a8 0x11a	/* ETK_CLK, MODE2 | INPUT_PULLUP */
 			0x5aa 0x11a	/* ETK_CTL, MODE2 | INPUT_PULLUP */
@@ -593,7 +579,7 @@
 
 	usb_phy_pins: pinmux_usb_phy_pins {
 		pinctrl-single,pins = <
-			0x140 0x4104     /* MCBSP3_CLKX, MODE4 (GPIO-142) | INPUT | OFFWAKEUP */
+			0x140 0x104     /* MCBSP3_CLKX, MODE4 (GPIO-142) | INPUT */
 			0x5ae 0x004     /* ETK_D1, MODE4 (GPIO_15) | OUTPUT */
 			0x5b0 0x004     /* ETK_D2, MODE4 (GPIO_16) | OUTPUT */
 			0x5c6 0x004     /* EDK_D13, MODE4 (GPIO_27) | OUTPUT */
@@ -668,13 +654,13 @@
 
 	cc_alert_pin: pinmax_cc_alert_pin {
 		pinctrl-single,pins = <
-			0x13c 0x411c	/* MCBSP3_DX, MODE4 | INPUT | INPUT_PULLUP | OFFWAKEUP */
+			0x13c 0x11c	/* MCBSP3_DX, MODE4 | INPUT | INPUT_PULLUP */
 		>;
 	};
 
 	charge_startb_pin: pinmax_charge_startb_pin {
 		pinctrl-single,pins = <
-			0x1a2 0x4104     /* MCSPI1_CS2, MODE4 | INPUT | OFFWAKEUP */
+			0x1a2 0x104     /* MCSPI1_CS2, MODE4 | INPUT */
 		>;
 	};
 };
@@ -686,7 +672,6 @@
 	wkup_pins: pinmux_wakeup_pins {
 		pinctrl-single,pins = <
 			0x006 0x008     /* SYS_CLKREQ, MODE0 | PULLDOWN */
-			0x018 0x000     /* SYS_OFF_MODE, MODE0 */
 			0x01a 0x10c     /* SYS_CLKOUT1, MODE4 | INPUT_PULLDOWN */
 			0x05a 0x004     /* GPIO_129, MODE4 | OUTPUT */
 		>;
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 5cad1100993..897c4925241 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -100,7 +100,6 @@
 			#size-cells = <0>;
 			pinctrl-single,register-width = <16>;
 			pinctrl-single,function-mask = <0x7f1f>;
-			#gpio-range-cells = <3>;
 		};
 
 		omap3_pmx_wkup: pinmux@0x48002a00 {
@@ -110,7 +109,6 @@
 			#size-cells = <0>;
 			pinctrl-single,register-width = <16>;
 			pinctrl-single,function-mask = <0x7f1f>;
-			#gpio-range-cells = <3>;
 		};
 
 		gpio1: gpio@48310000 {
@@ -134,12 +132,6 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-			/* for gpio 32 33 there is no pnctrl controller defined */
-			gpio-ranges = <&omap3_pmx_core 2 0x25 10>,
-					<&omap3_pmx_core 12 0x37 8>,
-					<&omap3_pmx_core 20 0x40 8>,
-					<&omap3_pmx_core 28 0x4B 3>,
-					<&omap3_pmx_core 31 0x4f 1>;
 		};
 
 		gpio3: gpio@49052000 {
@@ -151,7 +143,6 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-			gpio-ranges = <&omap3_pmx_core 0 0x50 32>;
 		};
 
 		gpio4: gpio@49054000 {
@@ -163,13 +154,6 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-			/*
-			* gpio 127 in wkup mux, whcih we can not use (see
-			* sorce code for comment)
-			*/
-			gpio-ranges = <&omap3_pmx_core 0 0x70 16>,
-					<&omap3_pmx_core 16 0x82 14>,
-					<&omap3_pmx_core 30 0x81 1>;
 		};
 
 		gpio5: gpio@49056000 {
@@ -181,11 +165,6 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-			/*
-			* gpio 128 129 in wkup mux, whcih we can not use (see
-			* sorce code for comment)
-			*/
-			gpio-ranges = <&omap3_pmx_core 2 0x94 30>;
 		};
 
 		gpio6: gpio@49058000 {
@@ -197,15 +176,6 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-			/* for gpio 187 there is no pnctrl controller defined */
-			gpio-ranges = <&omap3_pmx_core 0 0xb2 7>,
-					<&omap3_pmx_core 7 0x80 1>,
-					<&omap3_pmx_core 8 0xc7 1>,
-					<&omap3_pmx_core 9 0xc0 1>,
-					<&omap3_pmx_core 10 0xcb 13>,
-					<&omap3_pmx_core 23 0xc8 3>,
-					<&omap3_pmx_core 26 0xd9 1>,
-					<&omap3_pmx_core 28 0xc1 4>;
 		};
 
 		uart1: serial@4806a000 {
@@ -555,14 +525,14 @@
 		};
 
 		glbl_prm: glbl_prm@48307250 {
-			/*
-			* disabled by default. becasue two required
-			* values should be defined in board file
-			*/
-			status = "disabled";
 			compatible = "ti,omap3-glbl-prm";
 			reg = <0x48307250 0x60>;
 			reg-names = "base-address";
+			sys_off_mode;
+			auto_retention;
+			autoextclkmode = <2>;
+			clksetup_time = <1000>;
+			sys_clk = "osc_sys_ck";
 		};
 
 		vc: vc@48307220 {