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

Commit 5bcd7517 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

ARM: mach-shmobile: MMCIF on mackerel can also be a module 



Remember to also check for the CONFIG_MMC_SH_MMCIF_MODULE option
for the case of a modular MMCIF driver.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c9fcf007

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -705,7 +705,7 @@ static struct platform_device sdhi0_device = { 
	},

	},

};

};





#if !defined(CONFIG_MMC_SH_MMCIF)

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

/* SDHI1 */

/* SDHI1 */

static struct sh_mobile_sdhi_info sdhi1_info = {

static struct sh_mobile_sdhi_info sdhi1_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,

	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,
@@ -940,7 +940,7 @@ static struct platform_device *mackerel_devices[] __initdata = { 
	&fsi_ak4643_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&fsi_hdmi_device,

	&sdhi0_device,

	&sdhi0_device,

#if !defined(CONFIG_MMC_SH_MMCIF)

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

	&sdhi1_device,

	&sdhi1_device,

#endif

#endif

	&sdhi2_device,

	&sdhi2_device,
@@ -1140,7 +1140,7 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);





#if !defined(CONFIG_MMC_SH_MMCIF)

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

	/* enable SDHI1 */

	/* enable SDHI1 */

	gpio_request(GPIO_FN_SDHICMD1, NULL);

	gpio_request(GPIO_FN_SDHICMD1, NULL);

	gpio_request(GPIO_FN_SDHICLK1, NULL);

	gpio_request(GPIO_FN_SDHICLK1, NULL);