diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-05-19 18:36:08 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-22 17:05:21 +0900 |
| commit | f87c20a9db43f6f731270eeef616e1bcc266c2d4 (patch) | |
| tree | a8409e44117a95cc24c86af5cb3ca1e173edbd9b | |
| parent | ac8fb3e8627d5494f3d2221925a82be4c1778b0e (diff) | |
| download | linux-3.10-f87c20a9db43f6f731270eeef616e1bcc266c2d4.tar.gz linux-3.10-f87c20a9db43f6f731270eeef616e1bcc266c2d4.tar.bz2 linux-3.10-f87c20a9db43f6f731270eeef616e1bcc266c2d4.zip | |
mfd: pass platform flags down to the tmio_mmc driver
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/mfd/sh_mobile_sdhi.c | 2 | ||||
| -rw-r--r-- | 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 555374db866..19e0d48a599 100644 --- 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 c305461e7f4..c7b47f8ad65 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); }; |