mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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>
This commit is contained in:
parent
c8be24c2af
commit
58126c878b
2 changed files with 3 additions and 1 deletions
|
@ -129,6 +129,7 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
|
||||||
mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
|
mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
|
||||||
mmc_data->ocr_mask = p->tmio_ocr_mask;
|
mmc_data->ocr_mask = p->tmio_ocr_mask;
|
||||||
mmc_data->capabilities |= p->tmio_caps;
|
mmc_data->capabilities |= p->tmio_caps;
|
||||||
|
mmc_data->cd_gpio = p->cd_gpio;
|
||||||
|
|
||||||
if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
|
if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
|
||||||
priv->param_tx.slave_id = p->dma_slave_tx;
|
priv->param_tx.slave_id = p->dma_slave_tx;
|
||||||
|
|
|
@ -16,6 +16,7 @@ struct sh_mobile_sdhi_info {
|
||||||
unsigned long tmio_flags;
|
unsigned long tmio_flags;
|
||||||
unsigned long tmio_caps;
|
unsigned long tmio_caps;
|
||||||
u32 tmio_ocr_mask; /* available MMC voltages */
|
u32 tmio_ocr_mask; /* available MMC voltages */
|
||||||
|
unsigned int cd_gpio;
|
||||||
struct tmio_mmc_data *pdata;
|
struct tmio_mmc_data *pdata;
|
||||||
void (*set_pwr)(struct platform_device *pdev, int state);
|
void (*set_pwr)(struct platform_device *pdev, int state);
|
||||||
int (*get_cd)(struct platform_device *pdev);
|
int (*get_cd)(struct platform_device *pdev);
|
||||||
|
|
Loading…
Reference in a new issue