ARM: tegra: pluto: update sdmmc pinmux configuration
naveenk [Tue, 28 Aug 2012 16:18:25 +0000 (21:18 +0530)]
Bug 1017708

Change-Id: I8a9f54be345a91eafb971c4e3451f264b44317be
Signed-off-by: naveen kumar arepalli <naveenk@nvidia.com>
Reviewed-on: http://git-master/r/127887
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Pavan Kunapuli <pkunapuli@nvidia.com>

Rebase-Id: Rc0d076c23056024c5e15478ca9d242d17ca24d37

arch/arm/mach-tegra/board-pluto-pinmux.c

index a143d03..f8e6674 100644 (file)
@@ -121,8 +121,9 @@ static __initdata struct tegra_pingroup_config pluto_pinmux_common[] = {
        DEFAULT_PINMUX(DAP3_DIN,        I2S2,            PULL_DOWN,    NORMAL,     INPUT),
        DEFAULT_PINMUX(DAP3_DOUT,       I2S2,            PULL_DOWN,    NORMAL,     OUTPUT),
        DEFAULT_PINMUX(DAP3_SCLK,       I2S2,            PULL_DOWN,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(SDMMC1_CLK,      SDMMC1,          PULL_DOWN,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(SDMMC1_CMD,      SDMMC1,          PULL_UP,      NORMAL,     OUTPUT),
+       /* SDMMC1 pinmux */
+       DEFAULT_PINMUX(SDMMC1_CLK,      SDMMC1,          NORMAL,       NORMAL,     INPUT),
+       DEFAULT_PINMUX(SDMMC1_CMD,      SDMMC1,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC1_DAT3,     SDMMC1,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC1_DAT2,     SDMMC1,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC1_DAT1,     SDMMC1,          PULL_UP,      NORMAL,     INPUT),
@@ -169,8 +170,9 @@ static __initdata struct tegra_pingroup_config pluto_pinmux_common[] = {
        DEFAULT_PINMUX(GMI_OE_N,        SOC,             PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(GEN2_I2C_SCL,    I2C2,            NORMAL,       NORMAL,     OUTPUT),
        DEFAULT_PINMUX(GEN2_I2C_SDA,    I2C2,            NORMAL,       NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_CLK,      SDMMC4,          PULL_DOWN,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(SDMMC4_CMD,      SDMMC4,          PULL_UP,      NORMAL,     OUTPUT),
+       /* SDMMC4 pinmux */
+       DEFAULT_PINMUX(SDMMC4_CLK,      SDMMC4,          NORMAL,       NORMAL,     INPUT),
+       DEFAULT_PINMUX(SDMMC4_CMD,      SDMMC4,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC4_DAT0,     SDMMC4,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC4_DAT1,     SDMMC4,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC4_DAT2,     SDMMC4,          PULL_UP,      NORMAL,     INPUT),
@@ -192,6 +194,8 @@ static __initdata struct tegra_pingroup_config pluto_pinmux_common[] = {
        DEFAULT_PINMUX(KB_COL0,         KBC,             PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(KB_COL1,         KBC,             PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(KB_COL2,         KBC,             PULL_UP,      NORMAL,     INPUT),
+       /* SDMMC3 WP */
+       DEFAULT_PINMUX(KB_COL4,         SDMMC3,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(CLK_32K_OUT,     SOC,             PULL_DOWN,    NORMAL,     OUTPUT),
        DEFAULT_PINMUX(SYS_CLK_REQ,     SYSCLK,          NORMAL,       NORMAL,     OUTPUT),
        DEFAULT_PINMUX(DAP1_FS,         I2S0,            NORMAL,       NORMAL,     OUTPUT),
@@ -203,13 +207,15 @@ static __initdata struct tegra_pingroup_config pluto_pinmux_common[] = {
        DEFAULT_PINMUX(DAP2_DIN,        I2S1,            PULL_DOWN,    NORMAL,     INPUT),
        DEFAULT_PINMUX(DAP2_DOUT,       I2S1,            PULL_DOWN,    NORMAL,     OUTPUT),
        DEFAULT_PINMUX(DAP2_SCLK,       I2S1,            PULL_DOWN,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(SDMMC3_CLK,      SDMMC3,          PULL_DOWN,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(SDMMC3_CMD,      SDMMC3,          PULL_UP,      NORMAL,     OUTPUT),
+       /* SDMMC3 pinmux */
+       DEFAULT_PINMUX(SDMMC3_CLK,      SDMMC3,          NORMAL,       NORMAL,     INPUT),
+       DEFAULT_PINMUX(SDMMC3_CMD,      SDMMC3,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_DAT0,     SDMMC3,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_DAT1,     SDMMC3,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_DAT2,     SDMMC3,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_DAT3,     SDMMC3,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(HDMI_CEC,        CEC,             NORMAL,       NORMAL,     INPUT),
+       /* SDMMC3 CD */
        DEFAULT_PINMUX(SDMMC3_CD_N,     SDMMC3,          PULL_UP,      NORMAL,     INPUT),
        DEFAULT_PINMUX(OWR,             OWR,             NORMAL,       NORMAL,     INPUT),
        DEFAULT_PINMUX(DVFS_PWM,        CLDVFS,          PULL_DOWN,    NORMAL,     OUTPUT),