mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
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>
This commit is contained in:
parent
b6147490e6
commit
4fbc5ece43
1 changed files with 3 additions and 3 deletions
|
@ -464,7 +464,7 @@ static struct i2c_board_info ts_i2c_clients = {
|
||||||
.irq = IRQ0,
|
.irq = IRQ0,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_MFD_SH_MOBILE_SDHI
|
#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
|
||||||
/* SDHI0 */
|
/* SDHI0 */
|
||||||
static void sdhi0_set_pwr(struct platform_device *pdev, int state)
|
static void sdhi0_set_pwr(struct platform_device *pdev, int state)
|
||||||
{
|
{
|
||||||
|
@ -880,7 +880,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
|
||||||
&ceu0_device,
|
&ceu0_device,
|
||||||
&ceu1_device,
|
&ceu1_device,
|
||||||
&keysc_device,
|
&keysc_device,
|
||||||
#ifdef CONFIG_MFD_SH_MOBILE_SDHI
|
#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
|
||||||
&sdhi0_device,
|
&sdhi0_device,
|
||||||
#if !defined(CONFIG_MMC_SH_MMCIF)
|
#if !defined(CONFIG_MMC_SH_MMCIF)
|
||||||
&sdhi1_device,
|
&sdhi1_device,
|
||||||
|
@ -1162,7 +1162,7 @@ static int __init arch_setup(void)
|
||||||
gpio_direction_input(GPIO_PTR5);
|
gpio_direction_input(GPIO_PTR5);
|
||||||
gpio_direction_input(GPIO_PTR6);
|
gpio_direction_input(GPIO_PTR6);
|
||||||
|
|
||||||
#ifdef CONFIG_MFD_SH_MOBILE_SDHI
|
#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
|
||||||
/* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
|
/* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
|
||||||
gpio_request(GPIO_FN_SDHI0CD, NULL);
|
gpio_request(GPIO_FN_SDHI0CD, NULL);
|
||||||
gpio_request(GPIO_FN_SDHI0WP, NULL);
|
gpio_request(GPIO_FN_SDHI0WP, NULL);
|
||||||
|
|
Loading…
Reference in a new issue