colibri_t30: pin-mux: validate for latest hardware

Validate pin-muxing for latest Colibri T30 v1.1a and v1.1b module
hardware.

1 files changed, 188 insertions, 177 deletions

diff --git a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c
index d621160e2c39..fb9c54de6fce 100644
--- a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c
+++ b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c
@@ -66,26 +66,26 @@
 
 static __initdata struct tegra_drive_pingroup_config colibri_t30_drive_pinmux[] = {
 	/* DEFAULT_DRIVE(<pin_group>), */
+
+	/* Audio codec */
 	SET_DRIVE(DAP2, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST),
 
 	/* All I2C pins are driven to maximum drive strength */
 
-	/* GEN1 I2C */
+	/* GEN1_I2C: I2C_SDA/SCL on SODIMM pin 194/196 (e.g. RTC on carrier board) */
 	SET_DRIVE(DBG, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST),
 
-	/* DDC I2C */
+	/* DDC_CLOCK/DATA on X3 pin 15/16 (e.g. display EDID) */
 	SET_DRIVE(DDC, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST),
 
-	/* PWR_I2C */
+	/* PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and
+		    touch screen controller */
 	SET_DRIVE(AO1, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST),
 
-	/* UART3 */
-	SET_DRIVE(UART3, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST),
-
 	/* SDMMC2 */
-	SET_DRIVE(SDIO2, DISABLE, DISABLE, DIV_1, 46, 42, FAST, FAST),
+	SET_DRIVE(AO2,	DISABLE, DISABLE, DIV_1, 46, 42, FAST, FAST),
 
-	/* SDMMC4 */
+	/* eMMC on SDMMC4 */
 	SET_DRIVE(GMA, DISABLE, DISABLE, DIV_1, 9, 9, SLOWEST, SLOWEST),
 	SET_DRIVE(GMB, DISABLE, DISABLE, DIV_1, 9, 9, SLOWEST, SLOWEST),
 	SET_DRIVE(GMC, DISABLE, DISABLE, DIV_1, 9, 9, SLOWEST, SLOWEST),
@@ -97,7 +97,9 @@ static __initdata struct tegra_drive_pingroup_config colibri_t30_drive_pinmux[]
 		.pingroup	= TEGRA_PINGROUP_##_pingroup,	\
 		.func		= TEGRA_MUX_##_mux,		\
 		.pupd		= TEGRA_PUPD_##_pupd,		\
+/* TRISTATE here means output driver is tri-stated */ \
 		.tristate	= TEGRA_TRI_##_tri,		\
+/* INPUT here means input driver is enabled vs. OUTPUT where it is disabled */ \
 		.io		= TEGRA_PIN_##_io,		\
 		.lock		= TEGRA_PIN_LOCK_DEFAULT,	\
 		.od		= TEGRA_PIN_OD_DEFAULT,		\
@@ -141,18 +143,17 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 #else
 	DEFAULT_PINMUX(CAM_I2C_SDA, I2C3, NORMAL, TRISTATE, OUTPUT),
 #endif
-
 //multiplexed KB_ROW_10
 #ifdef COLIBRI_T30_SDMMC4B
 	DEFAULT_PINMUX(CAM_MCLK, POPSDMMC4, NORMAL, NORMAL, INPUT),
 #else
-	DEFAULT_PINMUX(CAM_MCLK, VI_ALT2, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(CAM_MCLK, VI_ALT2, NORMAL, TRISTATE, OUTPUT),
 #endif
 
 	DEFAULT_PINMUX(CLK1_OUT, EXTPERIPH1, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(CLK1_REQ, RSVD2, PULL_DOWN, TRISTATE, OUTPUT),	/* NC */
 
-	DEFAULT_PINMUX(CLK2_OUT, EXTPERIPH2, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(CLK2_OUT, EXTPERIPH2, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(CLK2_REQ, RSVD1, PULL_DOWN, TRISTATE, OUTPUT),	/* NC */
 
 	DEFAULT_PINMUX(CLK3_OUT, RSVD1, PULL_DOWN, TRISTATE, OUTPUT),	/* NC */
@@ -168,22 +169,24 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	DEFAULT_PINMUX(DAP1_FS, GMI, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(DAP1_SCLK, GMI, NORMAL, NORMAL, INPUT),
 
-//NC
-	DEFAULT_PINMUX(DAP2_DIN, RSVD2, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(DAP2_DOUT, RSVD2, NORMAL, TRISTATE, INPUT),
-
-	DEFAULT_PINMUX(DAP2_FS, RSVD2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(DAP2_SCLK, RSVD2, NORMAL, NORMAL, INPUT),
+//multiplexed LCD_D23
+	DEFAULT_PINMUX(DAP2_DIN, GMI, NORMAL, TRISTATE, OUTPUT),
+//multiplexed LCD_D22
+	DEFAULT_PINMUX(DAP2_DOUT, GMI, NORMAL, TRISTATE, OUTPUT),
+	DEFAULT_PINMUX(DAP2_FS, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(DAP2_SCLK, GMI, NORMAL, NORMAL, INPUT),
 
 	DEFAULT_PINMUX(DAP3_DIN, I2S2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(DAP3_DOUT, I2S2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(DAP3_FS, I2S2, NORMAL, NORMAL, INPUT),
+//	DEFAULT_PINMUX(DAP3_DOUT, I2S2, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(DAP3_DOUT, I2S2, NORMAL, NORMAL, OUTPUT),
+//	DEFAULT_PINMUX(DAP3_FS, I2S2, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(DAP3_FS, I2S2, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(DAP3_SCLK, I2S2, NORMAL, NORMAL, INPUT),
 
-	DEFAULT_PINMUX(DAP4_DIN, RSVD1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(DAP4_DOUT, RSVD1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(DAP4_FS, RSVD1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(DAP4_SCLK, RSVD1, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(DAP4_DIN, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(DAP4_DOUT, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(DAP4_FS, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(DAP4_SCLK, GMI, NORMAL, NORMAL, INPUT),
 
 	I2C_PINMUX(DDC_SCL, I2C4, NORMAL, NORMAL, INPUT, DISABLE, ENABLE),
 	I2C_PINMUX(DDC_SDA, I2C4, NORMAL, NORMAL, INPUT, DISABLE, ENABLE),
@@ -194,6 +197,11 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	DEFAULT_PINMUX(GEN2_I2C_SCL, RSVD3, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GEN2_I2C_SDA, RSVD3, NORMAL, NORMAL, INPUT),
 
+	DEFAULT_PINMUX(GMI_A16, UARTD, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_A17, UARTD, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_A18, UARTD, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_A19, UARTD, NORMAL, NORMAL, INPUT),
+#ifdef COLIBRI_T30_V10
 	DEFAULT_PINMUX(GMI_AD0, NAND, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GMI_AD1, NAND, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GMI_AD2, NAND, NORMAL, NORMAL, INPUT),
@@ -210,40 +218,77 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	DEFAULT_PINMUX(GMI_AD13, RSVD2, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GMI_AD14, RSVD2, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GMI_AD15, RSVD2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(GMI_A16, UARTD, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(GMI_A17, UARTD, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(GMI_A18, UARTD, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(GMI_A19, UARTD, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(GMI_ADV_N, NAND, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(GMI_CLK, NAND, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(GMI_CS0_N, RSVD1, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(GMI_CS1_N, RSVD1, NORMAL, NORMAL, OUTPUT),
+#else /* COLIBRI_T30_V10 */
+	DEFAULT_PINMUX(GMI_AD0, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD1, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD2, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD3, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD4, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD5, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD6, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD7, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD8, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD9, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD10, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD11, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD12, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD13, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD14, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_AD15, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_ADV_N, GMI, NORMAL, NORMAL, INPUT),
+//multiplexed OWR
+	DEFAULT_PINMUX(GMI_CLK, GMI, NORMAL, TRISTATE, OUTPUT),
+#endif /* COLIBRI_T30_V10 */
+	DEFAULT_PINMUX(GMI_CS0_N, RSVD1, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_CS1_N, RSVD1, NORMAL, NORMAL, INPUT),
+#ifdef COLIBRI_T30_V10
 	DEFAULT_PINMUX(GMI_CS2_N, NAND, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(GMI_CS3_N, NAND, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(GMI_CS4_N, NAND, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(GMI_CS6_N, GMI, NORMAL, NORMAL, OUTPUT),
+#else /* COLIBRI_T30_V10 */
+	DEFAULT_PINMUX(GMI_CS2_N, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_CS3_N, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_CS4_N, GMI, NORMAL, NORMAL, INPUT),
+#endif /* COLIBRI_T30_V10 */
+	DEFAULT_PINMUX(GMI_CS6_N, GMI, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GMI_CS7_N, GMI, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(GMI_DQS, RSVD1, PULL_DOWN, TRISTATE, OUTPUT),	/* NC */
+#ifdef COLIBRI_T30_V10
+	DEFAULT_PINMUX(GMI_DQS, NAND, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GMI_IORDY, NAND, NORMAL, NORMAL, OUTPUT),
 	DEFAULT_PINMUX(GMI_OE_N, NAND, NORMAL, NORMAL, OUTPUT),
-//???
-	DEFAULT_PINMUX(GMI_RST_N, GMI, NORMAL, NORMAL, OUTPUT),
+#else /* COLIBRI_T30_V10 */
+	DEFAULT_PINMUX(GMI_DQS, RSVD1, PULL_DOWN, TRISTATE, OUTPUT), /* NC */
+//multiplexed GMI_WAIT
+	DEFAULT_PINMUX(GMI_IORDY, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_OE_N, GMI, NORMAL, NORMAL, INPUT),
+#endif /* COLIBRI_T30_V10 */
+	DEFAULT_PINMUX(GMI_RST_N, GMI, NORMAL, NORMAL, INPUT),
+#ifdef COLIBRI_T30_V10
 	DEFAULT_PINMUX(GMI_WAIT, NAND, NORMAL, NORMAL, INPUT),
 //GPIO C7: eMMC vs. NAND flash detection
 	DEFAULT_PINMUX(GMI_WP_N, NAND, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GMI_WR_N, NAND, NORMAL, NORMAL, OUTPUT),
+#else /* COLIBRI_T30_V10 */
+//multiplexed GMI_IORDY
+	DEFAULT_PINMUX(GMI_WAIT, GMI, NORMAL, TRISTATE, OUTPUT),
+//GPIO PU6: MMC_CD
+	DEFAULT_PINMUX(GMI_WP_N, RSVD1, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GMI_WR_N, GMI, NORMAL, NORMAL, INPUT),
+#endif /* COLIBRI_T30_V10 */
 
 //multiplexed KB_ROW_12
 #ifdef COLIBRI_T30_SDMMC4B
 	DEFAULT_PINMUX(GPIO_PBB0, POPSDMMC4, PULL_UP, NORMAL, INPUT),
 #else
-	DEFAULT_PINMUX(GPIO_PBB0, RSVD1, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(GPIO_PBB0, RSVD1, NORMAL, TRISTATE, OUTPUT),
 #endif
 //multiplexed KB_ROW_15
 #ifdef COLIBRI_T30_SDMMC4B
 	DEFAULT_PINMUX(GPIO_PBB3, POPSDMMC4, PULL_UP, NORMAL, INPUT),
 #else
-	DEFAULT_PINMUX(GPIO_PBB3, VGP3, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(GPIO_PBB3, VGP3, NORMAL, TRISTATE, OUTPUT),
 #endif
 	DEFAULT_PINMUX(GPIO_PBB4, VGP4, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(GPIO_PBB5, VGP5, NORMAL, NORMAL, INPUT),
@@ -254,33 +299,40 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 #ifdef COLIBRI_T30_SDMMC4B
 	DEFAULT_PINMUX(GPIO_PCC1, POPSDMMC4, NORMAL, NORMAL, INPUT),
 #else
-	DEFAULT_PINMUX(GPIO_PCC1, RSVD1, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(GPIO_PCC1, RSVD1, NORMAL, TRISTATE, OUTPUT),
 #endif
+#ifdef COLIBRI_T30_SDMMC4B
+//when used for SDMMC4: 10k to VDDIO_CAM
+	DEFAULT_PINMUX(GPIO_PCC2, POPSDMMC4, PULL_UP, NORMAL, INPUT),
+#else /* COLIBRI_T30_SDMMC4B */
+//multiplexed VI_D11
 #ifdef COLIBRI_T30_VI
-	DEFAULT_PINMUX(GPIO_PCC2, RSVD1, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(GPIO_PCC2, RSVD1, NORMAL, TRISTATE, OUTPUT),
 #else
 	DEFAULT_PINMUX(GPIO_PCC2, RSVD1, NORMAL, NORMAL, INPUT),
 #endif
+#endif /* COLIBRI_T30_SDMMC4B */
 
-	DEFAULT_PINMUX(GPIO_PU0, RSVD1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(GPIO_PU1, RSVD1, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(GPIO_PU2, RSVD1, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(GPIO_PU3, RSVD1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(GPIO_PU4, RSVD1, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(GPIO_PU5, RSVD1, NORMAL, NORMAL, INPUT),
-//GPIO U6: MM_CD
-	DEFAULT_PINMUX(GPIO_PU6, RSVD1, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PU0, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PU1, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PU2, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PU3, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PU4, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PU5, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PU6, GMI, NORMAL, NORMAL, INPUT),
 
 //GPIO V0: touch pendown int
 	DEFAULT_PINMUX(GPIO_PV0, RSVD, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(GPIO_PV1, RSVD, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(GPIO_PV1, RSVD, NORMAL, NORMAL, INPUT),
 #ifdef COLIBRI_T30_VI
+//multiplexed VI_D0
 	DEFAULT_PINMUX(GPIO_PV2, RSVD1, NORMAL, TRISTATE, OUTPUT),
+//multiplexed VI_D8
 	DEFAULT_PINMUX(GPIO_PV3, RSVD1, NORMAL, TRISTATE, OUTPUT),
 #else
 //GPIO V2: BL_ON
-	DEFAULT_PINMUX(GPIO_PV2, RSVD1, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(GPIO_PV3, RSVD1, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(GPIO_PV2, RSVD1, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(GPIO_PV3, RSVD1, NORMAL, NORMAL, INPUT),
 #endif
 
 	DEFAULT_PINMUX(HDMI_CEC, RSVD1, PULL_DOWN, TRISTATE, OUTPUT),	/* NC */
@@ -306,7 +358,7 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	DEFAULT_PINMUX(KB_ROW5, KBC, NORMAL, TRISTATE, INPUT),
 	DEFAULT_PINMUX(KB_ROW6, KBC, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(KB_ROW7, KBC, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(KB_ROW8, KBC, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(KB_ROW8, KBC, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(KB_ROW9, KBC, NORMAL, TRISTATE, INPUT),
 
 //multiplexed SDMMC4.B
@@ -327,7 +379,8 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 #endif
 
 	DEFAULT_PINMUX(LCD_CS0_N, RSVD, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(LCD_CS1_N, RSVD2, NORMAL, NORMAL, INPUT),
+//multiplexed with SDMMC3_DAT5 gated GMI_WR_N
+	DEFAULT_PINMUX(LCD_CS1_N, RSVD2, NORMAL, TRISTATE, OUTPUT),
 	DEFAULT_PINMUX(LCD_D0, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_D1, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_D2, DISPLAYA, NORMAL, NORMAL, INPUT),
@@ -346,22 +399,28 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	DEFAULT_PINMUX(LCD_D15, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_D16, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_D17, DISPLAYA, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(LCD_D18, DISPLAYA, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(LCD_D19, DISPLAYA, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(LCD_D20, DISPLAYA, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(LCD_D21, DISPLAYA, NORMAL, TRISTATE, INPUT),
+
+//multiplexed
+	DEFAULT_PINMUX(LCD_D18, DISPLAYA, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(LCD_D19, DISPLAYA, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(LCD_D20, DISPLAYA, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(LCD_D21, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_D22, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_D23, DISPLAYA, NORMAL, NORMAL, INPUT),
+
 	DEFAULT_PINMUX(LCD_DC0, RSVD1, NORMAL, NORMAL, INPUT),
 //GPIO D2: THERMD_ALERT_N
 	DEFAULT_PINMUX(LCD_DC1, RSVD1, NORMAL, NORMAL, INPUT),
+//multiplexed LCD_M1
 	DEFAULT_PINMUX(LCD_DE, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_HSYNC, DISPLAYA, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(LCD_M1, DISPLAYA, NORMAL, TRISTATE, INPUT),
+//multiplexed LCD_DE
+	DEFAULT_PINMUX(LCD_M1, RSVD1, NORMAL, TRISTATE, OUTPUT),
 	DEFAULT_PINMUX(LCD_PCLK, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_PWR0, DISPLAYA, NORMAL, NORMAL, INPUT),
+//multiplexed VI_VSYNC
 #ifdef COLIBRI_T30_VI
-	DEFAULT_PINMUX(LCD_PWR1, RSVD1, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(LCD_PWR1, RSVD1, NORMAL, TRISTATE, OUTPUT),
 #else
 	DEFAULT_PINMUX(LCD_PWR1, RSVD1, NORMAL, NORMAL, INPUT),
 #endif
@@ -370,31 +429,34 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	DEFAULT_PINMUX(LCD_SDIN, RSVD, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_SDOUT, DISPLAYA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(LCD_VSYNC, DISPLAYA, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(LCD_WR_N, DISPLAYA, NORMAL, NORMAL, INPUT),
-
-	DEFAULT_PINMUX(OWR, OWR, NORMAL, TRISTATE, INPUT),
-
+//multiplexed with SDMMC3_DAT4 gated GMI_WR_N
+	DEFAULT_PINMUX(LCD_WR_N, RSVD, NORMAL, NORMAL, INPUT),
+//multiplexed GMI_CLK
+	DEFAULT_PINMUX(OWR, OWR, NORMAL, NORMAL, INPUT),
 //GPIO DD2: LAN_VBUS
 	DEFAULT_PINMUX(PEX_L0_CLKREQ_N, RSVD2, NORMAL, NORMAL, OUTPUT),
 //GPIO DD0: LAN_RESET
 	DEFAULT_PINMUX(PEX_L0_PRSNT_N, RSVD2, NORMAL, NORMAL, OUTPUT),
 //GPIO DD1: LAN_EXTWAKEUP
 	DEFAULT_PINMUX(PEX_L0_RST_N, RSVD2, NORMAL, NORMAL, INPUT),
+//multiplexed VI_D9
 #ifdef COLIBRI_T30_VI
-	DEFAULT_PINMUX(PEX_L1_CLKREQ_N, RSVD2, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(PEX_L1_CLKREQ_N, RSVD2, NORMAL, TRISTATE, OUTPUT),
 #else
 	DEFAULT_PINMUX(PEX_L1_CLKREQ_N, RSVD2, NORMAL, NORMAL, INPUT),
 #endif
 	DEFAULT_PINMUX(PEX_L1_PRSNT_N, RSVD2, PULL_DOWN, TRISTATE, OUTPUT), /* NC */
 #ifdef COLIBRI_T30_VI
+//multiplexed VI_D10
 	DEFAULT_PINMUX(PEX_L1_RST_N, RSVD2, NORMAL, TRISTATE, OUTPUT),
-	DEFAULT_PINMUX(PEX_L2_CLKREQ_N, RSVD2, NORMAL, TRISTATE, INPUT),
+//multiplexed VI_HSYNC
+	DEFAULT_PINMUX(PEX_L2_CLKREQ_N, RSVD2, NORMAL, TRISTATE, OUTPUT),
 #else
-	DEFAULT_PINMUX(PEX_L1_RST_N, RSVD2, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(PEX_L1_RST_N, RSVD2, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(PEX_L2_CLKREQ_N, RSVD2, NORMAL, NORMAL, INPUT),
 #endif
 	DEFAULT_PINMUX(PEX_L2_PRSNT_N, RSVD2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(PEX_L2_RST_N, RSVD2, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(PEX_L2_RST_N, RSVD2, NORMAL, NORMAL, INPUT),
 //GPIO DD3: LAN_PME
 	DEFAULT_PINMUX(PEX_WAKE_N, RSVD2, NORMAL, NORMAL, INPUT),
 
@@ -403,12 +465,18 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	I2C_PINMUX(PWR_I2C_SDA, I2CPWR, NORMAL, NORMAL, INPUT, DISABLE, ENABLE),
 
 #ifdef COLIBRI_T30_VI
-	DEFAULT_PINMUX(SDMMC1_CLK, RSVD1, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(SDMMC1_CMD, RSVD1, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(SDMMC1_DAT0, RSVD1, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(SDMMC1_DAT1, RSVD1, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(SDMMC1_DAT2, RSVD1, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(SDMMC1_DAT3, RSVD1, NORMAL, TRISTATE, INPUT),
+//multiplexed VI_PCLK
+	DEFAULT_PINMUX(SDMMC1_CLK, RSVD1, NORMAL, TRISTATE, OUTPUT),
+//multiplexed VI_D1
+	DEFAULT_PINMUX(SDMMC1_CMD, RSVD1, NORMAL, TRISTATE, OUTPUT),
+//multiplexed VI_D2
+	DEFAULT_PINMUX(SDMMC1_DAT0, RSVD1, NORMAL, TRISTATE, OUTPUT),
+//multiplexed VI_D3
+	DEFAULT_PINMUX(SDMMC1_DAT1, RSVD1, NORMAL, TRISTATE, OUTPUT),
+//multiplexed VI_D4
+	DEFAULT_PINMUX(SDMMC1_DAT2, RSVD1, NORMAL, TRISTATE, OUTPUT),
+//multiplexed VI_D5
+	DEFAULT_PINMUX(SDMMC1_DAT3, RSVD1, NORMAL, TRISTATE, OUTPUT),
 #else
 	DEFAULT_PINMUX(SDMMC1_CLK, RSVD1, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(SDMMC1_CMD, RSVD1, NORMAL, NORMAL, INPUT),
@@ -419,23 +487,27 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 #endif
 
 	DEFAULT_PINMUX(SDMMC3_CLK, PWM2, NORMAL, NORMAL, INPUT),
+//multiplexed VI_D6
 #ifdef COLIBRI_T30_VI
-	DEFAULT_PINMUX(SDMMC3_CMD, PWM3, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(SDMMC3_CMD, SDMMC3, NORMAL, TRISTATE, OUTPUT),
 #else
 	DEFAULT_PINMUX(SDMMC3_CMD, PWM3, NORMAL, NORMAL, INPUT),
 #endif
 	DEFAULT_PINMUX(SDMMC3_DAT0, RSVD0, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(SDMMC3_DAT1, RSVD0, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(SDMMC3_DAT2, PWM1, NORMAL, NORMAL, INPUT),
+//multiplexed VI_D7
 #ifdef COLIBRI_T30_VI
-	DEFAULT_PINMUX(SDMMC3_DAT3, PWM0, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(SDMMC3_DAT3, RSVD0, NORMAL, TRISTATE, OUTPUT),
 #else
 	DEFAULT_PINMUX(SDMMC3_DAT3, PWM0, NORMAL, NORMAL, INPUT),
 #endif
-	DEFAULT_PINMUX(SDMMC3_DAT4, SDMMC3, NORMAL, TRISTATE, INPUT),
-	DEFAULT_PINMUX(SDMMC3_DAT5, SDMMC3, NORMAL, TRISTATE, INPUT),
+//tri-stating GMI_WR_N on nPWE SODIMM pin 99
+	DEFAULT_PINMUX(SDMMC3_DAT4, SDMMC3, PULL_UP, TRISTATE, OUTPUT),
+//not tri-stating GMI_WR_N on RDnWR SODIMM pin 93
+	DEFAULT_PINMUX(SDMMC3_DAT5, SDMMC3, PULL_DOWN, TRISTATE, OUTPUT),
 //multiplexed ULPI_STP used as SSPFRM
-	DEFAULT_PINMUX(SDMMC3_DAT6, SPDIF, NORMAL, TRISTATE, INPUT),
+	DEFAULT_PINMUX(SDMMC3_DAT6, SPDIF, NORMAL, TRISTATE, OUTPUT),
 //multiplexed ULPI_CLK used as SSPTXD
 	DEFAULT_PINMUX(SDMMC3_DAT7, SPDIF, NORMAL, TRISTATE, OUTPUT),
 
@@ -464,7 +536,6 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 	DEFAULT_PINMUX(SDMMC4_DAT6, SDMMC4, PULL_UP, NORMAL, INPUT),
 	DEFAULT_PINMUX(SDMMC4_DAT7, SDMMC4, PULL_UP, NORMAL, INPUT),
 	DEFAULT_PINMUX(SDMMC4_RST_N, RSVD1, PULL_DOWN, NORMAL, INPUT),
-//      DEFAULT_PINMUX(SDMMC4_RST_N,    SDMMC4,          PULL_DOWN,  NORMAL,     INPUT),
 #endif /* COLIBRI_T30_SDMMC4B */
 
 //GPIO K6: USB_ID, multiplexed ACC1_DETECT
@@ -472,68 +543,69 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
 //GPIO K5: USBC_DET(VBUS), multiplexed USB1_VBUS
 	DEFAULT_PINMUX(SPDIF_OUT, RSVD1, NORMAL, NORMAL, INPUT),
 
-	DEFAULT_PINMUX(SPI1_CS0_N, SPI1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(SPI1_MISO, SPI1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(SPI1_MOSI, SPI1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(SPI1_SCK, SPI1, NORMAL, NORMAL, INPUT),
-
-	DEFAULT_PINMUX(SPI2_CS0_N, SPI2, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(SPI1_CS0_N, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(SPI1_MISO, RSVD3, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(SPI1_MOSI, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(SPI1_SCK, GMI, NORMAL, NORMAL, INPUT),
+//multiplexed LCD_D18
+	DEFAULT_PINMUX(SPI2_CS0_N, GMI, NORMAL, TRISTATE, OUTPUT),
 //GPIO W2: USBH_PEN
-	DEFAULT_PINMUX(SPI2_CS1_N, SPI2, PULL_UP, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(SPI2_CS1_N, SPI2, PULL_UP, NORMAL, INPUT),
 //GPIO W3: USBH_OC
 	DEFAULT_PINMUX(SPI2_CS2_N, SPI2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(SPI2_MISO, SPI2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(SPI2_MOSI, SPI2, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(SPI2_SCK, SPI2, NORMAL, NORMAL, INPUT),
+//multiplexed LCD_D20
+	DEFAULT_PINMUX(SPI2_MISO, GMI, NORMAL, TRISTATE, OUTPUT),
+//multiplexed LCD_D21
+	DEFAULT_PINMUX(SPI2_MOSI, GMI, NORMAL, TRISTATE, OUTPUT),
+//multiplexed LCD_D19
+	DEFAULT_PINMUX(SPI2_SCK, GMI, NORMAL, TRISTATE, OUTPUT),
 
 	DEFAULT_PINMUX(SYS_CLK_REQ, SYSCLK, NORMAL, TRISTATE, OUTPUT),
 
-	DEFAULT_PINMUX(UART2_CTS_N, UARTB, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(UART2_RTS_N, UARTB, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(UART2_CTS_N, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(UART2_RTS_N, GMI, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, INPUT),
 
-	DEFAULT_PINMUX(UART3_CTS_N, RSVD1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(UART3_RTS_N, RSVD2, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(UART3_RXD, RSVD1, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(UART3_TXD, RSVD1, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(UART3_TXD, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(UART3_RXD, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(UART3_CTS_N, GMI, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(UART3_RTS_N, GMI, NORMAL, NORMAL, INPUT),
 
 //multiplexed SDMMC3_DAT7
-	DEFAULT_PINMUX(ULPI_CLK, SPI1, NORMAL, NORMAL, OUTPUT),
-	DEFAULT_PINMUX(ULPI_DATA0, UARTA, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(ULPI_CLK, SPI1, NORMAL, NORMAL, INPUT),
+	DEFAULT_PINMUX(ULPI_DATA0, UARTA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_DATA1, UARTA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_DATA2, UARTA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_DATA3, UARTA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_DATA4, UARTA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_DATA5, UARTA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_DATA6, UARTA, NORMAL, NORMAL, INPUT),
-	DEFAULT_PINMUX(ULPI_DATA7, UARTA, NORMAL, NORMAL, OUTPUT),
+	DEFAULT_PINMUX(ULPI_DATA7, UARTA, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_DIR, SPI1, NORMAL, NORMAL, INPUT),
 	DEFAULT_PINMUX(ULPI_NXT, SPI1, NORMAL, NORMAL, INPUT),
 //multiplexed SDMMC3_DAT6
-	DEFAULT_PINMUX(ULPI_STP, SPI1, NORMAL, NORMAL, OUTPUT),
-
-	VI_PINMUX(VI_D0, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D1, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D2, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D3, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D4, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D5, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D6, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D7, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D8, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D9, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D10, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_D11, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_HSYNC, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
+	DEFAULT_PINMUX(ULPI_STP, SPI1, NORMAL, NORMAL, INPUT),
+
+//VI pins are all input level-shifted and multiplexed
+//unused VI pins could disable input drivers
+	VI_PINMUX(VI_D0, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D1, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D2, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D3, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D4, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D5, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D6, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D7, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D8, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D9, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D10, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_D11, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
+	VI_PINMUX(VI_HSYNC, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
 //GPIO T1: EN_MIC_GND
 	DEFAULT_PINMUX(VI_MCLK, VI, NORMAL, NORMAL, OUTPUT),
 	VI_PINMUX(VI_PCLK, VI, PULL_UP, TRISTATE, INPUT, DISABLE, DISABLE),
-	VI_PINMUX(VI_VSYNC, VI, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
-};
-
-static __initdata struct tegra_pingroup_config colibri_t30_unused_pins_lowpower[] = {
-//required?
+	VI_PINMUX(VI_VSYNC, VI, NORMAL, TRISTATE, INPUT, DISABLE, DISABLE),
 };
 
 #define GPIO_INIT_PIN_MODE(_gpio, _is_input, _value)	\
@@ -544,8 +616,6 @@ static __initdata struct tegra_pingroup_config colibri_t30_unused_pins_lowpower[
 	}
 
 static struct gpio_init_pin_info colibri_t30_init_gpio_mode[] = {
-	GPIO_INIT_PIN_MODE(TEGRA_GPIO_PDD6, false, 0),
-	GPIO_INIT_PIN_MODE(TEGRA_GPIO_PDD4, false, 0),
 };
 
 static void __init colibri_t30_gpio_init_configure(void)
@@ -574,64 +644,5 @@ int __init colibri_t30_pinmux_init(void)
 	tegra_drive_pinmux_config_table(colibri_t30_drive_pinmux,
 					ARRAY_SIZE(colibri_t30_drive_pinmux));
 
-	tegra_pinmux_config_table(colibri_t30_unused_pins_lowpower,
-				  ARRAY_SIZE(colibri_t30_unused_pins_lowpower));
-
-	return 0;
-}
-
-#define PIN_GPIO_LPM(_name, _gpio, _is_input, _value)	\
-	{					\
-		.name		= _name,	\
-		.gpio_nr	= _gpio,	\
-		.is_gpio	= true,		\
-		.is_input	= _is_input,	\
-		.value		= _value,	\
-	}
-
-struct gpio_init_pin_info colibri_t30_pin_lpm[] = {
-//required?
-};
-
-static void set_unused_pin_gpio(struct gpio_init_pin_info *lpm_pin_info,
-				int list_count)
-{
-	int i;
-	struct gpio_init_pin_info *pin_info;
-	int ret;
-
-	for (i = 0; i < list_count; ++i) {
-		pin_info = (struct gpio_init_pin_info *)(lpm_pin_info + i);
-		if (!pin_info->is_gpio)
-			continue;
-
-		ret = gpio_request(pin_info->gpio_nr, pin_info->name);
-		if (ret < 0) {
-			pr_err("%s() Error in gpio_request() for gpio %d\n",
-			       __func__, pin_info->gpio_nr);
-			continue;
-		}
-		if (pin_info->is_input)
-			ret = gpio_direction_input(pin_info->gpio_nr);
-		else
-			ret = gpio_direction_output(pin_info->gpio_nr,
-						    pin_info->value);
-		if (ret < 0) {
-			pr_err("%s() Error in setting gpio %d to in/out\n",
-			       __func__, pin_info->gpio_nr);
-			gpio_free(pin_info->gpio_nr);
-			continue;
-		}
-		tegra_gpio_enable(pin_info->gpio_nr);
-	}
-}
-
-/* Initialize the pins to desired state as per power/asic/system-eng
- * recomendation */
-int __init colibri_t30_pins_state_init(void)
-{
-	set_unused_pin_gpio(&colibri_t30_pin_lpm[0],
-			    ARRAY_SIZE(colibri_t30_pin_lpm));
-
 	return 0;
 }