2 files changed, 15 insertions, 0 deletions

diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c
index 49b4d069cbf9..01d83a41d570 100644
--- a/drivers/mfd/sh_mobile_sdhi.c
+++ b/drivers/mfd/sh_mobile_sdhi.c
@@ -65,6 +65,17 @@ static void sh_mobile_sdhi_set_pwr(struct platform_device *tmio, int state)
                 p->set_pwr(pdev, state);
 }
 
+static int sh_mobile_sdhi_get_cd(struct platform_device *tmio)
+{
+        struct platform_device *pdev = to_platform_device(tmio->dev.parent);
+        struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
+
+        if (p && p->get_cd)
+                return p->get_cd(pdev);
+        else
+                return -ENOSYS;
+}
+
 static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 {
         struct sh_mobile_sdhi *priv;
@@ -106,10 +117,12 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 
         mmc_data->hclk = clk_get_rate(priv->clk);
         mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;
+        mmc_data->get_cd = sh_mobile_sdhi_get_cd;
         mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
         if (p) {
                 mmc_data->flags = p->tmio_flags;
                 mmc_data->ocr_mask = p->tmio_ocr_mask;
+                mmc_data->capabilities |= p->tmio_caps;
         }
 
         if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h
index 49067802a6d7..c981b959760f 100644
--- a/include/linux/mfd/sh_mobile_sdhi.h
+++ b/include/linux/mfd/sh_mobile_sdhi.h
@@ -7,8 +7,10 @@ struct sh_mobile_sdhi_info {
         int dma_slave_tx;
         int dma_slave_rx;
         unsigned long tmio_flags;
+        unsigned long tmio_caps;
         u32 tmio_ocr_mask;      /* available MMC voltages */
         void (*set_pwr)(struct platform_device *pdev, int state);
+        int (*get_cd)(struct platform_device *pdev);
 };
 
 #endif /* __SH_MOBILE_SDHI_H__ */