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>

3 files changed, 212 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-sh03/Makefile b/arch/sh/boards/mach-sh03/Makefile
new file mode 100644
index 000000000000..400306a796ec
--- /dev/null
+++ b/arch/sh/boards/mach-sh03/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Interface (CTP/PCI-SH03) specific parts of the kernel
+#
+
+obj-y    := setup.o rtc.o
diff --git a/arch/sh/boards/mach-sh03/rtc.c b/arch/sh/boards/mach-sh03/rtc.c
new file mode 100644
index 000000000000..0a9266bb51c5
--- /dev/null
+++ b/arch/sh/boards/mach-sh03/rtc.c
@@ -0,0 +1,132 @@
+/*
+ * linux/arch/sh/boards/sh03/rtc.c -- CTP/PCI-SH03 on-chip RTC support
+ *
+ *  Copyright (C) 2004  Saito.K & Jeanne(ksaito@interface.co.jp)
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/bcd.h>
+#include <linux/rtc.h>
+#include <linux/spinlock.h>
+#include <asm/io.h>
+#include <asm/rtc.h>
+
+#define RTC_BASE        0xb0000000
+#define RTC_SEC1        (RTC_BASE + 0)
+#define RTC_SEC10       (RTC_BASE + 1)
+#define RTC_MIN1        (RTC_BASE + 2)
+#define RTC_MIN10       (RTC_BASE + 3)
+#define RTC_HOU1        (RTC_BASE + 4)
+#define RTC_HOU10       (RTC_BASE + 5)
+#define RTC_WEE1        (RTC_BASE + 6)
+#define RTC_DAY1        (RTC_BASE + 7)
+#define RTC_DAY10       (RTC_BASE + 8)
+#define RTC_MON1        (RTC_BASE + 9)
+#define RTC_MON10       (RTC_BASE + 10)
+#define RTC_YEA1        (RTC_BASE + 11)
+#define RTC_YEA10       (RTC_BASE + 12)
+#define RTC_YEA100      (RTC_BASE + 13)
+#define RTC_YEA1000     (RTC_BASE + 14)
+#define RTC_CTL         (RTC_BASE + 15)
+#define RTC_BUSY        1
+#define RTC_STOP        2
+
+extern spinlock_t rtc_lock;
+
+unsigned long get_cmos_time(void)
+{
+        unsigned int year, mon, day, hour, min, sec;
+
+        spin_lock(&rtc_lock);
+ again:
+        do {
+                sec  = (ctrl_inb(RTC_SEC1) & 0xf) + (ctrl_inb(RTC_SEC10) & 0x7) * 10;
+                min  = (ctrl_inb(RTC_MIN1) & 0xf) + (ctrl_inb(RTC_MIN10) & 0xf) * 10;
+                hour = (ctrl_inb(RTC_HOU1) & 0xf) + (ctrl_inb(RTC_HOU10) & 0xf) * 10;
+                day  = (ctrl_inb(RTC_DAY1) & 0xf) + (ctrl_inb(RTC_DAY10) & 0xf) * 10;
+                mon  = (ctrl_inb(RTC_MON1) & 0xf) + (ctrl_inb(RTC_MON10) & 0xf) * 10;
+                year = (ctrl_inb(RTC_YEA1) & 0xf) + (ctrl_inb(RTC_YEA10) & 0xf) * 10
+                     + (ctrl_inb(RTC_YEA100 ) & 0xf) * 100
+                     + (ctrl_inb(RTC_YEA1000) & 0xf) * 1000;
+        } while (sec != (ctrl_inb(RTC_SEC1) & 0xf) + (ctrl_inb(RTC_SEC10) & 0x7) * 10);
+        if (year == 0 || mon < 1 || mon > 12 || day > 31 || day < 1 ||
+            hour > 23 || min > 59 || sec > 59) {
+                printk(KERN_ERR
+                       "SH-03 RTC: invalid value, resetting to 1 Jan 2000\n");
+                printk("year=%d, mon=%d, day=%d, hour=%d, min=%d, sec=%d\n",
+                       year, mon, day, hour, min, sec);
+
+                ctrl_outb(0, RTC_SEC1); ctrl_outb(0, RTC_SEC10);
+                ctrl_outb(0, RTC_MIN1); ctrl_outb(0, RTC_MIN10);
+                ctrl_outb(0, RTC_HOU1); ctrl_outb(0, RTC_HOU10);
+                ctrl_outb(6, RTC_WEE1);
+                ctrl_outb(1, RTC_DAY1); ctrl_outb(0, RTC_DAY10);
+                ctrl_outb(1, RTC_MON1); ctrl_outb(0, RTC_MON10);
+                ctrl_outb(0, RTC_YEA1); ctrl_outb(0, RTC_YEA10);
+                ctrl_outb(0, RTC_YEA100);
+                ctrl_outb(2, RTC_YEA1000);
+                ctrl_outb(0, RTC_CTL);
+                goto again;
+        }
+
+        spin_unlock(&rtc_lock);
+        return mktime(year, mon, day, hour, min, sec);
+}
+
+void sh03_rtc_gettimeofday(struct timespec *tv)
+{
+
+        tv->tv_sec = get_cmos_time();
+        tv->tv_nsec = 0;
+}
+
+static int set_rtc_mmss(unsigned long nowtime)
+{
+        int retval = 0;
+        int real_seconds, real_minutes, cmos_minutes;
+        int i;
+
+        /* gets recalled with irq locally disabled */
+        spin_lock(&rtc_lock);
+        for (i = 0 ; i < 1000000 ; i++) /* may take up to 1 second... */
+                if (!(ctrl_inb(RTC_CTL) & RTC_BUSY))
+                        break;
+        cmos_minutes = (ctrl_inb(RTC_MIN1) & 0xf) + (ctrl_inb(RTC_MIN10) & 0xf) * 10;
+        real_seconds = nowtime % 60;
+        real_minutes = nowtime / 60;
+        if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
+                real_minutes += 30;             /* correct for half hour time zone */
+        real_minutes %= 60;
+
+        if (abs(real_minutes - cmos_minutes) < 30) {
+                ctrl_outb(real_seconds % 10, RTC_SEC1);
+                ctrl_outb(real_seconds / 10, RTC_SEC10);
+                ctrl_outb(real_minutes % 10, RTC_MIN1);
+                ctrl_outb(real_minutes / 10, RTC_MIN10);
+        } else {
+                printk(KERN_WARNING
+                       "set_rtc_mmss: can't update from %d to %d\n",
+                       cmos_minutes, real_minutes);
+                retval = -1;
+        }
+        spin_unlock(&rtc_lock);
+
+        return retval;
+}
+
+int sh03_rtc_settimeofday(const time_t secs)
+{
+        unsigned long nowtime = secs;
+
+        return set_rtc_mmss(nowtime);
+}
+
+void sh03_time_init(void)
+{
+        rtc_sh_get_time = sh03_rtc_gettimeofday;
+        rtc_sh_set_time = sh03_rtc_settimeofday;
+}
diff --git a/arch/sh/boards/mach-sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c
new file mode 100644
index 000000000000..cd9cff1ed349
--- /dev/null
+++ b/arch/sh/boards/mach-sh03/setup.c
@@ -0,0 +1,75 @@
+/*
+ * linux/arch/sh/boards/sh03/setup.c
+ *
+ * Copyright (C) 2004  Interface Co.,Ltd. Saito.K
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <asm/io.h>
+#include <asm/rtc.h>
+#include <mach/io.h>
+#include <mach/sh03.h>
+#include <asm/addrspace.h>
+
+static void __init init_sh03_IRQ(void)
+{
+        plat_irq_setup_pins(IRQ_MODE_IRQ);
+}
+
+extern void *cf_io_base;
+
+static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size)
+{
+        if (PXSEG(port))
+                return (void __iomem *)port;
+        /* CompactFlash (IDE) */
+        if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6))
+                return (void __iomem *)((unsigned long)cf_io_base + port);
+
+        return (void __iomem *)(port + PCI_IO_BASE);
+}
+
+/* arch/sh/boards/sh03/rtc.c */
+void sh03_time_init(void);
+
+static void __init sh03_setup(char **cmdline_p)
+{
+        board_time_init = sh03_time_init;
+}
+
+static struct resource heartbeat_resources[] = {
+        [0] = {
+                .start  = 0xa0800000,
+                .end    = 0xa0800000,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device heartbeat_device = {
+        .name           = "heartbeat",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(heartbeat_resources),
+        .resource       = heartbeat_resources,
+};
+
+static struct platform_device *sh03_devices[] __initdata = {
+        &heartbeat_device,
+};
+
+static int __init sh03_devices_setup(void)
+{
+        return platform_add_devices(sh03_devices, ARRAY_SIZE(sh03_devices));
+}
+__initcall(sh03_devices_setup);
+
+static struct sh_machine_vector mv_sh03 __initmv = {
+        .mv_name                = "Interface (CTP/PCI-SH03)",
+        .mv_setup               = sh03_setup,
+        .mv_nr_irqs             = 48,
+        .mv_ioport_map          = sh03_ioport_map,
+        .mv_init_irq            = init_sh03_IRQ,
+};