sh: Shuffle the board directories in to mach groups.

This flattens out the board directories in to individual mach groups,
we will use this for getting rid of unneeded directories, simplifying
the build system, and becoming more coherent with the refactored
arch/sh/include topology.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 441 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-r2d/Kconfig b/arch/sh/boards/mach-r2d/Kconfig
new file mode 100644
index 000000000000..8122a9667fc9
--- /dev/null
+++ b/arch/sh/boards/mach-r2d/Kconfig
@@ -0,0 +1,23 @@
+if SH_RTS7751R2D
+
+menu "RTS7751R2D Board Revision"
+
+config RTS7751R2D_PLUS
+        bool "R2D-PLUS"
+        help
+          Selecting this option will configure the kernel for R2D-PLUS.
+
+          R2D-PLUS is the smaller of the two R2D board versions, equipped
+          with a single PCI slot.
+
+config RTS7751R2D_1
+        bool "R2D-1"
+        help
+          Selecting this option will configure the kernel for R2D-1.
+
+          R2D-1 is the larger of the two R2D board versions, equipped
+          with two PCI slots.
+endmenu
+
+endif
+
diff --git a/arch/sh/boards/mach-r2d/Makefile b/arch/sh/boards/mach-r2d/Makefile
new file mode 100644
index 000000000000..0d4c75a72be0
--- /dev/null
+++ b/arch/sh/boards/mach-r2d/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the RTS7751R2D specific parts of the kernel
+#
+
+obj-y    := setup.o irq.o
diff --git a/arch/sh/boards/mach-r2d/irq.c b/arch/sh/boards/mach-r2d/irq.c
new file mode 100644
index 000000000000..8e49f6e51247
--- /dev/null
+++ b/arch/sh/boards/mach-r2d/irq.c
@@ -0,0 +1,155 @@
+/*
+ * linux/arch/sh/boards/renesas/rts7751r2d/irq.c
+ *
+ * Copyright (C) 2007  Magnus Damm
+ * Copyright (C) 2000  Kazumoto Kojima
+ *
+ * Renesas Technology Sales RTS7751R2D Support, R2D-PLUS and R2D-1.
+ *
+ * Modified for RTS7751R2D by
+ * Atom Create Engineering Co., Ltd. 2002.
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <asm/rts7751r2d.h>
+
+#define R2D_NR_IRL 13
+
+enum {
+        UNUSED = 0,
+
+        /* board specific interrupt sources (R2D-1 and R2D-PLUS) */
+        EXT,              /* EXT_INT0-3 */
+        RTC_T, RTC_A,     /* Real Time Clock */
+        AX88796,          /* Ethernet controller (R2D-1 board) */
+        KEY,              /* Key input (R2D-PLUS board) */
+        SDCARD,           /* SD Card */
+        CF_CD, CF_IDE,    /* CF Card Detect + CF IDE */
+        SM501,            /* SM501 aka Voyager */
+        PCI_INTD_RTL8139, /* Ethernet controller */
+        PCI_INTC_PCI1520, /* Cardbus/PCMCIA bridge */
+        PCI_INTB_RTL8139, /* Ethernet controller with HUB (R2D-PLUS board) */
+        PCI_INTB_SLOT,    /* PCI Slot 3.3v (R2D-1 board) */
+        PCI_INTA_SLOT,    /* PCI Slot 3.3v */
+        TP,               /* Touch Panel */
+};
+
+#ifdef CONFIG_RTS7751R2D_1
+
+/* Vectors for R2D-1 */
+static struct intc_vect vectors_r2d_1[] __initdata = {
+        INTC_IRQ(EXT, IRQ_EXT),
+        INTC_IRQ(RTC_T, IRQ_RTC_T), INTC_IRQ(RTC_A, IRQ_RTC_A),
+        INTC_IRQ(AX88796, IRQ_AX88796), INTC_IRQ(SDCARD, IRQ_SDCARD),
+        INTC_IRQ(CF_CD, IRQ_CF_CD), INTC_IRQ(CF_IDE, IRQ_CF_IDE), /* ng */
+        INTC_IRQ(SM501, IRQ_VOYAGER),
+        INTC_IRQ(PCI_INTD_RTL8139, IRQ_PCI_INTD),
+        INTC_IRQ(PCI_INTC_PCI1520, IRQ_PCI_INTC),
+        INTC_IRQ(PCI_INTB_SLOT, IRQ_PCI_INTB),
+        INTC_IRQ(PCI_INTA_SLOT, IRQ_PCI_INTA),
+        INTC_IRQ(TP, IRQ_TP),
+};
+
+/* IRLMSK mask register layout for R2D-1 */
+static struct intc_mask_reg mask_registers_r2d_1[] __initdata = {
+        { 0xa4000000, 0, 16, /* IRLMSK */
+          { TP, PCI_INTA_SLOT, PCI_INTB_SLOT,
+            PCI_INTC_PCI1520, PCI_INTD_RTL8139,
+            SM501, CF_IDE, CF_CD, SDCARD, AX88796,
+            RTC_A, RTC_T, 0, 0, 0, EXT } },
+};
+
+/* IRLn to IRQ table for R2D-1 */
+static unsigned char irl2irq_r2d_1[R2D_NR_IRL] __initdata = {
+        IRQ_PCI_INTD, IRQ_CF_IDE, IRQ_CF_CD, IRQ_PCI_INTC,
+        IRQ_VOYAGER, IRQ_AX88796, IRQ_RTC_A, IRQ_RTC_T,
+        IRQ_SDCARD, IRQ_PCI_INTA, IRQ_PCI_INTB, IRQ_EXT,
+        IRQ_TP,
+};
+
+static DECLARE_INTC_DESC(intc_desc_r2d_1, "r2d-1", vectors_r2d_1,
+                         NULL, mask_registers_r2d_1, NULL, NULL);
+
+#endif /* CONFIG_RTS7751R2D_1 */
+
+#ifdef CONFIG_RTS7751R2D_PLUS
+
+/* Vectors for R2D-PLUS */
+static struct intc_vect vectors_r2d_plus[] __initdata = {
+        INTC_IRQ(EXT, IRQ_EXT),
+        INTC_IRQ(RTC_T, IRQ_RTC_T), INTC_IRQ(RTC_A, IRQ_RTC_A),
+        INTC_IRQ(KEY, IRQ_KEY), INTC_IRQ(SDCARD, IRQ_SDCARD),
+        INTC_IRQ(CF_CD, IRQ_CF_CD), INTC_IRQ(CF_IDE, IRQ_CF_IDE),
+        INTC_IRQ(SM501, IRQ_VOYAGER),
+        INTC_IRQ(PCI_INTD_RTL8139, IRQ_PCI_INTD),
+        INTC_IRQ(PCI_INTC_PCI1520, IRQ_PCI_INTC),
+        INTC_IRQ(PCI_INTB_RTL8139, IRQ_PCI_INTB),
+        INTC_IRQ(PCI_INTA_SLOT, IRQ_PCI_INTA),
+        INTC_IRQ(TP, IRQ_TP),
+};
+
+/* IRLMSK mask register layout for R2D-PLUS */
+static struct intc_mask_reg mask_registers_r2d_plus[] __initdata = {
+        { 0xa4000000, 0, 16, /* IRLMSK */
+          { TP, PCI_INTA_SLOT, PCI_INTB_RTL8139,
+            PCI_INTC_PCI1520, PCI_INTD_RTL8139,
+            SM501, CF_IDE, CF_CD, SDCARD, KEY,
+            RTC_A, RTC_T, 0, 0, 0, EXT } },
+};
+
+/* IRLn to IRQ table for R2D-PLUS */
+static unsigned char irl2irq_r2d_plus[R2D_NR_IRL] __initdata = {
+        IRQ_PCI_INTD, IRQ_CF_IDE, IRQ_CF_CD, IRQ_PCI_INTC,
+        IRQ_VOYAGER, IRQ_KEY, IRQ_RTC_A, IRQ_RTC_T,
+        IRQ_SDCARD, IRQ_PCI_INTA, IRQ_PCI_INTB, IRQ_EXT,
+        IRQ_TP,
+};
+
+static DECLARE_INTC_DESC(intc_desc_r2d_plus, "r2d-plus", vectors_r2d_plus,
+                         NULL, mask_registers_r2d_plus, NULL, NULL);
+
+#endif /* CONFIG_RTS7751R2D_PLUS */
+
+static unsigned char irl2irq[R2D_NR_IRL];
+
+int rts7751r2d_irq_demux(int irq)
+{
+        if (irq >= R2D_NR_IRL || !irl2irq[irq])
+                return irq;
+
+        return irl2irq[irq];
+}
+
+/*
+ * Initialize IRQ setting
+ */
+void __init init_rts7751r2d_IRQ(void)
+{
+        struct intc_desc *d;
+
+        switch (ctrl_inw(PA_VERREG) & 0xf0) {
+#ifdef CONFIG_RTS7751R2D_PLUS
+        case 0x10:
+                printk(KERN_INFO "Using R2D-PLUS interrupt controller.\n");
+                d = &intc_desc_r2d_plus;
+                memcpy(irl2irq, irl2irq_r2d_plus, R2D_NR_IRL);
+                break;
+#endif
+#ifdef CONFIG_RTS7751R2D_1
+        case 0x00: /* according to manual */
+        case 0x30: /* in reality */
+                printk(KERN_INFO "Using R2D-1 interrupt controller.\n");
+                d = &intc_desc_r2d_1;
+                memcpy(irl2irq, irl2irq_r2d_1, R2D_NR_IRL);
+                break;
+#endif
+        default:
+                printk(KERN_INFO "Unknown R2D interrupt controller 0x%04x\n",
+                       ctrl_inw(PA_VERREG));
+                return;
+        }
+
+        register_intc_controller(d);
+}
diff --git a/arch/sh/boards/mach-r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c
new file mode 100644
index 000000000000..2308e8753bcd
--- /dev/null
+++ b/arch/sh/boards/mach-r2d/setup.c
@@ -0,0 +1,258 @@
+/*
+ * Renesas Technology Sales RTS7751R2D Support.
+ *
+ * Copyright (C) 2002 - 2006 Atom Create Engineering Co., Ltd.
+ * Copyright (C) 2004 - 2007 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/ata_platform.h>
+#include <linux/sm501.h>
+#include <linux/sm501-regs.h>
+#include <linux/pm.h>
+#include <linux/fb.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <asm/machvec.h>
+#include <asm/rts7751r2d.h>
+#include <asm/io.h>
+#include <asm/io_trapped.h>
+#include <asm/spi.h>
+
+static struct resource cf_ide_resources[] = {
+        [0] = {
+                .start  = PA_AREA5_IO + 0x1000,
+                .end    = PA_AREA5_IO + 0x1000 + 0x10 - 0x2,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = PA_AREA5_IO + 0x80c,
+                .end    = PA_AREA5_IO + 0x80c,
+                .flags  = IORESOURCE_MEM,
+        },
+#ifndef CONFIG_RTS7751R2D_1 /* For R2D-1 polling is preferred */
+        [2] = {
+                .start  = IRQ_CF_IDE,
+                .flags  = IORESOURCE_IRQ,
+        },
+#endif
+};
+
+static struct pata_platform_info pata_info = {
+        .ioport_shift   = 1,
+};
+
+static struct platform_device cf_ide_device  = {
+        .name           = "pata_platform",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(cf_ide_resources),
+        .resource       = cf_ide_resources,
+        .dev    = {
+                .platform_data  = &pata_info,
+        },
+};
+
+static struct spi_board_info spi_bus[] = {
+        {
+                .modalias       = "rtc-r9701",
+                .max_speed_hz   = 1000000,
+                .mode           = SPI_MODE_3,
+        },
+};
+
+static void r2d_chip_select(struct sh_spi_info *spi, int cs, int state)
+{
+        BUG_ON(cs != 0);  /* Single Epson RTC-9701JE attached on CS0 */
+        ctrl_outw(state == BITBANG_CS_ACTIVE, PA_RTCCE);
+}
+
+static struct sh_spi_info spi_info = {
+        .num_chipselect = 1,
+        .chip_select = r2d_chip_select,
+};
+
+static struct resource spi_sh_sci_resources[] = {
+        {
+                .start  = 0xffe00000,
+                .end    = 0xffe0001f,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device spi_sh_sci_device  = {
+        .name           = "spi_sh_sci",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(spi_sh_sci_resources),
+        .resource       = spi_sh_sci_resources,
+        .dev    = {
+                .platform_data  = &spi_info,
+        },
+};
+
+static struct resource heartbeat_resources[] = {
+        [0] = {
+                .start  = PA_OUTPORT,
+                .end    = PA_OUTPORT,
+                .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,
+                .end    = 0x13e00000 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1]     = {
+                .start  = 0x13e00000,
+                .end    = 0x13ffffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2]     = {
+                .start  = IRQ_VOYAGER,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct fb_videomode sm501_default_mode = {
+        .pixclock       = 35714,
+        .xres           = 640,
+        .yres           = 480,
+        .left_margin    = 105,
+        .right_margin   = 50,
+        .upper_margin   = 35,
+        .lower_margin   = 0,
+        .hsync_len      = 96,
+        .vsync_len      = 2,
+        .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_pnl = {
+        .def_bpp        = 16,
+        .def_mode       = &sm501_default_mode,
+        .flags          = SM501FB_FLAG_USE_INIT_MODE |
+                          SM501FB_FLAG_USE_HWCURSOR |
+                          SM501FB_FLAG_USE_HWACCEL |
+                          SM501FB_FLAG_DISABLE_AT_EXIT,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_crt = {
+        .flags          = (SM501FB_FLAG_USE_INIT_MODE |
+                           SM501FB_FLAG_USE_HWCURSOR |
+                           SM501FB_FLAG_USE_HWACCEL |
+                           SM501FB_FLAG_DISABLE_AT_EXIT),
+
+};
+
+static struct sm501_platdata_fb sm501_fb_pdata = {
+        .fb_route       = SM501_FB_OWN,
+        .fb_crt         = &sm501_pdata_fbsub_crt,
+        .fb_pnl         = &sm501_pdata_fbsub_pnl,
+        .flags          = SM501_FBPD_SWAP_FB_ENDIAN,
+};
+
+static struct sm501_initdata sm501_initdata = {
+        .devices        = SM501_USE_USB_HOST | SM501_USE_UART0,
+};
+
+static struct sm501_platdata sm501_platform_data = {
+        .init           = &sm501_initdata,
+        .fb             = &sm501_fb_pdata,
+};
+
+static struct platform_device sm501_device = {
+        .name           = "sm501",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &sm501_platform_data,
+        },
+        .num_resources  = ARRAY_SIZE(sm501_resources),
+        .resource       = sm501_resources,
+};
+
+static struct platform_device *rts7751r2d_devices[] __initdata = {
+        &sm501_device,
+        &heartbeat_device,
+        &spi_sh_sci_device,
+};
+
+/*
+ * The CF is connected with a 16-bit bus where 8-bit operations are
+ * unsupported. The linux ata driver is however using 8-bit operations, so
+ * insert a trapped io filter to convert 8-bit operations into 16-bit.
+ */
+static struct trapped_io cf_trapped_io = {
+        .resource               = cf_ide_resources,
+        .num_resources          = 2,
+        .minimum_bus_width      = 16,
+};
+
+static int __init rts7751r2d_devices_setup(void)
+{
+        if (register_trapped_io(&cf_trapped_io) == 0)
+                platform_device_register(&cf_ide_device);
+
+        spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus));
+
+        return platform_add_devices(rts7751r2d_devices,
+                                    ARRAY_SIZE(rts7751r2d_devices));
+}
+__initcall(rts7751r2d_devices_setup);
+
+static void rts7751r2d_power_off(void)
+{
+        ctrl_outw(0x0001, PA_POWOFF);
+}
+
+/*
+ * Initialize the board
+ */
+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");
+
+        printk(KERN_INFO "FPGA version:%d (revision:%d)\n",
+                                        (ver >> 4) & 0xf, ver & 0xf);
+
+        ctrl_outw(0x0000, PA_OUTPORT);
+        pm_power_off = rts7751r2d_power_off;
+
+        /* 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);
+}
+
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_rts7751r2d __initmv = {
+        .mv_name                = "RTS7751R2D",
+        .mv_setup               = rts7751r2d_setup,
+        .mv_init_irq            = init_rts7751r2d_IRQ,
+        .mv_irq_demux           = rts7751r2d_irq_demux,
+};