Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (28 commits)
  mm/hugetlb.c must #include <asm/io.h>
  video: Fix up hp6xx driver build regressions.
  sh: defconfig updates.
  sh: Kill off stray mach-rsk7203 reference.
  serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
  sh: Move out individual boards without mach groups.
  sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
  sh: Allow SH-3 and SH-5 to use common headers.
  sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
  sh/maple: clean maple bus code
  sh: More header path fixups for mach dir refactoring.
  sh: Move out the solution engine headers to arch/sh/include/mach-se/
  sh: I2C fix for AP325RXA and Migo-R
  sh: Shuffle the board directories in to mach groups.
  sh: dma-sh: Fix up dreamcast dma.h mach path.
  sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
  sh: Add ARCH_DEFCONFIG entries for sh and sh64.
  sh: Fix compile error of Solution Engine
  sh: Proper __put_user_asm() size mismatch fix.
  sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
  ...

4 files changed, 346 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-systemh/Makefile b/arch/sh/boards/mach-systemh/Makefile
new file mode 100644
index 000000000000..2cc6a23d9d39
--- /dev/null
+++ b/arch/sh/boards/mach-systemh/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the SystemH specific parts of the kernel
+#
+
+obj-y    := setup.o irq.o io.o
+
+# XXX: This wants to be consolidated in arch/sh/drivers/pci, and more
+# importantly, with the generic sh7751_pcic_init() code. For now, we'll
+# just abuse the hell out of kbuild, because we can..
+
+obj-$(CONFIG_PCI) += pci.o
+pci-y := ../../se/7751/pci.o
+
diff --git a/arch/sh/boards/mach-systemh/io.c b/arch/sh/boards/mach-systemh/io.c
new file mode 100644
index 000000000000..1b767e1a1428
--- /dev/null
+++ b/arch/sh/boards/mach-systemh/io.c
@@ -0,0 +1,174 @@
+/*
+ * linux/arch/sh/boards/renesas/systemh/io.c
+ *
+ * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
+ * Based largely on io_se.c.
+ *
+ * I/O routine for Hitachi 7751 Systemh.
+ */
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <asm/systemh7751.h>
+#include <asm/addrspace.h>
+#include <asm/io.h>
+
+#define ETHER_IOMAP(adr) (0xB3000000 + (adr)) /*map to 16bits access area
+                                                of smc lan chip*/
+static inline volatile __u16 *
+port2adr(unsigned int port)
+{
+        if (port >= 0x2000)
+                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
+        maybebadio((unsigned long)port);
+        return (volatile __u16*)port;
+}
+
+/*
+ * General outline: remap really low stuff [eventually] to SuperIO,
+ * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
+ * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
+ * should be way beyond the window, and is used  w/o translation for
+ * compatibility.
+ */
+unsigned char sh7751systemh_inb(unsigned long port)
+{
+        if (PXSEG(port))
+                return *(volatile unsigned char *)port;
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned char *)pci_ioaddr(port);
+        else if (port <= 0x3F1)
+                return *(volatile unsigned char *)ETHER_IOMAP(port);
+        else
+                return (*port2adr(port))&0xff;
+}
+
+unsigned char sh7751systemh_inb_p(unsigned long port)
+{
+        unsigned char v;
+
+        if (PXSEG(port))
+                v = *(volatile unsigned char *)port;
+        else if (is_pci_ioaddr(port))
+                v = *(volatile unsigned char *)pci_ioaddr(port);
+        else if (port <= 0x3F1)
+                v = *(volatile unsigned char *)ETHER_IOMAP(port);
+        else
+                v = (*port2adr(port))&0xff;
+        ctrl_delay();
+        return v;
+}
+
+unsigned short sh7751systemh_inw(unsigned long port)
+{
+        if (PXSEG(port))
+                return *(volatile unsigned short *)port;
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned short *)pci_ioaddr(port);
+        else if (port >= 0x2000)
+                return *port2adr(port);
+        else if (port <= 0x3F1)
+                return *(volatile unsigned int *)ETHER_IOMAP(port);
+        else
+                maybebadio(port);
+        return 0;
+}
+
+unsigned int sh7751systemh_inl(unsigned long port)
+{
+        if (PXSEG(port))
+                return *(volatile unsigned long *)port;
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned int *)pci_ioaddr(port);
+        else if (port >= 0x2000)
+                return *port2adr(port);
+        else if (port <= 0x3F1)
+                return *(volatile unsigned int *)ETHER_IOMAP(port);
+        else
+                maybebadio(port);
+        return 0;
+}
+
+void sh7751systemh_outb(unsigned char value, unsigned long port)
+{
+
+        if (PXSEG(port))
+                *(volatile unsigned char *)port = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
+        else if (port <= 0x3F1)
+                *(volatile unsigned char *)ETHER_IOMAP(port) = value;
+        else
+                *(port2adr(port)) = value;
+}
+
+void sh7751systemh_outb_p(unsigned char value, unsigned long port)
+{
+        if (PXSEG(port))
+                *(volatile unsigned char *)port = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
+        else if (port <= 0x3F1)
+                *(volatile unsigned char *)ETHER_IOMAP(port) = value;
+        else
+                *(port2adr(port)) = value;
+        ctrl_delay();
+}
+
+void sh7751systemh_outw(unsigned short value, unsigned long port)
+{
+        if (PXSEG(port))
+                *(volatile unsigned short *)port = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned short *)pci_ioaddr(port)) = value;
+        else if (port >= 0x2000)
+                *port2adr(port) = value;
+        else if (port <= 0x3F1)
+                *(volatile unsigned short *)ETHER_IOMAP(port) = value;
+        else
+                maybebadio(port);
+}
+
+void sh7751systemh_outl(unsigned int value, unsigned long port)
+{
+        if (PXSEG(port))
+                *(volatile unsigned long *)port = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned long*)pci_ioaddr(port)) = value;
+        else
+                maybebadio(port);
+}
+
+void sh7751systemh_insb(unsigned long port, void *addr, unsigned long count)
+{
+        unsigned char *p = addr;
+        while (count--) *p++ = sh7751systemh_inb(port);
+}
+
+void sh7751systemh_insw(unsigned long port, void *addr, unsigned long count)
+{
+        unsigned short *p = addr;
+        while (count--) *p++ = sh7751systemh_inw(port);
+}
+
+void sh7751systemh_insl(unsigned long port, void *addr, unsigned long count)
+{
+        maybebadio(port);
+}
+
+void sh7751systemh_outsb(unsigned long port, const void *addr, unsigned long count)
+{
+        unsigned char *p = (unsigned char*)addr;
+        while (count--) sh7751systemh_outb(*p++, port);
+}
+
+void sh7751systemh_outsw(unsigned long port, const void *addr, unsigned long count)
+{
+        unsigned short *p = (unsigned short*)addr;
+        while (count--) sh7751systemh_outw(*p++, port);
+}
+
+void sh7751systemh_outsl(unsigned long port, const void *addr, unsigned long count)
+{
+        maybebadio(port);
+}
diff --git a/arch/sh/boards/mach-systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c
new file mode 100644
index 000000000000..0ba2fe674c47
--- /dev/null
+++ b/arch/sh/boards/mach-systemh/irq.c
@@ -0,0 +1,102 @@
+/*
+ * linux/arch/sh/boards/renesas/systemh/irq.c
+ *
+ * Copyright (C) 2000  Kazumoto Kojima
+ *
+ * Hitachi SystemH Support.
+ *
+ * Modified for 7751 SystemH by
+ * Jonathan Short.
+ */
+
+#include <linux/init.h>
+#include <linux/irq.h>
+
+#include <linux/hdreg.h>
+#include <linux/ide.h>
+#include <asm/io.h>
+#include <asm/systemh7751.h>
+#include <asm/smc37c93x.h>
+
+/* address of external interrupt mask register
+ * address must be set prior to use these (maybe in init_XXX_irq())
+ * XXX : is it better to use .config than specifying it in code? */
+static unsigned long *systemh_irq_mask_register = (unsigned long *)0xB3F10004;
+static unsigned long *systemh_irq_request_register = (unsigned long *)0xB3F10000;
+
+/* forward declaration */
+static unsigned int startup_systemh_irq(unsigned int irq);
+static void shutdown_systemh_irq(unsigned int irq);
+static void enable_systemh_irq(unsigned int irq);
+static void disable_systemh_irq(unsigned int irq);
+static void mask_and_ack_systemh(unsigned int);
+static void end_systemh_irq(unsigned int irq);
+
+/* hw_interrupt_type */
+static struct hw_interrupt_type systemh_irq_type = {
+        .typename = " SystemH Register",
+        .startup = startup_systemh_irq,
+        .shutdown = shutdown_systemh_irq,
+        .enable = enable_systemh_irq,
+        .disable = disable_systemh_irq,
+        .ack = mask_and_ack_systemh,
+        .end = end_systemh_irq
+};
+
+static unsigned int startup_systemh_irq(unsigned int irq)
+{
+        enable_systemh_irq(irq);
+        return 0; /* never anything pending */
+}
+
+static void shutdown_systemh_irq(unsigned int irq)
+{
+        disable_systemh_irq(irq);
+}
+
+static void disable_systemh_irq(unsigned int irq)
+{
+        if (systemh_irq_mask_register) {
+                unsigned long val, mask = 0x01 << 1;
+
+                /* Clear the "irq"th bit in the mask and set it in the request */
+                val = ctrl_inl((unsigned long)systemh_irq_mask_register);
+                val &= ~mask;
+                ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
+
+                val = ctrl_inl((unsigned long)systemh_irq_request_register);
+                val |= mask;
+                ctrl_outl(val, (unsigned long)systemh_irq_request_register);
+        }
+}
+
+static void enable_systemh_irq(unsigned int irq)
+{
+        if (systemh_irq_mask_register) {
+                unsigned long val, mask = 0x01 << 1;
+
+                /* Set "irq"th bit in the mask register */
+                val = ctrl_inl((unsigned long)systemh_irq_mask_register);
+                val |= mask;
+                ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
+        }
+}
+
+static void mask_and_ack_systemh(unsigned int irq)
+{
+        disable_systemh_irq(irq);
+}
+
+static void end_systemh_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+                enable_systemh_irq(irq);
+}
+
+void make_systemh_irq(unsigned int irq)
+{
+        disable_irq_nosync(irq);
+        irq_desc[irq].chip = &systemh_irq_type;
+        disable_systemh_irq(irq);
+}
+
diff --git a/arch/sh/boards/mach-systemh/setup.c b/arch/sh/boards/mach-systemh/setup.c
new file mode 100644
index 000000000000..ee78af842778
--- /dev/null
+++ b/arch/sh/boards/mach-systemh/setup.c
@@ -0,0 +1,57 @@
+/*
+ * linux/arch/sh/boards/renesas/systemh/setup.c
+ *
+ * Copyright (C) 2000  Kazumoto Kojima
+ * Copyright (C) 2003  Paul Mundt
+ *
+ * Hitachi SystemH Support.
+ *
+ * Modified for 7751 SystemH by Jonathan Short.
+ *
+ * Rewritten for 2.6 by 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 <asm/machvec.h>
+#include <asm/systemh7751.h>
+
+extern void make_systemh_irq(unsigned int irq);
+
+/*
+ * Initialize IRQ setting
+ */
+static void __init sh7751systemh_init_irq(void)
+{
+        make_systemh_irq(0xb);  /* Ethernet interrupt */
+}
+
+static struct sh_machine_vector mv_7751systemh __initmv = {
+        .mv_name                = "7751 SystemH",
+        .mv_nr_irqs             = 72,
+
+        .mv_inb                 = sh7751systemh_inb,
+        .mv_inw                 = sh7751systemh_inw,
+        .mv_inl                 = sh7751systemh_inl,
+        .mv_outb                = sh7751systemh_outb,
+        .mv_outw                = sh7751systemh_outw,
+        .mv_outl                = sh7751systemh_outl,
+
+        .mv_inb_p               = sh7751systemh_inb_p,
+        .mv_inw_p               = sh7751systemh_inw,
+        .mv_inl_p               = sh7751systemh_inl,
+        .mv_outb_p              = sh7751systemh_outb_p,
+        .mv_outw_p              = sh7751systemh_outw,
+        .mv_outl_p              = sh7751systemh_outl,
+
+        .mv_insb                = sh7751systemh_insb,
+        .mv_insw                = sh7751systemh_insw,
+        .mv_insl                = sh7751systemh_insl,
+        .mv_outsb               = sh7751systemh_outsb,
+        .mv_outsw               = sh7751systemh_outsw,
+        .mv_outsl               = sh7751systemh_outsl,
+
+        .mv_init_irq            = sh7751systemh_init_irq,
+};