arm: msm: trout add mmc support

This adds the platform data for MMC on trout.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 7ff8020d4d2422f0f509e7bb8aec2631dca60f72..704610648a255870d5b959899d1f1f0b3a8259d4 100644 (file)
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
 obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
 obj-$(CONFIG_MSM_SMD) += last_radio_log.o
 
-obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o devices-msm7x00.o
+obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o
 obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o
 obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
 obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o

diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
new file mode 100644 (file)
index 0000000..7a773f8
--- /dev/null
+++ b/arch/arm/mach-msm/board-trout-mmc.c
@@ -0,0 +1,189 @@
+/* linux/arch/arm/mach-msm/board-trout-mmc.c
+** Author: Brian Swetland <swetland@google.com>
+*/
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sdio_ids.h>
+#include <linux/err.h>
+#include <linux/debugfs.h>
+
+#include <asm/gpio.h>
+#include <asm/io.h>
+
+#include <mach/vreg.h>
+
+#include <mach/mmc.h>
+
+#include "devices.h"
+
+#include "board-trout.h"
+
+#include "proc_comm.h"
+
+#define DEBUG_SDSLOT_VDD 1
+
+extern int msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat,
+                       unsigned int stat_irq, unsigned long stat_irq_flags);
+
+/* ---- COMMON ---- */
+static void config_gpio_table(uint32_t *table, int len)
+{
+       int n;
+       unsigned id;
+       for(n = 0; n < len; n++) {
+               id = table[n];
+               msm_proc_comm(PCOM_RPC_GPIO_TLMM_CONFIG_EX, &id, 0);
+       }
+}
+
+/* ---- SDCARD ---- */
+
+static uint32_t sdcard_on_gpio_table[] = {
+       PCOM_GPIO_CFG(62, 2, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_8MA), /* CLK */
+       PCOM_GPIO_CFG(63, 2, GPIO_OUTPUT, GPIO_PULL_UP, GPIO_8MA), /* CMD */
+       PCOM_GPIO_CFG(64, 2, GPIO_OUTPUT, GPIO_PULL_UP, GPIO_8MA), /* DAT3 */
+       PCOM_GPIO_CFG(65, 2, GPIO_OUTPUT, GPIO_PULL_UP, GPIO_8MA), /* DAT2 */
+       PCOM_GPIO_CFG(66, 2, GPIO_OUTPUT, GPIO_PULL_UP, GPIO_4MA), /* DAT1 */
+       PCOM_GPIO_CFG(67, 2, GPIO_OUTPUT, GPIO_PULL_UP, GPIO_4MA), /* DAT0 */
+};
+
+static uint32_t sdcard_off_gpio_table[] = {
+       PCOM_GPIO_CFG(62, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* CLK */
+       PCOM_GPIO_CFG(63, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* CMD */
+       PCOM_GPIO_CFG(64, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* DAT3 */
+       PCOM_GPIO_CFG(65, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* DAT2 */
+       PCOM_GPIO_CFG(66, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* DAT1 */
+       PCOM_GPIO_CFG(67, 0, GPIO_OUTPUT, GPIO_NO_PULL, GPIO_4MA), /* DAT0 */
+};
+
+static uint opt_disable_sdcard;
+
+static int __init trout_disablesdcard_setup(char *str)
+{
+       int cal = simple_strtol(str, NULL, 0);
+       
+       opt_disable_sdcard = cal;
+       return 1;
+}
+
+__setup("board_trout.disable_sdcard=", trout_disablesdcard_setup);
+
+static struct vreg *vreg_sdslot;       /* SD slot power */
+
+struct mmc_vdd_xlat {
+       int mask;
+       int level;
+};
+
+static struct mmc_vdd_xlat mmc_vdd_table[] = {
+       { MMC_VDD_165_195,      1800 },
+       { MMC_VDD_20_21,        2050 },
+       { MMC_VDD_21_22,        2150 },
+       { MMC_VDD_22_23,        2250 },
+       { MMC_VDD_23_24,        2350 },
+       { MMC_VDD_24_25,        2450 },
+       { MMC_VDD_25_26,        2550 },
+       { MMC_VDD_26_27,        2650 },
+       { MMC_VDD_27_28,        2750 },
+       { MMC_VDD_28_29,        2850 },
+       { MMC_VDD_29_30,        2950 },
+};
+
+static unsigned int sdslot_vdd = 0xffffffff;
+static unsigned int sdslot_vreg_enabled;
+
+static uint32_t trout_sdslot_switchvdd(struct device *dev, unsigned int vdd)
+{
+       int i, rc;
+
+       BUG_ON(!vreg_sdslot);
+
+       if (vdd == sdslot_vdd)
+               return 0;
+
+       sdslot_vdd = vdd;
+
+       if (vdd == 0) {
+#if DEBUG_SDSLOT_VDD
+               printk("%s: Disabling SD slot power\n", __func__);
+#endif
+               config_gpio_table(sdcard_off_gpio_table,
+                                 ARRAY_SIZE(sdcard_off_gpio_table));
+               vreg_disable(vreg_sdslot);
+               sdslot_vreg_enabled = 0;
+               return 0;
+       }
+
+       if (!sdslot_vreg_enabled) {
+               rc = vreg_enable(vreg_sdslot);
+               if (rc) {
+                       printk(KERN_ERR "%s: Error enabling vreg (%d)\n",
+                              __func__, rc);
+               }
+               config_gpio_table(sdcard_on_gpio_table,
+                                 ARRAY_SIZE(sdcard_on_gpio_table));
+               sdslot_vreg_enabled = 1;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(mmc_vdd_table); i++) {
+               if (mmc_vdd_table[i].mask == (1 << vdd)) {
+#if DEBUG_SDSLOT_VDD
+                       printk("%s: Setting level to %u\n",
+                               __func__, mmc_vdd_table[i].level);
+#endif
+                       rc = vreg_set_level(vreg_sdslot,
+                                           mmc_vdd_table[i].level);
+                       if (rc) {
+                               printk(KERN_ERR
+                                      "%s: Error setting vreg level (%d)\n",
+                                      __func__, rc);
+                       }
+                       return 0;
+               }
+       }
+
+       printk(KERN_ERR "%s: Invalid VDD %d specified\n", __func__, vdd);
+       return 0;
+}
+
+static unsigned int trout_sdslot_status(struct device *dev)
+{
+       unsigned int status;
+
+       status = (unsigned int) gpio_get_value(TROUT_GPIO_SDMC_CD_N);
+       return (!status);
+}
+
+#define TROUT_MMC_VDD  MMC_VDD_165_195 | MMC_VDD_20_21 | MMC_VDD_21_22 \
+                       | MMC_VDD_22_23 | MMC_VDD_23_24 | MMC_VDD_24_25 \
+                       | MMC_VDD_25_26 | MMC_VDD_26_27 | MMC_VDD_27_28 \
+                       | MMC_VDD_28_29 | MMC_VDD_29_30
+
+static struct mmc_platform_data trout_sdslot_data = {
+       .ocr_mask       = TROUT_MMC_VDD,
+       .status         = trout_sdslot_status,
+       .translate_vdd  = trout_sdslot_switchvdd,
+};
+
+int __init trout_init_mmc(unsigned int sys_rev)
+{
+       sdslot_vreg_enabled = 0;
+
+       vreg_sdslot = vreg_get(0, "gp6");
+       if (IS_ERR(vreg_sdslot))
+               return PTR_ERR(vreg_sdslot);
+
+       set_irq_wake(TROUT_GPIO_TO_INT(TROUT_GPIO_SDMC_CD_N), 1);
+
+       if (!opt_disable_sdcard)
+               msm_add_sdcc(2, &trout_sdslot_data,
+                            TROUT_GPIO_TO_INT(TROUT_GPIO_SDMC_CD_N), 0);
+       else
+               printk(KERN_INFO "trout: SD-Card interface disabled\n");
+       return 0;
+}
+

diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index dca5a5f062dce229fe98b9e00fe5f18e5ff40620..8f1b28f514d244ffe7600149246c41b8ec2810b0 100644 (file)
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -30,6 +30,8 @@
 #include "devices.h"
 #include "board-trout.h"
 
+extern int trout_init_mmc(unsigned int);
+
 static struct platform_device *devices[] __initdata = {
        &msm_device_uart3,
        &msm_device_smd,
@@ -56,7 +58,16 @@ static void __init trout_fixup(struct machine_desc *desc, struct tag *tags,
 
 static void __init trout_init(void)
 {
+       int rc;
+
        platform_add_devices(devices, ARRAY_SIZE(devices));
+
+#ifdef CONFIG_MMC
+        rc = trout_init_mmc(system_rev);
+        if (rc)
+                printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc);
+#endif
+
 }
 
 static struct map_desc trout_io_desc[] __initdata = {