sh: remove voyagergx

This patch removes redundant irq handling code together with unused
consistent alloc code. R2D uart setup code is changed to use
sm501-regs.h and unused header files are removed.

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

2 files changed, 39 insertions, 38 deletions

diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index 3fecd49e0d2a..8e49f6e51247 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -13,7 +13,6 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <asm/voyagergx.h>
 #include <asm/rts7751r2d.h>
 
 #define R2D_NR_IRL 13
@@ -153,7 +152,4 @@ 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 dc143c10cd18..8cb496617073 100644
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -13,36 +13,13 @@
 #include <linux/pata_platform.h>
 #include <linux/serial_8250.h>
 #include <linux/sm501.h>
+#include <linux/sm501-regs.h>
 #include <linux/pm.h>
 #include <linux/fb.h>
 #include <asm/machvec.h>
 #include <asm/rts7751r2d.h>
-#include <asm/voyagergx.h>
 #include <asm/io.h>
 
-static void __init voyagergx_serial_init(void)
-{
-        unsigned long val;
-
-        /*
-         * GPIO Control
-         */
-        val = readl((void __iomem *)GPIO_MUX_HIGH);
-        val |= 0x00001fe0;
-        writel(val, (void __iomem *)GPIO_MUX_HIGH);
-
-        /*
-         * Power Mode Gate
-         */
-        val = readl((void __iomem *)POWER_MODE0_GATE);
-        val |= (POWER_MODE0_GATE_U0 | POWER_MODE0_GATE_U1);
-        writel(val, (void __iomem *)POWER_MODE0_GATE);
-
-        val = readl((void __iomem *)POWER_MODE1_GATE);
-        val |= (POWER_MODE1_GATE_U0 | POWER_MODE1_GATE_U1);
-        writel(val, (void __iomem *)POWER_MODE1_GATE);
-}
-
 static struct resource cf_ide_resources[] = {
         [0] = {
                 .start  = PA_AREA5_IO + 0x1000,
@@ -94,11 +71,11 @@ static struct platform_device heartbeat_device = {
 #ifdef CONFIG_MFD_SM501
 static struct plat_serial8250_port uart_platform_data[] = {
         {
-                .membase        = (void __iomem *)VOYAGER_UART_BASE,
-                .mapbase        = VOYAGER_UART_BASE,
+                .membase        = (void __iomem *)0xb3e30000,
+                .mapbase        = 0xb3e30000,
                 .iotype         = UPIO_MEM,
-                .irq            = IRQ_SM501_U0,
-                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .irq            = IRQ_VOYAGER,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ,
                 .regshift       = 2,
                 .uartclk        = (9600 * 16),
         },
@@ -125,7 +102,7 @@ static struct resource sm501_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [2]     = {
-                .start  = IRQ_SM501_CV,
+                .start  = IRQ_VOYAGER,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -167,7 +144,15 @@ static struct sm501_platdata_fb sm501_fb_pdata = {
         .flags          = SM501_FBPD_SWAP_FB_ENDIAN,
 };
 
+static struct sm501_initdata sm501_initdata = {
+        .gpio_high      = {
+                .set    = 0x00001fe0,
+                .mask   = 0x0,
+        },
+};
+
 static struct sm501_platdata sm501_platform_data = {
+        .init           = &sm501_initdata,
         .fb             = &sm501_fb_pdata,
 };
 
@@ -237,6 +222,7 @@ u8 rts7751r2d_readb(void __iomem *addr)
  */
 static void __init rts7751r2d_setup(char **cmdline_p)
 {
+        void __iomem *sm501_reg;
         u16 ver = ctrl_inw(PA_VERREG);
 
         printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
@@ -247,7 +233,30 @@ static void __init rts7751r2d_setup(char **cmdline_p)
         ctrl_outw(0x0000, PA_OUTPORT);
         pm_power_off = rts7751r2d_power_off;
 
-        voyagergx_serial_init();
+        /* sm501 dram configuration:
+         * ColSizeX = 11 - External Memory Column Size: 256 words.
+         * APX = 1 - External Memory Active to Pre-Charge Delay: 7 clocks.
+         * RstX = 1 - External Memory Reset: Normal.
+         * Rfsh = 1 - Local Memory Refresh to Command Delay: 12 clocks.
+         * BwC =  1 - Local Memory Block Write Cycle Time: 2 clocks.
+         * BwP =  1 - Local Memory Block Write to Pre-Charge Delay: 1 clock.
+         * AP = 1 - Internal Memory Active to Pre-Charge Delay: 7 clocks.
+         * Rst = 1 - Internal Memory Reset: Normal.
+         * RA = 1 - Internal Memory Remain in Active State: Do not remain.
+         */
+
+        sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL;
+        writel(readl(sm501_reg) | 0x00f107c0, sm501_reg);
+
+        /*
+         * Power Mode Gate - Enable UART0
+         */
+
+        sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_0_GATE;
+        writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg);
+
+        sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_1_GATE;
+        writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg);
 }
 
 /*
@@ -260,8 +269,4 @@ static struct sh_machine_vector mv_rts7751r2d __initmv = {
         .mv_irq_demux           = rts7751r2d_irq_demux,
         .mv_writeb              = rts7751r2d_writeb,
         .mv_readb               = rts7751r2d_readb,
-#if defined(CONFIG_MFD_SM501) && defined(CONFIG_USB_OHCI_HCD)
-        .mv_consistent_alloc    = voyagergx_consistent_alloc,
-        .mv_consistent_free     = voyagergx_consistent_free,
-#endif
 };