Signed-off-by: Guennadi Liakhovetski <g.liakhovet...@gmx.de>
Acked-by: Ian Molton <i...@mnementh.co.uk>
---
 drivers/mfd/sh_mobile_sdhi.c       |    2 ++
 include/linux/mfd/sh_mobile_sdhi.h |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c
index dafa988..7970fe8 100644
--- a/drivers/mfd/sh_mobile_sdhi.c
+++ b/drivers/mfd/sh_mobile_sdhi.c
@@ -106,6 +106,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 c305461..c7b47f8 100644
--- 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);
 };
 
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to