summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-02-24 02:07:07 +0000
committerVinod Koul <vinod.koul@intel.com>2015-03-05 21:54:26 +0530
commit84f11d5b1f2abc0e22895b7e12e037f0ec03caeb (patch)
tree409c9b17a69320632bad77f183a0e2b1ff7610e2 /drivers/mmc
parentf33c9d655893d8632460696bbbdee737cb315711 (diff)
downloadop-kernel-dev-84f11d5b1f2abc0e22895b7e12e037f0ec03caeb.zip
op-kernel-dev-84f11d5b1f2abc0e22895b7e12e037f0ec03caeb.tar.gz
mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info
Current sh_mobile_sdhi's platform data is set via sh_mobile_sdhi_info and it is just copied to tmio_mmc_data. Now, tmio mmc platform data is specified via tmio_mmc_data. This patch replace sh_mobile_sdhi_info to tmio_mmc_data struct sh_mobile_sdhi_info { -> struct tmio_mmc_data { int dma_slave_tx; -> void *chan_priv_tx; int dma_slave_rx; -> void *chan_priv_rx; unsigned long tmio_flags; -> unsigned long flags; unsigned long tmio_caps; -> unsigned long capabilities; unsigned long tmio_caps2; -> unsigned long capabilities2; u32 tmio_ocr_mask; -> u32 ocr_mask; unsigned int cd_gpio; -> unsigned int cd_gpio; }; unsigned int hclk; void (*set_pwr)(...); void (*set_clk_div)(...); }; Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sh_mobile_sdhi.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 3137e29..354f4f3 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -202,7 +202,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
struct sh_mobile_sdhi *priv;
struct tmio_mmc_data *mmc_data;
struct tmio_mmc_data *mmd = pdev->dev.platform_data;
- struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
struct tmio_mmc_host *host;
struct resource *res;
int irq, ret, i = 0;
@@ -246,32 +245,9 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
else
host->bus_shift = 0;
- if (mmd) {
- /*
- * FIXME
- *
- * sh_mobile_sdhi_info will be replaced to tmio_mmc_data soon.
- * But, sh_mobile_sdhi_info is used under
- * ${LINUX}/arch/arm/mach-shmobile/
- * ${LINUX}/arch/sh/
- * To separate large patch into "tmio_mmc_data has .chan_priv_?x"
- * and "replace sh_mobile_sdhi_info in tmio_mmc_data",
- * here has dummy method.
- * These should be removed.
- */
- struct tmio_mmc_data m;
-
- mmd = &m;
- m.flags = p->tmio_flags;
- m.ocr_mask = p->tmio_ocr_mask;
- m.capabilities = p->tmio_caps;
- m.capabilities2 = p->tmio_caps2;
- m.cd_gpio = p->cd_gpio;
- m.chan_priv_tx = (void *)p->dma_slave_tx;
- m.chan_priv_rx = (void *)p->dma_slave_rx;
-
+ if (mmd)
*mmc_data = *mmd;
- }
+
dma_priv->filter = shdma_chan_filter;
dma_priv->enable = sh_mobile_sdhi_enable_dma;
OpenPOWER on IntegriCloud