diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-05-19 14:37:36 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-22 04:05:22 -0400 |
commit | bb0fe533514c1d480c6c16f8bad070270a73a96c (patch) | |
tree | 34de95399380a4043d16cf77466cabae343daf3b /drivers | |
parent | a2b14dc9615c215a8cf4f2041f6c0c3fff5fc486 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/sh_mobile_sdhi.c | 4 |
1 files changed, 3 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) | |||
107 | mmc_data->hclk = clk_get_rate(priv->clk); | 107 | mmc_data->hclk = clk_get_rate(priv->clk); |
108 | mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; | 108 | mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; |
109 | mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; | 109 | mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; |
110 | if (p) | 110 | if (p) { |
111 | mmc_data->flags = p->tmio_flags; | 111 | mmc_data->flags = p->tmio_flags; |
112 | mmc_data->ocr_mask = p->tmio_ocr_mask; | ||
113 | } | ||
112 | 114 | ||
113 | if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) { | 115 | if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) { |
114 | priv->param_tx.slave_id = p->dma_slave_tx; | 116 | priv->param_tx.slave_id = p->dma_slave_tx; |