4 files changed, 25 insertions, 31 deletions

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 37cf636fba55..6c73a5b2b014 100644
--- 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 e89932903caf..878852158b45 100644
--- 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 90703d5d1230..bea9848e5ff8 100644
--- 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 2e516e9a6ede..7892361eedc8 100644
--- 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