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

Commit 2b3e38c4 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Rafael J. Wysocki
Browse files

ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper 



This also fixes the following modular mmc build failure:

arch/arm/mach-shmobile/built-in.o: In function `ag5evm_sdhi0_gpio_cd':
pfc-sh73a0.c:(.text+0x7c0): undefined reference to `mmc_detect_change'

on this platform by eliminating the use of an inline function, which
calls into the mmc core.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Tested-by: default avatarSimon Horman <horms@verge.net.au>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent d48b97b4

arch/arm/mach-shmobile/board-mackerel.c

+2 −20
Original line number Diff line number Diff line
@@ -1011,21 +1011,12 @@ static int slot_cn7_get_cd(struct platform_device *pdev) 
}



/* SDHI0 */

static irqreturn_t mackerel_sdhi0_gpio_cd(int irq, void *arg)

{

	struct device *dev = arg;

	struct sh_mobile_sdhi_info *info = dev->platform_data;

	struct tmio_mmc_data *pdata = info->pdata;



	tmio_mmc_cd_wakeup(pdata);



	return IRQ_HANDLED;

}



static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.tmio_flags	= TMIO_MMC_USE_GPIO_CD,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.cd_gpio	= GPIO_PORT172,

};



static struct resource sdhi0_resources[] = {
@@ -1384,7 +1375,6 @@ static void __init mackerel_init(void) 
{

	u32 srcr4;

	struct clk *clk;

	int ret;



	/* External clock source */

	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
@@ -1481,7 +1471,6 @@ static void __init mackerel_init(void) 
	irq_set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH);



	/* enable SDHI0 */

	gpio_request(GPIO_FN_SDHICD0, NULL);

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);
@@ -1490,13 +1479,6 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);



	ret = request_irq(evt2irq(0x3340), mackerel_sdhi0_gpio_cd,

			  IRQF_TRIGGER_FALLING, "sdhi0 cd", &sdhi0_device.dev);

	if (!ret)

		sdhi0_info.tmio_flags |= TMIO_MMC_HAS_COLD_CD;

	else

		pr_err("Cannot get IRQ #%d: %d\n", evt2irq(0x3340), ret);



#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

	/* enable SDHI1 */

	gpio_request(GPIO_FN_SDHICMD1, NULL);