Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 58126c87 authored Feb 09, 2012 by Guennadi Liakhovetski Committed by Chris Ball Mar 27, 2012

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>

parent c8be24c2

drivers/mmc/host/sh_mobile_sdhi.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;

include/linux/mmc/sh_mobile_sdhi.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);