sh: replace sh specific CONFIG_VOYAGERGX with CONFIG_MFD_SM501

This patch replaces all instances of CONFIG_VOYAGERGX with
CONFIG_MFD_SM501. While at it we make sure the r2d code compiles
both with and without SM501.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 37cf636fba552f2657262db9a37c8b7debdf892c..6c73a5b2b014ddc66788f0c34c7f012ce91ad571 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -136,7 +136,7 @@ endif
 
 # Companion chips
 core-$(CONFIG_HD6446X_SERIES)  += arch/sh/cchips/hd6446x/
-core-$(CONFIG_VOYAGERGX)       += arch/sh/cchips/voyagergx/
+core-$(CONFIG_MFD_SM501)       += arch/sh/cchips/voyagergx/
 
 cpuincdir-$(CONFIG_CPU_SH2)    := cpu-sh2
 cpuincdir-$(CONFIG_CPU_SH2A)   := cpu-sh2a

diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index e89932903caf626656de9b9fc054a6628344f45c..878852158b451db4155c9ef40cf7a736e7ed8a1f 100644 (file)
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -153,5 +153,7 @@ void __init init_rts7751r2d_IRQ(void)
        }
 
        register_intc_controller(d);
+#ifdef CONFIG_MFD_SM501
        setup_voyagergx_irq();
+#endif
 }

diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index 90703d5d12303bca2e5e0d1cd32166a09219d1ac..bea9848e5ff895422a6f9a7b9f29a372b154c2db 100644 (file)
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -73,6 +73,22 @@ static struct platform_device cf_ide_device  = {
        },
 };
 
+static struct resource heartbeat_resources[] = {
+       [0] = {
+               .start  = PA_OUTPORT,
+               .end    = PA_OUTPORT + 8 - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device heartbeat_device = {
+       .name           = "heartbeat",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(heartbeat_resources),
+       .resource       = heartbeat_resources,
+};
+
+#ifdef CONFIG_MFD_SM501
 static struct plat_serial8250_port uart_platform_data[] = {
        {
                .membase        = (void __iomem *)VOYAGER_UART_BASE,
@@ -94,21 +110,6 @@ static struct platform_device uart_device = {
        },
 };
 
-static struct resource heartbeat_resources[] = {
-       [0] = {
-               .start  = PA_OUTPORT,
-               .end    = PA_OUTPORT + 8 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device heartbeat_device = {
-       .name           = "heartbeat",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(heartbeat_resources),
-       .resource       = heartbeat_resources,
-};
-
 static struct resource sm501_resources[] = {
        [0]     = {
                .start  = 0x10000000,
@@ -133,10 +134,14 @@ static struct platform_device sm501_device = {
        .resource       = sm501_resources,
 };
 
+#endif /* CONFIG_MFD_SM501 */
+
 static struct platform_device *rts7751r2d_devices[] __initdata = {
+#ifdef CONFIG_MFD_SM501
        &uart_device,
-       &heartbeat_device,
        &sm501_device,
+#endif
+       &heartbeat_device,
 };
 
 static int __init rts7751r2d_devices_setup(void)
@@ -187,7 +192,7 @@ static struct sh_machine_vector mv_rts7751r2d __initmv = {
        .mv_init_irq            = init_rts7751r2d_IRQ,
        .mv_irq_demux           = rts7751r2d_irq_demux,
 
-#ifdef CONFIG_USB_SM501
+#if defined(CONFIG_MFD_SM501) && defined(CONFIG_USB_OHCI_HCD)
        .mv_consistent_alloc    = voyagergx_consistent_alloc,
        .mv_consistent_free     = voyagergx_consistent_free,
 #endif

diff --git a/arch/sh/cchips/Kconfig b/arch/sh/cchips/Kconfig
index 2e516e9a6ede5bf7be19ce8a8cf9dd449458eb1e..7892361eedc8fb6a414a566b093d49c6a7f8c7cf 100644 (file)
--- a/arch/sh/cchips/Kconfig
+++ b/arch/sh/cchips/Kconfig
@@ -1,18 +1,5 @@
 menu "Companion Chips"
 
-config VOYAGERGX
-       bool "VoyagerGX chip support"
-       depends on SH_RTS7751R2D
-       help
-         Selecting this option will support Silicon Motion, Inc. SM501.
-         Designed to complement needs for the embedded industry, it
-         provides video and 2D capability. To reduce system cost a
-         wide variety of include I/O is supported, including analog RGB
-         and digital LCD Panel interface, 8-bit parallel interface, USB,
-         UART, IrDA, Zoom Video, AC97 or I2S, SSP, PWM, and I2C. There
-         are additional GPIO bits that can be used to interface to
-         external as well.
-
 config HD6446X_SERIES
        bool