mfd: pass platform flags down to the tmio_mmc driver

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Acked-by: Ian Molton <[email protected]>
Signed-off-by: Paul Mundt <[email protected]>

diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c
index 555374db866234e93bebb616547ab3850ae5b45b..19e0d48a599adfeed9c6ee18942a548030860c10 100644 (file)
--- a/drivers/mfd/sh_mobile_sdhi.c
+++ b/drivers/mfd/sh_mobile_sdhi.c
@@ -107,6 +107,8 @@ static int __init 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->capabilities = MMC_CAP_MMC_HIGHSPEED;
+       if (p)
+               mmc_data->flags = p->tmio_flags;
 
        if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {
                priv->param_tx.slave_id = p->dma_slave_tx;

diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h
index c305461e7f47fc544c10e2c9322eaff5b755067d..c7b47f8ad6504a21f88cf3d939b64bb5c107d685 100644 (file)
--- a/include/linux/mfd/sh_mobile_sdhi.h
+++ b/include/linux/mfd/sh_mobile_sdhi.h
@@ -4,6 +4,7 @@
 struct sh_mobile_sdhi_info {
        int dma_slave_tx;
        int dma_slave_rx;
+       unsigned long tmio_flags;
        void (*set_pwr)(struct platform_device *pdev, int state);
 };