aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-02-09 16:57:10 -0500
committerChris Ball <cjb@laptop.org>2012-03-27 12:20:16 -0400
commit58126c878b4a4f658015e383614bafb6331e46d3 (patch)
tree4cc680965609d21b2d384819205dac4e78ece09e /drivers/mmc
parentc8be24c2afd3ed2445bbf8f542af35a9787fc0e8 (diff)
mmc: sh_mobile_sdhi: pass card hotplug GPIO number to TMIO MMC
To use TMIO MMC driver ability to interface to the generic MMC GPIO card hotplug detection helper, the SDHI driver has to pass the GPIO number from its own platform data. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sh_mobile_sdhi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 58da3c44acc5..cb279b4e501b 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -129,6 +129,7 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
129 mmc_data->write16_hook = sh_mobile_sdhi_write16_hook; 129 mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
130 mmc_data->ocr_mask = p->tmio_ocr_mask; 130 mmc_data->ocr_mask = p->tmio_ocr_mask;
131 mmc_data->capabilities |= p->tmio_caps; 131 mmc_data->capabilities |= p->tmio_caps;
132 mmc_data->cd_gpio = p->cd_gpio;
132 133
133 if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) { 134 if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
134 priv->param_tx.slave_id = p->dma_slave_tx; 135 priv->param_tx.slave_id = p->dma_slave_tx;
@@ -211,7 +212,7 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
211 212
212 dev_info(&pdev->dev, "%s base at 0x%08lx clock rate %u MHz\n", 213 dev_info(&pdev->dev, "%s base at 0x%08lx clock rate %u MHz\n",
213 mmc_hostname(host->mmc), (unsigned long) 214 mmc_hostname(host->mmc), (unsigned long)
214 (platform_get_resource(pdev,IORESOURCE_MEM, 0)->start), 215 (platform_get_resource(pdev, IORESOURCE_MEM, 0)->start),
215 mmc_data->hclk / 1000000); 216 mmc_data->hclk / 1000000);
216 217
217 return ret; 218 return ret;