diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-05-19 18:37:36 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-22 17:05:22 +0900 |
| commit | bb0fe533514c1d480c6c16f8bad070270a73a96c (patch) | |
| tree | 34de95399380a4043d16cf77466cabae343daf3b | |
| parent | a2b14dc9615c215a8cf4f2041f6c0c3fff5fc486 (diff) | |
| download | linux-bb0fe533514c1d480c6c16f8bad070270a73a96c.tar.bz2 | |
sh: allow platforms to specify SD-card supported voltages
Boards can have different supplied voltages on different SD card slots. This
information has to be passed down to the SD/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 | 4 | ||||
| -rw-r--r-- | include/linux/mfd/sh_mobile_sdhi.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index 19e0d48a599a..cd164595f08a 100644 --- a/drivers/mfd/sh_mobile_sdhi.c +++ b/drivers/mfd/sh_mobile_sdhi.c @@ -107,8 +107,10 @@ 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) + if (p) { mmc_data->flags = p->tmio_flags; + mmc_data->ocr_mask = p->tmio_ocr_mask; + } 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 c7b47f8ad650..49067802a6d7 100644 --- a/include/linux/mfd/sh_mobile_sdhi.h +++ b/include/linux/mfd/sh_mobile_sdhi.h @@ -1,10 +1,13 @@ #ifndef __SH_MOBILE_SDHI_H__ #define __SH_MOBILE_SDHI_H__ +#include <linux/types.h> + struct sh_mobile_sdhi_info { int dma_slave_tx; int dma_slave_rx; unsigned long tmio_flags; + u32 tmio_ocr_mask; /* available MMC voltages */ void (*set_pwr)(struct platform_device *pdev, int state); }; |