Merge branch 'p-ti-linux-3.8.y' of git://git.omapzoom.org/kernel/omap into p-ti-android-3.8.yp-ti-android-3.8.y

* 'p-ti-linux-3.8.y' of git://git.omapzoom.org/kernel/omap:
  arm: dra72: dts: Enable the HS200 property for MMC2
  mmc: omap-hsmmc: Set HS200 via DT property

Change-Id: I8c5fbead05a87ebce2d8b1fface4be8ecdfdce9a
Signed-off-by: Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
index 826cc51e425f..489db582589f 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -25,6 +25,7 @@ One tx and one rx pair is required.
 dma-names: DMA request names. These strings correspond 1:1 with
 the ordered pairs in dmas. The RX request must be "rx" and the
 TX request must be "tx".
+caps2-mmc-hs200-1_8v: the controller supports HS200 mode
 
 Examples:
 
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index 38fef89b3b99..fbe3622bb5e2 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -850,6 +850,7 @@
         vmmc-supply = <&vmmc2_fixed>;
         bus-width = <8>;
         max-frequency = <192000000>;
+        caps2-mmc-hs200-1_8v;
         ti,non-removable;
         pinctrl-names = "default";
         pinctrl-0 = <&mmc2_pins>;
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 37182f70a8ec..346ed86c31ee 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2135,6 +2135,9 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
         if (of_find_property(np, "ti,needs-special-hs-handling", NULL))
                 pdata->slots[0].features |= HSMMC_HAS_HSPE_SUPPORT;
 
+        if (of_find_property(np, "caps2-mmc-hs200-1_8v", NULL))
+                pdata->slots[0].caps2 |= MMC_CAP2_HS200_1_8V_SDR | MMC_CAP2_HS200;
+
         return pdata;
 }
 #else
@@ -2157,7 +2160,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         unsigned tx_req, rx_req;
         struct dmaengine_chan_caps *dma_chan_caps;
         struct pinctrl *pinctrl;
-        u32 revision, capa2;
+        u32 revision;
 
         match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev);
         if (match) {
@@ -2287,15 +2290,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         mmc->caps |= MMC_CAP_DRIVER_TYPE_A | MMC_CAP_DRIVER_TYPE_C |
                      MMC_CAP_DRIVER_TYPE_D;
 
-        capa2 = OMAP_HSMMC_READ(host->base, CAPA2);
-        if ((capa2 & SDR104) && (mmc->f_max > (2 * MMC_HIGH_DDR_MAX_DTR))) {
-                mmc->caps |= MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_SDR50;
-                mmc->caps2 |= MMC_CAP2_HS200_1_8V_SDR;
-        }
-        if (capa2 & SDR50)
-                mmc->caps |= MMC_CAP_UHS_SDR50;
-        if (capa2 & DDR50)
-                mmc->caps |= MMC_CAP_UHS_DDR50;
+        if ((mmc_slot(host).caps2 & (MMC_CAP2_HS200_1_8V_SDR | MMC_CAP2_HS200)) &&
+            (mmc->f_max > 2 * MMC_HIGH_DDR_MAX_DTR))
+                mmc->caps2 |= mmc_slot(host).caps2;
 
         omap_hsmmc_conf_bus_power(host);
 
diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
index 2bf1b30cb5dc..e104597ddf0b 100644
--- a/include/linux/platform_data/mmc-omap.h
+++ b/include/linux/platform_data/mmc-omap.h
@@ -76,6 +76,7 @@ struct omap_mmc_platform_data {
                 u8  wires;      /* Used for the MMC driver on omap1 and 2420 */
                 u32 caps;       /* Used for the MMC driver on 2430 and later */
                 u32 pm_caps;    /* PM capabilities of the mmc */
+                u32 caps2;
 
                 /*
                  * nomux means "standard" muxing is wrong on this board, and