aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/sh_mobile_sdhi.c4
-rw-r--r--include/linux/mfd/sh_mobile_sdhi.h3
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)
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;
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 @@
1#ifndef __SH_MOBILE_SDHI_H__ 1#ifndef __SH_MOBILE_SDHI_H__
2#define __SH_MOBILE_SDHI_H__ 2#define __SH_MOBILE_SDHI_H__
3 3
4#include <linux/types.h>
5
4struct sh_mobile_sdhi_info { 6struct sh_mobile_sdhi_info {
5 int dma_slave_tx; 7 int dma_slave_tx;
6 int dma_slave_rx; 8 int dma_slave_rx;
7 unsigned long tmio_flags; 9 unsigned long tmio_flags;
10 u32 tmio_ocr_mask; /* available MMC voltages */
8 void (*set_pwr)(struct platform_device *pdev, int state); 11 void (*set_pwr)(struct platform_device *pdev, int state);
9}; 12};
10 13