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, 176 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-sdk7780/Kconfig b/arch/sh/boards/mach-sdk7780/Kconfig
new file mode 100644
index 000000000000..065f1df09bf1
--- /dev/null
+++ b/arch/sh/boards/mach-sdk7780/Kconfig
@@ -0,0 +1,16 @@
+if SH_SDK7780
+
+choice
+        prompt "SDK7780 options"
+        default SH_SDK7780_BASE
+
+config SH_SDK7780_BASE
+        bool "SDK7780 with base-board support"
+        depends on CPU_SUBTYPE_SH7780
+        help
+          Selecting this option will enable support for the expansion
+          baseboard devices. If in doubt, say Y.
+
+endchoice
+
+endif
diff --git a/arch/sh/boards/mach-sdk7780/Makefile b/arch/sh/boards/mach-sdk7780/Makefile
new file mode 100644
index 000000000000..3d8f0befc35d
--- /dev/null
+++ b/arch/sh/boards/mach-sdk7780/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the SDK7780 specific parts of the kernel
+#
+obj-y    := setup.o irq.o
+
diff --git a/arch/sh/boards/mach-sdk7780/irq.c b/arch/sh/boards/mach-sdk7780/irq.c
new file mode 100644
index 000000000000..87cdc578f6ff
--- /dev/null
+++ b/arch/sh/boards/mach-sdk7780/irq.c
@@ -0,0 +1,46 @@
+/*
+ * linux/arch/sh/boards/renesas/sdk7780/irq.c
+ *
+ * Renesas Technology Europe SDK7780 Support.
+ *
+ * Copyright (C) 2008  Nicholas Beck <nbeck@mpc-data.co.uk>
+ *
+ * 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/irq.h>
+#include <linux/io.h>
+#include <asm/sdk7780.h>
+
+enum {
+        UNUSED = 0,
+        /* board specific interrupt sources */
+        SMC91C111,      /* Ethernet controller */
+};
+
+static struct intc_vect fpga_vectors[] __initdata = {
+        INTC_IRQ(SMC91C111, IRQ_ETHERNET),
+};
+
+static struct intc_mask_reg fpga_mask_registers[] __initdata = {
+        { 0, FPGA_IRQ0MR, 16,
+          { 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, SMC91C111, 0, 0, 0, 0 } },
+};
+
+static DECLARE_INTC_DESC(fpga_intc_desc, "sdk7780-irq", fpga_vectors,
+                         NULL, fpga_mask_registers, NULL, NULL);
+
+void __init init_sdk7780_IRQ(void)
+{
+        printk(KERN_INFO "Using SDK7780 interrupt controller.\n");
+
+        ctrl_outw(0xFFFF, FPGA_IRQ0MR);
+        /* Setup IRL 0-3 */
+        ctrl_outw(0x0003, FPGA_IMSR);
+        plat_irq_setup_pins(IRQ_MODE_IRL3210);
+
+        register_intc_controller(&fpga_intc_desc);
+}
diff --git a/arch/sh/boards/mach-sdk7780/setup.c b/arch/sh/boards/mach-sdk7780/setup.c
new file mode 100644
index 000000000000..acc5932587f1
--- /dev/null
+++ b/arch/sh/boards/mach-sdk7780/setup.c
@@ -0,0 +1,109 @@
+/*
+ * arch/sh/boards/renesas/sdk7780/setup.c
+ *
+ * Renesas Solutions SH7780 SDK Support
+ * Copyright (C) 2008 Nicholas Beck <nbeck@mpc-data.co.uk>
+ *
+ * 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/types.h>
+#include <linux/platform_device.h>
+#include <linux/ata_platform.h>
+#include <asm/machvec.h>
+#include <asm/sdk7780.h>
+#include <asm/heartbeat.h>
+#include <asm/io.h>
+#include <asm/addrspace.h>
+
+#define GPIO_PECR        0xFFEA0008
+
+//* Heartbeat */
+static struct heartbeat_data heartbeat_data = {
+        .regsize = 16,
+};
+
+static struct resource heartbeat_resources[] = {
+        [0] = {
+                .start  = PA_LED,
+                .end    = PA_LED,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device heartbeat_device = {
+        .name           = "heartbeat",
+        .id             = -1,
+        .dev = {
+                .platform_data = &heartbeat_data,
+        },
+        .num_resources  = ARRAY_SIZE(heartbeat_resources),
+        .resource       = heartbeat_resources,
+};
+
+/* SMC91x */
+static struct resource smc91x_eth_resources[] = {
+        [0] = {
+                .name   = "smc91x-regs" ,
+                .start  = PA_LAN + 0x300,
+                .end    = PA_LAN + 0x300 + 0x10 ,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_ETHERNET,
+                .end    = IRQ_ETHERNET,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device smc91x_eth_device = {
+        .name           = "smc91x",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = NULL,         /* don't use dma */
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(smc91x_eth_resources),
+        .resource       = smc91x_eth_resources,
+};
+
+static struct platform_device *sdk7780_devices[] __initdata = {
+        &heartbeat_device,
+        &smc91x_eth_device,
+};
+
+static int __init sdk7780_devices_setup(void)
+{
+        return platform_add_devices(sdk7780_devices,
+                ARRAY_SIZE(sdk7780_devices));
+}
+device_initcall(sdk7780_devices_setup);
+
+static void __init sdk7780_setup(char **cmdline_p)
+{
+        u16 ver = ctrl_inw(FPGA_FPVERR);
+        u16 dateStamp = ctrl_inw(FPGA_FPDATER);
+
+        printk(KERN_INFO "Renesas Technology Europe SDK7780 support.\n");
+        printk(KERN_INFO "Board version: %d (revision %d), "
+                         "FPGA version: %d (revision %d), datestamp : %d\n",
+                         (ver >> 12) & 0xf, (ver >> 8) & 0xf,
+                         (ver >>  4) & 0xf, ver & 0xf,
+                         dateStamp);
+
+        /* Setup pin mux'ing for PCIC */
+        ctrl_outw(0x0000, GPIO_PECR);
+}
+
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_se7780 __initmv = {
+        .mv_name        = "Renesas SDK7780-R3" ,
+        .mv_setup               = sdk7780_setup,
+        .mv_nr_irqs             = 111,
+        .mv_init_irq    = init_sdk7780_IRQ,
+};
+