tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD

The CONFIG_MFD_SH_MOBILE_SDHI Kconfig symbol is going to disappear soon,
switch ecovec to using CONFIG_MMC_TMIO(_MODULE).

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

authored by Guennadi Liakhovetski and committed by Chris Ball 4fbc5ece b6147490

+3 -3
unified split
+3 -3
arch/sh/boards/mach-ecovec24/setup.c
··· 464 464 .irq = IRQ0, 465 465 }; 466 466 467 - #ifdef CONFIG_MFD_SH_MOBILE_SDHI 467 + #if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE) 468 468 /* SDHI0 */ 469 469 static void sdhi0_set_pwr(struct platform_device *pdev, int state) 470 470 { ··· 880 880 &ceu0_device, 881 881 &ceu1_device, 882 882 &keysc_device, 883 - #ifdef CONFIG_MFD_SH_MOBILE_SDHI 883 + #if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE) 884 884 &sdhi0_device, 885 885 #if !defined(CONFIG_MMC_SH_MMCIF) 886 886 &sdhi1_device, ··· 1162 1162 gpio_direction_input(GPIO_PTR5); 1163 1163 gpio_direction_input(GPIO_PTR6); 1164 1164 1165 - #ifdef CONFIG_MFD_SH_MOBILE_SDHI 1165 + #if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE) 1166 1166 /* enable SDHI0 on CN11 (needs DS2.4 set to ON) */ 1167 1167 gpio_request(GPIO_FN_SDHI0CD, NULL); 1168 1168 gpio_request(GPIO_FN_SDHI0WP, NULL);