Merge tag 'mmc-v4.1' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Add support for marking HPI as broken through devicetree
   - Enable runtime PM management of host devices
   - Remove the ->enable|disable() callbacks
   - Restructure code and cleanups
   - Refreshed some of the MMC sections in MAINTAINERS

  MMC host:
   - dw_mmc: HS400 mode support
   - dw_mmc: Add the cmd11 timer to detect a timeout
   - dw_mmc: Endian agnostic IO accessors
   - dw_mmc: Bugfixes
   - sh_mmcif: Add exclusion between cmd and interrupt
   - omap_hsmmc: Hibernation support
   - omap_hsmmc: Rework and simplify cover/card detect
   - omap_hsmmc: Stop using ->enable|disable() callbacks
   - atmel-mci: Endian agnostic IO
   - sunxi: Enable MMC_CAP_SDIO_IRQ
   - sdhci-st: Add support for the stih407 family silicon
   - sdhci-st: UHS card support in SDR104 mode
   - sdhci-st: HS200 mode support
   - sdhci-esdhc-imx: Use common mmc DT parser
   - sdhci-of-arasan: Use common mmc DT parser
   - sdhci-iproc: Add new driver for Broadcom IPROC SDHCI controller
   - sdhci-tegra: Convert to GPIO descriptors
   - sdhci-tegra: Optmize write_w path for tegra114 and later
   - sdhci-sirf: Update tuning procedure
   - sdhci: Fix card presence logic
   - sdhci: Cleanups and consolidation"

* tag 'mmc-v4.1' of git://git.linaro.org/people/ulf.hansson/mmc: (79 commits)
  mmc: sdhci-st: Update ST SDHCI binding documentation.
  mmc: sdhci-st: Update the quirks for this controller.
  mmc: sdhci-st: Add sdhci_st_set_uhs_signaling function.
  mmc: sdhci-st: Add st_mmcss_cconfig function to configure mmcss glue registers.
  mmc: sdhci-st: Add delay management functions for top registers (eMMC).
  mmc: sdhci-st: Add support for de-asserting reset signal and top regs resource
  mmc: sdhci-st: Add macros for register offsets and bitfields for mmcss glue regs
  mmc: sdhci-esdhc-imx: Call mmc_of_parse()
  mmc: dw_mmc: Add locking around cmd11 timer
  mmc: dw_mmc: Add a return in an unexpected cmd11 timeout
  mmc: dw_mmc: Increase cmd11 timeout to 500ms
  mmc: dw_mmc: fix fifo ordering in big endian
  mmc: dw_mmc: change idmac descriptor files to __le32
  mmc: dw_mmc: make IO accessors endian agnostic
  mmc: core: Convert the error field in struct mmc_command|data into an int
  mmc: sdhci-of-arasan: Call OF parsing for MMC
  mmc: sdhci-pci: fix 64 BIT DMA quirks for rtsx
  mmc: Add support for marking hpi as broken through devicetree
  mmc: sdhci-tegra: convert to use GPIO descriptors
  mmc: omap_hsmmc: use generic slot-gpio isr to manage card detect pin
  ...

1 files changed, 25 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index dc6e79c4484a..9a8611ab5dfa 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -150,9 +150,13 @@ static int nop_mmc_set_power(struct device *dev, int power_on, int vdd)
 static inline void omap_hsmmc_mux(struct omap_hsmmc_platform_data
                                   *mmc_controller, int controller_nr)
 {
-        if (gpio_is_valid(mmc_controller->switch_pin) &&
-            (mmc_controller->switch_pin < OMAP_MAX_GPIO_LINES))
-                omap_mux_init_gpio(mmc_controller->switch_pin,
+        if (gpio_is_valid(mmc_controller->gpio_cd) &&
+            (mmc_controller->gpio_cd < OMAP_MAX_GPIO_LINES))
+                omap_mux_init_gpio(mmc_controller->gpio_cd,
+                                   OMAP_PIN_INPUT_PULLUP);
+        if (gpio_is_valid(mmc_controller->gpio_cod) &&
+            (mmc_controller->gpio_cod < OMAP_MAX_GPIO_LINES))
+                omap_mux_init_gpio(mmc_controller->gpio_cod,
                                    OMAP_PIN_INPUT_PULLUP);
         if (gpio_is_valid(mmc_controller->gpio_wp) &&
             (mmc_controller->gpio_wp < OMAP_MAX_GPIO_LINES))
@@ -250,15 +254,20 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
         mmc->internal_clock = !c->ext_clock;
         mmc->reg_offset = 0;
 
-        mmc->switch_pin = c->gpio_cd;
+        if (c->cover_only) {
+                /* detect if mobile phone cover removed */
+                mmc->gpio_cd = -EINVAL;
+                mmc->gpio_cod = c->gpio_cd;
+        } else {
+                /* card detect pin on the mmc socket itself */
+                mmc->gpio_cd = c->gpio_cd;
+                mmc->gpio_cod = -EINVAL;
+        }
         mmc->gpio_wp = c->gpio_wp;
 
         mmc->remux = c->remux;
         mmc->init_card = c->init_card;
 
-        if (c->cover_only)
-                mmc->cover = 1;
-
         if (c->nonremovable)
                 mmc->nonremovable = 1;
 
@@ -358,7 +367,15 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)
                 if (!mmc_pdata)
                         continue;
 
-                mmc_pdata->switch_pin = c->gpio_cd;
+                if (c->cover_only) {
+                        /* detect if mobile phone cover removed */
+                        mmc_pdata->gpio_cd = -EINVAL;
+                        mmc_pdata->gpio_cod = c->gpio_cd;
+                } else {
+                        /* card detect pin on the mmc socket itself */
+                        mmc_pdata->gpio_cd = c->gpio_cd;
+                        mmc_pdata->gpio_cod = -EINVAL;
+                }
                 mmc_pdata->gpio_wp = c->gpio_wp;
 
                 res = omap_device_register(pdev);