Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

[pandora-kernel.git] / arch / arm / mach-msm / gpiomux-8x50.c

diff --git a/arch/arm/mach-msm/gpiomux-8x50.c b/arch/arm/mach-msm/gpiomux-8x50.c
index 4406e0f..f7a4ea5 100644 (file)
--- a/arch/arm/mach-msm/gpiomux-8x50.c
+++ b/arch/arm/mach-msm/gpiomux-8x50.c
@@ -16,6 +16,19 @@
  */
 #include "gpiomux.h"
 
+#if defined(CONFIG_MMC_MSM) || defined(CONFIG_MMC_MSM_MODULE)
+       #define SDCC_DAT_0_3_CMD_ACTV_CFG (GPIOMUX_VALID | GPIOMUX_PULL_UP\
+                                       | GPIOMUX_FUNC_1 | GPIOMUX_DRV_8MA)
+       #define SDCC_CLK_ACTV_CFG (GPIOMUX_VALID | GPIOMUX_PULL_NONE\
+                                       | GPIOMUX_FUNC_1 | GPIOMUX_DRV_8MA)
+#else
+       #define SDCC_DAT_0_3_CMD_ACTV_CFG 0
+       #define SDCC_CLK_ACTV_CFG 0
+#endif
+
+#define SDC1_SUSPEND_CONFIG (GPIOMUX_VALID | GPIOMUX_PULL_DOWN\
+                               | GPIOMUX_FUNC_GPIO | GPIOMUX_DRV_2MA)
+
 struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
        [86] = { /* UART3 RX */
                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
@@ -25,4 +38,14 @@ struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
                             GPIOMUX_FUNC_1 | GPIOMUX_VALID,
        },
+       /* SDC1 data[3:0] & CMD */
+       [51 ... 55] = {
+               .active = SDCC_DAT_0_3_CMD_ACTV_CFG,
+               .suspended = SDC1_SUSPEND_CONFIG
+       },
+       /* SDC1 CLK */
+       [56] = {
+               .active = SDCC_CLK_ACTV_CFG,
+               .suspended = SDC1_SUSPEND_CONFIG
+       },
 };