]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/arm/mach-omap2/mmc-twl4030.c
Fix few checkpatch.pl warnings for upstream patches
[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / mmc-twl4030.c
index ca8e358095abbca9bdc7f319b2b93d7184b2f21a..9831b2bfa9aeb8a78d279693db299c76a083aed2 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/i2c/twl4030.h>
+#include <linux/regulator/machine.h>
 
 #include <mach/hardware.h>
 #include <mach/control.h>
@@ -25,7 +26,8 @@
 
 #include "mmc-twl4030.h"
 
-#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
+#if defined(CONFIG_TWL4030_CORE) && \
+       (defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE))
 
 #define LDO_CLR                        0x00
 #define VSEL_S2_CLR            0x40
@@ -43,6 +45,7 @@
 #define VMMC2_315V             0x0c
 #define VMMC2_300V             0x0b
 #define VMMC2_285V             0x0a
+#define VMMC2_280V             0x09
 #define VMMC2_260V             0x08
 #define VMMC2_185V             0x06
 #define VMMC2_DEDICATED                0x2E
 #define VMMC_DEV_GRP_P1                0x20
 
 static u16 control_pbias_offset;
+static u16 control_devconf1_offset;
+
+#define HSMMC_NAME_LEN 9
 
 static struct twl_mmc_controller {
-       u16             control_devconf_offset;
-       u32             devconf_loopback_clock;
-       int             card_detect_gpio;
-       unsigned        card_wp_gpio;
+       struct omap_mmc_platform_data   *mmc;
        u8              twl_vmmc_dev_grp;
        u8              twl_mmc_dedicated;
-} hsmmc[] = {
+       char            name[HSMMC_NAME_LEN + 1];
+} hsmmc[OMAP34XX_NR_MMC] = {
        {
-               .control_devconf_offset         = OMAP2_CONTROL_DEVCONF0,
-               .devconf_loopback_clock         = OMAP2_MMCSDIO1ADPCLKISEL,
-               .card_detect_gpio               = -EINVAL,
                .twl_vmmc_dev_grp               = VMMC1_DEV_GRP,
                .twl_mmc_dedicated              = VMMC1_DEDICATED,
        },
        {
-               /* control_devconf_offset set dynamically */
-               .devconf_loopback_clock         = OMAP2_MMCSDIO2ADPCLKISEL,
-               .card_detect_gpio               = -EINVAL,
                .twl_vmmc_dev_grp               = VMMC2_DEV_GRP,
                .twl_mmc_dedicated              = VMMC2_DEDICATED,
        },
 };
 
-static int twl_mmc1_card_detect(int irq)
+static int twl_mmc_card_detect(int irq)
 {
-       /* NOTE: assumes card detect signal is active-low */
-       return !gpio_get_value_cansleep(hsmmc[0].card_detect_gpio);
+       unsigned i;
+
+       for (i = 0; i < ARRAY_SIZE(hsmmc); i++) {
+               struct omap_mmc_platform_data *mmc;
+
+               mmc = hsmmc[i].mmc;
+               if (!mmc)
+                       continue;
+               if (irq != mmc->slots[0].card_detect_irq)
+                       continue;
+
+               /* NOTE: assumes card detect signal is active-low */
+               return !gpio_get_value_cansleep(mmc->slots[0].switch_pin);
+       }
+       return -ENOSYS;
 }
 
-static int twl_mmc1_get_ro(struct device *dev, int slot)
+static int twl_mmc_get_ro(struct device *dev, int slot)
 {
+       struct omap_mmc_platform_data *mmc = dev->platform_data;
+
        /* NOTE: assumes write protect signal is active-high */
-       return gpio_get_value_cansleep(hsmmc[0].card_wp_gpio);
+       return gpio_get_value_cansleep(mmc->slots[0].gpio_wp);
+}
+
+static int twl_mmc_get_cover_state(struct device *dev, int slot)
+{
+       struct omap_mmc_platform_data *mmc = dev->platform_data;
+
+       /* NOTE: assumes card detect signal is active-low */
+       return !gpio_get_value_cansleep(mmc->slots[0].switch_pin);
 }
 
 /*
  * MMC Slot Initialization.
  */
-static int twl_mmc1_late_init(struct device *dev)
+static int twl_mmc_late_init(struct device *dev)
 {
        struct omap_mmc_platform_data *mmc = dev->platform_data;
        int ret = 0;
+       int i;
 
-       ret = gpio_request(hsmmc[0].card_detect_gpio, "mmc0_cd");
+       ret = gpio_request(mmc->slots[0].switch_pin, "mmc_cd");
        if (ret)
                goto done;
-       ret = gpio_direction_input(hsmmc[0].card_detect_gpio);
+       ret = gpio_direction_input(mmc->slots[0].switch_pin);
        if (ret)
                goto err;
 
-       /* FIXME assumes this uses (a) TWL4030 and (b) GPIO-0 ...
-        * but that's not actually required.
-        */
-       ret = twl4030_set_gpio_debounce(0, true);
-       if (ret)
-               goto err;
+       for (i = 0; i < ARRAY_SIZE(hsmmc); i++) {
+               if (hsmmc[i].name == mmc->slots[0].name) {
+                       hsmmc[i].mmc = mmc;
+                       break;
+               }
+       }
 
-       return ret;
+       return 0;
 
 err:
-       dev_err(dev, "Failed to configure TWL4030 card detect\n");
+       gpio_free(mmc->slots[0].switch_pin);
 done:
        mmc->slots[0].card_detect_irq = 0;
        mmc->slots[0].card_detect = NULL;
+
+       dev_err(dev, "err %d configuring card detect\n", ret);
        return ret;
 }
 
-static void twl_mmc1_cleanup(struct device *dev)
+static void twl_mmc_cleanup(struct device *dev)
 {
-       gpio_free(hsmmc[0].card_detect_gpio);
+       struct omap_mmc_platform_data *mmc = dev->platform_data;
+
+       gpio_free(mmc->slots[0].switch_pin);
 }
 
 #ifdef CONFIG_PM
@@ -150,66 +176,85 @@ static int twl_mmc_resume(struct device *dev, int slot)
 /*
  * Sets the MMC voltage in twl4030
  */
+
+#define MMC1_OCR       (MMC_VDD_165_195 \
+               |MMC_VDD_28_29|MMC_VDD_29_30|MMC_VDD_30_31|MMC_VDD_31_32)
+#define MMC2_OCR       (MMC_VDD_165_195 \
+               |MMC_VDD_25_26|MMC_VDD_26_27|MMC_VDD_27_28 \
+               |MMC_VDD_28_29|MMC_VDD_29_30|MMC_VDD_30_31|MMC_VDD_31_32)
+
 static int twl_mmc_set_voltage(struct twl_mmc_controller *c, int vdd)
 {
        int ret;
-       u8 vmmc, dev_grp_val;
-
-       switch (1 << vdd) {
-       case MMC_VDD_35_36:
-       case MMC_VDD_34_35:
-       case MMC_VDD_33_34:
-       case MMC_VDD_32_33:
-       case MMC_VDD_31_32:
-       case MMC_VDD_30_31:
-               if (c->twl_vmmc_dev_grp == VMMC1_DEV_GRP)
-                       vmmc = VMMC1_315V;
-               else
-                       vmmc = VMMC2_315V;
-               break;
-       case MMC_VDD_29_30:
-               if (c->twl_vmmc_dev_grp == VMMC1_DEV_GRP)
-                       vmmc = VMMC1_315V;
-               else
-                       vmmc = VMMC2_300V;
-               break;
-       case MMC_VDD_27_28:
-       case MMC_VDD_26_27:
-               if (c->twl_vmmc_dev_grp == VMMC1_DEV_GRP)
-                       vmmc = VMMC1_285V;
-               else
-                       vmmc = VMMC2_285V;
-               break;
-       case MMC_VDD_25_26:
-       case MMC_VDD_24_25:
-       case MMC_VDD_23_24:
-       case MMC_VDD_22_23:
-       case MMC_VDD_21_22:
-       case MMC_VDD_20_21:
-               if (c->twl_vmmc_dev_grp == VMMC1_DEV_GRP)
-                       vmmc = VMMC1_285V;
-               else
-                       vmmc = VMMC2_260V;
-               break;
-       case MMC_VDD_165_195:
-               if (c->twl_vmmc_dev_grp == VMMC1_DEV_GRP)
+       u8 vmmc = 0, dev_grp_val;
+
+       if (!vdd)
+               goto doit;
+
+       if (c->twl_vmmc_dev_grp == VMMC1_DEV_GRP) {
+               /* VMMC1:  max 220 mA.  And for 8-bit mode,
+                * VSIM:  max 50 mA
+                */
+               switch (1 << vdd) {
+               case MMC_VDD_165_195:
                        vmmc = VMMC1_185V;
-               else
+                       /* and VSIM_180V */
+                       break;
+               case MMC_VDD_28_29:
+                       vmmc = VMMC1_285V;
+                       /* and VSIM_280V */
+                       break;
+               case MMC_VDD_29_30:
+               case MMC_VDD_30_31:
+                       vmmc = VMMC1_300V;
+                       /* and VSIM_300V */
+                       break;
+               case MMC_VDD_31_32:
+                       vmmc = VMMC1_315V;
+                       /* error if VSIM needed */
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       } else if (c->twl_vmmc_dev_grp == VMMC2_DEV_GRP) {
+               /* VMMC2:  max 100 mA */
+               switch (1 << vdd) {
+               case MMC_VDD_165_195:
                        vmmc = VMMC2_185V;
-               break;
-       default:
-               vmmc = 0;
-               break;
+                       break;
+               case MMC_VDD_25_26:
+               case MMC_VDD_26_27:
+                       vmmc = VMMC2_260V;
+                       break;
+               case MMC_VDD_27_28:
+                       vmmc = VMMC2_280V;
+                       break;
+               case MMC_VDD_28_29:
+                       vmmc = VMMC2_285V;
+                       break;
+               case MMC_VDD_29_30:
+               case MMC_VDD_30_31:
+                       vmmc = VMMC2_300V;
+                       break;
+               case MMC_VDD_31_32:
+                       vmmc = VMMC2_315V;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       } else {
+               return -EINVAL;
        }
 
-       if (vmmc)
+doit:
+       if (vdd)
                dev_grp_val = VMMC_DEV_GRP_P1;  /* Power up */
        else
                dev_grp_val = LDO_CLR;          /* Power down */
 
        ret = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
                                        dev_grp_val, c->twl_vmmc_dev_grp);
-       if (ret)
+       if (ret || !vdd)
                return ret;
 
        ret = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
@@ -224,7 +269,16 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on,
        u32 reg;
        int ret = 0;
        struct twl_mmc_controller *c = &hsmmc[0];
+       struct omap_mmc_platform_data *mmc = dev->platform_data;
 
+       /*
+        * Assume we power both OMAP VMMC1 (for CMD, CLK, DAT0..3) and the
+        * card using the same TWL VMMC1 supply (hsmmc[0]); OMAP has both
+        * 1.8V and 3.0V modes, controlled by the PBIAS register.
+        *
+        * In 8-bit modes, OMAP VMMC1A (for DAT4..7) needs a supply, which
+        * is most naturally TWL VSIM; those pins also use PBIAS.
+        */
        if (power_on) {
                if (cpu_is_omap2430()) {
                        reg = omap_ctrl_readl(OMAP243X_CONTROL_DEVCONF1);
@@ -235,11 +289,10 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on,
                        omap_ctrl_writel(reg, OMAP243X_CONTROL_DEVCONF1);
                }
 
-               /* REVISIT: Loop back clock not needed for 2430? */
-               if (!cpu_is_omap2430()) {
-                       reg = omap_ctrl_readl(c->control_devconf_offset);
+               if (mmc->slots[0].internal_clock) {
+                       reg = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
                        reg |= OMAP2_MMCSDIO1ADPCLKISEL;
-                       omap_ctrl_writel(reg, c->control_devconf_offset);
+                       omap_ctrl_writel(reg, OMAP2_CONTROL_DEVCONF0);
                }
 
                reg = omap_ctrl_readl(control_pbias_offset);
@@ -279,15 +332,23 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on,
 static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vdd)
 {
        int ret;
-
        struct twl_mmc_controller *c = &hsmmc[1];
+       struct omap_mmc_platform_data *mmc = dev->platform_data;
 
+       /*
+        * Assume TWL VMMC2 (hsmmc[1]) is used only to power the card ... OMAP
+        * VDDS is used to power the pins, optionally with a transceiver to
+        * support cards using voltages other than VDDS (1.8V nominal).  When a
+        * transceiver is used, DAT3..7 are muxed as transceiver control pins.
+        */
        if (power_on) {
-               u32 reg;
+               if (mmc->slots[0].internal_clock) {
+                       u32 reg;
 
-               reg = omap_ctrl_readl(c->control_devconf_offset);
-               reg |= OMAP2_MMCSDIO2ADPCLKISEL;
-               omap_ctrl_writel(reg, c->control_devconf_offset);
+                       reg = omap_ctrl_readl(control_devconf1_offset);
+                       reg |= OMAP2_MMCSDIO2ADPCLKISEL;
+                       omap_ctrl_writel(reg, control_devconf1_offset);
+               }
                ret = twl_mmc_set_voltage(c, vdd);
        } else {
                ret = twl_mmc_set_voltage(c, 0);
@@ -296,25 +357,44 @@ static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vd
        return ret;
 }
 
-static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC];
+static int twl_mmc3_set_power(struct device *dev, int slot, int power_on,
+               int vdd)
+{
+       /*
+        * Assume MMC3 has self-powered device connected, for example on-board
+        * chip with external power source.
+        */
+       return 0;
+}
 
-#define HSMMC_NAME_LEN 9
+static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata;
 
-void __init hsmmc_init(struct twl4030_hsmmc_info *controllers)
+void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 {
        struct twl4030_hsmmc_info *c;
+       int nr_hsmmc = ARRAY_SIZE(hsmmc_data);
 
        if (cpu_is_omap2430()) {
                control_pbias_offset = OMAP243X_CONTROL_PBIAS_LITE;
-               hsmmc[1].control_devconf_offset = OMAP243X_CONTROL_DEVCONF1;
+               control_devconf1_offset = OMAP243X_CONTROL_DEVCONF1;
+               nr_hsmmc = 2;
        } else {
                control_pbias_offset = OMAP343X_CONTROL_PBIAS_LITE;
-               hsmmc[1].control_devconf_offset = OMAP343X_CONTROL_DEVCONF1;
+               control_devconf1_offset = OMAP343X_CONTROL_DEVCONF1;
        }
 
        for (c = controllers; c->mmc; c++) {
-               struct omap_mmc_platform_data *mmc;
-               char *name;
+               struct twl_mmc_controller *twl = hsmmc + c->mmc - 1;
+               struct omap_mmc_platform_data *mmc = hsmmc_data[c->mmc - 1];
+
+               if (!c->mmc || c->mmc > nr_hsmmc) {
+                       pr_debug("MMC%d: no such controller\n", c->mmc);
+                       continue;
+               }
+               if (mmc) {
+                       pr_debug("MMC%d: already configured\n", c->mmc);
+                       continue;
+               }
 
                mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);
                if (!mmc) {
@@ -322,72 +402,81 @@ void __init hsmmc_init(struct twl4030_hsmmc_info *controllers)
                        return;
                }
 
-               name = kzalloc(HSMMC_NAME_LEN, GFP_KERNEL);
-               if (!name) {
-                       kfree(mmc);
-                       pr_err("Cannot allocate memory for mmc name!\n");
-                       return;
-               }
-
-               sprintf(name, "mmc%islot%i", c->mmc, 1);
-               mmc->slots[0].name = name;
+               if (c->name)
+                       strncpy(twl->name, c->name, HSMMC_NAME_LEN);
+               else
+                       sprintf(twl->name, "mmc%islot%i", c->mmc, 1);
+               mmc->slots[0].name = twl->name;
                mmc->nr_slots = 1;
-               mmc->slots[0].ocr_mask = MMC_VDD_165_195 |
-                                       MMC_VDD_26_27 | MMC_VDD_27_28 |
-                                       MMC_VDD_29_30 |
-                                       MMC_VDD_30_31 | MMC_VDD_31_32;
                mmc->slots[0].wires = c->wires;
+               mmc->slots[0].internal_clock = !c->ext_clock;
                mmc->dma_mask = 0xffffffff;
 
+               /* note: twl4030 card detect GPIOs normally switch VMMCx ... */
+               if (gpio_is_valid(c->gpio_cd)) {
+                       mmc->init = twl_mmc_late_init;
+                       mmc->cleanup = twl_mmc_cleanup;
+                       mmc->suspend = twl_mmc_suspend;
+                       mmc->resume = twl_mmc_resume;
+
+                       mmc->slots[0].switch_pin = c->gpio_cd;
+                       mmc->slots[0].card_detect_irq = gpio_to_irq(c->gpio_cd);
+                       if (c->cover_only)
+                               mmc->slots[0].get_cover_state = twl_mmc_get_cover_state;
+                       else
+                               mmc->slots[0].card_detect = twl_mmc_card_detect;
+               } else
+                       mmc->slots[0].switch_pin = -EINVAL;
+
+               /* write protect normally uses an OMAP gpio */
+               if (gpio_is_valid(c->gpio_wp)) {
+                       gpio_request(c->gpio_wp, "mmc_wp");
+                       gpio_direction_input(c->gpio_wp);
+
+                       mmc->slots[0].gpio_wp = c->gpio_wp;
+                       mmc->slots[0].get_ro = twl_mmc_get_ro;
+               } else
+                       mmc->slots[0].gpio_wp = -EINVAL;
+
                /* NOTE:  we assume OMAP's MMC1 and MMC2 use
                 * the TWL4030's VMMC1 and VMMC2, respectively;
-                * and that OMAP's MMC3 isn't used.
+                * and that MMC3 device has it's own power source.
                 */
 
                switch (c->mmc) {
                case 1:
                        mmc->slots[0].set_power = twl_mmc1_set_power;
-                       if (gpio_is_valid(c->gpio_cd)) {
-                               mmc->slots[0].card_detect_irq =
-                                               gpio_to_irq(c->gpio_cd);
-                               mmc->suspend = twl_mmc_suspend;
-                               mmc->resume = twl_mmc_resume;
-
-                               /* NOTE: hsmmc[0] is hard-wired ... */
-                               hsmmc[0].card_detect_gpio = c->gpio_cd;
-                               mmc->init = twl_mmc1_late_init;
-                               mmc->cleanup = twl_mmc1_cleanup;
-                               mmc->slots[0].card_detect =
-                                               twl_mmc1_card_detect;
-                       }
-                       if (gpio_is_valid(c->gpio_wp)) {
-                               gpio_request(c->gpio_wp, "mmc0_wp");
-                               gpio_direction_input(c->gpio_wp);
-
-                               /* NOTE: hsmmc[0] is hard-wired ... */
-                               hsmmc[0].card_wp_gpio = c->gpio_wp;
-                               mmc->slots[0].get_ro = twl_mmc1_get_ro;
-                       }
-                       hsmmc_data[0] = mmc;
+                       mmc->slots[0].ocr_mask = MMC1_OCR;
                        break;
                case 2:
-                       /* FIXME rework interfaces so that mmc2 (and mmc3) can
-                        * be fully functional... hsmmc[] shouldn't hold gpios.
-                        */
                        mmc->slots[0].set_power = twl_mmc2_set_power;
-                       if (gpio_is_valid(c->gpio_cd))
-                               pr_warning("MMC2 detect nyet supported!\n");
-                       if (gpio_is_valid(c->gpio_wp))
-                               pr_warning("MMC2 WP nyet supported!\n");
-                       hsmmc_data[1] = mmc;
+                       if (c->transceiver)
+                               mmc->slots[0].ocr_mask = MMC2_OCR;
+                       else
+                               mmc->slots[0].ocr_mask = MMC_VDD_165_195;
+                       break;
+               case 3:
+                       mmc->slots[0].set_power = twl_mmc3_set_power;
+                       mmc->slots[0].ocr_mask = MMC_VDD_165_195;
                        break;
                default:
                        pr_err("MMC%d configuration not supported!\n", c->mmc);
-                       return;
+                       kfree(mmc);
+                       continue;
                }
+               hsmmc_data[c->mmc - 1] = mmc;
        }
 
        omap2_init_mmc(hsmmc_data, OMAP34XX_NR_MMC);
+
+       /* pass the device nodes back to board setup code */
+       for (c = controllers; c->mmc; c++) {
+               struct omap_mmc_platform_data *mmc = hsmmc_data[c->mmc - 1];
+
+               if (!c->mmc || c->mmc > nr_hsmmc)
+                       continue;
+               c->dev = mmc->dev;
+       }
 }
 
 #endif