Merge branch 'master' into gfs2

237 files changed, 17228 insertions, 6583 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1a0db1d4c952..1cc5c9b27bfd 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configuration"
 config SUPERH
         bool
         default y
+        select EMBEDDED
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
@@ -51,18 +52,23 @@ source "init/Kconfig"
 
 menu "System type"
 
+config SOLUTION_ENGINE
+        bool
+
 choice
         prompt "SuperH system type"
         default SH_UNKNOWN
 
 config SH_SOLUTION_ENGINE
         bool "SolutionEngine"
+        select SOLUTION_ENGINE
         help
           Select SolutionEngine if configuring for a Hitachi SH7709
           or SH7750 evaluation board.
 
 config SH_7751_SOLUTION_ENGINE
         bool "SolutionEngine7751"
+        select SOLUTION_ENGINE
         select CPU_SUBTYPE_SH7751
         help
           Select 7751 SolutionEngine if configuring for a Hitachi SH7751
@@ -70,17 +76,27 @@ config SH_7751_SOLUTION_ENGINE
 
 config SH_7300_SOLUTION_ENGINE
         bool "SolutionEngine7300"
+        select SOLUTION_ENGINE
         select CPU_SUBTYPE_SH7300
         help
-          Select 7300 SolutionEngine if configuring for a Hitachi SH7300(SH-Mobile V)
-          evaluation board.
+          Select 7300 SolutionEngine if configuring for a Hitachi
+          SH7300(SH-Mobile V) evaluation board.
+
+config SH_7343_SOLUTION_ENGINE
+        bool "SolutionEngine7343"
+        select SOLUTION_ENGINE
+        select CPU_SUBTYPE_SH7343
+        help
+          Select 7343 SolutionEngine if configuring for a Hitachi
+          SH7343 (SH-Mobile 3AS) evaluation board.
 
 config SH_73180_SOLUTION_ENGINE
        bool "SolutionEngine73180"
-       select CPU_SUBTYPE_SH73180
-       help
-         Select 73180 SolutionEngine if configuring for a Hitachi SH73180(SH-Mobile 3)
-         evaluation board.
+        select SOLUTION_ENGINE
+        select CPU_SUBTYPE_SH73180
+        help
+          Select 73180 SolutionEngine if configuring for a Hitachi
+          SH73180(SH-Mobile 3) evaluation board.
 
 config SH_7751_SYSTEMH
         bool "SystemH7751R"
@@ -89,12 +105,6 @@ config SH_7751_SYSTEMH
           Select SystemH if you are configuring for a Renesas SystemH
           7751R evaluation board.
 
-config SH_STB1_HARP
-        bool "STB1_Harp"
-
-config SH_STB1_OVERDRIVE
-        bool "STB1_Overdrive"
-
 config SH_HP6XX
         bool "HP6XX"
         help
@@ -102,19 +112,6 @@ config SH_HP6XX
           More information (hardware only) at
           <http://www.hp.com/jornada/>.
 
-config SH_CQREEK
-        bool "CqREEK"
-        help
-          Select CqREEK if configuring for a CqREEK SH7708 or SH7750.
-          More information at
-          <http://sources.redhat.com/ecos/hardware.html#SuperH>.
-
-config SH_DMIDA
-        bool "DMIDA"
-        help
-          Select DMIDA if configuring for a DataMyte 4000 Industrial
-          Digital Assistant. More information at <http://www.dmida.com/>.
-
 config SH_EC3104
         bool "EC3104"
         help
@@ -136,25 +133,9 @@ config SH_DREAMCAST
           <http://www.m17n.org/linux-sh/dreamcast/>.  There is a
           Dreamcast project is at <http://linuxdc.sourceforge.net/>.
 
-config SH_CAT68701
-        bool "CAT68701"
-
 config SH_BIGSUR
         bool "BigSur"
 
-config SH_SH2000
-        bool "SH2000"
-        select CPU_SUBTYPE_SH7709
-        help
-          SH-2000 is a single-board computer based around SH7709A chip
-          intended for embedded applications.
-          It has an Ethernet interface (CS8900A), direct connected
-          Compact Flash socket, three serial ports and PC-104 bus.
-          More information at <http://sh2000.sh-linux.org>.
-
-config SH_ADX
-        bool "ADX"
-
 config SH_MPC1211
         bool "Interface MPC1211"
         help
@@ -184,6 +165,13 @@ config SH_HS7751RVOIP
           Select HS7751RVOIP if configuring for a Renesas Technology
           Sales VoIP board.
 
+config SH_7710VOIPGW
+        bool "SH7710-VOIP-GW"
+        select CPU_SUBTYPE_SH7710
+        help
+          Select this option to build a kernel for the SH7710 based
+          VOIP GW.
+
 config SH_RTS7751R2D
         bool "RTS7751R2D"
         select CPU_SUBTYPE_SH7751R
@@ -222,6 +210,12 @@ config SH_TITAN
           Select Titan if you are configuring for a Nimble Microsystems
           NetEngine NP51R.
 
+config SH_SHMIN
+        bool "SHMIN"
+        select CPU_SUBTYPE_SH7706
+        help
+          Select SHMIN if configureing for the SHMIN board
+
 config SH_UNKNOWN
         bool "BareCPU"
         help
@@ -238,35 +232,9 @@ endchoice
 
 source "arch/sh/mm/Kconfig"
 
-config MEMORY_START
-        hex "Physical memory start address"
-        default "0x08000000"
-        ---help---
-          Computers built with Hitachi SuperH processors always
-          map the ROM starting at address zero.  But the processor
-          does not specify the range that RAM takes.
-
-          The physical memory (RAM) start address will be automatically
-          set to 08000000. Other platforms, such as the Solution Engine
-          boards typically map RAM at 0C000000.
-
-          Tweak this only when porting to a new machine which does not
-          already have a defconfig. Changing it from the known correct
-          value on any of the known systems will only lead to disaster.
-
-config MEMORY_SIZE
-        hex "Physical memory size"
-        default "0x00400000"
-        help
-          This sets the default memory size assumed by your SH kernel. It can
-          be overridden as normal by the 'mem=' argument on the kernel command
-          line. If unsure, consult your board specifications or just leave it
-          as 0x00400000 which was the default value before this became
-          configurable.
-
 config CF_ENABLER
         bool "Compact Flash Enabler support"
-        depends on SH_ADX || SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_CAT68701 || SH_SH03
+        depends on SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_SH03
         ---help---
           Compact Flash is a small, removable mass storage device introduced
           in 1994 originally as a PCMCIA device.  If you say `Y' here, you
@@ -294,7 +262,7 @@ config CF_AREA5
           - "Area5" if CompactFlash is connected to Area 5 (0x14000000)
           - "Area6" if it is connected to Area 6 (0x18000000)
 
-          "Area6" will work for most boards. For ADX, select "Area5".
+          "Area6" will work for most boards.
 
 config CF_AREA6
         bool "Area6"
@@ -316,19 +284,6 @@ config CPU_LITTLE_ENDIAN
           endian byte order. These modes require different kernels. Say Y if
           your machine is little endian, N if it's a big endian machine.
 
-# The SH7750 RTC module is disabled in the Dreamcast
-config SH_RTC
-        bool
-        depends on !SH_DREAMCAST && !SH_SATURN && !SH_7300_SOLUTION_ENGINE && \
-                   !SH_73180_SOLUTION_ENGINE && !SH_LANDISK && \
-                   !SH_R7780RP
-        default y
-        help
-          Selecting this option will allow the Linux kernel to emulate
-          PC's RTC.
-
-          If unsure, say N.
-
 config SH_FPU
         bool "FPU support"
         depends on !CPU_SH3
@@ -339,14 +294,22 @@ config SH_FPU
 
           This option must be set in order to enable the FPU.
 
+config SH_FPU_EMU
+        bool "FPU emulation support"
+        depends on !SH_FPU && EXPERIMENTAL
+        default n
+        help
+          Selecting this option will enable support for software FPU emulation.
+          Most SH-3 users will want to say Y here, whereas most SH-4 users will
+          want to say N.
+
 config SH_DSP
         bool "DSP support"
-        depends on !CPU_SH4
-        default y
+        default y if SH4AL_DSP || !CPU_SH4
+        default n
         help
           Selecting this option will enable support for SH processors that
-          have DSP units (ie, SH2-DSP and SH3-DSP). It is safe to say Y here
-          by default, as the existance of the DSP will be probed at runtime.
+          have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
 
           This option must be set in order to enable the DSP.
 
@@ -373,6 +336,9 @@ config CPU_HAS_INTEVT
 config CPU_HAS_PINT_IRQ
         bool
 
+config CPU_HAS_MASKREG_IRQ
+        bool
+
 config CPU_HAS_INTC2_IRQ
         bool
 
@@ -400,16 +366,19 @@ config SH_TMU
 
 endmenu
 
-#source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+
+source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 
-#source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
+source "arch/sh/boards/renesas/r7780rp/Kconfig"
 
 config SH_PCLK_FREQ
         int "Peripheral clock frequency (in Hz)"
         default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780
         default "60000000" if CPU_SUBTYPE_SH7751
-        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7760
-        default "27000000" if CPU_SUBTYPE_SH73180
+        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
+                              CPU_SUBTYPE_SH7760
+        default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
         default "66000000" if CPU_SUBTYPE_SH4_202
         help
           This option is used to specify the peripheral clock frequency.
@@ -440,10 +409,8 @@ source "arch/sh/cchips/Kconfig"
 
 config HEARTBEAT
         bool "Heartbeat LED"
-        depends on SH_MPC1211 || SH_SH03 || SH_CAT68701 || \
-                   SH_STB1_HARP || SH_STB1_OVERDRIVE || SH_BIGSUR || \
-                   SH_7751_SOLUTION_ENGINE || SH_7300_SOLUTION_ENGINE || \
-                   SH_73180_SOLUTION_ENGINE || SH_SOLUTION_ENGINE || \
+        depends on SH_MPC1211 || SH_SH03 || \
+                   SH_BIGSUR || SOLUTION_ENGINE || \
                    SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK
         help
           Use the power-on LED on your machine as a load meter.  The exact
@@ -459,6 +426,8 @@ config ISA_DMA_API
 
 menu "Kernel features"
 
+source kernel/Kconfig.hz
+
 config KEXEC
         bool "kexec system call (EXPERIMENTAL)"
         depends on EXPERIMENTAL
@@ -476,10 +445,6 @@ config KEXEC
           support.  As of this writing the exact hardware interface is
           strongly in flux, so no good recommendation can be made.
 
-config PREEMPT
-        bool "Preemptible Kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-
 config SMP
         bool "Symmetric multi-processing support"
         ---help---
@@ -515,6 +480,8 @@ config NR_CPUS
           This is purely to save memory - each supported CPU adds
           approximately eight kilobytes to the kernel image.
 
+source "kernel/Kconfig.preempt"
+
 config CPU_HAS_SR_RB
         bool "CPU has SR.RB"
         depends on CPU_SH3 || CPU_SH4
@@ -636,6 +603,16 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+menu "Power management options (EXPERIMENTAL)"
+depends on EXPERIMENTAL
+
+source kernel/power/Kconfig
+
+config APM
+        bool "Advanced Power Management Emulation"
+        depends on PM
+endmenu
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 8fb31ab2c02c..48479e014dac 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -30,8 +30,35 @@ config EARLY_PRINTK
           when the kernel may crash or hang before the serial console is
           initialised. If unsure, say N.
 
+config DEBUG_STACKOVERFLOW
+        bool "Check for stack overflows"
+        depends on DEBUG_KERNEL
+        help
+          This option will cause messages to be printed if free stack space
+          drops below a certain limit.
+
+config DEBUG_STACK_USAGE
+        bool "Stack utilization instrumentation"
+        depends on DEBUG_KERNEL
+        help
+          Enables the display of the minimum amount of free stack which each
+          task has ever had available in the sysrq-T and sysrq-P debug output.
+
+          This option will slow down process creation somewhat.
+
+config 4KSTACKS
+        bool "Use 4Kb for kernel stacks instead of 8Kb"
+        depends on DEBUG_KERNEL
+        help
+          If you say Y here the kernel will use a 4Kb stacksize for the
+          kernel stack attached to each process/thread. This facilitates
+          running more threads on a system and also reduces the pressure
+          on the VM subsystem for higher order allocations. This option
+          will also use IRQ stacks to compensate for the reduced stackspace.
+
 config KGDB
         bool "Include KGDB kernel debugger"
+        select FRAME_POINTER
         help
           Include in-kernel hooks for kgdb, the Linux kernel source level
           debugger.  See <http://kgdb.sourceforge.net/> for more information.
@@ -112,13 +139,4 @@ endchoice
 
 endmenu
 
-config FRAME_POINTER
-        bool "Compile the kernel with frame pointers"
-        default y if KGDB
-        help
-          If you say Y here the resulting kernel image will be slightly larger
-          and slower, but it will give very useful debugging information.
-          If you don't debug the kernel, you can say N, but we may not be able
-          to solve problems without frame pointers.
-
 endmenu
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index e467a450662b..26d62ff51a64 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -18,11 +18,13 @@ cflags-y				:= -mb
 cflags-$(CONFIG_CPU_LITTLE_ENDIAN)      := -ml
 
 isa-y                                   := any
+isa-$(CONFIG_SH_DSP)                    := sh
 isa-$(CONFIG_CPU_SH2)                   := sh2
+isa-$(CONFIG_CPU_SH2A)                  := sh2a
 isa-$(CONFIG_CPU_SH3)                   := sh3
 isa-$(CONFIG_CPU_SH4)                   := sh4
 isa-$(CONFIG_CPU_SH4A)                  := sh4a
-isa-$(CONFIG_CPU_SH2A)                  := sh2a
+isa-$(CONFIG_CPU_SH4AL_DSP)             := sh4al
 
 isa-$(CONFIG_SH_DSP)                    := $(isa-y)-dsp
 
@@ -30,9 +32,11 @@ ifndef CONFIG_MMU
 isa-y                   := $(isa-y)-nommu
 endif
 
+ifndef CONFIG_SH_DSP
 ifndef CONFIG_SH_FPU
 isa-y                   := $(isa-y)-nofpu
 endif
+endif
 
 cflags-y        += $(call as-option,-Wa$(comma)-isa=$(isa-y),)
 
@@ -79,24 +83,19 @@ head-y := arch/sh/kernel/head.o arch/sh/kernel/init_task.o
 LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 core-y                          += arch/sh/kernel/ arch/sh/mm/
+core-$(CONFIG_SH_FPU_EMU)       += arch/sh/math-emu/
 
 # Boards
 machdir-$(CONFIG_SH_SOLUTION_ENGINE)            := se/770x
 machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)       := se/7751
 machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)       := se/7300
+machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)       := se/7343
 machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)      := se/73180
-machdir-$(CONFIG_SH_STB1_HARP)                  := harp
-machdir-$(CONFIG_SH_STB1_OVERDRIVE)             := overdrive
 machdir-$(CONFIG_SH_HP6XX)                      := hp6xx
-machdir-$(CONFIG_SH_CQREEK)                     := cqreek
-machdir-$(CONFIG_SH_DMIDA)                      := dmida
 machdir-$(CONFIG_SH_EC3104)                     := ec3104
 machdir-$(CONFIG_SH_SATURN)                     := saturn
 machdir-$(CONFIG_SH_DREAMCAST)                  := dreamcast
-machdir-$(CONFIG_SH_CAT68701)                   := cat68701
 machdir-$(CONFIG_SH_BIGSUR)                     := bigsur
-machdir-$(CONFIG_SH_SH2000)                     := sh2000
-machdir-$(CONFIG_SH_ADX)                        := adx
 machdir-$(CONFIG_SH_MPC1211)                    := mpc1211
 machdir-$(CONFIG_SH_SH03)                       := sh03
 machdir-$(CONFIG_SH_SECUREEDGE5410)             := snapgear
@@ -104,16 +103,16 @@ machdir-$(CONFIG_SH_HS7751RVOIP)		:= renesas/hs7751rvoip
 machdir-$(CONFIG_SH_RTS7751R2D)                 := renesas/rts7751r2d
 machdir-$(CONFIG_SH_7751_SYSTEMH)               := renesas/systemh
 machdir-$(CONFIG_SH_EDOSK7705)                  := renesas/edosk7705
+machdir-$(CONFIG_SH_R7780RP)                    := renesas/r7780rp
+machdir-$(CONFIG_SH_7710VOIPGW)                 := renesas/sh7710voipgw
 machdir-$(CONFIG_SH_SH4202_MICRODEV)            := superh/microdev
+machdir-$(CONFIG_SH_LANDISK)                    := landisk
+machdir-$(CONFIG_SH_TITAN)                      := titan
+machdir-$(CONFIG_SH_SHMIN)                      := shmin
 machdir-$(CONFIG_SH_UNKNOWN)                    := unknown
 
 incdir-y                        := $(notdir $(machdir-y))
-
-incdir-$(CONFIG_SH_SOLUTION_ENGINE)             := se
-incdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)        := se7751
-incdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)        := se7300
-incdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)       := se73180
-incdir-$(CONFIG_SH_HP600)                       := hp6xx
+incdir-$(CONFIG_SH_HP6XX)                       := hp6xx
 
 ifneq ($(machdir-y),)
 core-y                          += arch/sh/boards/$(machdir-y)/
@@ -137,17 +136,14 @@ boot := arch/sh/boot
 
 CPPFLAGS_vmlinux.lds := -traditional
 
-ifneq ($(KBUILD_SRC),)
 incdir-prefix   := $(srctree)/include/asm-sh/
-else
-incdir-prefix   :=
-endif
 
 #       Update machine arch and proc symlinks if something which affects
 #       them changed.  We use .arch and .mach to indicate when they were
 #       updated last, otherwise make uses the target directory mtime.
 
-include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/auto.conf
+include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \
+                     include/config/auto.conf FORCE
         @echo '  SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)'
         $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
         $(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu
@@ -157,7 +153,8 @@ include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/auto.conf
 #       don't, just reference the parent directory so the semantics are
 #       kept roughly the same.
 
-include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/auto.conf
+include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
+                      include/config/auto.conf FORCE
         @echo -n '  SYMLINK include/asm-sh/mach -> '
         $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
         $(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \
@@ -170,7 +167,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/auto.conf
         fi
         @touch $@
 
-archprepare: maketools include/asm-sh/.cpu include/asm-sh/.mach
+archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools
 
 PHONY += maketools FORCE
 maketools:  include/linux/version.h FORCE
@@ -191,4 +188,3 @@ CLEAN_FILES += include/asm-sh/machtypes.h
 define archhelp
         @echo '  zImage                    - Compressed kernel image (arch/sh/boot/zImage)'
 endef
-
diff --git a/arch/sh/boards/adx/Makefile b/arch/sh/boards/adx/Makefile
deleted file mode 100644
index 5b1c531b3991..000000000000
--- a/arch/sh/boards/adx/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for ADX boards
-#
-
-obj-y    := setup.o irq.o irq_maskreq.o
-
diff --git a/arch/sh/boards/adx/irq.c b/arch/sh/boards/adx/irq.c
deleted file mode 100644
index c6ca409dff98..000000000000
--- a/arch/sh/boards/adx/irq.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * linux/arch/sh/boards/adx/irq.c
- *
- * Copyright (C) 2001 A&D Co., Ltd.
- *
- * I/O routine and setup routines for A&D ADX Board
- *
- * 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 <asm/irq.h>
-
-void init_adx_IRQ(void)
-{
-        int i;
-
-/*      printk("init_adx_IRQ()\n");*/
-        /* setup irq_mask_register */
-        irq_mask_register = (unsigned short *)0xa6000008;
-
-        /* cover all external interrupt area by maskreg_irq_type
-         * (Actually, irq15 doesn't exist)
-         */
-        for (i = 0; i < 16; i++) {
-                make_maskreg_irq(i);
-                disable_irq(i);
-        }
-}
diff --git a/arch/sh/boards/adx/setup.c b/arch/sh/boards/adx/setup.c
deleted file mode 100644
index 4938d9592343..000000000000
--- a/arch/sh/boards/adx/setup.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* 
- * linux/arch/sh/board/adx/setup.c
- *
- * Copyright (C) 2001 A&D Co., Ltd.
- *
- * I/O routine and setup routines for A&D ADX Board
- *
- * 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 <asm/machvec.h>
-#include <linux/module.h>
-
-extern void init_adx_IRQ(void);
-extern void *cf_io_base;
-
-const char *get_system_type(void)
-{
-        return "A&D ADX";
-}
-
-unsigned long adx_isa_port2addr(unsigned long offset)
-{
-        /* CompactFlash (IDE) */
-        if (((offset >= 0x1f0) && (offset <= 0x1f7)) || (offset == 0x3f6)) {
-                return (unsigned long)cf_io_base + offset;
-        }
-
-        /* eth0 */
-        if ((offset >= 0x300) && (offset <= 0x30f)) {
-                return 0xa5000000 + offset;     /* COMM BOARD (AREA1) */
-        }
-
-        return offset + 0xb0000000; /* IOBUS (AREA 4)*/
-}
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_adx __initmv = {
-        .mv_nr_irqs             = 48,
-        .mv_isa_port2addr       = adx_isa_port2addr,
-        .mv_init_irq            = init_adx_IRQ,
-};
-ALIAS_MV(adx)
-
-int __init platform_setup(void)
-{
-        /* Nothing to see here .. */
-        return 0;
-}
-
diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c
index ac946a2201c7..1ab04da36382 100644
--- a/arch/sh/boards/bigsur/irq.c
+++ b/arch/sh/boards/bigsur/irq.c
@@ -19,6 +19,7 @@
  * IRQ functions for a Hitachi Big Sur Evaluation Board.
  *
  */
+#undef DEBUG
 
 #include <linux/sched.h>
 #include <linux/module.h>
@@ -41,10 +42,8 @@
 #undef BIGSUR_DEBUG
 
 #ifdef BIGSUR_DEBUG
-#define DPRINTK(args...)        printk(args)
 #define DIPRINTK(n, args...)    if (BIGSUR_DEBUG>(n)) printk(args)
 #else
-#define DPRINTK(args...)
 #define DIPRINTK(n, args...)
 #endif /* BIGSUR_DEBUG */
 
@@ -60,45 +59,39 @@ extern int hd64465_irq_demux(int irq);
 /* Level 1 IRQ routines */
 static void disable_bigsur_l1irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned char mask;
         unsigned int mask_port = ((irq - BIGSUR_IRQ_LOW)/8) ? BIGSUR_IRLMR1 : BIGSUR_IRLMR0;
         unsigned char bit =  (1 << ((irq - MGATE_IRQ_LOW)%8) );
 
         if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
-                DPRINTK("Disable L1 IRQ %d\n", irq);
+                pr_debug("Disable L1 IRQ %d\n", irq);
                 DIPRINTK(2,"disable_bigsur_l1irq: IMR=0x%08x mask=0x%x\n",
                         mask_port, bit);
-                local_irq_save(flags);
 
                 /* Disable IRQ - set mask bit */
                 mask = inb(mask_port) | bit;
                 outb(mask, mask_port);
-                local_irq_restore(flags);
                 return;
         }
-        DPRINTK("disable_bigsur_l1irq: Invalid IRQ %d\n", irq);
+        pr_debug("disable_bigsur_l1irq: Invalid IRQ %d\n", irq);
 }
 
 static void enable_bigsur_l1irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned char mask;
         unsigned int mask_port = ((irq - BIGSUR_IRQ_LOW)/8) ? BIGSUR_IRLMR1 : BIGSUR_IRLMR0;
         unsigned char bit =  (1 << ((irq - MGATE_IRQ_LOW)%8) );
 
         if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
-                DPRINTK("Enable L1 IRQ %d\n", irq);
+                pr_debug("Enable L1 IRQ %d\n", irq);
                 DIPRINTK(2,"enable_bigsur_l1irq: IMR=0x%08x mask=0x%x\n",
                         mask_port, bit);
-                local_irq_save(flags);
                 /* Enable L1 IRQ - clear mask bit */
                 mask = inb(mask_port) & ~bit;
                 outb(mask, mask_port);
-                local_irq_restore(flags);
                 return;
         }
-        DPRINTK("enable_bigsur_l1irq: Invalid IRQ %d\n", irq);
+        pr_debug("enable_bigsur_l1irq: Invalid IRQ %d\n", irq);
 }
 
 
@@ -126,51 +119,45 @@ static const u32 imr_offset = BIGSUR_IMR0 - BIGSUR_IMR1;
 /* Level 2 IRQ routines */
 static void disable_bigsur_l2irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned char mask;
         unsigned char bit = 1 << ((irq-BIGSUR_2NDLVL_IRQ_LOW)%8);
         unsigned int mask_port = imr_base - REG_NUM(irq)*imr_offset;
 
-    if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
-                DPRINTK("Disable L2 IRQ %d\n", irq);
+        if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
+                pr_debug("Disable L2 IRQ %d\n", irq);
                 DIPRINTK(2,"disable_bigsur_l2irq: IMR=0x%08x mask=0x%x\n",
                         mask_port, bit);
-                local_irq_save(flags);
 
                 /* Disable L2 IRQ - set mask bit */
                 mask = inb(mask_port) | bit;
                 outb(mask, mask_port);
-                local_irq_restore(flags);
                 return;
         }
-        DPRINTK("disable_bigsur_l2irq: Invalid IRQ %d\n", irq);
+        pr_debug("disable_bigsur_l2irq: Invalid IRQ %d\n", irq);
 }
 
 static void enable_bigsur_l2irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned char mask;
         unsigned char bit = 1 << ((irq-BIGSUR_2NDLVL_IRQ_LOW)%8);
         unsigned int mask_port = imr_base - REG_NUM(irq)*imr_offset;
 
-    if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
-                DPRINTK("Enable L2 IRQ %d\n", irq);
+        if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
+                pr_debug("Enable L2 IRQ %d\n", irq);
                 DIPRINTK(2,"enable_bigsur_l2irq: IMR=0x%08x mask=0x%x\n",
                         mask_port, bit);
-                local_irq_save(flags);
 
                 /* Enable L2 IRQ - clear mask bit */
                 mask = inb(mask_port) & ~bit;
                 outb(mask, mask_port);
-                local_irq_restore(flags);
                 return;
         }
-        DPRINTK("enable_bigsur_l2irq: Invalid IRQ %d\n", irq);
+        pr_debug("enable_bigsur_l2irq: Invalid IRQ %d\n", irq);
 }
 
 static void mask_and_ack_bigsur(unsigned int irq)
 {
-        DPRINTK("mask_and_ack_bigsur IRQ %d\n", irq);
+        pr_debug("mask_and_ack_bigsur IRQ %d\n", irq);
         if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH)
                 disable_bigsur_l1irq(irq);
         else
@@ -179,7 +166,7 @@ static void mask_and_ack_bigsur(unsigned int irq)
 
 static void end_bigsur_irq(unsigned int irq)
 {
-        DPRINTK("end_bigsur_irq IRQ %d\n", irq);
+        pr_debug("end_bigsur_irq IRQ %d\n", irq);
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) {
                 if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH)
                         enable_bigsur_l1irq(irq);
@@ -193,7 +180,7 @@ static unsigned int startup_bigsur_irq(unsigned int irq)
         u8 mask;
         u32 reg;
 
-        DPRINTK("startup_bigsur_irq IRQ %d\n", irq);
+        pr_debug("startup_bigsur_irq IRQ %d\n", irq);
 
         if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
                 /* Enable the L1 IRQ */
@@ -218,7 +205,7 @@ static unsigned int startup_bigsur_irq(unsigned int irq)
 
 static void shutdown_bigsur_irq(unsigned int irq)
 {
-        DPRINTK("shutdown_bigsur_irq IRQ %d\n", irq);
+        pr_debug("shutdown_bigsur_irq IRQ %d\n", irq);
         if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH)
                 disable_bigsur_l1irq(irq);
         else
@@ -260,7 +247,7 @@ static void make_bigsur_l1isr(unsigned int irq) {
                 disable_bigsur_l1irq(irq);
                 return;
         }
-        DPRINTK("make_bigsur_l1isr: bad irq, %d\n", irq);
+        pr_debug("make_bigsur_l1isr: bad irq, %d\n", irq);
         return;
 }
 
@@ -277,7 +264,7 @@ static void make_bigsur_l2isr(unsigned int irq) {
                 disable_bigsur_l2irq(irq);
                 return;
         }
-        DPRINTK("make_bigsur_l2isr: bad irq, %d\n", irq);
+        pr_debug("make_bigsur_l2isr: bad irq, %d\n", irq);
         return;
 }
 
diff --git a/arch/sh/boards/bigsur/setup.c b/arch/sh/boards/bigsur/setup.c
index dfeede9da50f..9711c20fc9e4 100644
--- a/arch/sh/boards/bigsur/setup.c
+++ b/arch/sh/boards/bigsur/setup.c
@@ -41,31 +41,7 @@
 //              Big Sur Init Routines   
 /*===========================================================*/
 
-const char *get_system_type(void)
-{
-        return "Big Sur";
-}
-
-/*
- * The Machine Vector
- */
-extern void heartbeat_bigsur(void);
-extern void init_bigsur_IRQ(void);
-
-struct sh_machine_vector mv_bigsur __initmv = {
-        .mv_nr_irqs             = NR_IRQS,     // Defined in <asm/irq.h>
-
-        .mv_isa_port2addr       = bigsur_isa_port2addr,
-        .mv_irq_demux           = bigsur_irq_demux,
-
-        .mv_init_irq            = init_bigsur_IRQ,
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_bigsur,
-#endif
-};
-ALIAS_MV(bigsur)
-
-int __init platform_setup(void)
+static void __init bigsur_setup(char **cmdline_p)
 {
         /* Mask all 2nd level IRQ's */
         outb(-1,BIGSUR_IMR0);
@@ -89,7 +65,24 @@ int __init platform_setup(void)
         outw(1, BIGSUR_ETHR+0xe);
         /* set the IO port to BIGSUR_ETHER_IOPORT */
         outw(BIGSUR_ETHER_IOPORT<<3, BIGSUR_ETHR+0x2);
-
-        return 0;
 }
 
+/*
+ * The Machine Vector
+ */
+extern void heartbeat_bigsur(void);
+extern void init_bigsur_IRQ(void);
+
+struct sh_machine_vector mv_bigsur __initmv = {
+        .mv_name                = "Big Sur",
+        .mv_setup               = bigsur_setup,
+
+        .mv_isa_port2addr       = bigsur_isa_port2addr,
+        .mv_irq_demux           = bigsur_irq_demux,
+
+        .mv_init_irq            = init_bigsur_IRQ,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = heartbeat_bigsur,
+#endif
+};
+ALIAS_MV(bigsur)
diff --git a/arch/sh/boards/cat68701/Makefile b/arch/sh/boards/cat68701/Makefile
deleted file mode 100644
index 52c1de0a6dfd..000000000000
--- a/arch/sh/boards/cat68701/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for the CAT-68701 specific parts of the kernel
-#
-
-obj-y    := setup.o irq.o
-
diff --git a/arch/sh/boards/cat68701/irq.c b/arch/sh/boards/cat68701/irq.c
deleted file mode 100644
index f9a6d185fb8b..000000000000
--- a/arch/sh/boards/cat68701/irq.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * linux/arch/sh/boards/cat68701/irq.c
- *
- * Copyright (C) 2000  Niibe Yutaka
- *               2001  Yutaro Ebihara
- *
- * Setup routines for A-ONE Corp CAT-68701 SH7708 Board
- *
- * 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 <asm/irq.h>
-
-int cat68701_irq_demux(int irq)
-{
-        if(irq==13) return 14;
-        if(irq==7)  return 10;
-        return irq;
-}
-
-void init_cat68701_IRQ()
-{
-        make_imask_irq(10);
-        make_imask_irq(14);
-}
diff --git a/arch/sh/boards/cat68701/setup.c b/arch/sh/boards/cat68701/setup.c
deleted file mode 100644
index 90e5175df227..000000000000
--- a/arch/sh/boards/cat68701/setup.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 
- * linux/arch/sh/boards/cat68701/setup.c
- *
- * Copyright (C) 2000  Niibe Yutaka
- *               2001  Yutaro Ebihara
- *
- * Setup routines for A-ONE Corp CAT-68701 SH7708 Board
- *
- * 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 <asm/io.h>
-#include <asm/machvec.h>
-#include <asm/mach/io.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-
-const char *get_system_type(void)
-{
-        return "CAT-68701";
-}
-
-#ifdef CONFIG_HEARTBEAT
-void heartbeat_cat68701()
-{
-        static unsigned int cnt = 0, period = 0 , bit = 0;
-        cnt += 1;
-        if (cnt < period) {
-                return;
-        }
-        cnt = 0;
-
-        /* Go through the points (roughly!):
-         * f(0)=10, f(1)=16, f(2)=20, f(5)=35,f(inf)->110
-         */
-        period = 110 - ( (300<<FSHIFT)/
-                         ((avenrun[0]/5) + (3<<FSHIFT)) );
-
-        if(bit){ bit=0; }else{ bit=1; }
-        outw(bit<<15,0x3fe);
-}
-#endif /* CONFIG_HEARTBEAT */
-
-unsigned long cat68701_isa_port2addr(unsigned long offset)
-{
-        /* CompactFlash (IDE) */
-        if (((offset >= 0x1f0) && (offset <= 0x1f7)) || (offset==0x3f6))
-                return 0xba000000 + offset;
-
-        /* INPUT PORT */
-        if ((offset >= 0x3fc) && (offset <= 0x3fd))
-                return 0xb4007000 + offset;
-
-        /* OUTPUT PORT */
-        if ((offset >= 0x3fe) && (offset <= 0x3ff))
-                return 0xb4007400 + offset;
-
-        return offset + 0xb4000000; /* other I/O (EREA 5)*/
-}
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_cat68701 __initmv = {
-        .mv_nr_irqs             = 32,
-        .mv_isa_port2addr       = cat68701_isa_port2addr,
-        .mv_irq_demux           = cat68701_irq_demux,
-
-        .mv_init_irq            = init_cat68701_IRQ,
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_cat68701,
-#endif
-};
-ALIAS_MV(cat68701)
-
-int __init platform_setup(void)
-{
-        /* dummy read erea5 (CS8900A) */
-}
-
diff --git a/arch/sh/boards/cqreek/Makefile b/arch/sh/boards/cqreek/Makefile
deleted file mode 100644
index 1a788a85eba3..000000000000
--- a/arch/sh/boards/cqreek/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for the CqREEK specific parts of the kernel
-#
-
-obj-y    := setup.o irq.o
-
diff --git a/arch/sh/boards/cqreek/irq.c b/arch/sh/boards/cqreek/irq.c
deleted file mode 100644
index 2955adc52310..000000000000
--- a/arch/sh/boards/cqreek/irq.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* $Id: irq.c,v 1.1.2.4 2002/11/04 20:33:56 lethal Exp $
- *
- * arch/sh/boards/cqreek/irq.c
- *
- * Copyright (C) 2000  Niibe Yutaka
- *
- * CqREEK IDE/ISA Bridge Support.
- *
- */
-
-#include <linux/irq.h>
-#include <linux/init.h>
-
-#include <asm/cqreek/cqreek.h>
-#include <asm/io.h>
-#include <asm/io_generic.h>
-#include <asm/irq.h>
-#include <asm/machvec.h>
-#include <asm/machvec_init.h>
-#include <asm/rtc.h>
-
-struct cqreek_irq_data {
-        unsigned short mask_port;       /* Port of Interrupt Mask Register */
-        unsigned short stat_port;       /* Port of Interrupt Status Register */
-        unsigned short bit;             /* Value of the bit */
-};
-static struct cqreek_irq_data cqreek_irq_data[NR_IRQS];
-
-static void disable_cqreek_irq(unsigned int irq)
-{
-        unsigned long flags;
-        unsigned short mask;
-        unsigned short mask_port = cqreek_irq_data[irq].mask_port;
-        unsigned short bit = cqreek_irq_data[irq].bit;
-
-        local_irq_save(flags);
-        /* Disable IRQ */
-        mask = inw(mask_port) & ~bit;
-        outw_p(mask, mask_port);
-        local_irq_restore(flags);
-}
-
-static void enable_cqreek_irq(unsigned int irq)
-{
-        unsigned long flags;
-        unsigned short mask;
-        unsigned short mask_port = cqreek_irq_data[irq].mask_port;
-        unsigned short bit = cqreek_irq_data[irq].bit;
-
-        local_irq_save(flags);
-        /* Enable IRQ */
-        mask = inw(mask_port) | bit;
-        outw_p(mask, mask_port);
-        local_irq_restore(flags);
-}
-
-static void mask_and_ack_cqreek(unsigned int irq)
-{
-        unsigned short stat_port = cqreek_irq_data[irq].stat_port;
-        unsigned short bit = cqreek_irq_data[irq].bit;
-
-        disable_cqreek_irq(irq);
-        /* Clear IRQ (it might be edge IRQ) */
-        inw(stat_port);
-        outw_p(bit, stat_port);
-}
-
-static void end_cqreek_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                enable_cqreek_irq(irq);
-}
-
-static unsigned int startup_cqreek_irq(unsigned int irq)
-{ 
-        enable_cqreek_irq(irq);
-        return 0;
-}
-
-static void shutdown_cqreek_irq(unsigned int irq)
-{
-        disable_cqreek_irq(irq);
-}
-
-static struct hw_interrupt_type cqreek_irq_type = {
-        .typename = "CqREEK-IRQ",
-        .startup = startup_cqreek_irq,
-        .shutdown = shutdown_cqreek_irq,
-        .enable = enable_cqreek_irq,
-        .disable = disable_cqreek_irq,
-        .ack = mask_and_ack_cqreek,
-        .end = end_cqreek_irq
-};
-
-int cqreek_has_ide, cqreek_has_isa;
-
-/* XXX: This is just for test for my NE2000 ISA board
-   What we really need is virtualized IRQ and demultiplexer like HP600 port */
-void __init init_cqreek_IRQ(void)
-{
-        if (cqreek_has_ide) {
-                cqreek_irq_data[14].mask_port = BRIDGE_IDE_INTR_MASK;
-                cqreek_irq_data[14].stat_port = BRIDGE_IDE_INTR_STAT;
-                cqreek_irq_data[14].bit = 1;
-
-                irq_desc[14].chip = &cqreek_irq_type;
-                irq_desc[14].status = IRQ_DISABLED;
-                irq_desc[14].action = 0;
-                irq_desc[14].depth = 1;
-
-                disable_cqreek_irq(14);
-        }
-
-        if (cqreek_has_isa) {
-                cqreek_irq_data[10].mask_port = BRIDGE_ISA_INTR_MASK;
-                cqreek_irq_data[10].stat_port = BRIDGE_ISA_INTR_STAT;
-                cqreek_irq_data[10].bit = (1 << 10);
-
-                /* XXX: Err... we may need demultiplexer for ISA irq... */
-                irq_desc[10].chip = &cqreek_irq_type;
-                irq_desc[10].status = IRQ_DISABLED;
-                irq_desc[10].action = 0;
-                irq_desc[10].depth = 1;
-
-                disable_cqreek_irq(10);
-        }
-}
-
diff --git a/arch/sh/boards/cqreek/setup.c b/arch/sh/boards/cqreek/setup.c
deleted file mode 100644
index eff4ed93599f..000000000000
--- a/arch/sh/boards/cqreek/setup.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $Id: setup.c,v 1.5 2003/08/04 01:51:58 lethal Exp $
- *
- * arch/sh/kernel/setup_cqreek.c
- *
- * Copyright (C) 2000  Niibe Yutaka
- *
- * CqREEK IDE/ISA Bridge Support.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-
-#include <asm/mach/cqreek.h>
-#include <asm/machvec.h>
-#include <asm/io.h>
-#include <asm/io_generic.h>
-#include <asm/irq.h>
-#include <asm/rtc.h>
-
-#define IDE_OFFSET 0xA4000000UL
-#define ISA_OFFSET 0xA4A00000UL
-
-const char *get_system_type(void)
-{
-        return "CqREEK";
-}
-
-static unsigned long cqreek_port2addr(unsigned long port)
-{
-        if (0x0000<=port && port<=0x0040)
-                return IDE_OFFSET + port;
-        if ((0x01f0<=port && port<=0x01f7) || port == 0x03f6)
-                return IDE_OFFSET + port;
-
-        return ISA_OFFSET + port;
-}
-
-/*
- * The Machine Vector
- */
-struct sh_machine_vector mv_cqreek __initmv = {
-#if defined(CONFIG_CPU_SH4)
-        .mv_nr_irqs             = 48,
-#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
-        .mv_nr_irqs             = 32,
-#elif defined(CONFIG_CPU_SUBTYPE_SH7709)
-        .mv_nr_irqs             = 61,
-#endif
-
-        .mv_init_irq            = init_cqreek_IRQ,
-
-        .mv_isa_port2addr       = cqreek_port2addr,
-};
-ALIAS_MV(cqreek)
-
-/*
- * Initialize the board
- */
-void __init platform_setup(void)
-{
-        int i;
-/* udelay is not available at setup time yet... */
-#define DELAY() do {for (i=0; i<10000; i++) ctrl_inw(0xa0000000);} while(0)
-
-        if ((inw (BRIDGE_FEATURE) & 1)) { /* We have IDE interface */
-                outw_p(0, BRIDGE_IDE_INTR_LVL);
-                outw_p(0, BRIDGE_IDE_INTR_MASK);
-
-                outw_p(0, BRIDGE_IDE_CTRL);
-                DELAY();
-
-                outw_p(0x8000, BRIDGE_IDE_CTRL);
-                DELAY();
-
-                outw_p(0xffff, BRIDGE_IDE_INTR_STAT); /* Clear interrupt status */
-                outw_p(0x0f-14, BRIDGE_IDE_INTR_LVL); /* Use 14 IPR */
-                outw_p(1, BRIDGE_IDE_INTR_MASK); /* Enable interrupt */
-                cqreek_has_ide=1;
-        }
-
-        if ((inw (BRIDGE_FEATURE) & 2)) { /* We have ISA interface */
-                outw_p(0, BRIDGE_ISA_INTR_LVL);
-                outw_p(0, BRIDGE_ISA_INTR_MASK);
-
-                outw_p(0, BRIDGE_ISA_CTRL);
-                DELAY();
-                outw_p(0x8000, BRIDGE_ISA_CTRL);
-                DELAY();
-
-                outw_p(0xffff, BRIDGE_ISA_INTR_STAT); /* Clear interrupt status */
-                outw_p(0x0f-10, BRIDGE_ISA_INTR_LVL); /* Use 10 IPR */
-                outw_p(0xfff8, BRIDGE_ISA_INTR_MASK); /* Enable interrupt */
-                cqreek_has_isa=1;
-        }
-
-        printk(KERN_INFO "CqREEK Setup (IDE=%d, ISA=%d)...done\n", cqreek_has_ide, cqreek_has_isa);
-}
-
diff --git a/arch/sh/boards/dmida/Makefile b/arch/sh/boards/dmida/Makefile
deleted file mode 100644
index 75999aa0a2d9..000000000000
--- a/arch/sh/boards/dmida/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for the DataMyte Industrial Digital Assistant(tm) specific parts
-# of the kernel
-#
-
-obj-y    := mach.o
-
diff --git a/arch/sh/boards/dmida/mach.c b/arch/sh/boards/dmida/mach.c
deleted file mode 100644
index d03a25f989c2..000000000000
--- a/arch/sh/boards/dmida/mach.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * linux/arch/sh/boards/dmida/mach.c
- *
- * by Greg Banks <gbanks@pocketpenguins.com>
- * (c) 2000 PocketPenguins Inc
- *
- * Derived from mach_hp600.c, which bore the message:
- * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the DataMyte Industrial Digital Assistant(tm).
- * See http://www.dmida.com
- *
- */
-
-#include <linux/init.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/machvec_init.h>
-
-#include <asm/io.h>
-#include <asm/hd64465/hd64465.h>
-#include <asm/irq.h>
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_dmida __initmv = {
-        .mv_nr_irqs             = HD64465_IRQ_BASE+HD64465_IRQ_NUM,
-
-        .mv_inb                 = hd64465_inb,
-        .mv_inw                 = hd64465_inw,
-        .mv_inl                 = hd64465_inl,
-        .mv_outb                = hd64465_outb,
-        .mv_outw                = hd64465_outw,
-        .mv_outl                = hd64465_outl,
-
-        .mv_inb_p               = hd64465_inb_p,
-        .mv_inw_p               = hd64465_inw,
-        .mv_inl_p               = hd64465_inl,
-        .mv_outb_p              = hd64465_outb_p,
-        .mv_outw_p              = hd64465_outw,
-        .mv_outl_p              = hd64465_outl,
-
-        .mv_insb                = hd64465_insb,
-        .mv_insw                = hd64465_insw,
-        .mv_insl                = hd64465_insl,
-        .mv_outsb               = hd64465_outsb,
-        .mv_outsw               = hd64465_outsw,
-        .mv_outsl               = hd64465_outsl,
-
-        .mv_irq_demux           = hd64465_irq_demux,
-};
-ALIAS_MV(dmida)
-
diff --git a/arch/sh/boards/dreamcast/irq.c b/arch/sh/boards/dreamcast/irq.c
index b10a6b11c034..5bf01f86c20c 100644
--- a/arch/sh/boards/dreamcast/irq.c
+++ b/arch/sh/boards/dreamcast/irq.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/irq.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/dreamcast/sysasic.h>
@@ -26,10 +25,10 @@
    event.
 
    There are three 32-bit ESRs located at 0xa05f8900 - 0xa05f6908.  Event
-   types can be found in include/asm-sh/dc_sysasic.h.  There are three groups
-   of EMRs that parallel the ESRs.  Each EMR group corresponds to an IRQ, so
-   0xa05f6910 - 0xa05f6918 triggers IRQ 13, 0xa05f6920 - 0xa05f6928 triggers
-   IRQ 11, and 0xa05f6930 - 0xa05f6938 triggers IRQ 9.
+   types can be found in include/asm-sh/dreamcast/sysasic.h. There are three
+   groups of EMRs that parallel the ESRs.  Each EMR group corresponds to an
+   IRQ, so 0xa05f6910 - 0xa05f6918 triggers IRQ 13, 0xa05f6920 - 0xa05f6928
+   triggers IRQ 11, and 0xa05f6930 - 0xa05f6938 triggers IRQ 9.
 
    In the kernel, these events are mapped to virtual IRQs so that drivers can
    respond to them as they would a normal interrupt.  In order to keep this
@@ -57,29 +56,23 @@
 /* Disable the hardware event by masking its bit in its EMR */
 static inline void disable_systemasic_irq(unsigned int irq)
 {
-        unsigned long flags;
         __u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
         __u32 mask;
 
-        local_irq_save(flags);
         mask = inl(emr);
         mask &= ~(1 << EVENT_BIT(irq));
         outl(mask, emr);
-        local_irq_restore(flags);
 }
 
 /* Enable the hardware event by setting its bit in its EMR */
 static inline void enable_systemasic_irq(unsigned int irq)
 {
-        unsigned long flags;
         __u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
         __u32 mask;
 
-        local_irq_save(flags);
         mask = inl(emr);
         mask |= (1 << EVENT_BIT(irq));
         outl(mask, emr);
-        local_irq_restore(flags);
 }
 
 /* Acknowledge a hardware event by writing its bit back to its ESR */
diff --git a/arch/sh/boards/dreamcast/rtc.c b/arch/sh/boards/dreamcast/rtc.c
index 379de1629134..b3a876a3b859 100644
--- a/arch/sh/boards/dreamcast/rtc.c
+++ b/arch/sh/boards/dreamcast/rtc.c
@@ -1,4 +1,5 @@
-/* arch/sh/kernel/rtc-aica.c
+/*
+ * arch/sh/boards/dreamcast/rtc.c
  *
  * Dreamcast AICA RTC routines.
  *
@@ -10,15 +11,12 @@
  */
 
 #include <linux/time.h>
-
+#include <asm/rtc.h>
 #include <asm/io.h>
 
-extern void (*rtc_get_time)(struct timespec *);
-extern int (*rtc_set_time)(const time_t);
-
 /* The AICA RTC has an Epoch of 1/1/1950, so we must subtract 20 years (in
-   seconds to get the standard Unix Epoch when getting the time, and add 20
-   years when setting the time. */
+   seconds) to get the standard Unix Epoch when getting the time, and add
+   20 years when setting the time. */
 #define TWENTY_YEARS ((20 * 365LU + 5) * 86400)
 
 /* The AICA RTC is represented by a 32-bit seconds counter stored in 2 16-bit
@@ -32,7 +30,8 @@ extern int (*rtc_set_time)(const time_t);
  *
  * Grabs the current RTC seconds counter and adjusts it to the Unix Epoch.
  */
-void aica_rtc_gettimeofday(struct timespec *ts) {
+void aica_rtc_gettimeofday(struct timespec *ts)
+{
         unsigned long val1, val2;
 
         do {
@@ -55,7 +54,8 @@ void aica_rtc_gettimeofday(struct timespec *ts) {
  *
  * Adjusts the given @tv to the AICA Epoch and sets the RTC seconds counter.
  */
-int aica_rtc_settimeofday(const time_t secs) {
+int aica_rtc_settimeofday(const time_t secs)
+{
         unsigned long val1, val2;
         unsigned long adj = secs + TWENTY_YEARS;
 
@@ -75,7 +75,7 @@ int aica_rtc_settimeofday(const time_t secs) {
 
 void aica_time_init(void)
 {
-        rtc_get_time = aica_rtc_gettimeofday;
-        rtc_set_time = aica_rtc_settimeofday;
+        rtc_sh_get_time = aica_rtc_gettimeofday;
+        rtc_sh_set_time = aica_rtc_settimeofday;
 }
 
diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/dreamcast/setup.c
index 0027b80a2343..f13017eeeb27 100644
--- a/arch/sh/boards/dreamcast/setup.c
+++ b/arch/sh/boards/dreamcast/setup.c
@@ -22,41 +22,21 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/device.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/rtc.h>
 #include <asm/machvec.h>
-#include <asm/machvec_init.h>
 #include <asm/mach/sysasic.h>
 
 extern struct hw_interrupt_type systemasic_int;
-/* XXX: Move this into it's proper header. */
-extern void (*board_time_init)(void);
 extern void aica_time_init(void);
 extern int gapspci_init(void);
 extern int systemasic_irq_demux(int);
 
-void *dreamcast_consistent_alloc(struct device *, size_t, dma_addr_t *, int);
+void *dreamcast_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
 int dreamcast_consistent_free(struct device *, size_t, void *, dma_addr_t);
 
-const char *get_system_type(void)
-{
-        return "Sega Dreamcast";
-}
-
-struct sh_machine_vector mv_dreamcast __initmv = {
-        .mv_nr_irqs             = NR_IRQS,
-
-        .mv_irq_demux           = systemasic_irq_demux,
-
-#ifdef CONFIG_PCI
-        .mv_consistent_alloc    = dreamcast_consistent_alloc,
-        .mv_consistent_free     = dreamcast_consistent_free,
-#endif
-};
-ALIAS_MV(dreamcast)
-
-int __init platform_setup(void)
+static void __init dreamcast_setup(char **cmdline_p)
 {
         int i;
 
@@ -78,6 +58,16 @@ int __init platform_setup(void)
         if (gapspci_init() < 0)
                 printk(KERN_WARNING "GAPSPCI was not detected.\n");
 #endif
-
-        return 0;
 }
+
+struct sh_machine_vector mv_dreamcast __initmv = {
+        .mv_name                = "Sega Dreamcast",
+        .mv_setup               = dreamcast_setup,
+        .mv_irq_demux           = systemasic_irq_demux,
+
+#ifdef CONFIG_PCI
+        .mv_consistent_alloc    = dreamcast_consistent_alloc,
+        .mv_consistent_free     = dreamcast_consistent_free,
+#endif
+};
+ALIAS_MV(dreamcast)
diff --git a/arch/sh/boards/ec3104/setup.c b/arch/sh/boards/ec3104/setup.c
index 4b3ef16a0e96..902bc975a13e 100644
--- a/arch/sh/boards/ec3104/setup.c
+++ b/arch/sh/boards/ec3104/setup.c
@@ -21,22 +21,36 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/types.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/machvec.h>
 #include <asm/mach/ec3104.h>
 
-const char *get_system_type(void)
+static void __init ec3104_setup(char **cmdline_p)
 {
-        return "EC3104";
+        char str[8];
+        int i;
+
+        for (i=0; i<8; i++)
+                str[i] = ctrl_readb(EC3104_BASE + i);
+
+        for (i = EC3104_IRQBASE; i < EC3104_IRQBASE + 32; i++)
+                irq_desc[i].handler = &ec3104_int;
+
+        printk("initializing EC3104 \"%.8s\" at %08x, IRQ %d, IRQ base %d\n",
+               str, EC3104_BASE, EC3104_IRQ, EC3104_IRQBASE);
+
+        /* mask all interrupts.  this should have been done by the boot
+         * loader for us but we want to be sure ... */
+        ctrl_writel(0xffffffff, EC3104_IMR);
 }
 
 /*
  * The Machine Vector
  */
-
 struct sh_machine_vector mv_ec3104 __initmv = {
+        .mv_name        = "EC3104",
+        .mv_setup       = ec3104_setup,
         .mv_nr_irqs     = 96,
 
         .mv_inb         = ec3104_inb,
@@ -48,31 +62,4 @@ struct sh_machine_vector mv_ec3104 __initmv = {
 
         .mv_irq_demux   = ec3104_irq_demux,
 };
-
 ALIAS_MV(ec3104)
-
-int __init platform_setup(void)
-{
-        char str[8];
-        int i;
-        
-        if (0)
-                return 0;
-
-        for (i=0; i<8; i++)
-                str[i] = ctrl_readb(EC3104_BASE + i);
-
-        for (i = EC3104_IRQBASE; i < EC3104_IRQBASE + 32; i++)
-                irq_desc[i].chip = &ec3104_int;
-
-        printk("initializing EC3104 \"%.8s\" at %08x, IRQ %d, IRQ base %d\n",
-               str, EC3104_BASE, EC3104_IRQ, EC3104_IRQBASE);
-
-
-        /* mask all interrupts.  this should have been done by the boot
-         * loader for us but we want to be sure ... */
-        ctrl_writel(0xffffffff, EC3104_IMR);
-        
-        return 0;
-}
-
diff --git a/arch/sh/boards/harp/Makefile b/arch/sh/boards/harp/Makefile
deleted file mode 100644
index eb753d31812e..000000000000
--- a/arch/sh/boards/harp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for STMicroelectronics board specific parts of the kernel
-#
-
-obj-y := irq.o setup.o mach.o led.o
-
-obj-$(CONFIG_PCI) += pcidma.o
-
diff --git a/arch/sh/boards/harp/irq.c b/arch/sh/boards/harp/irq.c
deleted file mode 100644
index 96bb41c9fc55..000000000000
--- a/arch/sh/boards/harp/irq.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * Looks after interrupts on the HARP board.
- *
- * Bases on the IPR irq system
- */
-
-#include <linux/init.h>
-#include <linux/irq.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/harp/harp.h>
-
-
-#define NUM_EXTERNAL_IRQS 16
-
-// Early versions of the STB1 Overdrive required this nasty frig
-//#define INVERT_INTMASK_WRITES
-
-static void enable_harp_irq(unsigned int irq);
-static void disable_harp_irq(unsigned int irq);
-
-/* shutdown is same as "disable" */
-#define shutdown_harp_irq disable_harp_irq
-
-static void mask_and_ack_harp(unsigned int);
-static void end_harp_irq(unsigned int irq);
-
-static unsigned int startup_harp_irq(unsigned int irq)
-{
-        enable_harp_irq(irq);
-        return 0;               /* never anything pending */
-}
-
-static struct hw_interrupt_type harp_irq_type = {
-        .typename = "Harp-IRQ",
-        .startup = startup_harp_irq,
-        .shutdown = shutdown_harp_irq,
-        .enable = enable_harp_irq,
-        .disable = disable_harp_irq,
-        .ack = mask_and_ack_harp,
-        .end = end_harp_irq
-};
-
-static void disable_harp_irq(unsigned int irq)
-{
-        unsigned val, flags;
-        unsigned maskReg;
-        unsigned mask;
-        int pri;
-
-        if (irq < 0 || irq >= NUM_EXTERNAL_IRQS)
-                return;
-
-        pri = 15 - irq;
-
-        if (pri < 8) {
-                maskReg = EPLD_INTMASK0;
-        } else {
-                maskReg = EPLD_INTMASK1;
-                pri -= 8;
-        }
-
-        local_irq_save(flags);
-        mask = ctrl_inl(maskReg);
-        mask &= (~(1 << pri));
-#if defined(INVERT_INTMASK_WRITES)
-        mask ^= 0xff;
-#endif
-        ctrl_outl(mask, maskReg);
-        local_irq_restore(flags);
-}
-
-static void enable_harp_irq(unsigned int irq)
-{
-        unsigned flags;
-        unsigned maskReg;
-        unsigned mask;
-        int pri;
-
-        if (irq < 0 || irq >= NUM_EXTERNAL_IRQS)
-                return;
-
-        pri = 15 - irq;
-
-        if (pri < 8) {
-                maskReg = EPLD_INTMASK0;
-        } else {
-                maskReg = EPLD_INTMASK1;
-                pri -= 8;
-        }
-
-        local_irq_save(flags);
-        mask = ctrl_inl(maskReg);
-
-
-        mask |= (1 << pri);
-
-#if defined(INVERT_INTMASK_WRITES)
-        mask ^= 0xff;
-#endif
-        ctrl_outl(mask, maskReg);
-
-        local_irq_restore(flags);
-}
-
-/* This functions sets the desired irq handler to be an overdrive type */
-static void __init make_harp_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        irq_desc[irq].chip = &harp_irq_type;
-        disable_harp_irq(irq);
-}
-
-static void mask_and_ack_harp(unsigned int irq)
-{
-        disable_harp_irq(irq);
-}
-
-static void end_harp_irq(unsigned int irq)
-{
-        enable_harp_irq(irq);
-}
-
-void __init init_harp_irq(void)
-{
-        int i;
-
-#if !defined(INVERT_INTMASK_WRITES)
-        // On the harp these are set to enable an interrupt
-        ctrl_outl(0x00, EPLD_INTMASK0);
-        ctrl_outl(0x00, EPLD_INTMASK1);
-#else
-        // On the Overdrive the data is inverted before being stored in the reg
-        ctrl_outl(0xff, EPLD_INTMASK0);
-        ctrl_outl(0xff, EPLD_INTMASK1);
-#endif
-
-        for (i = 0; i < NUM_EXTERNAL_IRQS; i++) {
-                make_harp_irq(i);
-        }
-}
diff --git a/arch/sh/boards/harp/led.c b/arch/sh/boards/harp/led.c
deleted file mode 100644
index aeb7b392b190..000000000000
--- a/arch/sh/boards/harp/led.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * linux/arch/sh/stboards/led.c
- *
- * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains ST40STB1 HARP and compatible code.
- */
-
-#include <asm/io.h>
-#include <asm/harp/harp.h>
-
-/* Harp: Flash LD10 (front pannel) connected to EPLD (IC8) */
-/* Overdrive: Flash LD1 (front panel) connected to EPLD (IC4) */
-/* Works for HARP and overdrive */
-static void mach_led(int position, int value)
-{
-        if (value) {
-                ctrl_outl(EPLD_LED_ON, EPLD_LED);
-        } else {
-                ctrl_outl(EPLD_LED_OFF, EPLD_LED);
-        }
-}
-
-#ifdef CONFIG_HEARTBEAT
-
-#include <linux/sched.h>
-
-/* acts like an actual heart beat -- ie thump-thump-pause... */
-void heartbeat_harp(void)
-{
-        static unsigned cnt = 0, period = 0, dist = 0;
-
-        if (cnt == 0 || cnt == dist)
-                mach_led( -1, 1);
-        else if (cnt == 7 || cnt == dist+7)
-                mach_led( -1, 0);
-
-        if (++cnt > period) {
-                cnt = 0;
-                /* The hyperbolic function below modifies the heartbeat period
-                 * length in dependency of the current (5min) load. It goes
-                 * through the points f(0)=126, f(1)=86, f(5)=51,
-                 * f(inf)->30. */
-                period = ((672<<FSHIFT)/(5*avenrun[0]+(7<<FSHIFT))) + 30;
-                dist = period / 4;
-        }
-}
-#endif
diff --git a/arch/sh/boards/harp/mach.c b/arch/sh/boards/harp/mach.c
deleted file mode 100644
index a946dd1674ca..000000000000
--- a/arch/sh/boards/harp/mach.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * linux/arch/sh/boards/harp/mach.c
- *
- * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the STMicroelectronics STB1 HARP and compatible boards
- */
-
-#include <linux/init.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/machvec_init.h>
-#include <asm/hd64465/io.h>
-#include <asm/hd64465/hd64465.h>
-
-void setup_harp(void);
-void init_harp_irq(void);
-void heartbeat_harp(void);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_harp __initmv = {
-        .mv_nr_irqs             = 89 + HD64465_IRQ_NUM,
-
-        .mv_inb                 = hd64465_inb,
-        .mv_inw                 = hd64465_inw,
-        .mv_inl                 = hd64465_inl,
-        .mv_outb                = hd64465_outb,
-        .mv_outw                = hd64465_outw,
-        .mv_outl                = hd64465_outl,
-
-        .mv_inb_p               = hd64465_inb_p,
-        .mv_inw_p               = hd64465_inw,
-        .mv_inl_p               = hd64465_inl,
-        .mv_outb_p              = hd64465_outb_p,
-        .mv_outw_p              = hd64465_outw,
-        .mv_outl_p              = hd64465_outl,
-
-        .mv_insb                = hd64465_insb,
-        .mv_insw                = hd64465_insw,
-        .mv_insl                = hd64465_insl,
-        .mv_outsb               = hd64465_outsb,
-        .mv_outsw               = hd64465_outsw,
-        .mv_outsl               = hd64465_outsl,
-
-        .mv_isa_port2addr       = hd64465_isa_port2addr,
-
-#ifdef CONFIG_PCI
-        .mv_init_irq            = init_harp_irq,
-#endif
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_harp,
-#endif
-};
-
-ALIAS_MV(harp)
diff --git a/arch/sh/boards/harp/pcidma.c b/arch/sh/boards/harp/pcidma.c
deleted file mode 100644
index 475311390fd6..000000000000
--- a/arch/sh/boards/harp/pcidma.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * Dynamic DMA mapping support.
- */
-
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-#include <asm/addrspace.h>
-
-
-void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                           dma_addr_t * dma_handle)
-{
-        void *ret;
-        int gfp = GFP_ATOMIC;
-
-        ret = (void *) __get_free_pages(gfp, get_order(size));
-
-        if (ret != NULL) {
-                /* Is it neccessary to do the memset? */
-                memset(ret, 0, size);
-                *dma_handle = virt_to_bus(ret);
-        }
-        /* We must flush the cache before we pass it on to the device */
-        flush_cache_all();
-        return  P2SEGADDR(ret);
-}
-
-void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-                         void *vaddr, dma_addr_t dma_handle)
-{
-        unsigned long p1addr=P1SEGADDR((unsigned long)vaddr);
-
-        free_pages(p1addr, get_order(size));
-}
diff --git a/arch/sh/boards/harp/setup.c b/arch/sh/boards/harp/setup.c
deleted file mode 100644
index 886e450ab63e..000000000000
--- a/arch/sh/boards/harp/setup.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * arch/sh/stboard/setup.c
- *
- * Copyright (C) 2001 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * STMicroelectronics ST40STB1 HARP and compatible support.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <asm/harp/harp.h>
-
-const char *get_system_type(void)
-{
-        return "STB1 Harp";
-}
-
-/*
- * Initialize the board
- */
-int __init platform_setup(void)
-{
-#ifdef CONFIG_SH_STB1_HARP
-        unsigned long ic8_version, ic36_version;
-
-        ic8_version = ctrl_inl(EPLD_REVID2);
-        ic36_version = ctrl_inl(EPLD_REVID1);
-
-        printk("STMicroelectronics STB1 HARP initialisaton\n");
-        printk("EPLD versions: IC8: %d.%02d, IC36: %d.%02d\n",
-               (ic8_version >> 4) & 0xf, ic8_version & 0xf,
-               (ic36_version >> 4) & 0xf, ic36_version & 0xf);
-#elif defined(CONFIG_SH_STB1_OVERDRIVE)
-        unsigned long version;
-
-        version = ctrl_inl(EPLD_REVID);
-
-        printk("STMicroelectronics STB1 Overdrive initialisaton\n");
-        printk("EPLD version: %d.%02d\n",
-               (version >> 4) & 0xf, version & 0xf);
-#else
-#error Undefined machine
-#endif
- 
-        /* Currently all STB1 chips have problems with the sleep instruction,
-         * so disable it here.
-         */
-        disable_hlt();
-
-        return 0;
-}
-
-/*
- * pcibios_map_platform_irq
- *
- * This is board specific and returns the IRQ for a given PCI device.
- * It is used by the PCI code (arch/sh/kernel/st40_pci*)
- *
- */
-
-#define HARP_PCI_IRQ    1
-#define HARP_BRIDGE_IRQ 2
-#define OVERDRIVE_SLOT0_IRQ 0
-
-
-int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        switch (slot) {
-#ifdef CONFIG_SH_STB1_HARP
-        case 2:         /*This is the PCI slot on the */
-                return HARP_PCI_IRQ;
-        case 1:         /* this is the bridge */
-                return HARP_BRIDGE_IRQ;
-#elif defined(CONFIG_SH_STB1_OVERDRIVE)
-        case 1:
-        case 2:
-        case 3:
-                return slot - 1;
-#else
-#error Unknown board
-#endif
-        default:
-                return -1;
-        }
-}
-
diff --git a/arch/sh/boards/hp6xx/Makefile b/arch/sh/boards/hp6xx/Makefile
index 927fe0aa5dfa..ff1b7f5b4e91 100644
--- a/arch/sh/boards/hp6xx/Makefile
+++ b/arch/sh/boards/hp6xx/Makefile
@@ -2,5 +2,6 @@
 # Makefile for the HP6xx specific parts of the kernel
 #
 
-obj-y    := mach.o setup.o
-
+obj-y                   := setup.o
+obj-$(CONFIG_PM)        += pm.o pm_wakeup.o
+obj-$(CONFIG_APM)       += hp6xx_apm.o
diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/hp6xx/hp6xx_apm.c
new file mode 100644
index 000000000000..ad0e712c29f6
--- /dev/null
+++ b/arch/sh/boards/hp6xx/hp6xx_apm.c
@@ -0,0 +1,123 @@
+/*
+ * bios-less APM driver for hp680
+ *
+ * Copyright 2005 (c) Andriy Skulysh <askulysh@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/apm_bios.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <asm/io.h>
+#include <asm/apm.h>
+#include <asm/adc.h>
+#include <asm/hp6xx/hp6xx.h>
+
+#define SH7709_PGDR                     0xa400012c
+
+#define APM_CRITICAL                    10
+#define APM_LOW                         30
+
+#define HP680_BATTERY_MAX               875
+#define HP680_BATTERY_MIN               600
+#define HP680_BATTERY_AC_ON             900
+
+#define MODNAME "hp6x0_apm"
+
+static int hp6x0_apm_get_info(char *buf, char **start, off_t fpos, int length)
+{
+        u8 pgdr;
+        char *p;
+        int battery_status;
+        int battery_flag;
+        int ac_line_status;
+        int time_units = APM_BATTERY_LIFE_UNKNOWN;
+
+        int battery = adc_single(ADC_CHANNEL_BATTERY);
+        int backup = adc_single(ADC_CHANNEL_BACKUP);
+        int charging = adc_single(ADC_CHANNEL_CHARGE);
+        int percentage;
+
+        percentage = 100 * (battery - HP680_BATTERY_MIN) /
+                           (HP680_BATTERY_MAX - HP680_BATTERY_MIN);
+
+        ac_line_status = (battery > HP680_BATTERY_AC_ON) ?
+                         APM_AC_ONLINE : APM_AC_OFFLINE;
+
+        p = buf;
+
+        pgdr = ctrl_inb(SH7709_PGDR);
+        if (pgdr & PGDR_MAIN_BATTERY_OUT) {
+                battery_status = APM_BATTERY_STATUS_NOT_PRESENT;
+                battery_flag = 0x80;
+                percentage = -1;
+        } else if (charging < 8 ) {
+                battery_status = APM_BATTERY_STATUS_CHARGING;
+                battery_flag = 0x08;
+                ac_line_status = 0xff;
+        } else if (percentage <= APM_CRITICAL) {
+                battery_status = APM_BATTERY_STATUS_CRITICAL;
+                battery_flag = 0x04;
+        } else if (percentage <= APM_LOW) {
+                battery_status = APM_BATTERY_STATUS_LOW;
+                battery_flag = 0x02;
+        } else {
+                battery_status = APM_BATTERY_STATUS_HIGH;
+                battery_flag = 0x01;
+        }
+
+        p += sprintf(p, "1.0 1.2 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",
+                     APM_32_BIT_SUPPORT,
+                     ac_line_status,
+                     battery_status,
+                     battery_flag,
+                     percentage,
+                     time_units,
+                     "min");
+        p += sprintf(p, "bat=%d backup=%d charge=%d\n",
+                     battery, backup, charging);
+
+        return p - buf;
+}
+
+static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev, struct pt_regs *regs)
+{
+        if (!apm_suspended)
+                apm_queue_event(APM_USER_SUSPEND);
+
+        return IRQ_HANDLED;
+}
+
+static int __init hp6x0_apm_init(void)
+{
+        int ret;
+
+        ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt,
+                          SA_INTERRUPT, MODNAME, 0);
+        if (unlikely(ret < 0)) {
+                printk(KERN_ERR MODNAME ": IRQ %d request failed\n",
+                       HP680_BTN_IRQ);
+                return ret;
+        }
+
+        apm_get_info = hp6x0_apm_get_info;
+
+        return ret;
+}
+
+static void __exit hp6x0_apm_exit(void)
+{
+        free_irq(HP680_BTN_IRQ, 0);
+        apm_get_info = 0;
+}
+
+module_init(hp6x0_apm_init);
+module_exit(hp6x0_apm_exit);
+
+MODULE_AUTHOR("Adriy Skulysh");
+MODULE_DESCRIPTION("hp6xx Advanced Power Management");
+MODULE_LICENSE("GPL");
diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c
new file mode 100644
index 000000000000..0e501bcbd7a9
--- /dev/null
+++ b/arch/sh/boards/hp6xx/pm.c
@@ -0,0 +1,88 @@
+/*
+ * hp6x0 Power Management Routines
+ *
+ * Copyright (c) 2006 Andriy Skulysh <askulsyh@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License.
+ */
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/suspend.h>
+#include <linux/errno.h>
+#include <linux/time.h>
+#include <asm/io.h>
+#include <asm/hd64461.h>
+#include <asm/hp6xx/hp6xx.h>
+#include <asm/cpu/dac.h>
+#include <asm/pm.h>
+
+#define STBCR           0xffffff82
+#define STBCR2          0xffffff88
+
+static int hp6x0_pm_enter(suspend_state_t state)
+{
+        u8 stbcr, stbcr2;
+#ifdef CONFIG_HD64461_ENABLER
+        u8 scr;
+        u16 hd64461_stbcr;
+#endif
+
+        if (state != PM_SUSPEND_MEM)
+                return -EINVAL;
+
+#ifdef CONFIG_HD64461_ENABLER
+        outb(0, HD64461_PCC1CSCIER);
+
+        scr = inb(HD64461_PCC1SCR);
+        scr |= HD64461_PCCSCR_VCC1;
+        outb(scr, HD64461_PCC1SCR);
+
+        hd64461_stbcr = inw(HD64461_STBCR);
+        hd64461_stbcr |= HD64461_STBCR_SPC1ST;
+        outw(hd64461_stbcr, HD64461_STBCR);
+#endif
+
+        ctrl_outb(0x1f, DACR);
+
+        stbcr = ctrl_inb(STBCR);
+        ctrl_outb(0x01, STBCR);
+
+        stbcr2 = ctrl_inb(STBCR2);
+        ctrl_outb(0x7f , STBCR2);
+
+        outw(0xf07f, HD64461_SCPUCR);
+
+        pm_enter();
+
+        outw(0, HD64461_SCPUCR);
+        ctrl_outb(stbcr, STBCR);
+        ctrl_outb(stbcr2, STBCR2);
+
+#ifdef CONFIG_HD64461_ENABLER
+        hd64461_stbcr = inw(HD64461_STBCR);
+        hd64461_stbcr &= ~HD64461_STBCR_SPC1ST;
+        outw(hd64461_stbcr, HD64461_STBCR);
+
+        outb(0x4c, HD64461_PCC1CSCIER);
+        outb(0x00, HD64461_PCC1CSCR);
+#endif
+
+        return 0;
+}
+
+/*
+ * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
+ */
+static struct pm_ops hp6x0_pm_ops = {
+        .pm_disk_mode   = PM_DISK_FIRMWARE,
+        .enter          = hp6x0_pm_enter,
+};
+
+static int __init hp6x0_pm_init(void)
+{
+        pm_set_ops(&hp6x0_pm_ops);
+        return 0;
+}
+
+late_initcall(hp6x0_pm_init);
diff --git a/arch/sh/boards/hp6xx/pm_wakeup.S b/arch/sh/boards/hp6xx/pm_wakeup.S
new file mode 100644
index 000000000000..45e9bf0b9115
--- /dev/null
+++ b/arch/sh/boards/hp6xx/pm_wakeup.S
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2006 Andriy Skulysh <askulsyh@gmail.com>
+ *
+ * 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/linkage.h>
+#include <asm/cpu/mmu_context.h>
+
+#define k0      r0
+#define k1      r1
+#define k2      r2
+#define k3      r3
+#define k4      r4
+
+/*
+ * Kernel mode register usage:
+ *      k0      scratch
+ *      k1      scratch
+ *      k2      scratch (Exception code)
+ *      k3      scratch (Return address)
+ *      k4      scratch
+ *      k5      reserved
+ *      k6      Global Interrupt Mask (0--15 << 4)
+ *      k7      CURRENT_THREAD_INFO (pointer to current thread info)
+ */
+
+ENTRY(wakeup_start)
+! clear STBY bit
+        mov     #-126, k2
+        and     #127, k0
+        mov.b   k0, @k2
+! enable refresh
+        mov.l   5f, k1
+        mov.w   6f, k0
+        mov.w   k0, @k1
+! jump to handler
+        mov.l   2f, k2
+        mov.l   3f, k3
+        mov.l   @k2, k2
+
+        mov.l   4f, k1
+        jmp     @k1
+        nop
+
+        .align  2
+1:      .long   EXPEVT
+2:      .long   INTEVT
+3:      .long   ret_from_irq
+4:      .long   handle_exception
+5:      .long   0xffffff68
+6:      .word   0x0524
+
+ENTRY(wakeup_end)
+        nop
diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c
index 71f315663cc9..60ab17ad6054 100644
--- a/arch/sh/boards/hp6xx/setup.c
+++ b/arch/sh/boards/hp6xx/setup.c
@@ -8,22 +8,22 @@
  *
  * Setup code for an HP680  (internal peripherials only)
  */
-
+#include <linux/types.h>
 #include <linux/init.h>
-#include <asm/io.h>
 #include <asm/hd64461.h>
+#include <asm/io.h>
+#include <asm/irq.h>
 #include <asm/hp6xx/hp6xx.h>
 #include <asm/cpu/dac.h>
 
-const char *get_system_type(void)
-{
-        return "HP6xx";
-}
+#define SCPCR   0xa4000116
+#define SCPDR   0xa4000136
 
-int __init platform_setup(void)
+static void __init hp6xx_setup(char **cmdline_p)
 {
         u8 v8;
         u16 v;
+
         v = inw(HD64461_STBCR);
         v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST |
             HD64461_STBCR_STM1ST | HD64461_STBCR_STM0ST |
@@ -50,5 +50,51 @@ int __init platform_setup(void)
         v8 &= ~DACR_DAE;
         ctrl_outb(v8,DACR);
 
-        return 0;
+        v8 = ctrl_inb(SCPDR);
+        v8 |= SCPDR_TS_SCAN_X | SCPDR_TS_SCAN_Y;
+        v8 &= ~SCPDR_TS_SCAN_ENABLE;
+        ctrl_outb(v8, SCPDR);
+
+        v = ctrl_inw(SCPCR);
+        v &= ~SCPCR_TS_MASK;
+        v |= SCPCR_TS_ENABLE;
+        ctrl_outw(v, SCPCR);
 }
+
+/*
+ * XXX: This is stupid, we should have a generic machine vector for the cchips
+ * and just wrap the platform setup code in to this, as it's the only thing
+ * that ends up being different.
+ */
+struct sh_machine_vector mv_hp6xx __initmv = {
+        .mv_name = "hp6xx",
+        .mv_setup = hp6xx_setup,
+        .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM,
+
+        .mv_inb = hd64461_inb,
+        .mv_inw = hd64461_inw,
+        .mv_inl = hd64461_inl,
+        .mv_outb = hd64461_outb,
+        .mv_outw = hd64461_outw,
+        .mv_outl = hd64461_outl,
+
+        .mv_inb_p = hd64461_inb_p,
+        .mv_inw_p = hd64461_inw,
+        .mv_inl_p = hd64461_inl,
+        .mv_outb_p = hd64461_outb_p,
+        .mv_outw_p = hd64461_outw,
+        .mv_outl_p = hd64461_outl,
+
+        .mv_insb = hd64461_insb,
+        .mv_insw = hd64461_insw,
+        .mv_insl = hd64461_insl,
+        .mv_outsb = hd64461_outsb,
+        .mv_outsw = hd64461_outsw,
+        .mv_outsl = hd64461_outsl,
+
+        .mv_readw = hd64461_readw,
+        .mv_writew = hd64461_writew,
+
+        .mv_irq_demux = hd64461_irq_demux,
+};
+ALIAS_MV(hp6xx)
diff --git a/arch/sh/boards/landisk/Makefile b/arch/sh/boards/landisk/Makefile
new file mode 100644
index 000000000000..89e4beb2ad47
--- /dev/null
+++ b/arch/sh/boards/landisk/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for I-O DATA DEVICE, INC. "LANDISK Series"
+#
+
+obj-y    := setup.o io.o irq.o rtc.o landisk_pwb.o
diff --git a/arch/sh/boards/landisk/io.c b/arch/sh/boards/landisk/io.c
new file mode 100644
index 000000000000..92498b4947d5
--- /dev/null
+++ b/arch/sh/boards/landisk/io.c
@@ -0,0 +1,250 @@
+/*
+ * arch/sh/boards/landisk/io.c
+ *
+ * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
+ * Based largely on io_se.c.
+ *
+ * I/O routine for I-O Data Device, Inc. LANDISK.
+ *
+ * Initial version only to support LAN access; some
+ * placeholder code from io_landisk.c left in with the
+ * expectation of later SuperIO and PCMCIA access.
+ */
+/*
+ * modifed by kogiidena
+ * 2005.03.03
+ */
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <asm/landisk/iodata_landisk.h>
+#include <asm/addrspace.h>
+#include <asm/io.h>
+
+extern void *area5_io_base;     /* Area 5 I/O Base address */
+extern void *area6_io_base;     /* Area 6 I/O Base address */
+
+static inline unsigned long port2adr(unsigned int port)
+{
+        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
+                if (port == 0x3f6)
+                        return ((unsigned long)area5_io_base + 0x2c);
+                else
+                        return ((unsigned long)area5_io_base + PA_PIDE_OFFSET +
+                                ((port - 0x1f0) << 1));
+        else if ((0x170 <= port && port < 0x178) || port == 0x376)
+                if (port == 0x376)
+                        return ((unsigned long)area6_io_base + 0x2c);
+                else
+                        return ((unsigned long)area6_io_base + PA_SIDE_OFFSET +
+                                ((port - 0x170) << 1));
+        else
+                maybebadio((unsigned long)port);
+
+        return 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.
+ */
+u8 landisk_inb(unsigned long port)
+{
+        if (PXSEG(port))
+                return ctrl_inb(port);
+        else if (is_pci_ioaddr(port))
+                return ctrl_inb(pci_ioaddr(port));
+
+        return ctrl_inw(port2adr(port)) & 0xff;
+}
+
+u8 landisk_inb_p(unsigned long port)
+{
+        u8 v;
+
+        if (PXSEG(port))
+                v = ctrl_inb(port);
+        else if (is_pci_ioaddr(port))
+                v = ctrl_inb(pci_ioaddr(port));
+        else
+                v = ctrl_inw(port2adr(port)) & 0xff;
+
+        ctrl_delay();
+
+        return v;
+}
+
+u16 landisk_inw(unsigned long port)
+{
+        if (PXSEG(port))
+                return ctrl_inw(port);
+        else if (is_pci_ioaddr(port))
+                return ctrl_inw(pci_ioaddr(port));
+        else
+                maybebadio(port);
+
+        return 0;
+}
+
+u32 landisk_inl(unsigned long port)
+{
+        if (PXSEG(port))
+                return ctrl_inl(port);
+        else if (is_pci_ioaddr(port))
+                return ctrl_inl(pci_ioaddr(port));
+        else
+                maybebadio(port);
+
+        return 0;
+}
+
+void landisk_outb(u8 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outb(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outb(value, pci_ioaddr(port));
+        else
+                ctrl_outw(value, port2adr(port));
+}
+
+void landisk_outb_p(u8 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outb(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outb(value, pci_ioaddr(port));
+        else
+                ctrl_outw(value, port2adr(port));
+        ctrl_delay();
+}
+
+void landisk_outw(u16 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outw(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outw(value, pci_ioaddr(port));
+        else
+                maybebadio(port);
+}
+
+void landisk_outl(u32 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outl(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outl(value, pci_ioaddr(port));
+        else
+                maybebadio(port);
+}
+
+void landisk_insb(unsigned long port, void *dst, unsigned long count)
+{
+        volatile u16 *p;
+        u8 *buf = dst;
+
+        if (PXSEG(port)) {
+                while (count--)
+                        *buf++ = *(volatile u8 *)port;
+        } else if (is_pci_ioaddr(port)) {
+                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
+
+                while (count--)
+                        *buf++ = *bp;
+        } else {
+                p = (volatile u16 *)port2adr(port);
+                while (count--)
+                        *buf++ = *p & 0xff;
+        }
+}
+
+void landisk_insw(unsigned long port, void *dst, unsigned long count)
+{
+        volatile u16 *p;
+        u16 *buf = dst;
+
+        if (PXSEG(port))
+                p = (volatile u16 *)port;
+        else if (is_pci_ioaddr(port))
+                p = (volatile u16 *)pci_ioaddr(port);
+        else
+                p = (volatile u16 *)port2adr(port);
+        while (count--)
+                *buf++ = *p;
+}
+
+void landisk_insl(unsigned long port, void *dst, unsigned long count)
+{
+        u32 *buf = dst;
+
+        if (is_pci_ioaddr(port)) {
+                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+
+                while (count--)
+                        *buf++ = *p;
+        } else
+                maybebadio(port);
+}
+
+void landisk_outsb(unsigned long port, const void *src, unsigned long count)
+{
+        volatile u16 *p;
+        const u8 *buf = src;
+
+        if (PXSEG(port))
+                while (count--)
+                        ctrl_outb(*buf++, port);
+        else if (is_pci_ioaddr(port)) {
+                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
+
+                while (count--)
+                        *bp = *buf++;
+        } else {
+                p = (volatile u16 *)port2adr(port);
+                while (count--)
+                        *p = *buf++;
+        }
+}
+
+void landisk_outsw(unsigned long port, const void *src, unsigned long count)
+{
+        volatile u16 *p;
+        const u16 *buf = src;
+
+        if (PXSEG(port))
+                p = (volatile u16 *)port;
+        else if (is_pci_ioaddr(port))
+                p = (volatile u16 *)pci_ioaddr(port);
+        else
+                p = (volatile u16 *)port2adr(port);
+
+        while (count--)
+                *p = *buf++;
+}
+
+void landisk_outsl(unsigned long port, const void *src, unsigned long count)
+{
+        const u32 *buf = src;
+
+        if (is_pci_ioaddr(port)) {
+                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+
+                while (count--)
+                        *p = *buf++;
+        } else
+                maybebadio(port);
+}
+
+void __iomem *landisk_ioport_map(unsigned long port, unsigned int size)
+{
+        if (PXSEG(port))
+                return (void __iomem *)port;
+        else if (is_pci_ioaddr(port))
+                return (void __iomem *)pci_ioaddr(port);
+
+        return (void __iomem *)port2adr(port);
+}
diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/landisk/irq.c
new file mode 100644
index 000000000000..a006d6443225
--- /dev/null
+++ b/arch/sh/boards/landisk/irq.c
@@ -0,0 +1,99 @@
+/*
+ * arch/sh/boards/landisk/irq.c
+ *
+ * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
+ * Based largely on io_se.c.
+ *
+ * I/O routine for I-O Data Device, Inc. LANDISK.
+ *
+ * Initial version only to support LAN access; some
+ * placeholder code from io_landisk.c left in with the
+ * expectation of later SuperIO and PCMCIA access.
+ */
+/*
+ * modified by kogiidena
+ * 2005.03.03
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/landisk/iodata_landisk.h>
+
+static void enable_landisk_irq(unsigned int irq);
+static void disable_landisk_irq(unsigned int irq);
+
+/* shutdown is same as "disable" */
+#define shutdown_landisk_irq disable_landisk_irq
+
+static void ack_landisk_irq(unsigned int irq);
+static void end_landisk_irq(unsigned int irq);
+
+static unsigned int startup_landisk_irq(unsigned int irq)
+{
+        enable_landisk_irq(irq);
+        return 0;               /* never anything pending */
+}
+
+static void disable_landisk_irq(unsigned int irq)
+{
+        unsigned char val;
+        unsigned char mask = 0xff ^ (0x01 << (irq - 5));
+
+        /* Set the priority in IPR to 0 */
+        val = ctrl_inb(PA_IMASK);
+        val &= mask;
+        ctrl_outb(val, PA_IMASK);
+}
+
+static void enable_landisk_irq(unsigned int irq)
+{
+        unsigned char val;
+        unsigned char value = (0x01 << (irq - 5));
+
+        /* Set priority in IPR back to original value */
+        val = ctrl_inb(PA_IMASK);
+        val |= value;
+        ctrl_outb(val, PA_IMASK);
+}
+
+static void ack_landisk_irq(unsigned int irq)
+{
+        disable_landisk_irq(irq);
+}
+
+static void end_landisk_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+                enable_landisk_irq(irq);
+}
+
+static struct hw_interrupt_type landisk_irq_type = {
+        .typename = "LANDISK IRQ",
+        .startup = startup_landisk_irq,
+        .shutdown = shutdown_landisk_irq,
+        .enable = enable_landisk_irq,
+        .disable = disable_landisk_irq,
+        .ack = ack_landisk_irq,
+        .end = end_landisk_irq
+};
+
+static void make_landisk_irq(unsigned int irq)
+{
+        disable_irq_nosync(irq);
+        irq_desc[irq].handler = &landisk_irq_type;
+        disable_landisk_irq(irq);
+}
+
+/*
+ * Initialize IRQ setting
+ */
+void __init init_landisk_IRQ(void)
+{
+        int i;
+
+        for (i = 5; i < 14; i++)
+                make_landisk_irq(i);
+}
diff --git a/arch/sh/boards/landisk/landisk_pwb.c b/arch/sh/boards/landisk/landisk_pwb.c
new file mode 100644
index 000000000000..e75cb578a28b
--- /dev/null
+++ b/arch/sh/boards/landisk/landisk_pwb.c
@@ -0,0 +1,348 @@
+/*
+ * arch/sh/boards/landisk/landisk_pwb.c -- driver for the Power control switch.
+ *
+ * This driver will also support the I-O DATA Device, Inc. LANDISK Board.
+ *
+ * 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.
+ *
+ * Copylight (C) 2002 Atom Create Engineering Co., Ltd.
+ *
+ * LED control drive function added by kogiidena
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/major.h>
+#include <linux/poll.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+
+#include <asm/system.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include <asm/landisk/iodata_landisk.h>
+
+#define SHUTDOWN_BTN_MINOR      1       /* Shutdown button device minor no. */
+#define LED_MINOR              21       /* LED minor no. */
+#define BTN_MINOR              22       /* BUTTON minor no. */
+#define GIO_MINOR              40       /* GIO minor no. */
+
+static int openCnt;
+static int openCntLED;
+static int openCntGio;
+static int openCntBtn;
+static int landisk_btn;
+static int landisk_btnctrlpid;
+/*
+ * Functions prototypes
+ */
+
+static int gio_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
+                     unsigned long arg);
+
+static int swdrv_open(struct inode *inode, struct file *filp)
+{
+        int minor;
+
+        minor = MINOR(inode->i_rdev);
+        filp->private_data = (void *)minor;
+
+        if (minor == SHUTDOWN_BTN_MINOR) {
+                if (openCnt > 0) {
+                        return -EALREADY;
+                } else {
+                        openCnt++;
+                        return 0;
+                }
+        } else if (minor == LED_MINOR) {
+                if (openCntLED > 0) {
+                        return -EALREADY;
+                } else {
+                        openCntLED++;
+                        return 0;
+                }
+        } else if (minor == BTN_MINOR) {
+                if (openCntBtn > 0) {
+                        return -EALREADY;
+                } else {
+                        openCntBtn++;
+                        return 0;
+                }
+        } else if (minor == GIO_MINOR) {
+                if (openCntGio > 0) {
+                        return -EALREADY;
+                } else {
+                        openCntGio++;
+                        return 0;
+                }
+        }
+        return -ENOENT;
+
+}
+
+static int swdrv_close(struct inode *inode, struct file *filp)
+{
+        int minor;
+
+        minor = MINOR(inode->i_rdev);
+        if (minor == SHUTDOWN_BTN_MINOR) {
+                openCnt--;
+        } else if (minor == LED_MINOR) {
+                openCntLED--;
+        } else if (minor == BTN_MINOR) {
+                openCntBtn--;
+        } else if (minor == GIO_MINOR) {
+                openCntGio--;
+        }
+        return 0;
+}
+
+static int swdrv_read(struct file *filp, char *buff, size_t count,
+                      loff_t * ppos)
+{
+        int minor;
+        minor = (int)(filp->private_data);
+
+        if (!access_ok(VERIFY_WRITE, (void *)buff, count))
+                return -EFAULT;
+
+        if (minor == SHUTDOWN_BTN_MINOR) {
+                if (landisk_btn & 0x10) {
+                        put_user(1, buff);
+                        return 1;
+                } else {
+                        return 0;
+                }
+        }
+        return 0;
+}
+
+static int swdrv_write(struct file *filp, const char *buff, size_t count,
+                       loff_t * ppos)
+{
+        int minor;
+        minor = (int)(filp->private_data);
+
+        if (minor == SHUTDOWN_BTN_MINOR) {
+                return count;
+        }
+        return count;
+}
+
+static irqreturn_t sw_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        landisk_btn = (0x0ff & (~ctrl_inb(PA_STATUS)));
+        disable_irq(IRQ_BUTTON);
+        disable_irq(IRQ_POWER);
+        ctrl_outb(0x00, PA_PWRINT_CLR);
+
+        if (landisk_btnctrlpid != 0) {
+                kill_proc(landisk_btnctrlpid, SIGUSR1, 1);
+                landisk_btnctrlpid = 0;
+        }
+
+        return IRQ_HANDLED;
+}
+
+static struct file_operations swdrv_fops = {
+        .read = swdrv_read,     /* read */
+        .write = swdrv_write,   /* write */
+        .open = swdrv_open,     /* open */
+        .release = swdrv_close, /* release */
+        .ioctl = gio_ioctl,     /* ioctl */
+
+};
+
+static char banner[] __initdata =
+    KERN_INFO "LANDISK and USL-5P Button, LED and GIO driver initialized\n";
+
+int __init swdrv_init(void)
+{
+        int error;
+
+        printk("%s", banner);
+
+        openCnt = 0;
+        openCntLED = 0;
+        openCntBtn = 0;
+        openCntGio = 0;
+        landisk_btn = 0;
+        landisk_btnctrlpid = 0;
+
+        if ((error = register_chrdev(SHUTDOWN_BTN_MAJOR, "swdrv", &swdrv_fops))) {
+                printk(KERN_ERR
+                       "Button, LED and GIO driver:Couldn't register driver, error=%d\n",
+                       error);
+                return 1;
+        }
+
+        if (request_irq(IRQ_POWER, sw_interrupt, 0, "SHUTDOWNSWITCH", NULL)) {
+                printk(KERN_ERR "Unable to get IRQ 11.\n");
+                return 1;
+        }
+        if (request_irq(IRQ_BUTTON, sw_interrupt, 0, "USL-5P BUTTON", NULL)) {
+                printk(KERN_ERR "Unable to get IRQ 12.\n");
+                return 1;
+        }
+        ctrl_outb(0x00, PA_PWRINT_CLR);
+
+        return 0;
+}
+
+module_init(swdrv_init);
+
+/*
+ * gio driver
+ *
+ */
+
+#include <asm/landisk/gio.h>
+
+static int gio_ioctl(struct inode *inode, struct file *filp,
+                     unsigned int cmd, unsigned long arg)
+{
+        int minor;
+        unsigned int data, mask;
+        static unsigned int addr = 0;
+
+        minor = (int)(filp->private_data);
+
+        /* access control */
+        if (minor == GIO_MINOR) {
+                ;
+        } else if (minor == LED_MINOR) {
+                if (((cmd & 0x0ff) >= 9) && ((cmd & 0x0ff) < 20)) {
+                        ;
+                } else {
+                        return -EINVAL;
+                }
+        } else if (minor == BTN_MINOR) {
+                if (((cmd & 0x0ff) >= 20) && ((cmd & 0x0ff) < 30)) {
+                        ;
+                } else {
+                        return -EINVAL;
+                }
+        } else {
+                return -EINVAL;
+        }
+
+        if (cmd & 0x01) {       /* write */
+                if (copy_from_user(&data, (int *)arg, sizeof(int))) {
+                        return -EFAULT;
+                }
+        }
+
+        switch (cmd) {
+        case GIODRV_IOCSGIOSETADDR:     /* addres set */
+                addr = data;
+                break;
+
+        case GIODRV_IOCSGIODATA1:       /* write byte */
+                ctrl_outb((unsigned char)(0x0ff & data), addr);
+                break;
+
+        case GIODRV_IOCSGIODATA2:       /* write word */
+                if (addr & 0x01) {
+                        return -EFAULT;
+                }
+                ctrl_outw((unsigned short int)(0x0ffff & data), addr);
+                break;
+
+        case GIODRV_IOCSGIODATA4:       /* write long */
+                if (addr & 0x03) {
+                        return -EFAULT;
+                }
+                ctrl_outl(data, addr);
+                break;
+
+        case GIODRV_IOCGGIODATA1:       /* read byte */
+                data = ctrl_inb(addr);
+                break;
+
+        case GIODRV_IOCGGIODATA2:       /* read word */
+                if (addr & 0x01) {
+                        return -EFAULT;
+                }
+                data = ctrl_inw(addr);
+                break;
+
+        case GIODRV_IOCGGIODATA4:       /* read long */
+                if (addr & 0x03) {
+                        return -EFAULT;
+                }
+                data = ctrl_inl(addr);
+                break;
+        case GIODRV_IOCSGIO_LED:        /* write */
+                mask = ((data & 0x00ffffff) << 8)
+                    | ((data & 0x0000ffff) << 16)
+                    | ((data & 0x000000ff) << 24);
+                landisk_ledparam = data & (~mask);
+                if (landisk_arch == 0) {        /* arch == landisk */
+                        landisk_ledparam &= 0x03030303;
+                        mask = (~(landisk_ledparam >> 22)) & 0x000c;
+                        landisk_ledparam |= mask;
+                } else {                        /* arch == usl-5p */
+                        mask = (landisk_ledparam >> 24) & 0x0001;
+                        landisk_ledparam |= mask;
+                        landisk_ledparam &= 0x007f7f7f;
+                }
+                landisk_ledparam |= 0x80;
+                break;
+        case GIODRV_IOCGGIO_LED:        /* read */
+                data = landisk_ledparam;
+                if (landisk_arch == 0) {        /* arch == landisk */
+                        data &= 0x03030303;
+                } else {                        /* arch == usl-5p */
+                        ;
+                }
+                data &= (~0x080);
+                break;
+        case GIODRV_IOCSGIO_BUZZER:     /* write */
+                landisk_buzzerparam = data;
+                landisk_ledparam |= 0x80;
+                break;
+        case GIODRV_IOCGGIO_LANDISK:    /* read */
+                data = landisk_arch & 0x01;
+                break;
+        case GIODRV_IOCGGIO_BTN:        /* read */
+                data = (0x0ff & ctrl_inb(PA_PWRINT_CLR));
+                data <<= 8;
+                data |= (0x0ff & ctrl_inb(PA_IMASK));
+                data <<= 8;
+                data |= (0x0ff & landisk_btn);
+                data <<= 8;
+                data |= (0x0ff & (~ctrl_inb(PA_STATUS)));
+                break;
+        case GIODRV_IOCSGIO_BTNPID:     /* write */
+                landisk_btnctrlpid = data;
+                landisk_btn = 0;
+                if (irq_desc[IRQ_BUTTON].depth) {
+                        enable_irq(IRQ_BUTTON);
+                }
+                if (irq_desc[IRQ_POWER].depth) {
+                        enable_irq(IRQ_POWER);
+                }
+                break;
+        case GIODRV_IOCGGIO_BTNPID:     /* read */
+                data = landisk_btnctrlpid;
+                break;
+        default:
+                return -EFAULT;
+                break;
+        }
+
+        if ((cmd & 0x01) == 0) {        /* read */
+                if (copy_to_user((int *)arg, &data, sizeof(int))) {
+                        return -EFAULT;
+                }
+        }
+        return 0;
+}
diff --git a/arch/sh/boards/landisk/rtc.c b/arch/sh/boards/landisk/rtc.c
new file mode 100644
index 000000000000..35ba726a0979
--- /dev/null
+++ b/arch/sh/boards/landisk/rtc.c
@@ -0,0 +1,93 @@
+/*
+ * arch/sh/boards/landisk/rtc.c --  RTC support
+ *
+ *  Copyright (C) 2000  Philipp Rumpf <prumpf@tux.org>
+ *  Copyright (C) 1999  Tetsuya Okada & Niibe Yutaka
+ */
+/*
+ * modifed by kogiidena
+ * 2005.09.16
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/bcd.h>
+#include <asm/rtc.h>
+
+extern spinlock_t rtc_lock;
+
+extern void
+rs5c313_set_cmos_time(unsigned int BCD_yr, unsigned int BCD_mon,
+                      unsigned int BCD_day, unsigned int BCD_hr,
+                      unsigned int BCD_min, unsigned int BCD_sec);
+
+extern unsigned long
+rs5c313_get_cmos_time(unsigned int *BCD_yr, unsigned int *BCD_mon,
+                      unsigned int *BCD_day, unsigned int *BCD_hr,
+                      unsigned int *BCD_min, unsigned int *BCD_sec);
+
+void landisk_rtc_gettimeofday(struct timespec *tv)
+{
+        unsigned int BCD_yr, BCD_mon, BCD_day, BCD_hr, BCD_min, BCD_sec;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
+        tv->tv_sec = rs5c313_get_cmos_time
+            (&BCD_yr, &BCD_mon, &BCD_day, &BCD_hr, &BCD_min, &BCD_sec);
+        tv->tv_nsec = 0;
+        spin_unlock_irqrestore(&rtc_lock, flags);
+}
+
+int landisk_rtc_settimeofday(const time_t secs)
+{
+        int retval = 0;
+        int real_seconds, real_minutes, cmos_minutes;
+        unsigned long flags;
+        unsigned long nowtime = secs;
+        unsigned int BCD_yr, BCD_mon, BCD_day, BCD_hr, BCD_min, BCD_sec;
+
+        spin_lock_irqsave(&rtc_lock, flags);
+
+        rs5c313_get_cmos_time
+          (&BCD_yr, &BCD_mon, &BCD_day, &BCD_hr, &BCD_min, &BCD_sec);
+        cmos_minutes = BCD_min;
+        BCD_TO_BIN(cmos_minutes);
+
+        /*
+         * since we're only adjusting minutes and seconds,
+         * don't interfere with hour overflow. This avoids
+         * messing with unknown time zones but requires your
+         * RTC not to be off by more than 15 minutes
+         */
+        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) {
+                BIN_TO_BCD(real_seconds);
+                BIN_TO_BCD(real_minutes);
+                rs5c313_set_cmos_time(BCD_yr, BCD_mon, BCD_day, BCD_hr,
+                                      real_minutes, real_seconds);
+        } else {
+                printk(KERN_WARNING
+                       "set_rtc_time: can't update from %d to %d\n",
+                       cmos_minutes, real_minutes);
+                retval = -1;
+        }
+
+        spin_unlock_irqrestore(&rtc_lock, flags);
+        return retval;
+}
+
+void landisk_time_init(void)
+{
+        rtc_sh_get_time = landisk_rtc_gettimeofday;
+        rtc_sh_set_time = landisk_rtc_settimeofday;
+}
diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c
new file mode 100644
index 000000000000..127b9e020e00
--- /dev/null
+++ b/arch/sh/boards/landisk/setup.c
@@ -0,0 +1,177 @@
+/*
+ * arch/sh/boards/landisk/setup.c
+ *
+ * Copyright (C) 2000 Kazumoto Kojima
+ * Copyright (C) 2002 Paul Mundt
+ *
+ * I-O DATA Device, Inc. LANDISK Support.
+ *
+ * Modified for LANDISK by
+ * Atom Create Engineering Co., Ltd. 2002.
+ *
+ * modifed by kogiidena
+ * 2005.09.16
+ *
+ * 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/config.h>
+#include <linux/init.h>
+#include <linux/pm.h>
+#include <linux/mm.h>
+#include <asm/machvec.h>
+#include <asm/rtc.h>
+#include <asm/landisk/iodata_landisk.h>
+#include <asm/io.h>
+
+void landisk_time_init(void);
+void init_landisk_IRQ(void);
+
+int landisk_ledparam;
+int landisk_buzzerparam;
+int landisk_arch;
+
+/* cycle the led's in the clasic knightrider/sun pattern */
+static void heartbeat_landisk(void)
+{
+        static unsigned int cnt = 0, blink = 0x00, period = 25;
+        volatile u8 *p = (volatile u8 *)PA_LED;
+        char data;
+
+        if ((landisk_ledparam & 0x080) == 0)
+                return;
+
+        cnt += 1;
+
+        if (cnt < period)
+                return;
+
+        cnt = 0;
+        blink++;
+
+        data = (blink & 0x01) ? (landisk_ledparam >> 16) : 0;
+        data |= (blink & 0x02) ? (landisk_ledparam >> 8) : 0;
+        data |= landisk_ledparam;
+
+        /* buzzer */
+        if (landisk_buzzerparam & 0x1) {
+                data |= 0x80;
+        } else {
+                data &= 0x7f;
+        }
+        *p = data;
+
+        if (((landisk_ledparam & 0x007f7f00) == 0) &&
+             (landisk_buzzerparam == 0))
+                landisk_ledparam &= (~0x0080);
+
+        landisk_buzzerparam >>= 1;
+}
+
+static void landisk_power_off(void)
+{
+        ctrl_outb(0x01, PA_SHUTDOWN);
+}
+
+static void check_usl5p(void)
+{
+        volatile u8 *p = (volatile u8 *)PA_LED;
+        u8 tmp1, tmp2;
+
+        tmp1 = *p;
+        *p = 0x40;
+        tmp2 = *p;
+        *p = tmp1;
+
+        landisk_arch = (tmp2 == 0x40);
+        if (landisk_arch == 1) {
+                /* arch == usl-5p */
+                landisk_ledparam = 0x00000380;
+                landisk_ledparam |= (tmp1 & 0x07c);
+        } else {
+                /* arch == landisk */
+                landisk_ledparam = 0x02000180;
+                landisk_ledparam |= 0x04;
+        }
+}
+
+void *area5_io_base;
+void *area6_io_base;
+
+static int __init landisk_cf_init(void)
+{
+        pgprot_t prot;
+        unsigned long paddrbase, psize;
+
+        /* open I/O area window */
+        paddrbase = virt_to_phys((void *)PA_AREA5_IO);
+        psize = PAGE_SIZE;
+        prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);
+        area5_io_base = p3_ioremap(paddrbase, psize, prot.pgprot);
+        if (!area5_io_base) {
+                printk("allocate_cf_area : can't open CF I/O window!\n");
+                return -ENOMEM;
+        }
+
+        paddrbase = virt_to_phys((void *)PA_AREA6_IO);
+        psize = PAGE_SIZE;
+        prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO16);
+        area6_io_base = p3_ioremap(paddrbase, psize, prot.pgprot);
+        if (!area6_io_base) {
+                printk("allocate_cf_area : can't open HDD I/O window!\n");
+                return -ENOMEM;
+        }
+
+        printk(KERN_INFO "Allocate Area5/6 success.\n");
+
+        /* XXX : do we need attribute and common-memory area also? */
+
+        return 0;
+}
+
+static void __init landisk_setup(char **cmdline_p)
+{
+        device_initcall(landisk_cf_init);
+
+        landisk_buzzerparam = 0;
+        check_usl5p();
+
+        printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
+
+        board_time_init = landisk_time_init;
+        pm_power_off = landisk_power_off;
+}
+
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_landisk __initmv = {
+        .mv_name = "LANDISK",
+        .mv_setup = landisk_setup,
+        .mv_nr_irqs = 72,
+        .mv_inb = landisk_inb,
+        .mv_inw = landisk_inw,
+        .mv_inl = landisk_inl,
+        .mv_outb = landisk_outb,
+        .mv_outw = landisk_outw,
+        .mv_outl = landisk_outl,
+        .mv_inb_p = landisk_inb_p,
+        .mv_inw_p = landisk_inw,
+        .mv_inl_p = landisk_inl,
+        .mv_outb_p = landisk_outb_p,
+        .mv_outw_p = landisk_outw,
+        .mv_outl_p = landisk_outl,
+        .mv_insb = landisk_insb,
+        .mv_insw = landisk_insw,
+        .mv_insl = landisk_insl,
+        .mv_outsb = landisk_outsb,
+        .mv_outsw = landisk_outsw,
+        .mv_outsl = landisk_outsl,
+        .mv_ioport_map = landisk_ioport_map,
+        .mv_init_irq = init_landisk_IRQ,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat = heartbeat_landisk,
+#endif
+};
+ALIAS_MV(landisk)
diff --git a/arch/sh/boards/mpc1211/rtc.c b/arch/sh/boards/mpc1211/rtc.c
index a76c655dceee..03b123a4bba4 100644
--- a/arch/sh/boards/mpc1211/rtc.c
+++ b/arch/sh/boards/mpc1211/rtc.c
@@ -130,7 +130,7 @@ int mpc1211_rtc_settimeofday(const struct timeval *tv)
 
 void mpc1211_time_init(void)
 {
-        rtc_get_time = mpc1211_rtc_gettimeofday;
-        rtc_set_time = mpc1211_rtc_settimeofday;
+        rtc_sh_get_time = mpc1211_rtc_gettimeofday;
+        rtc_sh_set_time = mpc1211_rtc_settimeofday;
 }
 
diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c
index 2bfb221cc35c..8eb5d4303972 100644
--- a/arch/sh/boards/mpc1211/setup.c
+++ b/arch/sh/boards/mpc1211/setup.c
@@ -10,14 +10,12 @@
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/interrupt.h>
-
 #include <asm/io.h>
 #include <asm/machvec.h>
 #include <asm/mpc1211/mpc1211.h>
 #include <asm/mpc1211/pci.h>
 #include <asm/mpc1211/m1543c.h>
 
-
 /* ALI15X3 SMBus address offsets */
 #define SMBHSTSTS   (0 + 0x3100)
 #define SMBHSTCNT   (1 + 0x3100)
@@ -50,11 +48,6 @@
 #define ALI15X3_STS_TERM        0x80    /* terminated by abort */
 #define ALI15X3_STS_ERR         0xE0    /* all the bad error bits */
 
-const char *get_system_type(void)
-{
-        return "Interface MPC-1211(CTP/PCI/MPC-SH02)";
-}
-
 static void __init pci_write_config(unsigned long busNo,
                                     unsigned long devNo,
                                     unsigned long fncNo,
@@ -80,9 +73,6 @@ volatile unsigned long irq_err_count;
 
 static void disable_mpc1211_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        save_and_cli(flags);
         if( irq < 8) {
                 m_irq_mask |= (1 << irq);
                 outb(m_irq_mask,I8259_M_MR);
@@ -90,16 +80,11 @@ static void disable_mpc1211_irq(unsigned int irq)
                 s_irq_mask |= (1 << (irq - 8));
                 outb(s_irq_mask,I8259_S_MR);
         }
-        restore_flags(flags);
 
 }
 
 static void enable_mpc1211_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        save_and_cli(flags);
-
         if( irq < 8) {
                 m_irq_mask &= ~(1 << irq);
                 outb(m_irq_mask,I8259_M_MR);
@@ -107,7 +92,6 @@ static void enable_mpc1211_irq(unsigned int irq)
                 s_irq_mask &= ~(1 << (irq - 8));
                 outb(s_irq_mask,I8259_S_MR);
         }
-        restore_flags(flags);
 }
 
 static inline int mpc1211_irq_real(unsigned int irq)
@@ -131,10 +115,6 @@ static inline int mpc1211_irq_real(unsigned int irq)
 
 static void mask_and_ack_mpc1211(unsigned int irq)
 {
-        unsigned long flags;
-
-        save_and_cli(flags);
-
         if(irq < 8) {
                 if(m_irq_mask & (1<<irq)){
                   if(!mpc1211_irq_real(irq)){
@@ -162,7 +142,6 @@ static void mask_and_ack_mpc1211(unsigned int irq)
                 outb(0x60+(irq-8),I8259_S_CR);  /* EOI */
                 outb(0x60+2,I8259_M_CR);
         }
-        restore_flags(flags);
 }
 
 static void end_mpc1211_irq(unsigned int irq)
@@ -219,7 +198,7 @@ int mpc1211_irq_demux(int irq)
         return irq;
 }
 
-void __init init_mpc1211_IRQ(void)
+static void __init init_mpc1211_IRQ(void)
 {
         int i;
         /*
@@ -255,23 +234,12 @@ void __init init_mpc1211_IRQ(void)
         }
 }
 
-/*
-  Initialize the board
-*/
-
-
-static void delay (void)
-{
-        volatile unsigned short tmp;
-        tmp = *(volatile unsigned short *) 0xa0000000;
-}
-
-static void delay1000 (void)
+static void delay1000(void)
 {
         int i;
 
         for (i=0; i<1000; i++)
-                delay ();
+                ctrl_delay();
 }
 
 static int put_smb_blk(unsigned char *p, int address, int command, int no)
@@ -314,26 +282,10 @@ static int put_smb_blk(unsigned char *p, int address, int command, int no)
         return 0;
 }
 
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_mpc1211 __initmv = {
-        .mv_nr_irqs             = 48,
-        .mv_irq_demux           = mpc1211_irq_demux,
-        .mv_init_irq            = init_mpc1211_IRQ,
-
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_mpc1211,
-#endif
-};
-
-ALIAS_MV(mpc1211)
-
 /* arch/sh/boards/mpc1211/rtc.c */
 void mpc1211_time_init(void);
 
-int __init platform_setup(void)
+static void __init mpc1211_setup(char **cmdline_p)
 {
         unsigned char spd_buf[128];
 
@@ -357,3 +309,18 @@ int __init platform_setup(void)
         return 0;
 }
 
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_mpc1211 __initmv = {
+        .mv_name                = "Interface MPC-1211(CTP/PCI/MPC-SH02)",
+        .mv_setup               = mpc1211_setup,
+        .mv_nr_irqs             = 48,
+        .mv_irq_demux           = mpc1211_irq_demux,
+        .mv_init_irq            = init_mpc1211_IRQ,
+
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = heartbeat_mpc1211,
+#endif
+};
+ALIAS_MV(mpc1211)
diff --git a/arch/sh/boards/overdrive/Makefile b/arch/sh/boards/overdrive/Makefile
deleted file mode 100644
index 245f03baf762..000000000000
--- a/arch/sh/boards/overdrive/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the STMicroelectronics Overdrive specific parts of the kernel
-#
-
-obj-y    := mach.o setup.o io.o irq.o led.o
-
-obj-$(CONFIG_PCI) += fpga.o galileo.o pcidma.o
-
diff --git a/arch/sh/boards/overdrive/fpga.c b/arch/sh/boards/overdrive/fpga.c
deleted file mode 100644
index 956c23901228..000000000000
--- a/arch/sh/boards/overdrive/fpga.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * This file handles programming up the Altera Flex10K that interfaces to
- * the Galileo, and does the PS/2 keyboard and mouse
- *
- */
-
-
-#include <linux/kernel.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-
-
-#include <asm/overdriver/gt64111.h>
-#include <asm/overdrive/overdrive.h>
-#include <asm/overdrive/fpga.h>
-
-#define FPGA_NotConfigHigh()  (*FPGA_ControlReg) = (*FPGA_ControlReg) | ENABLE_FPGA_BIT
-#define FPGA_NotConfigLow()   (*FPGA_ControlReg) = (*FPGA_ControlReg) & RESET_FPGA_MASK
-
-/* I need to find out what (if any) the real delay factor here is */
-/* The delay is definately not critical */
-#define long_delay() {int i;for(i=0;i<10000;i++);}
-#define short_delay() {int i;for(i=0;i<100;i++);}
-
-static void __init program_overdrive_fpga(const unsigned char *fpgacode,
-                                          int size)
-{
-        int timeout = 0;
-        int i, j;
-        unsigned char b;
-        static volatile unsigned char *FPGA_ControlReg =
-            (volatile unsigned char *) (OVERDRIVE_CTRL);
-        static volatile unsigned char *FPGA_ProgramReg =
-            (volatile unsigned char *) (FPGA_DCLK_ADDRESS);
-
-        printk("FPGA:  Commencing FPGA Programming\n");
-
-        /* The PCI reset but MUST be low when programming the FPGA !!! */
-        b = (*FPGA_ControlReg) & RESET_PCI_MASK;
-
-        (*FPGA_ControlReg) = b;
-
-        /* Prepare FPGA to program */
-
-        FPGA_NotConfigHigh();
-        long_delay();
-
-        FPGA_NotConfigLow();
-        short_delay();
-
-        while ((*FPGA_ProgramReg & FPGA_NOT_STATUS) != 0) {
-                printk("FPGA:  Waiting for NotStatus to go Low ... \n");
-        }
-
-        FPGA_NotConfigHigh();
-
-        /* Wait for FPGA "ready to be programmed" signal */
-        printk("FPGA:  Waiting for NotStatus to go high (FPGA ready)... \n");
-
-        for (timeout = 0;
-             (((*FPGA_ProgramReg & FPGA_NOT_STATUS) == 0)
-              && (timeout < FPGA_TIMEOUT)); timeout++);
-
-        /* Check if timeout condition occured - i.e. an error */
-
-        if (timeout == FPGA_TIMEOUT) {
-                printk
-                    ("FPGA:  Failed to program - Timeout waiting for notSTATUS to go high\n");
-                return;
-        }
-
-        printk("FPGA:  Copying data to FPGA ... %d bytes\n", size);
-
-        /* Copy array to FPGA - bit at a time */
-
-        for (i = 0; i < size; i++) {
-                volatile unsigned w = 0;
-
-                for (j = 0; j < 8; j++) {
-                        *FPGA_ProgramReg = (fpgacode[i] >> j) & 0x01;
-                        short_delay();
-                }
-                if ((i & 0x3ff) == 0) {
-                        printk(".");
-                }
-        }
-
-        /* Waiting for CONFDONE to go high - means the program is complete  */
-
-        for (timeout = 0;
-             (((*FPGA_ProgramReg & FPGA_CONFDONE) == 0)
-              && (timeout < FPGA_TIMEOUT)); timeout++) {
-
-                *FPGA_ProgramReg = 0x0;
-                long_delay();
-        }
-
-        if (timeout == FPGA_TIMEOUT) {
-                printk
-                    ("FPGA:  Failed to program - Timeout waiting for CONFDONE to go high\n");
-                return;
-        } else {                /* Clock another 10 times - gets the device into a working state      */
-                for (i = 0; i < 10; i++) {
-                        *FPGA_ProgramReg = 0x0;
-                        short_delay();
-                }
-        }
-
-        printk("FPGA:  Programming complete\n");
-}
-
-
-static const unsigned char __init fpgacode[] = {
-#include "./overdrive.ttf"      /* Code from maxplus2 compiler */
-        , 0, 0
-};
-
-
-int __init init_overdrive_fpga(void)
-{
-        program_overdrive_fpga(fpgacode, sizeof(fpgacode));
-
-        return 0;
-}
diff --git a/arch/sh/boards/overdrive/galileo.c b/arch/sh/boards/overdrive/galileo.c
deleted file mode 100644
index 29e48971bba0..000000000000
--- a/arch/sh/boards/overdrive/galileo.c
+++ /dev/null
@@ -1,587 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * This file contains the PCI routines required for the Galileo GT6411 
- * PCI bridge as used on the Orion and Overdrive boards.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/types.h>
-#include <linux/ioport.h>
-
-#include <asm/overdrive/overdrive.h>
-#include <asm/overdrive/gt64111.h>
-
-
-/* After boot, we shift the Galileo registers so that they appear 
- * in BANK6, along with IO space. This means we can have one contingous
- * lump of PCI address space without these registers appearing in the 
- * middle of them 
- */
-
-#define GT64111_BASE_ADDRESS  0xbb000000
-#define GT64111_IO_BASE_ADDRESS  0x1000
-/* The GT64111 registers appear at this address to the SH4 after reset */
-#define RESET_GT64111_BASE_ADDRESS           0xb4000000
-
-/* Macros used to access the Galileo registers */
-#define RESET_GT64111_REG(x) (RESET_GT64111_BASE_ADDRESS+x)
-#define GT64111_REG(x) (GT64111_BASE_ADDRESS+x)
-
-#define RESET_GT_WRITE(x,v) writel((v),RESET_GT64111_REG(x))
-
-#define RESET_GT_READ(x) readl(RESET_GT64111_REG(x))
-
-#define GT_WRITE(x,v) writel((v),GT64111_REG(x))
-#define GT_WRITE_BYTE(x,v) writeb((v),GT64111_REG(x))
-#define GT_WRITE_SHORT(x,v) writew((v),GT64111_REG(x))
-
-#define GT_READ(x)    readl(GT64111_REG(x))
-#define GT_READ_BYTE(x)  readb(GT64111_REG(x))
-#define GT_READ_SHORT(x) readw(GT64111_REG(x))
-
-
-/* Where the various SH banks start at */
-#define SH_BANK4_ADR 0xb0000000
-#define SH_BANK5_ADR 0xb4000000
-#define SH_BANK6_ADR 0xb8000000
-
-/* Masks out everything but lines 28,27,26 */
-#define BANK_SELECT_MASK 0x1c000000
-
-#define SH4_TO_BANK(x) ( (x) & BANK_SELECT_MASK)
-
-/* 
- * Masks used for address conversaion. Bank 6 is used for IO and 
- * has all the address bits zeroed by the FPGA. Special case this
- */
-#define MEMORY_BANK_MASK 0x1fffffff
-#define IO_BANK_MASK  0x03ffffff
-
-/* Mark bank 6 as the bank used for IO. You can change this in the FPGA code
- * if you want 
- */
-#define IO_BANK_ADR PCI_GTIO_BASE
-
-/* Will select the correct mask to apply depending on the SH$ address */
-#define SELECT_BANK_MASK(x) \
-   ( (SH4_TO_BANK(x)==SH4_TO_BANK(IO_BANK_ADR)) ? IO_BANK_MASK : MEMORY_BANK_MASK)
-
-/* Converts between PCI space and P2 region */
-#define SH4_TO_PCI(x) ((x)&SELECT_BANK_MASK(x))
-
-/* Various macros for figuring out what to stick in the Galileo registers. 
- * You *really* don't want to figure this stuff out by hand, you always get
- * it wrong
- */
-#define GT_MEM_LO_ADR(x) ((((unsigned)((x)&SELECT_BANK_MASK(x)))>>21)&0x7ff)
-#define GT_MEM_HI_ADR(x) ((((unsigned)((x)&SELECT_BANK_MASK(x)))>>21)&0x7f)
-#define GT_MEM_SUB_ADR(x) ((((unsigned)((x)&SELECT_BANK_MASK(x)))>>20)&0xff)
-
-#define PROGRAM_HI_LO(block,a,s) \
-    GT_WRITE(block##_LO_DEC_ADR,GT_MEM_LO_ADR(a));\
-    GT_WRITE(block##_HI_DEC_ADR,GT_MEM_HI_ADR(a+s-1))
-
-#define PROGRAM_SUB_HI_LO(block,a,s) \
-    GT_WRITE(block##_LO_DEC_ADR,GT_MEM_SUB_ADR(a));\
-    GT_WRITE(block##_HI_DEC_ADR,GT_MEM_SUB_ADR(a+s-1))
-
-/* We need to set the size, and the offset register */
-
-#define GT_BAR_MASK(x) ((x)&~0xfff)
-
-/* Macro to set up the BAR in the Galileo. Essentially used for the DRAM */
-#define PROGRAM_GT_BAR(block,a,s) \
-  GT_WRITE(PCI_##block##_BANK_SIZE,GT_BAR_MASK((s-1)));\
-  write_config_to_galileo(PCI_CONFIG_##block##_BASE_ADR,\
-                             GT_BAR_MASK(a))
-
-#define DISABLE_GT_BAR(block) \
-  GT_WRITE(PCI_##block##_BANK_SIZE,0),\
-  GT_CONFIG_WRITE(PCI_CONFIG_##block##_BASE_ADR,\
-    0x80000000)
-
-/* Macros to disable things we are not going to use */
-#define DISABLE_DECODE(x) GT_WRITE(x##_LO_DEC_ADR,0x7ff);\
-                          GT_WRITE(x##_HI_DEC_ADR,0x00)
-
-#define DISABLE_SUB_DECODE(x) GT_WRITE(x##_LO_DEC_ADR,0xff);\
-                              GT_WRITE(x##_HI_DEC_ADR,0x00)
-
-static void __init reset_pci(void)
-{
-        /* Set RESET_PCI bit high */
-        writeb(readb(OVERDRIVE_CTRL) | ENABLE_PCI_BIT, OVERDRIVE_CTRL);
-        udelay(250);
-
-        /* Set RESET_PCI bit low */
-        writeb(readb(OVERDRIVE_CTRL) & RESET_PCI_MASK, OVERDRIVE_CTRL);
-        udelay(250);
-
-        writeb(readb(OVERDRIVE_CTRL) | ENABLE_PCI_BIT, OVERDRIVE_CTRL);
-        udelay(250);
-}
-
-static int write_config_to_galileo(int where, u32 val);
-#define GT_CONFIG_WRITE(where,val) write_config_to_galileo(where,val)
-
-#define ENABLE_PCI_DRAM
-
-
-#ifdef TEST_DRAM
-/* Test function to check out if the PCI DRAM is working OK */
-static int  /* __init */ test_dram(unsigned *base, unsigned size)
-{
-        unsigned *p = base;
-        unsigned *end = (unsigned *) (((unsigned) base) + size);
-        unsigned w;
-
-        for (p = base; p < end; p++) {
-                *p = 0xffffffff;
-                if (*p != 0xffffffff) {
-                        printk("AAARGH -write failed!!! at %p is %x\n", p,
-                               *p);
-                        return 0;
-                }
-                *p = 0x0;
-                if (*p != 0x0) {
-                        printk("AAARGH -write failed!!!\n");
-                        return 0;
-                }
-        }
-
-        for (p = base; p < end; p++) {
-                *p = (unsigned) p;
-                if (*p != (unsigned) p) {
-                        printk("Failed at 0x%p, actually is 0x%x\n", p,
-                               *p);
-                        return 0;
-                }
-        }
-
-        for (p = base; p < end; p++) {
-                w = ((unsigned) p & 0xffff0000);
-                *p = w | (w >> 16);
-        }
-
-        for (p = base; p < end; p++) {
-                w = ((unsigned) p & 0xffff0000);
-                w |= (w >> 16);
-                if (*p != w) {
-                        printk
-                            ("Failed at 0x%p, should be 0x%x actually is 0x%x\n",
-                             p, w, *p);
-                        return 0;
-                }
-        }
-
-        return 1;
-}
-#endif
-
-
-/* Function to set up and initialise the galileo. This sets up the BARS,
- * maps the DRAM into the address space etc,etc
- */
-int __init galileo_init(void)
-{
-        reset_pci();
-
-        /* Now shift the galileo regs into this block */
-        RESET_GT_WRITE(INTERNAL_SPACE_DEC,
-                       GT_MEM_LO_ADR(GT64111_BASE_ADDRESS));
-
-        /* Should have a sanity check here, that you can read back  at the new
-         * address what you just wrote 
-         */
-
-        /* Disable decode for all regions */
-        DISABLE_DECODE(RAS10);
-        DISABLE_DECODE(RAS32);
-        DISABLE_DECODE(CS20);
-        DISABLE_DECODE(CS3);
-        DISABLE_DECODE(PCI_IO);
-        DISABLE_DECODE(PCI_MEM0);
-        DISABLE_DECODE(PCI_MEM1);
-
-        /* Disable all BARS */
-        GT_WRITE(BAR_ENABLE_ADR, 0x1ff);
-        DISABLE_GT_BAR(RAS10);
-        DISABLE_GT_BAR(RAS32);
-        DISABLE_GT_BAR(CS20);
-        DISABLE_GT_BAR(CS3);
-
-        /* Tell the BAR where the IO registers now are */
-        GT_CONFIG_WRITE(PCI_CONFIG_INT_REG_IO_ADR,GT_BAR_MASK(
-                                            (GT64111_IO_BASE_ADDRESS &
-                                             IO_BANK_MASK)));
-        /* set up a 112 Mb decode */
-        PROGRAM_HI_LO(PCI_MEM0, SH_BANK4_ADR, 112 * 1024 * 1024);
-
-        /* Set up a 32 MB io space decode */
-        PROGRAM_HI_LO(PCI_IO, IO_BANK_ADR, 32 * 1024 * 1024);
-
-#ifdef ENABLE_PCI_DRAM
-        /* Program up the DRAM configuration - there is DRAM only in bank 0 */
-        /* Now set up the DRAM decode */
-        PROGRAM_HI_LO(RAS10, PCI_DRAM_BASE, PCI_DRAM_SIZE);
-        /* And the sub decode */
-        PROGRAM_SUB_HI_LO(RAS0, PCI_DRAM_BASE, PCI_DRAM_SIZE);
-
-        DISABLE_SUB_DECODE(RAS1);
-
-        /* Set refresh rate */
-        GT_WRITE(DRAM_BANK0_PARMS, 0x3f);
-        GT_WRITE(DRAM_CFG, 0x100);
-
-        /* we have to lob off the top bits rememeber!! */
-        PROGRAM_GT_BAR(RAS10, SH4_TO_PCI(PCI_DRAM_BASE), PCI_DRAM_SIZE);
-
-#endif
-
-        /* We are only interested in decoding RAS10 and the Galileo's internal 
-         * registers (as IO) on the PCI bus
-         */
-#ifdef ENABLE_PCI_DRAM
-        GT_WRITE(BAR_ENABLE_ADR, (~((1 << 8) | (1 << 3))) & 0x1ff);
-#else
-        GT_WRITE(BAR_ENABLE_ADR, (~(1 << 3)) & 0x1ff);
-#endif
-
-        /* Change the class code to host bridge, it actually powers up 
-         * as a memory controller
-         */
-        GT_CONFIG_WRITE(8, 0x06000011);
-
-        /* Allow the galileo to master the PCI bus */
-        GT_CONFIG_WRITE(PCI_COMMAND,
-                        PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
-                        PCI_COMMAND_IO);
-
-
-#if 0
-        printk("Testing PCI DRAM - ");
-        if(test_dram(PCI_DRAM_BASE,PCI_DRAM_SIZE)) {
-                printk("Passed\n");
-        }else {
-                printk("FAILED\n");
-        }
-#endif
-        return 0;
-
-}
-
-
-#define SET_CONFIG_BITS(bus,devfn,where)\
-  ((1<<31) | ((bus) << 16) | ((devfn) << 8) | ((where) & ~3))
-
-#define CONFIG_CMD(dev, where) SET_CONFIG_BITS((dev)->bus->number,(dev)->devfn,where)
-
-/* This write to the galileo config registers, unlike the functions below, can
- * be used before the PCI subsystem has started up
- */
-static int __init write_config_to_galileo(int where, u32 val)
-{
-        GT_WRITE(PCI_CFG_ADR, SET_CONFIG_BITS(0, 0, where));
-
-        GT_WRITE(PCI_CFG_DATA, val);
-        return 0;
-}
-
-/* We exclude the galileo and slot 31, the galileo because I don't know how to stop
- * the setup code shagging up the setup I have done on it, and 31 because the whole
- * thing locks up if you try to access that slot (which doesn't exist of course anyway
- */
-
-#define EXCLUDED_DEV(dev) ((dev->bus->number==0) && ((PCI_SLOT(dev->devfn)==0) || (PCI_SLOT(dev->devfn) == 31)))
-
-static int galileo_read_config_byte(struct pci_dev *dev, int where,
-                                    u8 * val)
-{
-
-        
-        /* I suspect this doesn't work because this drives a special cycle ? */
-        if (EXCLUDED_DEV(dev)) {
-                *val = 0xff;
-                return PCIBIOS_SUCCESSFUL;
-        }
-        /* Start the config cycle */
-        GT_WRITE(PCI_CFG_ADR, CONFIG_CMD(dev, where));
-        /* Read back the result */
-        *val = GT_READ_BYTE(PCI_CFG_DATA + (where & 3));
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int galileo_read_config_word(struct pci_dev *dev, int where,
-                                    u16 * val)
-{
-
-        if (EXCLUDED_DEV(dev)) {
-                *val = 0xffff;
-                return PCIBIOS_SUCCESSFUL;
-        }
-
-        GT_WRITE(PCI_CFG_ADR, CONFIG_CMD(dev, where));
-        *val = GT_READ_SHORT(PCI_CFG_DATA + (where & 2));
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int galileo_read_config_dword(struct pci_dev *dev, int where,
-                                     u32 * val)
-{
-        if (EXCLUDED_DEV(dev)) {
-                *val = 0xffffffff;
-                return PCIBIOS_SUCCESSFUL;
-        }
-
-        GT_WRITE(PCI_CFG_ADR, CONFIG_CMD(dev, where));
-        *val = GT_READ(PCI_CFG_DATA);
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static int galileo_write_config_byte(struct pci_dev *dev, int where,
-                                     u8 val)
-{
-        GT_WRITE(PCI_CFG_ADR, CONFIG_CMD(dev, where));
-
-        GT_WRITE_BYTE(PCI_CFG_DATA + (where & 3), val);
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int galileo_write_config_word(struct pci_dev *dev, int where,
-                                     u16 val)
-{
-        GT_WRITE(PCI_CFG_ADR, CONFIG_CMD(dev, where));
-
-        GT_WRITE_SHORT(PCI_CFG_DATA + (where & 2), val);
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static int galileo_write_config_dword(struct pci_dev *dev, int where,
-                                      u32 val)
-{
-        GT_WRITE(PCI_CFG_ADR, CONFIG_CMD(dev, where));
-
-        GT_WRITE(PCI_CFG_DATA, val);
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops pci_config_ops = {
-        galileo_read_config_byte,
-        galileo_read_config_word,
-        galileo_read_config_dword,
-        galileo_write_config_byte,
-        galileo_write_config_word,
-        galileo_write_config_dword
-};
-
-
-/* Everything hangs off this */
-static struct pci_bus *pci_root_bus;
-
-
-static u8 __init no_swizzle(struct pci_dev *dev, u8 * pin)
-{
-        return PCI_SLOT(dev->devfn);
-}
-
-static int __init map_od_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        /* Slot 1: Galileo 
-         * Slot 2: PCI Slot 1
-         * Slot 3: PCI Slot 2
-         * Slot 4: ESS
-         */
-        switch (slot) {
-        case 2: 
-                return OVERDRIVE_PCI_IRQ1;
-        case 3:
-                /* Note this assumes you have a hacked card in slot 2 */
-                return OVERDRIVE_PCI_IRQ2;
-        case 4:
-                return OVERDRIVE_ESS_IRQ;
-        default:
-                /* printk("PCI: Unexpected IRQ mapping request for slot %d\n", slot); */
-                return -1;
-        }
-}
-
-
-
-void __init
-pcibios_fixup_pbus_ranges(struct pci_bus *bus, struct pbus_set_ranges_data *ranges)
-{
-        ranges->io_start -= bus->resource[0]->start;
-        ranges->io_end -= bus->resource[0]->start;
-        ranges->mem_start -= bus->resource[1]->start;
-        ranges->mem_end -= bus->resource[1]->start;
-}                                                                                
-
-static void __init pci_fixup_ide_bases(struct pci_dev *d)
-{
-        int i;
-
-        /*
-         * PCI IDE controllers use non-standard I/O port decoding, respect it.
-         */
-        if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
-                return;
-        printk("PCI: IDE base address fixup for %s\n", pci_name(d));
-        for(i=0; i<4; i++) {
-                struct resource *r = &d->resource[i];
-                if ((r->start & ~0x80) == 0x374) {
-                        r->start |= 2;
-                        r->end = r->start;
-                }
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
-
-void __init pcibios_init(void)
-{
-        static struct resource galio,galmem;
-
-        /* Allocate the registers used by the Galileo */
-        galio.flags = IORESOURCE_IO;
-        galio.name  = "Galileo GT64011";
-        galmem.flags = IORESOURCE_MEM|IORESOURCE_PREFETCH;
-        galmem.name  = "Galileo GT64011 DRAM";
-
-        allocate_resource(&ioport_resource, &galio, 256,
-                    GT64111_IO_BASE_ADDRESS,GT64111_IO_BASE_ADDRESS+256, 256, NULL, NULL);
-        allocate_resource(&iomem_resource, &galmem,PCI_DRAM_SIZE,
-                    PHYSADDR(PCI_DRAM_BASE), PHYSADDR(PCI_DRAM_BASE)+PCI_DRAM_SIZE, 
-                             PCI_DRAM_SIZE, NULL, NULL);
-
-        /* ok, do the scan man */
-        pci_root_bus = pci_scan_bus(0, &pci_config_ops, NULL);
-
-        pci_assign_unassigned_resources();
-        pci_fixup_irqs(no_swizzle, map_od_irq);
-
-#ifdef TEST_DRAM
-        printk("Testing PCI DRAM - ");
-        if(test_dram(PCI_DRAM_BASE,PCI_DRAM_SIZE)) {
-                printk("Passed\n");
-        }else {
-                printk("FAILED\n");
-        }
-#endif
-
-}
-
-char * __init pcibios_setup(char *str)
-{
-        return str;
-}
-
-
-
-int pcibios_enable_device(struct pci_dev *dev)
-{
-
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx = 0; idx < 6; idx++) {
-                r = dev->resource + idx;
-                if (!r->start && r->end) {
-                        printk(KERN_ERR
-                               "PCI: Device %s not available because"
-                               " of resource collisions\n",
-                               pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (cmd != old_cmd) {
-                printk("PCI: enabling device %s (%04x -> %04x)\n",
-                       pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-
-}
-
-/* We should do some optimisation work here I think. Ok for now though */
-void __init pcibios_fixup_bus(struct pci_bus *bus)
-{
-
-}
-
-void pcibios_align_resource(void *data, struct resource *res,
-                            resource_size_t size)
-{
-}
-
-void __init pcibios_update_resource(struct pci_dev *dev, struct resource *root,
-                             struct resource *res, int resource)
-{
-
-        unsigned long where, size;
-        u32 reg;
-        
-
-        printk("PCI: Assigning %3s %08lx to %s\n",
-               res->flags & IORESOURCE_IO ? "IO" : "MEM",
-               res->start, dev->name);
-
-        where = PCI_BASE_ADDRESS_0 + resource * 4;
-        size = res->end - res->start;
-
-        pci_read_config_dword(dev, where, &reg);
-        reg = (reg & size) | (((u32) (res->start - root->start)) & ~size);
-        pci_write_config_dword(dev, where, reg);
-}
-
-
-void __init pcibios_update_irq(struct pci_dev *dev, int irq)
-{
-        printk("PCI: Assigning IRQ %02d to %s\n", irq, dev->name);
-        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-}
-
-/*
- *  If we set up a device for bus mastering, we need to check the latency
- *  timer as certain crappy BIOSes forget to set it properly.
- */
-unsigned int pcibios_max_latency = 255;
-
-void pcibios_set_master(struct pci_dev *dev)
-{
-        u8 lat;
-        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
-        if (lat < 16)
-                lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency;
-        else if (lat > pcibios_max_latency)
-                lat = pcibios_max_latency;
-        else
-                return;
-        printk("PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);
-        pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
-}
diff --git a/arch/sh/boards/overdrive/io.c b/arch/sh/boards/overdrive/io.c
deleted file mode 100644
index 4671b6b047bb..000000000000
--- a/arch/sh/boards/overdrive/io.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * This file contains the I/O routines for use on the overdrive board
- *
- */
-
-#include <linux/types.h>
-#include <linux/delay.h>
-#include <asm/processor.h>
-#include <asm/io.h>
-#include <asm/addrspace.h>
-
-#include <asm/overdrive/overdrive.h>
-
-/*
- * readX/writeX() are used to access memory mapped devices. On some
- * architectures the memory mapped IO stuff needs to be accessed
- * differently. On the SuperH architecture, we just read/write the
- * memory location directly.
- */
-
-#define dprintk(x...)
-
-/* Translates an IO address to where it is mapped in memory */
-
-#define io_addr(x) (((unsigned)(x))|PCI_GTIO_BASE)
-
-unsigned char od_inb(unsigned long port)
-{
-dprintk("od_inb(%x)\n", port);
-        return readb(io_addr(port)) & 0xff;
-}
-
-
-unsigned short od_inw(unsigned long port)
-{
-dprintk("od_inw(%x)\n", port);
-        return readw(io_addr(port)) & 0xffff;
-}
-
-unsigned int od_inl(unsigned long port)
-{
-dprintk("od_inl(%x)\n", port);
-        return readl(io_addr(port));
-}
-
-void od_outb(unsigned char value, unsigned long port)
-{
-dprintk("od_outb(%x, %x)\n", value, port);
-        writeb(value, io_addr(port));
-}
-
-void od_outw(unsigned short value, unsigned long port)
-{
-dprintk("od_outw(%x, %x)\n", value, port);
-        writew(value, io_addr(port));
-}
-
-void od_outl(unsigned int value, unsigned long port)
-{
-dprintk("od_outl(%x, %x)\n", value, port);
-        writel(value, io_addr(port));
-}
-
-/* This is horrible at the moment - needs more work to do something sensible */
-#define IO_DELAY() udelay(10)
-
-#define OUT_DELAY(x,type) \
-void od_out##x##_p(unsigned type value,unsigned long port){out##x(value,port);IO_DELAY();}
-
-#define IN_DELAY(x,type) \
-unsigned type od_in##x##_p(unsigned long port) {unsigned type tmp=in##x(port);IO_DELAY();return tmp;}
-
-
-OUT_DELAY(b,char)
-OUT_DELAY(w,short)
-OUT_DELAY(l,int)
-
-IN_DELAY(b,char)
-IN_DELAY(w,short)
-IN_DELAY(l,int)
-
-
-/*  Now for the string version of these functions */
-void od_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        int i;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p++) {
-                outb(*p, port);
-        }
-}
-
-
-void od_insb(unsigned long port, void *addr, unsigned long count)
-{
-        int i;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p++) {
-                *p = inb(port);
-        }
-}
-
-/* For the 16 and 32 bit string functions, we have to worry about alignment.
- * The SH does not do unaligned accesses, so we have to read as bytes and
- * then write as a word or dword. 
- * This can be optimised a lot more, especially in the case where the data
- * is aligned
- */
-
-void od_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        int i;
-        unsigned short tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 2) {
-                tmp = (*p) | ((*(p + 1)) << 8);
-                outw(tmp, port);
-        }
-}
-
-
-void od_insw(unsigned long port, void *addr, unsigned long count)
-{
-        int i;
-        unsigned short tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 2) {
-                tmp = inw(port);
-                p[0] = tmp & 0xff;
-                p[1] = (tmp >> 8) & 0xff;
-        }
-}
-
-
-void od_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        int i;
-        unsigned tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 4) {
-                tmp = (*p) | ((*(p + 1)) << 8) | ((*(p + 2)) << 16) |
-                      ((*(p + 3)) << 24);
-                outl(tmp, port);
-        }
-}
-
-
-void od_insl(unsigned long port, void *addr, unsigned long count)
-{
-        int i;
-        unsigned tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 4) {
-                tmp = inl(port);
-                p[0] = tmp & 0xff;
-                p[1] = (tmp >> 8) & 0xff;
-                p[2] = (tmp >> 16) & 0xff;
-                p[3] = (tmp >> 24) & 0xff;
-
-        }
-}
diff --git a/arch/sh/boards/overdrive/irq.c b/arch/sh/boards/overdrive/irq.c
deleted file mode 100644
index 5d730c70389e..000000000000
--- a/arch/sh/boards/overdrive/irq.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * Looks after interrupts on the overdrive board.
- *
- * Bases on the IPR irq system
- */
-
-#include <linux/init.h>
-#include <linux/irq.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-
-#include <asm/overdrive/overdrive.h>
-
-struct od_data {
-        int overdrive_irq;
-        int irq_mask;
-};
-
-#define NUM_EXTERNAL_IRQS 16
-#define EXTERNAL_IRQ_NOT_IN_USE (-1)
-#define EXTERNAL_IRQ_NOT_ASSIGNED (-1)
-
-/*
- * This table is used to determine what to program into the FPGA's CT register
- * for the specified Linux IRQ.
- *
- * The irq_mask gives the interrupt number from the PCI board (PCI_Int(6:0))
- * but is one greater than that because the because the FPGA treats 0
- * as disabled, a value of 1 asserts PCI_Int0, and so on.
- *
- * The overdrive_irq specifies which of the eight interrupt sources generates
- * that interrupt, and but is multiplied by four to give the bit offset into
- * the CT register.
- *
- * The seven interrupts levels (SH4 IRL's) we have available here is hardwired
- * by the EPLD. The assignments here of which PCI interrupt generates each
- * level is arbitary.
- */
-static struct od_data od_data_table[NUM_EXTERNAL_IRQS] = {
-        /*    overdrive_irq       , irq_mask */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 0 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, 7}, /* 1 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, 6}, /* 2 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 3 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, 5}, /* 4 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 5 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 6 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, 4}, /* 7 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 8 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 9 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, 3}, /* 10 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, 2}, /* 11 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 12 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, 1}, /* 13 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE},   /* 14 */
-        {EXTERNAL_IRQ_NOT_ASSIGNED, EXTERNAL_IRQ_NOT_IN_USE}    /* 15 */
-};
-
-static void set_od_data(int overdrive_irq, int irq)
-{
-        if (irq >= NUM_EXTERNAL_IRQS || irq < 0)
-                return;
-        od_data_table[irq].overdrive_irq = overdrive_irq << 2;
-}
-
-static void enable_od_irq(unsigned int irq);
-void disable_od_irq(unsigned int irq);
-
-/* shutdown is same as "disable" */
-#define shutdown_od_irq disable_od_irq
-
-static void mask_and_ack_od(unsigned int);
-static void end_od_irq(unsigned int irq);
-
-static unsigned int startup_od_irq(unsigned int irq)
-{
-        enable_od_irq(irq);
-        return 0;               /* never anything pending */
-}
-
-static struct hw_interrupt_type od_irq_type = {
-        .typename = "Overdrive-IRQ",
-        .startup = startup_od_irq,
-        .shutdown = shutdown_od_irq,
-        .enable = enable_od_irq,
-        .disable = disable_od_irq,
-        .ack = mask_and_ack_od,
-        .end = end_od_irq
-};
-
-static void disable_od_irq(unsigned int irq)
-{
-        unsigned val, flags;
-        int overdrive_irq;
-        unsigned mask;
-
-        /* Not a valid interrupt */
-        if (irq < 0 || irq >= NUM_EXTERNAL_IRQS)
-                return;
-
-        /* Is is necessary to use a cli here? Would a spinlock not be 
-         * mroe efficient?
-         */
-        local_irq_save(flags);
-        overdrive_irq = od_data_table[irq].overdrive_irq;
-        if (overdrive_irq != EXTERNAL_IRQ_NOT_ASSIGNED) {
-                mask = ~(0x7 << overdrive_irq);
-                val = ctrl_inl(OVERDRIVE_INT_CT);
-                val &= mask;
-                ctrl_outl(val, OVERDRIVE_INT_CT);
-        }
-        local_irq_restore(flags);
-}
-
-static void enable_od_irq(unsigned int irq)
-{
-        unsigned val, flags;
-        int overdrive_irq;
-        unsigned mask;
-
-        /* Not a valid interrupt */
-        if (irq < 0 || irq >= NUM_EXTERNAL_IRQS)
-                return;
-
-        /* Set priority in OD back to original value */
-        local_irq_save(flags);
-        /* This one is not in use currently */
-        overdrive_irq = od_data_table[irq].overdrive_irq;
-        if (overdrive_irq != EXTERNAL_IRQ_NOT_ASSIGNED) {
-                val = ctrl_inl(OVERDRIVE_INT_CT);
-                mask = ~(0x7 << overdrive_irq);
-                val &= mask;
-                mask = od_data_table[irq].irq_mask << overdrive_irq;
-                val |= mask;
-                ctrl_outl(val, OVERDRIVE_INT_CT);
-        }
-        local_irq_restore(flags);
-}
-
-
-
-/* this functions sets the desired irq handler to be an overdrive type */
-static void __init make_od_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        irq_desc[irq].chip = &od_irq_type;
-        disable_od_irq(irq);
-}
-
-
-static void mask_and_ack_od(unsigned int irq)
-{
-        disable_od_irq(irq);
-}
-
-static void end_od_irq(unsigned int irq)
-{
-        enable_od_irq(irq);
-}
-
-void __init init_overdrive_irq(void)
-{
-        int i;
-
-        /* Disable all interrupts */
-        ctrl_outl(0, OVERDRIVE_INT_CT);
-
-        /* Update interrupt pin mode to use encoded interrupts */
-        i = ctrl_inw(INTC_ICR);
-        i &= ~INTC_ICR_IRLM;
-        ctrl_outw(i, INTC_ICR);
-
-        for (i = 0; i < NUM_EXTERNAL_IRQS; i++) {
-                if (od_data_table[i].irq_mask != EXTERNAL_IRQ_NOT_IN_USE) {
-                        make_od_irq(i);
-                } else if (i != 15) {   // Cannot use imask on level 15
-                        make_imask_irq(i);
-                }
-        }
-
-        /* Set up the interrupts */
-        set_od_data(OVERDRIVE_PCI_INTA, OVERDRIVE_PCI_IRQ1);
-        set_od_data(OVERDRIVE_PCI_INTB, OVERDRIVE_PCI_IRQ2);
-        set_od_data(OVERDRIVE_AUDIO_INT, OVERDRIVE_ESS_IRQ);
-}
diff --git a/arch/sh/boards/overdrive/led.c b/arch/sh/boards/overdrive/led.c
deleted file mode 100644
index 860d7f204a4e..000000000000
--- a/arch/sh/boards/overdrive/led.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * linux/arch/sh/overdrive/led.c
- *
- * Copyright (C) 1999 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains an Overdrive specific LED feature.
- */
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/overdrive/overdrive.h>
-
-static void mach_led(int position, int value)
-{
-        unsigned long flags;
-        unsigned long reg;
-
-        local_irq_save(flags);
-        
-        reg = readl(OVERDRIVE_CTRL);
-        if (value) {
-                reg |= (1<<3);
-        } else {
-                reg &= ~(1<<3);
-        }
-        writel(reg, OVERDRIVE_CTRL);
-
-        local_irq_restore(flags);
-}
-
-#ifdef CONFIG_HEARTBEAT
-
-#include <linux/sched.h>
-
-/* acts like an actual heart beat -- ie thump-thump-pause... */
-void heartbeat_od(void)
-{
-        static unsigned cnt = 0, period = 0, dist = 0;
-
-        if (cnt == 0 || cnt == dist)
-                mach_led( -1, 1);
-        else if (cnt == 7 || cnt == dist+7)
-                mach_led( -1, 0);
-
-        if (++cnt > period) {
-                cnt = 0;
-                /* The hyperbolic function below modifies the heartbeat period
-                 * length in dependency of the current (5min) load. It goes
-                 * through the points f(0)=126, f(1)=86, f(5)=51,
-                 * f(inf)->30. */
-                period = ((672<<FSHIFT)/(5*avenrun[0]+(7<<FSHIFT))) + 30;
-                dist = period / 4;
-        }
-}
-#endif /* CONFIG_HEARTBEAT */
diff --git a/arch/sh/boards/overdrive/mach.c b/arch/sh/boards/overdrive/mach.c
deleted file mode 100644
index 2834a03ae477..000000000000
--- a/arch/sh/boards/overdrive/mach.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * linux/arch/sh/overdrive/mach.c
- *
- * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the STMicroelectronics Overdrive
- */
-
-#include <linux/init.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/machvec_init.h>
-
-#include <asm/io_unknown.h>
-#include <asm/io_generic.h>
-#include <asm/overdrive/io.h>
-
-void heartbeat_od(void);
-void init_overdrive_irq(void);
-void galileo_pcibios_init(void);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_od __initmv = {
-        .mv_nr_irqs             = 48,
-
-        .mv_inb                 = od_inb,
-        .mv_inw                 = od_inw,
-        .mv_inl                 = od_inl,
-        .mv_outb                = od_outb,
-        .mv_outw                = od_outw,
-        .mv_outl                = od_outl,
-
-        .mv_inb_p               = od_inb_p,
-        .mv_inw_p               = od_inw_p,
-        .mv_inl_p               = od_inl_p,
-        .mv_outb_p              = od_outb_p,
-        .mv_outw_p              = od_outw_p,
-        .mv_outl_p              = od_outl_p,
-
-        .mv_insb                = od_insb,
-        .mv_insw                = od_insw,
-        .mv_insl                = od_insl,
-        .mv_outsb               = od_outsb,
-        .mv_outsw               = od_outsw,
-        .mv_outsl               = od_outsl,
-
-#ifdef CONFIG_PCI
-        .mv_init_irq            = init_overdrive_irq,
-#endif
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_od,
-#endif
-};
-
-ALIAS_MV(od)
diff --git a/arch/sh/boards/overdrive/pcidma.c b/arch/sh/boards/overdrive/pcidma.c
deleted file mode 100644
index 1c9bfeda00b7..000000000000
--- a/arch/sh/boards/overdrive/pcidma.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * Dynamic DMA mapping support.
- *
- * On the overdrive, we can only DMA from memory behind the PCI bus!
- * this means that all DMA'able memory must come from there. 
- * this restriction will not apply to later boards.
- */
-
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-
-void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                           dma_addr_t * dma_handle)
-{
-        void *ret;
-        int gfp = GFP_ATOMIC;
-
-        printk("BUG: pci_alloc_consistent() called - not yet supported\n");
-        /* We ALWAYS need DMA memory on the overdrive hardware,
-         * due to it's extreme weirdness
-         * Need to flush the cache here as well, since the memory
-         * can still be seen through the cache!
-         */
-        gfp |= GFP_DMA;
-        ret = (void *) __get_free_pages(gfp, get_order(size));
-
-        if (ret != NULL) {
-                memset(ret, 0, size);
-                *dma_handle = virt_to_bus(ret);
-        }
-        return ret;
-}
-
-void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-                         void *vaddr, dma_addr_t dma_handle)
-{
-        free_pages((unsigned long) vaddr, get_order(size));
-}
diff --git a/arch/sh/boards/overdrive/setup.c b/arch/sh/boards/overdrive/setup.c
deleted file mode 100644
index a3a7744c2047..000000000000
--- a/arch/sh/boards/overdrive/setup.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/sh/overdrive/setup.c
- *
- * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * STMicroelectronics Overdrive Support.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/io.h>
-
-#include <asm/overdrive/overdrive.h>
-#include <asm/overdrive/fpga.h>
-
-const char *get_system_type(void)
-{
-        return "SH7750 Overdrive";
-}
-
-/*
- * Initialize the board
- */
-int __init platform_setup(void)
-{
-#ifdef CONFIG_PCI
-        init_overdrive_fpga();
-        galileo_init();
-#endif
-
-        /* Enable RS232 receive buffers */
-        writel(0x1e, OVERDRIVE_CTRL);
-}
diff --git a/arch/sh/boards/renesas/edosk7705/Makefile b/arch/sh/boards/renesas/edosk7705/Makefile
index 7fccbf2e4a1d..14bdd531f116 100644
--- a/arch/sh/boards/renesas/edosk7705/Makefile
+++ b/arch/sh/boards/renesas/edosk7705/Makefile
@@ -1,10 +1,6 @@
 #
 # Makefile for the EDOSK7705 specific parts of the kernel
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
 
 obj-y    := setup.o io.o
 
diff --git a/arch/sh/boards/renesas/edosk7705/setup.c b/arch/sh/boards/renesas/edosk7705/setup.c
index ba143fa4afaa..ec5be0107719 100644
--- a/arch/sh/boards/renesas/edosk7705/setup.c
+++ b/arch/sh/boards/renesas/edosk7705/setup.c
@@ -8,19 +8,21 @@
  * Modified for edosk7705 development
  * board by S. Dunn, 2003.
  */
-
 #include <linux/init.h>
 #include <asm/machvec.h>
-#include <asm/machvec_init.h>
 #include <asm/edosk7705/io.h>
 
-static void init_edosk7705(void);
+static void __init sh_edosk7705_init_irq(void)
+{
+        /* This is the Ethernet interrupt */
+        make_imask_irq(0x09);
+}
 
 /*
  * The Machine Vector
  */
-
 struct sh_machine_vector mv_edosk7705 __initmv = {
+        .mv_name                = "EDOSK7705",
         .mv_nr_irqs             = 80,
 
         .mv_inb                 = sh_edosk7705_inb,
@@ -37,23 +39,6 @@ struct sh_machine_vector mv_edosk7705 __initmv = {
         .mv_outsl               = sh_edosk7705_outsl,
 
         .mv_isa_port2addr       = sh_edosk7705_isa_port2addr,
-        .mv_init_irq            = init_edosk7705,
+        .mv_init_irq            = sh_edosk7705_init_irq,
 };
 ALIAS_MV(edosk7705)
-
-static void __init init_edosk7705(void)
-{
-        /* This is the Ethernet interrupt */
-        make_imask_irq(0x09);
-}
-
-const char *get_system_type(void)
-{
-        return "EDOSK7705";
-}
-
-void __init platform_setup(void)
-{
-        /* Nothing .. */
-}
-
diff --git a/arch/sh/boards/renesas/hs7751rvoip/Kconfig b/arch/sh/boards/renesas/hs7751rvoip/Kconfig
new file mode 100644
index 000000000000..1743be477be5
--- /dev/null
+++ b/arch/sh/boards/renesas/hs7751rvoip/Kconfig
@@ -0,0 +1,12 @@
+if SH_HS7751RVOIP
+
+menu "HS7751RVoIP options"
+
+config HS7751RVOIP_CODEC
+        bool "Support VoIP Codec section"
+        help
+          Selecting this option will support CODEC section.
+
+endmenu
+
+endif
diff --git a/arch/sh/boards/renesas/hs7751rvoip/Makefile b/arch/sh/boards/renesas/hs7751rvoip/Makefile
index e8b4109ace11..e626377c55ee 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/Makefile
+++ b/arch/sh/boards/renesas/hs7751rvoip/Makefile
@@ -1,12 +1,8 @@
 #
 # Makefile for the HS7751RVoIP specific parts of the kernel
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
 
-obj-y    := mach.o setup.o io.o irq.o led.o
+obj-y    := setup.o io.o irq.o
 
 obj-$(CONFIG_PCI) += pci.o
 
diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c
index 3a1abfa2fefb..9ea1136b219b 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/io.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/io.c
@@ -10,21 +10,16 @@
  * placeholder code from io_hs7751rvoip.c left in with the
  * expectation of later SuperIO and PCMCIA access.
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/hs7751rvoip/hs7751rvoip.h>
 #include <asm/addrspace.h>
 
-#include <linux/module.h>
-#include <linux/pci.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-
-extern void *area5_io8_base;    /* Area 5 8bit I/O Base address */
 extern void *area6_io8_base;    /* Area 6 8bit I/O Base address */
 extern void *area5_io16_base;   /* Area 5 16bit I/O Base address */
-extern void *area6_io16_base;   /* Area 6 16bit I/O Base address */
 
 /*
  * The 7751R HS7751RVoIP uses the built-in PCI controller (PCIC)
@@ -33,25 +28,8 @@ extern void *area6_io16_base;	/* Area 6 16bit I/O Base address */
  * like the other Solution Engine boards.
  */
 
-#define PCIIOBR         (volatile long *)PCI_REG(SH7751_PCIIOBR)
-#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
-#define PCI_IO_AREA     SH7751_PCI_IO_BASE
-#define PCI_MEM_AREA    SH7751_PCI_CONFIG_BASE
-
-#define PCI_IOMAP(adr)  (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
-
-#if defined(CONFIG_HS7751RVOIP_CODEC)
 #define CODEC_IO_BASE   0x1000
-#endif
-
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
+#define CODEC_IOMAP(a)  ((unsigned long)area6_io8_base + ((a) - CODEC_IO_BASE))
 
 static inline unsigned long port2adr(unsigned int port)
 {
@@ -59,9 +37,10 @@ static inline unsigned long port2adr(unsigned int port)
                 if (port == 0x3f6)
                         return ((unsigned long)area5_io16_base + 0x0c);
                 else
-                        return ((unsigned long)area5_io16_base + 0x800 + ((port-0x1f0) << 1));
+                        return ((unsigned long)area5_io16_base + 0x800 +
+                                ((port-0x1f0) << 1));
         else
-                maybebadio(port2adr, (unsigned long)port);
+                maybebadio((unsigned long)port);
         return port;
 }
 
@@ -78,25 +57,10 @@ static inline int shifted_port(unsigned long port)
 }
 
 #if defined(CONFIG_HS7751RVOIP_CODEC)
-static inline int
-codec_port(unsigned long port)
-{
-        if (CODEC_IO_BASE <= port && port < (CODEC_IO_BASE+0x20))
-                return 1;
-        else
-                return 0;
-}
-#endif
-
-/* In case someone configures the kernel w/o PCI support: in that */
-/* scenario, don't ever bother to check for PCI-window addresses */
-
-/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
-#if defined(CONFIG_PCI)
-#define CHECK_SH7751_PCIIO(port) \
-  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
+#define codec_port(port)        \
+        ((CODEC_IO_BASE <= (port)) && ((port) < (CODEC_IO_BASE + 0x20)))
 #else
-#define CHECK_SH7751_PCIIO(port) (0)
+#define codec_port(port)        (0)
 #endif
 
 /*
@@ -109,15 +73,13 @@ codec_port(unsigned long port)
 unsigned char hs7751rvoip_inb(unsigned long port)
 {
         if (PXSEG(port))
-                return *(volatile unsigned char *)port;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
+                return ctrl_inb(port);
         else if (codec_port(port))
-                return *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE));
-#endif
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned char *)PCI_IOMAP(port);
+                return ctrl_inb(CODEC_IOMAP(port));
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return ctrl_inb(pci_ioaddr(port));
         else
-                return (*(volatile unsigned short *)port2adr(port) & 0xff);
+                return ctrl_inw(port2adr(port)) & 0xff;
 }
 
 unsigned char hs7751rvoip_inb_p(unsigned long port)
@@ -125,38 +87,36 @@ unsigned char hs7751rvoip_inb_p(unsigned long port)
         unsigned char v;
 
         if (PXSEG(port))
-                v = *(volatile unsigned char *)port;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
+                v = ctrl_inb(port);
         else if (codec_port(port))
-                v = *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE));
-#endif
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(port);
+                v = ctrl_inb(CODEC_IOMAP(port));
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                v = ctrl_inb(pci_ioaddr(port));
         else
-                v = (*(volatile unsigned short *)port2adr(port) & 0xff);
-        delay();
+                v = ctrl_inw(port2adr(port)) & 0xff;
+        ctrl_delay();
         return v;
 }
 
 unsigned short hs7751rvoip_inw(unsigned long port)
 {
         if (PXSEG(port))
-                return *(volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned short *)PCI_IOMAP(port);
+                return ctrl_inw(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return ctrl_inw(pci_ioaddr(port));
         else
-                maybebadio(inw, port);
+                maybebadio(port);
         return 0;
 }
 
 unsigned int hs7751rvoip_inl(unsigned long port)
 {
         if (PXSEG(port))
-                return *(volatile unsigned long *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned long *)PCI_IOMAP(port);
+                return ctrl_inl(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return ctrl_inl(pci_ioaddr(port));
         else
-                maybebadio(inl, port);
+                maybebadio(port);
         return 0;
 }
 
@@ -164,146 +124,160 @@ void hs7751rvoip_outb(unsigned char value, unsigned long port)
 {
 
         if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
+                ctrl_outb(value, port);
         else if (codec_port(port))
-                *(volatile unsigned cjar *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE)) = value;
-#endif
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *(unsigned char *)PCI_IOMAP(port) = value;
+                ctrl_outb(value, CODEC_IOMAP(port));
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outb(value, pci_ioaddr(port));
         else
-                *(volatile unsigned short *)port2adr(port) = value;
+                ctrl_outb(value, port2adr(port));
 }
 
 void hs7751rvoip_outb_p(unsigned char value, unsigned long port)
 {
         if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
+                ctrl_outb(value, port);
         else if (codec_port(port))
-                *(volatile unsigned cjar *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE)) = value;
-#endif
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *(unsigned char *)PCI_IOMAP(port) = value;
+                ctrl_outb(value, CODEC_IOMAP(port));
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outb(value, pci_ioaddr(port));
         else
-                *(volatile unsigned short *)port2adr(port) = value;
-        delay();
+                ctrl_outw(value, port2adr(port));
+
+        ctrl_delay();
 }
 
 void hs7751rvoip_outw(unsigned short value, unsigned long port)
 {
         if (PXSEG(port))
-                *(volatile unsigned short *)port = value;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *(unsigned short *)PCI_IOMAP(port) = value;
+                ctrl_outw(value, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outw(value, pci_ioaddr(port));
         else
-                maybebadio(outw, port);
+                maybebadio(port);
 }
 
 void hs7751rvoip_outl(unsigned int value, unsigned long port)
 {
         if (PXSEG(port))
-                *(volatile unsigned long *)port = value;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *((unsigned long *)PCI_IOMAP(port)) = value;
+                ctrl_outl(value, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outl(value, pci_ioaddr(port));
         else
-                maybebadio(outl, port);
+                maybebadio(port);
 }
 
 void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count)
 {
+        u8 *buf = addr;
+
         if (PXSEG(port))
-                while (count--) *((unsigned char *) addr)++ = *(volatile unsigned char *)port;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
+                while (count--)
+                        *buf++ = ctrl_inb(port);
         else if (codec_port(port))
-                while (count--) *((unsigned char *) addr)++ = *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE));
-#endif
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                volatile __u8 *bp = (__u8 *)PCI_IOMAP(port);
+                while (count--)
+                        *buf++ = ctrl_inb(CODEC_IOMAP(port));
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
 
-                while (count--) *((volatile unsigned char *) addr)++ = *bp;
+                while (count--)
+                        *buf++ = *bp;
         } else {
-                volatile __u16 *p = (volatile unsigned short *)port2adr(port);
+                volatile u16 *p = (volatile u16 *)port2adr(port);
 
-                while (count--) *((unsigned char *) addr)++ = *p & 0xff;
+                while (count--)
+                        *buf++ = *p & 0xff;
         }
 }
 
 void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count)
 {
-        volatile __u16 *p;
+        volatile u16 *p;
+        u16 *buf = addr;
 
         if (PXSEG(port))
-                p = (volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                p = (volatile unsigned short *)PCI_IOMAP(port);
+                p = (volatile u16 *)port;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                p = (volatile u16 *)pci_ioaddr(port);
         else
-                p = (volatile unsigned short *)port2adr(port);
-        while (count--) *((__u16 *) addr)++ = *p;
+                p = (volatile u16 *)port2adr(port);
+        while (count--)
+                *buf++ = *p;
 }
 
 void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count)
 {
-        if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
 
-                while (count--) *((__u32 *) addr)++ = *p;
+        if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+                u32 *buf = addr;
+
+                while (count--)
+                        *buf++ = *p;
         } else
-                maybebadio(insl, port);
+                maybebadio(port);
 }
 
 void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count)
 {
+        const u8 *buf = addr;
+
         if (PXSEG(port))
-                while (count--) *(volatile unsigned char *)port = *((unsigned char *) addr)++;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
+                while (count--)
+                        ctrl_outb(*buf++, port);
         else if (codec_port(port))
-                while (count--) *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE)) = *((unsigned char *) addr)++;
-#endif
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                volatile __u8 *bp = (__u8 *)PCI_IOMAP(port);
+                while (count--)
+                        ctrl_outb(*buf++, CODEC_IOMAP(port));
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
 
-                while (count--) *bp = *((volatile unsigned char *) addr)++;
+                while (count--)
+                        *bp = *buf++;
         } else {
-                volatile __u16 *p = (volatile unsigned short *)port2adr(port);
+                volatile u16 *p = (volatile u16 *)port2adr(port);
 
-                while (count--) *p = *((unsigned char *) addr)++;
+                while (count--)
+                        *p = *buf++;
         }
 }
 
 void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count)
 {
-        volatile __u16 *p;
+        volatile u16 *p;
+        const u16 *buf = addr;
 
         if (PXSEG(port))
-                p = (volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                p = (volatile unsigned short *)PCI_IOMAP(port);
+                p = (volatile u16 *)port;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                p = (volatile u16 *)pci_ioaddr(port);
         else
-                p = (volatile unsigned short *)port2adr(port);
-        while (count--) *p = *((__u16 *) addr)++;
+                p = (volatile u16 *)port2adr(port);
+
+        while (count--)
+                *p = *buf++;
 }
 
 void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count)
 {
-        if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
+        const u32 *buf = addr;
 
-                while (count--) *p = *((__u32 *) addr)++;
+        if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+
+                while (count--)
+                        *p = *buf++;
         } else
-                maybebadio(outsl, port);
+                maybebadio(port);
 }
 
-void *hs7751rvoip_ioremap(unsigned long offset, unsigned long size)
+void __iomem *hs7751rvoip_ioport_map(unsigned long port, unsigned int size)
 {
-        if (offset >= 0xfd000000)
-                return (void *)offset;
-        else
-                return (void *)P2SEGADDR(offset);
-}
-EXPORT_SYMBOL(hs7751rvoip_ioremap);
+        if (PXSEG(port))
+                return (void __iomem *)port;
+        else if (unlikely(codec_port(port) && (size == 1)))
+                return (void __iomem *)CODEC_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return (void __iomem *)pci_ioaddr(port);
 
-unsigned long hs7751rvoip_isa_port2addr(unsigned long offset)
-{
-        return port2adr(offset);
+        return (void __iomem *)port2adr(port);
 }
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c
index 705b7ddcb0d2..c617b188258a 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/irq.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/irq.c
@@ -35,30 +35,24 @@ static unsigned int startup_hs7751rvoip_irq(unsigned int irq)
 
 static void disable_hs7751rvoip_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
 
         /* Set the priority in IPR to 0 */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR3);
         val &= mask;
         ctrl_outw(val, IRLCNTR3);
-        local_irq_restore(flags);
 }
 
 static void enable_hs7751rvoip_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short value = (0x0001 << mask_pos[irq]);
 
         /* Set priority in IPR back to original value */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR3);
         val |= value;
         ctrl_outw(val, IRLCNTR3);
-        local_irq_restore(flags);
 }
 
 static void ack_hs7751rvoip_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/hs7751rvoip/led.c b/arch/sh/boards/renesas/hs7751rvoip/led.c
deleted file mode 100644
index b6608fff9f38..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/led.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * linux/arch/sh/kernel/setup_hs7751rvoip.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Renesas Technology Sales HS7751RVoIP Support.
- *
- * Modified for HS7751RVoIP by
- * Atom Create Engineering Co., Ltd. 2002.
- * Lineo uSolutions, Inc. 2003.
- */
-
-#include <asm/io.h>
-#include <asm/hs7751rvoip/hs7751rvoip.h>
-
-extern unsigned int debug_counter;
-
-void debug_led_disp(void)
-{
-        unsigned short value;
-
-        value = (unsigned char)debug_counter++;
-        ctrl_outb((0xf0|value), PA_OUTPORTR);
-        if (value == 0x0f)
-                debug_counter = 0;
-}
diff --git a/arch/sh/boards/renesas/hs7751rvoip/mach.c b/arch/sh/boards/renesas/hs7751rvoip/mach.c
deleted file mode 100644
index caf967f77c61..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/mach.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * linux/arch/sh/kernel/mach_hs7751rvoip.c
- *
- * Minor tweak of mach_se.c file to reference hs7751rvoip-specific items.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the Renesas Technology sales HS7751RVoIP
- */
-
-#include <linux/init.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/irq.h>
-#include <asm/hs7751rvoip/io.h>
-
-extern void init_hs7751rvoip_IRQ(void);
-extern void *hs7751rvoip_ioremap(unsigned long, unsigned long);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_hs7751rvoip __initmv = {
-        .mv_nr_irqs             = 72,
-
-        .mv_inb                 = hs7751rvoip_inb,
-        .mv_inw                 = hs7751rvoip_inw,
-        .mv_inl                 = hs7751rvoip_inl,
-        .mv_outb                = hs7751rvoip_outb,
-        .mv_outw                = hs7751rvoip_outw,
-        .mv_outl                = hs7751rvoip_outl,
-
-        .mv_inb_p               = hs7751rvoip_inb_p,
-        .mv_inw_p               = hs7751rvoip_inw,
-        .mv_inl_p               = hs7751rvoip_inl,
-        .mv_outb_p              = hs7751rvoip_outb_p,
-        .mv_outw_p              = hs7751rvoip_outw,
-        .mv_outl_p              = hs7751rvoip_outl,
-
-        .mv_insb                = hs7751rvoip_insb,
-        .mv_insw                = hs7751rvoip_insw,
-        .mv_insl                = hs7751rvoip_insl,
-        .mv_outsb               = hs7751rvoip_outsb,
-        .mv_outsw               = hs7751rvoip_outsw,
-        .mv_outsl               = hs7751rvoip_outsl,
-
-        .mv_ioremap             = hs7751rvoip_ioremap,
-        .mv_isa_port2addr       = hs7751rvoip_isa_port2addr,
-        .mv_init_irq            = init_hs7751rvoip_IRQ,
-};
-ALIAS_MV(hs7751rvoip)
diff --git a/arch/sh/boards/renesas/hs7751rvoip/setup.c b/arch/sh/boards/renesas/hs7751rvoip/setup.c
index 29fb5ff70fb5..0414c15c3458 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/setup.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/setup.c
@@ -1,44 +1,38 @@
 /*
- * linux/arch/sh/kernel/setup_hs7751rvoip.c
+ * Renesas Technology Sales HS7751RVoIP Support.
  *
  * Copyright (C) 2000  Kazumoto Kojima
  *
- * Renesas Technology Sales HS7751RVoIP Support.
- *
  * Modified for HS7751RVoIP by
  * Atom Create Engineering Co., Ltd. 2002.
  * Lineo uSolutions, Inc. 2003.
  */
-
 #include <linux/init.h>
 #include <linux/irq.h>
-
+#include <linux/mm.h>
+#include <linux/vmalloc.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
+#include <linux/pm.h>
 #include <asm/io.h>
 #include <asm/hs7751rvoip/hs7751rvoip.h>
+#include <asm/machvec.h>
+#include <asm/rtc.h>
+#include <asm/irq.h>
 
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-
-/* defined in mm/ioremap.c */
-extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags);
-
-unsigned int debug_counter;
-
-const char *get_system_type(void)
+static void __init hs7751rvoip_init_irq(void)
 {
-        return "HS7751RVoIP";
+#if defined(CONFIG_HS7751RVOIP_CODEC)
+        make_ipr_irq(DMTE0_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
+        make_ipr_irq(DMTE1_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
+#endif
+
+        init_hs7751rvoip_IRQ();
 }
 
-/*
- * Initialize the board
- */
-void __init platform_setup(void)
+static void hs7751rvoip_power_off(void)
 {
-        printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
-        ctrl_outb(0xf0, PA_OUTPORTR);
-        debug_counter = 0;
+        ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR);
 }
 
 void *area5_io8_base;
@@ -46,16 +40,15 @@ void *area6_io8_base;
 void *area5_io16_base;
 void *area6_io16_base;
 
-int __init cf_init(void)
+static int __init hs7751rvoip_cf_init(void)
 {
         pgprot_t prot;
-        unsigned long paddrbase, psize;
+        unsigned long paddrbase;
 
         /* open I/O area window */
         paddrbase = virt_to_phys((void *)(PA_AREA5_IO+0x00000800));
-        psize = PAGE_SIZE;
         prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_COM16);
-        area5_io16_base = p3_ioremap(paddrbase, psize, prot.pgprot);
+        area5_io16_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
         if (!area5_io16_base) {
                 printk("allocate_cf_area : can't open CF I/O window!\n");
                 return -ENOMEM;
@@ -64,19 +57,18 @@ int __init cf_init(void)
         /* XXX : do we need attribute and common-memory area also? */
 
         paddrbase = virt_to_phys((void *)PA_AREA6_IO);
-        psize = PAGE_SIZE;
 #if defined(CONFIG_HS7751RVOIP_CODEC)
         prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_COM8);
 #else
         prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO8);
 #endif
-        area6_io8_base = p3_ioremap(paddrbase, psize, prot.pgprot);
+        area6_io8_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
         if (!area6_io8_base) {
                 printk("allocate_cf_area : can't open CODEC I/O 8bit window!\n");
                 return -ENOMEM;
         }
         prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO16);
-        area6_io16_base = p3_ioremap(paddrbase, psize, prot.pgprot);
+        area6_io16_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
         if (!area6_io16_base) {
                 printk("allocate_cf_area : can't open CODEC I/O 16bit window!\n");
                 return -ENOMEM;
@@ -85,4 +77,46 @@ int __init cf_init(void)
         return 0;
 }
 
-__initcall (cf_init);
+/*
+ * Initialize the board
+ */
+static void __init hs7751rvoip_setup(char **cmdline_p)
+{
+        device_initcall(hs7751rvoip_cf_init);
+
+        ctrl_outb(0xf0, PA_OUTPORTR);
+        pm_power_off = hs7751rvoip_power_off;
+
+        printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
+}
+
+struct sh_machine_vector mv_hs7751rvoip __initmv = {
+        .mv_name                = "HS7751RVoIP",
+        .mv_setup               = hs7751rvoip_setup,
+        .mv_nr_irqs             = 72,
+
+        .mv_inb                 = hs7751rvoip_inb,
+        .mv_inw                 = hs7751rvoip_inw,
+        .mv_inl                 = hs7751rvoip_inl,
+        .mv_outb                = hs7751rvoip_outb,
+        .mv_outw                = hs7751rvoip_outw,
+        .mv_outl                = hs7751rvoip_outl,
+
+        .mv_inb_p               = hs7751rvoip_inb_p,
+        .mv_inw_p               = hs7751rvoip_inw,
+        .mv_inl_p               = hs7751rvoip_inl,
+        .mv_outb_p              = hs7751rvoip_outb_p,
+        .mv_outw_p              = hs7751rvoip_outw,
+        .mv_outl_p              = hs7751rvoip_outl,
+
+        .mv_insb                = hs7751rvoip_insb,
+        .mv_insw                = hs7751rvoip_insw,
+        .mv_insl                = hs7751rvoip_insl,
+        .mv_outsb               = hs7751rvoip_outsb,
+        .mv_outsw               = hs7751rvoip_outsw,
+        .mv_outsl               = hs7751rvoip_outsl,
+
+        .mv_init_irq            = hs7751rvoip_init_irq,
+        .mv_ioport_map          = hs7751rvoip_ioport_map,
+};
+ALIAS_MV(hs7751rvoip)
diff --git a/arch/sh/boards/renesas/r7780rp/Kconfig b/arch/sh/boards/renesas/r7780rp/Kconfig
new file mode 100644
index 000000000000..c26d9813d239
--- /dev/null
+++ b/arch/sh/boards/renesas/r7780rp/Kconfig
@@ -0,0 +1,14 @@
+if SH_R7780RP
+
+menu "R7780RP options"
+
+config SH_R7780MP
+        bool "R7780MP board support"
+        default y
+        help
+          Selecting this option will enable support for the mass-production
+          version of the R7780RP. If in doubt, say Y.
+
+endmenu
+
+endif
diff --git a/arch/sh/boards/renesas/r7780rp/Makefile b/arch/sh/boards/renesas/r7780rp/Makefile
new file mode 100644
index 000000000000..f1776d027978
--- /dev/null
+++ b/arch/sh/boards/renesas/r7780rp/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the R7780RP-1 specific parts of the kernel
+#
+
+obj-y    := setup.o io.o irq.o
+obj-$(CONFIG_HEARTBEAT) += led.o
diff --git a/arch/sh/boards/renesas/r7780rp/io.c b/arch/sh/boards/renesas/r7780rp/io.c
new file mode 100644
index 000000000000..db92d6e6ae99
--- /dev/null
+++ b/arch/sh/boards/renesas/r7780rp/io.c
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
+ * Based largely on io_se.c.
+ *
+ * I/O routine for Renesas Solutions Highlander R7780RP-1
+ *
+ * Initial version only to support LAN access; some
+ * placeholder code from io_r7780rp.c left in with the
+ * expectation of later SuperIO and PCMCIA access.
+ */
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <asm/r7780rp/r7780rp.h>
+#include <asm/addrspace.h>
+#include <asm/io.h>
+
+static inline unsigned long port2adr(unsigned int port)
+{
+        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
+                if (port == 0x3f6)
+                        return (PA_AREA5_IO + 0x80c);
+                else
+                        return (PA_AREA5_IO + 0x1000 + ((port-0x1f0) << 1));
+        else
+                maybebadio((unsigned long)port);
+
+        return port;
+}
+
+static inline unsigned long port88796l(unsigned int port, int flag)
+{
+        unsigned long addr;
+
+        if (flag)
+                addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1);
+        else
+                addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1) + 0x1000;
+
+        return addr;
+}
+
+/* The 7780 R7780RP-1 seems to have everything hooked */
+/* up pretty normally (nothing on high-bytes only...) so this */
+/* shouldn't be needed */
+static inline int shifted_port(unsigned long port)
+{
+        /* For IDE registers, value is not shifted */
+        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
+                return 0;
+        else
+                return 1;
+}
+
+#if defined(CONFIG_NE2000) || defined(CONFIG_NE2000_MODULE)
+#define CHECK_AX88796L_PORT(port) \
+  ((port >= AX88796L_IO_BASE) && (port < (AX88796L_IO_BASE+0x20)))
+#else
+#define CHECK_AX88796L_PORT(port) (0)
+#endif
+
+/*
+ * 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.
+ */
+u8 r7780rp_inb(unsigned long port)
+{
+        if (CHECK_AX88796L_PORT(port))
+                return ctrl_inw(port88796l(port, 0)) & 0xff;
+        else if (PXSEG(port))
+                return ctrl_inb(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return ctrl_inb(pci_ioaddr(port));
+
+        return ctrl_inw(port2adr(port)) & 0xff;
+}
+
+u8 r7780rp_inb_p(unsigned long port)
+{
+        u8 v;
+
+        if (CHECK_AX88796L_PORT(port))
+                v = ctrl_inw(port88796l(port, 0)) & 0xff;
+        else if (PXSEG(port))
+                v = ctrl_inb(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                v = ctrl_inb(pci_ioaddr(port));
+        else
+                v = ctrl_inw(port2adr(port)) & 0xff;
+
+        ctrl_delay();
+
+        return v;
+}
+
+u16 r7780rp_inw(unsigned long port)
+{
+        if (CHECK_AX88796L_PORT(port))
+                maybebadio(port);
+        else if (PXSEG(port))
+                return ctrl_inw(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return ctrl_inw(pci_ioaddr(port));
+        else
+                maybebadio(port);
+
+        return 0;
+}
+
+u32 r7780rp_inl(unsigned long port)
+{
+        if (CHECK_AX88796L_PORT(port))
+                maybebadio(port);
+        else if (PXSEG(port))
+                return ctrl_inl(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return ctrl_inl(pci_ioaddr(port));
+        else
+                maybebadio(port);
+
+        return 0;
+}
+
+void r7780rp_outb(u8 value, unsigned long port)
+{
+        if (CHECK_AX88796L_PORT(port))
+                ctrl_outw(value, port88796l(port, 0));
+        else if (PXSEG(port))
+                ctrl_outb(value, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outb(value, pci_ioaddr(port));
+        else
+                ctrl_outw(value, port2adr(port));
+}
+
+void r7780rp_outb_p(u8 value, unsigned long port)
+{
+        if (CHECK_AX88796L_PORT(port))
+                ctrl_outw(value, port88796l(port, 0));
+        else if (PXSEG(port))
+                ctrl_outb(value, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outb(value, pci_ioaddr(port));
+        else
+                ctrl_outw(value, port2adr(port));
+
+        ctrl_delay();
+}
+
+void r7780rp_outw(u16 value, unsigned long port)
+{
+        if (CHECK_AX88796L_PORT(port))
+                maybebadio(port);
+        else if (PXSEG(port))
+                ctrl_outw(value, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outw(value, pci_ioaddr(port));
+        else
+                maybebadio(port);
+}
+
+void r7780rp_outl(u32 value, unsigned long port)
+{
+        if (CHECK_AX88796L_PORT(port))
+                maybebadio(port);
+        else if (PXSEG(port))
+                ctrl_outl(value, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                ctrl_outl(value, pci_ioaddr(port));
+        else
+                maybebadio(port);
+}
+
+void r7780rp_insb(unsigned long port, void *dst, unsigned long count)
+{
+        volatile u16 *p;
+        u8 *buf = dst;
+
+        if (CHECK_AX88796L_PORT(port)) {
+                p = (volatile u16 *)port88796l(port, 0);
+                while (count--)
+                        *buf++ = *p & 0xff;
+        } else if (PXSEG(port)) {
+                while (count--)
+                        *buf++ = *(volatile u8 *)port;
+        } else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
+
+                while (count--)
+                        *buf++ = *bp;
+        } else {
+                p = (volatile u16 *)port2adr(port);
+                while (count--)
+                        *buf++ = *p & 0xff;
+        }
+}
+
+void r7780rp_insw(unsigned long port, void *dst, unsigned long count)
+{
+        volatile u16 *p;
+        u16 *buf = dst;
+
+        if (CHECK_AX88796L_PORT(port))
+                p = (volatile u16 *)port88796l(port, 1);
+        else if (PXSEG(port))
+                p = (volatile u16 *)port;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                p = (volatile u16 *)pci_ioaddr(port);
+        else
+                p = (volatile u16 *)port2adr(port);
+
+        while (count--)
+                *buf++ = *p;
+}
+
+void r7780rp_insl(unsigned long port, void *dst, unsigned long count)
+{
+        u32 *buf = dst;
+
+        if (CHECK_AX88796L_PORT(port))
+                maybebadio(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+
+                while (count--)
+                        *buf++ = *p;
+        } else
+                maybebadio(port);
+}
+
+void r7780rp_outsb(unsigned long port, const void *src, unsigned long count)
+{
+        volatile u16 *p;
+        const u8 *buf = src;
+
+        if (CHECK_AX88796L_PORT(port)) {
+                p = (volatile u16 *)port88796l(port, 0);
+                while (count--)
+                        *p = *buf++;
+        } else if (PXSEG(port))
+                while (count--)
+                        ctrl_outb(*buf++, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
+
+                while (count--)
+                        *bp = *buf++;
+        } else {
+                p = (volatile u16 *)port2adr(port);
+                while (count--)
+                        *p = *buf++;
+        }
+}
+
+void r7780rp_outsw(unsigned long port, const void *src, unsigned long count)
+{
+        volatile u16 *p;
+        const u16 *buf = src;
+
+        if (CHECK_AX88796L_PORT(port))
+                p = (volatile u16 *)port88796l(port, 1);
+        else if (PXSEG(port))
+                p = (volatile u16 *)port;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                p = (volatile u16 *)pci_ioaddr(port);
+        else
+                p = (volatile u16 *)port2adr(port);
+
+        while (count--)
+                *p = *buf++;
+}
+
+void r7780rp_outsl(unsigned long port, const void *src, unsigned long count)
+{
+        const u32 *buf = src;
+
+        if (CHECK_AX88796L_PORT(port))
+                maybebadio(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+
+                while (count--)
+                        *p = *buf++;
+        } else
+                maybebadio(port);
+}
+
+void __iomem *r7780rp_ioport_map(unsigned long port, unsigned int size)
+{
+        if (CHECK_AX88796L_PORT(port))
+                return (void __iomem *)port88796l(port, size > 1);
+        else if (PXSEG(port))
+                return (void __iomem *)port;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return (void __iomem *)pci_ioaddr(port);
+
+        return (void __iomem *)port2adr(port);
+}
diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c
new file mode 100644
index 000000000000..61d5e5d3c294
--- /dev/null
+++ b/arch/sh/boards/renesas/r7780rp/irq.c
@@ -0,0 +1,117 @@
+/*
+ * linux/arch/sh/boards/renesas/r7780rp/irq.c
+ *
+ * Copyright (C) 2000  Kazumoto Kojima
+ *
+ * Renesas Solutions Highlander R7780RP-1 Support.
+ *
+ * Modified for R7780RP-1 by
+ * Atom Create Engineering Co., Ltd. 2002.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/r7780rp/r7780rp.h>
+
+#ifdef CONFIG_SH_R7780MP
+static int mask_pos[] = {12, 11, 9, 14, 15, 8, 13, 6, 5, 4, 3, 2, 0, 0, 1, 0};
+#else
+static int mask_pos[] = {15, 14, 13, 12, 11, 10, 9, 8, 7, 5, 6, 4, 0, 1, 2, 0};
+#endif
+
+static void enable_r7780rp_irq(unsigned int irq);
+static void disable_r7780rp_irq(unsigned int irq);
+
+/* shutdown is same as "disable" */
+#define shutdown_r7780rp_irq disable_r7780rp_irq
+
+static void ack_r7780rp_irq(unsigned int irq);
+static void end_r7780rp_irq(unsigned int irq);
+
+static unsigned int startup_r7780rp_irq(unsigned int irq)
+{
+        enable_r7780rp_irq(irq);
+        return 0; /* never anything pending */
+}
+
+static void disable_r7780rp_irq(unsigned int irq)
+{
+        unsigned short val;
+        unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
+
+        /* Set the priority in IPR to 0 */
+        val = ctrl_inw(IRLCNTR1);
+        val &= mask;
+        ctrl_outw(val, IRLCNTR1);
+}
+
+static void enable_r7780rp_irq(unsigned int irq)
+{
+        unsigned short val;
+        unsigned short value = (0x0001 << mask_pos[irq]);
+
+        /* Set priority in IPR back to original value */
+        val = ctrl_inw(IRLCNTR1);
+        val |= value;
+        ctrl_outw(val, IRLCNTR1);
+}
+
+static void ack_r7780rp_irq(unsigned int irq)
+{
+        disable_r7780rp_irq(irq);
+}
+
+static void end_r7780rp_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+                enable_r7780rp_irq(irq);
+}
+
+static struct hw_interrupt_type r7780rp_irq_type = {
+        .typename = "R7780RP-IRQ",
+        .startup = startup_r7780rp_irq,
+        .shutdown = shutdown_r7780rp_irq,
+        .enable = enable_r7780rp_irq,
+        .disable = disable_r7780rp_irq,
+        .ack = ack_r7780rp_irq,
+        .end = end_r7780rp_irq,
+};
+
+static void make_r7780rp_irq(unsigned int irq)
+{
+        disable_irq_nosync(irq);
+        irq_desc[irq].handler = &r7780rp_irq_type;
+        disable_r7780rp_irq(irq);
+}
+
+/*
+ * Initialize IRQ setting
+ */
+void __init init_r7780rp_IRQ(void)
+{
+        int i;
+
+        /* IRL0=PCI Slot #A
+         * IRL1=PCI Slot #B
+         * IRL2=PCI Slot #C
+         * IRL3=PCI Slot #D
+         * IRL4=CF Card
+         * IRL5=CF Card Insert
+         * IRL6=M66596
+         * IRL7=SD Card
+         * IRL8=Touch Panel
+         * IRL9=SCI
+         * IRL10=Serial
+         * IRL11=Extention #A
+         * IRL11=Extention #B
+         * IRL12=Debug LAN
+         * IRL13=Push Switch
+         * IRL14=ZiggBee IO
+         */
+
+        for (i=0; i<15; i++)
+                make_r7780rp_irq(i);
+}
diff --git a/arch/sh/boards/renesas/r7780rp/led.c b/arch/sh/boards/renesas/r7780rp/led.c
new file mode 100644
index 000000000000..9f02766b6f53
--- /dev/null
+++ b/arch/sh/boards/renesas/r7780rp/led.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) Atom Create Engineering Co., Ltd.
+ *
+ * May be copied or modified under the terms of GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ * This file contains Renesas Solutions HIGHLANDER R7780RP-1 specific LED code.
+ */
+
+#include <linux/config.h>
+#include <linux/sched.h>
+#include <asm/io.h>
+#include <asm/r7780rp/r7780rp.h>
+
+/* Cycle the LED's in the clasic Knightriger/Sun pattern */
+void heartbeat_r7780rp(void)
+{
+        static unsigned int cnt = 0, period = 0;
+        volatile unsigned short *p = (volatile unsigned short *)PA_OBLED;
+        static unsigned bit = 0, up = 1;
+        unsigned bit_pos[] = {2, 1, 0, 3, 6, 5, 4, 7};
+
+        cnt += 1;
+        if (cnt < period)
+                return;
+
+        cnt = 0;
+
+        /* Go through the points (roughly!):
+         * f(0)=10, f(1)=16, f(2)=20, f(5)=35, f(int)->110
+         */
+        period = 110 - ((300 << FSHIFT)/((avenrun[0]/5) + (3<<FSHIFT)));
+
+        *p = 1 << bit_pos[bit];
+        if (up)
+                if (bit == 7) {
+                        bit--;
+                        up = 0;
+                } else
+                        bit++;
+        else if (bit == 0)
+                up = 1;
+        else
+                bit--;
+}
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
new file mode 100644
index 000000000000..b941aa0aa34e
--- /dev/null
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -0,0 +1,163 @@
+/*
+ * arch/sh/boards/renesas/r7780rp/setup.c
+ *
+ * Copyright (C) 2002 Atom Create Engineering Co., Ltd.
+ * Copyright (C) 2005, 2006 Paul Mundt
+ *
+ * Renesas Solutions Highlander R7780RP-1 Support.
+ *
+ * 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 <asm/machvec.h>
+#include <asm/r7780rp/r7780rp.h>
+#include <asm/clock.h>
+#include <asm/io.h>
+
+extern void heartbeat_r7780rp(void);
+extern void init_r7780rp_IRQ(void);
+
+static struct resource m66596_usb_host_resources[] = {
+        [0] = {
+                .start  = 0xa4800000,
+                .end    = 0xa4ffffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 6,            /* irq number */
+                .end    = 6,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device m66596_usb_host_device = {
+        .name           = "m66596-hcd",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = NULL,         /* don't use dma */
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(m66596_usb_host_resources),
+        .resource       = m66596_usb_host_resources,
+};
+
+static struct platform_device *r7780rp_devices[] __initdata = {
+        &m66596_usb_host_device,
+};
+
+static int __init r7780rp_devices_setup(void)
+{
+        return platform_add_devices(r7780rp_devices,
+                                    ARRAY_SIZE(r7780rp_devices));
+}
+
+/*
+ * Platform specific clocks
+ */
+static void ivdr_clk_enable(struct clk *clk)
+{
+        ctrl_outw(ctrl_inw(PA_IVDRCTL) | (1 << 8), PA_IVDRCTL);
+}
+
+static void ivdr_clk_disable(struct clk *clk)
+{
+        ctrl_outw(ctrl_inw(PA_IVDRCTL) & ~(1 << 8), PA_IVDRCTL);
+}
+
+static struct clk_ops ivdr_clk_ops = {
+        .enable         = ivdr_clk_enable,
+        .disable        = ivdr_clk_disable,
+};
+
+static struct clk ivdr_clk = {
+        .name           = "ivdr_clk",
+        .ops            = &ivdr_clk_ops,
+};
+
+static struct clk *r7780rp_clocks[] = {
+        &ivdr_clk,
+};
+
+static void r7780rp_power_off(void)
+{
+#ifdef CONFIG_SH_R7780MP
+        ctrl_outw(0x0001, PA_POFF);
+#endif
+}
+
+/*
+ * Initialize the board
+ */
+static void __init r7780rp_setup(char **cmdline_p)
+{
+        u16 ver = ctrl_inw(PA_VERREG);
+        int i;
+
+        device_initcall(r7780rp_devices_setup);
+
+        printk(KERN_INFO "Renesas Solutions Highlander R7780RP-1 support.\n");
+
+        printk(KERN_INFO "Board version: %d (revision %d), "
+                         "FPGA version: %d (revision %d)\n",
+                         (ver >> 12) & 0xf, (ver >> 8) & 0xf,
+                         (ver >>  4) & 0xf, ver & 0xf);
+
+        /*
+         * Enable the important clocks right away..
+         */
+        for (i = 0; i < ARRAY_SIZE(r7780rp_clocks); i++) {
+                struct clk *clk = r7780rp_clocks[i];
+
+                clk_register(clk);
+                clk_enable(clk);
+        }
+
+        ctrl_outw(0x0000, PA_OBLED);    /* Clear LED. */
+#ifndef CONFIG_SH_R7780MP
+        ctrl_outw(0x0001, PA_SDPOW);    /* SD Power ON */
+#endif
+        ctrl_outw(ctrl_inw(PA_IVDRCTL) | 0x0100, PA_IVDRCTL);   /* Si13112 */
+
+        pm_power_off = r7780rp_power_off;
+}
+
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_r7780rp __initmv = {
+        .mv_name                = "Highlander R7780RP-1",
+        .mv_setup               = r7780rp_setup,
+
+        .mv_nr_irqs             = 109,
+
+        .mv_inb                 = r7780rp_inb,
+        .mv_inw                 = r7780rp_inw,
+        .mv_inl                 = r7780rp_inl,
+        .mv_outb                = r7780rp_outb,
+        .mv_outw                = r7780rp_outw,
+        .mv_outl                = r7780rp_outl,
+
+        .mv_inb_p               = r7780rp_inb_p,
+        .mv_inw_p               = r7780rp_inw,
+        .mv_inl_p               = r7780rp_inl,
+        .mv_outb_p              = r7780rp_outb_p,
+        .mv_outw_p              = r7780rp_outw,
+        .mv_outl_p              = r7780rp_outl,
+
+        .mv_insb                = r7780rp_insb,
+        .mv_insw                = r7780rp_insw,
+        .mv_insl                = r7780rp_insl,
+        .mv_outsb               = r7780rp_outsb,
+        .mv_outsw               = r7780rp_outsw,
+        .mv_outsl               = r7780rp_outsl,
+
+        .mv_ioport_map          = r7780rp_ioport_map,
+        .mv_init_irq            = init_r7780rp_IRQ,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = heartbeat_r7780rp,
+#endif
+};
+ALIAS_MV(r7780rp)
diff --git a/arch/sh/boards/renesas/rts7751r2d/Kconfig b/arch/sh/boards/renesas/rts7751r2d/Kconfig
new file mode 100644
index 000000000000..7780d1fb13ff
--- /dev/null
+++ b/arch/sh/boards/renesas/rts7751r2d/Kconfig
@@ -0,0 +1,12 @@
+if SH_RTS7751R2D
+
+menu "RTS7751R2D options"
+
+config RTS7751R2D_REV11
+        bool "RTS7751R2D Rev. 1.1 board support"
+        help
+          Selecting this option will support version rev. 1.1.
+endmenu
+
+endif
+
diff --git a/arch/sh/boards/renesas/rts7751r2d/Makefile b/arch/sh/boards/renesas/rts7751r2d/Makefile
index daa53334bdc3..686fc9ea5989 100644
--- a/arch/sh/boards/renesas/rts7751r2d/Makefile
+++ b/arch/sh/boards/renesas/rts7751r2d/Makefile
@@ -1,10 +1,6 @@
 #
 # Makefile for the RTS7751R2D specific parts of the kernel
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-obj-y    := mach.o setup.o io.o irq.o led.o
 
+obj-y    := setup.o io.o irq.o
+obj-$(CONFIG_HEARTBEAT) += led.o
diff --git a/arch/sh/boards/renesas/rts7751r2d/io.c b/arch/sh/boards/renesas/rts7751r2d/io.c
index 123abbbc91e0..135aa0b5e62d 100644
--- a/arch/sh/boards/renesas/rts7751r2d/io.c
+++ b/arch/sh/boards/renesas/rts7751r2d/io.c
@@ -1,6 +1,4 @@
 /*
- * linux/arch/sh/kernel/io_rts7751r2d.c
- *
  * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
  * Based largely on io_se.c.
  *
@@ -10,17 +8,13 @@
  * placeholder code from io_rts7751r2d.c left in with the
  * expectation of later SuperIO and PCMCIA access.
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/pci.h>
 #include <asm/rts7751r2d/rts7751r2d.h>
+#include <asm/io.h>
 #include <asm/addrspace.h>
 
-#include <linux/module.h>
-#include <linux/pci.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-
 /*
  * The 7751R RTS7751R2D uses the built-in PCI controller (PCIC)
  * of the 7751R processor, and has a SuperIO accessible via the PCI.
@@ -28,22 +22,6 @@
  * like the other Solution Engine boards.
  */
 
-#define PCIIOBR         (volatile long *)PCI_REG(SH7751_PCIIOBR)
-#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
-#define PCI_IO_AREA     SH7751_PCI_IO_BASE
-#define PCI_MEM_AREA    SH7751_PCI_CONFIG_BASE
-
-#define PCI_IOMAP(adr)  (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
-
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
-
 static inline unsigned long port2adr(unsigned int port)
 {
         if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
@@ -52,7 +30,7 @@ static inline unsigned long port2adr(unsigned int port)
                 else
                         return (PA_AREA5_IO + 0x1000 + ((port-0x1f0) << 1));
         else
-                maybebadio(port2adr, (unsigned long)port);
+                maybebadio((unsigned long)port);
 
         return port;
 }
@@ -81,17 +59,6 @@ static inline int shifted_port(unsigned long port)
                 return 1;
 }
 
-/* In case someone configures the kernel w/o PCI support: in that */
-/* scenario, don't ever bother to check for PCI-window addresses */
-
-/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
-#if defined(CONFIG_PCI)
-#define CHECK_SH7751_PCIIO(port) \
-  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
-#else
-#define CHECK_SH7751_PCIIO(port) (0)
-#endif
-
 #if defined(CONFIG_NE2000) || defined(CONFIG_NE2000_MODULE)
 #define CHECK_AX88796L_PORT(port) \
   ((port >= AX88796L_IO_BASE) && (port < (AX88796L_IO_BASE+0x20)))
@@ -112,8 +79,8 @@ unsigned char rts7751r2d_inb(unsigned long port)
                 return (*(volatile unsigned short *)port88796l(port, 0)) & 0xff;
         else if (PXSEG(port))
                 return *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return *(volatile unsigned char *)pci_ioaddr(port);
         else
                 return (*(volatile unsigned short *)port2adr(port) & 0xff);
 }
@@ -126,11 +93,12 @@ unsigned char rts7751r2d_inb_p(unsigned long port)
                 v = (*(volatile unsigned short *)port88796l(port, 0)) & 0xff;
         else if (PXSEG(port))
                 v = *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                v = *(volatile unsigned char *)pci_ioaddr(port);
         else
                 v = (*(volatile unsigned short *)port2adr(port) & 0xff);
-        delay();
+
+        ctrl_delay();
 
         return v;
 }
@@ -138,13 +106,13 @@ unsigned char rts7751r2d_inb_p(unsigned long port)
 unsigned short rts7751r2d_inw(unsigned long port)
 {
         if (CHECK_AX88796L_PORT(port))
-                maybebadio(inw, port);
+                maybebadio(port);
         else if (PXSEG(port))
                 return *(volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned short *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return *(volatile unsigned short *)pci_ioaddr(port);
         else
-                maybebadio(inw, port);
+                maybebadio(port);
 
         return 0;
 }
@@ -152,13 +120,13 @@ unsigned short rts7751r2d_inw(unsigned long port)
 unsigned int rts7751r2d_inl(unsigned long port)
 {
         if (CHECK_AX88796L_PORT(port))
-                maybebadio(inl, port);
+                maybebadio(port);
         else if (PXSEG(port))
                 return *(volatile unsigned long *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned long *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                return *(volatile unsigned long *)pci_ioaddr(port);
         else
-                maybebadio(inl, port);
+                maybebadio(port);
 
         return 0;
 }
@@ -169,8 +137,8 @@ void rts7751r2d_outb(unsigned char value, unsigned long port)
                 *((volatile unsigned short *)port88796l(port, 0)) = value;
         else if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *(volatile unsigned char *)PCI_IOMAP(port) = value;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                *(volatile unsigned char *)pci_ioaddr(port) = value;
         else
                 *(volatile unsigned short *)port2adr(port) = value;
 }
@@ -181,143 +149,152 @@ void rts7751r2d_outb_p(unsigned char value, unsigned long port)
                 *((volatile unsigned short *)port88796l(port, 0)) = value;
         else if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *(volatile unsigned char *)PCI_IOMAP(port) = value;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                *(volatile unsigned char *)pci_ioaddr(port) = value;
         else
                 *(volatile unsigned short *)port2adr(port) = value;
-        delay();
+
+        ctrl_delay();
 }
 
 void rts7751r2d_outw(unsigned short value, unsigned long port)
 {
         if (CHECK_AX88796L_PORT(port))
-                maybebadio(outw, port);
+                maybebadio(port);
         else if (PXSEG(port))
                 *(volatile unsigned short *)port = value;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *(volatile unsigned short *)PCI_IOMAP(port) = value;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                *(volatile unsigned short *)pci_ioaddr(port) = value;
         else
-                maybebadio(outw, port);
+                maybebadio(port);
 }
 
 void rts7751r2d_outl(unsigned int value, unsigned long port)
 {
         if (CHECK_AX88796L_PORT(port))
-                maybebadio(outl, port);
+                maybebadio(port);
         else if (PXSEG(port))
                 *(volatile unsigned long *)port = value;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                *(volatile unsigned long *)PCI_IOMAP(port) = value;
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                *(volatile unsigned long *)pci_ioaddr(port) = value;
         else
-                maybebadio(outl, port);
+                maybebadio(port);
 }
 
 void rts7751r2d_insb(unsigned long port, void *addr, unsigned long count)
 {
+        unsigned long a = (unsigned long)addr;
         volatile __u8 *bp;
         volatile __u16 *p;
-        unsigned char *s = addr;
 
         if (CHECK_AX88796L_PORT(port)) {
                 p = (volatile unsigned short *)port88796l(port, 0);
-                while (count--) *s++ = *p & 0xff;
+                while (count--)
+                        ctrl_outb(*p & 0xff, a++);
         } else if (PXSEG(port))
-                while (count--) *s++ = *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                bp = (__u8 *)PCI_IOMAP(port);
-                while (count--) *s++ = *bp;
+                while (count--)
+                        ctrl_outb(ctrl_inb(port), a++);
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                bp = (__u8 *)pci_ioaddr(port);
+                while (count--)
+                        ctrl_outb(*bp, a++);
         } else {
                 p = (volatile unsigned short *)port2adr(port);
-                while (count--) *s++ = *p & 0xff;
+                while (count--)
+                        ctrl_outb(*p & 0xff, a++);
         }
 }
 
 void rts7751r2d_insw(unsigned long port, void *addr, unsigned long count)
 {
+        unsigned long a = (unsigned long)addr;
         volatile __u16 *p;
-        __u16 *s = addr;
 
         if (CHECK_AX88796L_PORT(port))
                 p = (volatile unsigned short *)port88796l(port, 1);
         else if (PXSEG(port))
                 p = (volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                p = (volatile unsigned short *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                p = (volatile unsigned short *)pci_ioaddr(port);
         else
                 p = (volatile unsigned short *)port2adr(port);
-        while (count--) *s++ = *p;
+        while (count--)
+                ctrl_outw(*p, a++);
 }
 
 void rts7751r2d_insl(unsigned long port, void *addr, unsigned long count)
 {
         if (CHECK_AX88796L_PORT(port))
-                maybebadio(insl, port);
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
-                __u32 *s = addr;
-
-                while (count--) *s++ = *p;
+                maybebadio(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                unsigned long a = (unsigned long)addr;
+
+                while (count--) {
+                        ctrl_outl(ctrl_inl(pci_ioaddr(port)), a);
+                        a += 4;
+                }
         } else
-                maybebadio(insl, port);
+                maybebadio(port);
 }
 
 void rts7751r2d_outsb(unsigned long port, const void *addr, unsigned long count)
 {
+        unsigned long a = (unsigned long)addr;
         volatile __u8 *bp;
         volatile __u16 *p;
-        const __u8 *s = addr;
 
         if (CHECK_AX88796L_PORT(port)) {
                 p = (volatile unsigned short *)port88796l(port, 0);
-                while (count--) *p = *s++;
+                while (count--)
+                        *p = ctrl_inb(a++);
         } else if (PXSEG(port))
-                while (count--) *(volatile unsigned char *)port = *s++;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                bp = (__u8 *)PCI_IOMAP(port);
-                while (count--) *bp = *s++;
+                while (count--)
+                        ctrl_outb(a++, port);
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                bp = (__u8 *)pci_ioaddr(port);
+                while (count--)
+                        *bp = ctrl_inb(a++);
         } else {
                 p = (volatile unsigned short *)port2adr(port);
-                while (count--) *p = *s++;
+                while (count--)
+                        *p = ctrl_inb(a++);
         }
 }
 
 void rts7751r2d_outsw(unsigned long port, const void *addr, unsigned long count)
 {
+        unsigned long a = (unsigned long)addr;
         volatile __u16 *p;
-        const __u16 *s = addr;
 
         if (CHECK_AX88796L_PORT(port))
                 p = (volatile unsigned short *)port88796l(port, 1);
         else if (PXSEG(port))
                 p = (volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                p = (volatile unsigned short *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port))
+                p = (volatile unsigned short *)pci_ioaddr(port);
         else
                 p = (volatile unsigned short *)port2adr(port);
-        while (count--) *p = *s++;
+
+        while (count--) {
+                ctrl_outw(*p, a);
+                a += 2;
+        }
 }
 
 void rts7751r2d_outsl(unsigned long port, const void *addr, unsigned long count)
 {
         if (CHECK_AX88796L_PORT(port))
-                maybebadio(outsl, port);
-        else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-                volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
-                const __u32 *s = addr;
-
-                while (count--) *p = *s++;
+                maybebadio(port);
+        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+                unsigned long a = (unsigned long)addr;
+
+                while (count--) {
+                        ctrl_outl(ctrl_inl(a), pci_ioaddr(port));
+                        a += 4;
+                }
         } else
-                maybebadio(outsl, port);
-}
-
-void *rts7751r2d_ioremap(unsigned long offset, unsigned long size)
-{
-        if (offset >= 0xfd000000)
-                return (void *)offset;
-        else
-                return (void *)P2SEGADDR(offset);
+                maybebadio(port);
 }
-EXPORT_SYMBOL(rts7751r2d_ioremap);
 
 unsigned long rts7751r2d_isa_port2addr(unsigned long offset)
 {
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index 154535440bbf..c915e7a3693a 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -41,30 +41,24 @@ static unsigned int startup_rts7751r2d_irq(unsigned int irq)
 
 static void disable_rts7751r2d_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
 
         /* Set the priority in IPR to 0 */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR1);
         val &= mask;
         ctrl_outw(val, IRLCNTR1);
-        local_irq_restore(flags);
 }
 
 static void enable_rts7751r2d_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short value = (0x0001 << mask_pos[irq]);
 
         /* Set priority in IPR back to original value */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR1);
         val |= value;
         ctrl_outw(val, IRLCNTR1);
-        local_irq_restore(flags);
 }
 
 int rts7751r2d_irq_demux(int irq)
diff --git a/arch/sh/boards/renesas/rts7751r2d/led.c b/arch/sh/boards/renesas/rts7751r2d/led.c
index 4d16de71fac1..e14a13d12d4a 100644
--- a/arch/sh/boards/renesas/rts7751r2d/led.c
+++ b/arch/sh/boards/renesas/rts7751r2d/led.c
@@ -12,8 +12,6 @@
 #include <asm/io.h>
 #include <asm/rts7751r2d/rts7751r2d.h>
 
-extern unsigned int debug_counter;
-
 #ifdef CONFIG_HEARTBEAT
 
 #include <linux/sched.h>
@@ -55,12 +53,3 @@ void rts7751r2d_led(unsigned short value)
         ctrl_outw(value, PA_OUTPORT);
 }
 
-void debug_led_disp(void)
-{
-        unsigned short value;
-
-        value = (unsigned short)debug_counter++;
-        rts7751r2d_led(value);
-        if (value == 0xff)
-                debug_counter = 0;
-}
diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c
deleted file mode 100644
index 5ed9e97ea197..000000000000
--- a/arch/sh/boards/renesas/rts7751r2d/mach.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * linux/arch/sh/kernel/mach_rts7751r2d.c
- *
- * Minor tweak of mach_se.c file to reference rts7751r2d-specific items.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the Renesas Technology sales RTS7751R2D
- */
-
-#include <linux/init.h>
-#include <linux/types.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/irq.h>
-#include <asm/rts7751r2d/io.h>
-
-extern void heartbeat_rts7751r2d(void);
-extern void init_rts7751r2d_IRQ(void);
-extern void *rts7751r2d_ioremap(unsigned long, unsigned long);
-extern int rts7751r2d_irq_demux(int irq);
-
-extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
-extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_rts7751r2d __initmv = {
-        .mv_nr_irqs             = 72,
-
-        .mv_inb                 = rts7751r2d_inb,
-        .mv_inw                 = rts7751r2d_inw,
-        .mv_inl                 = rts7751r2d_inl,
-        .mv_outb                = rts7751r2d_outb,
-        .mv_outw                = rts7751r2d_outw,
-        .mv_outl                = rts7751r2d_outl,
-
-        .mv_inb_p               = rts7751r2d_inb_p,
-        .mv_inw_p               = rts7751r2d_inw,
-        .mv_inl_p               = rts7751r2d_inl,
-        .mv_outb_p              = rts7751r2d_outb_p,
-        .mv_outw_p              = rts7751r2d_outw,
-        .mv_outl_p              = rts7751r2d_outl,
-
-        .mv_insb                = rts7751r2d_insb,
-        .mv_insw                = rts7751r2d_insw,
-        .mv_insl                = rts7751r2d_insl,
-        .mv_outsb               = rts7751r2d_outsb,
-        .mv_outsw               = rts7751r2d_outsw,
-        .mv_outsl               = rts7751r2d_outsl,
-
-        .mv_ioremap             = rts7751r2d_ioremap,
-        .mv_isa_port2addr       = rts7751r2d_isa_port2addr,
-        .mv_init_irq            = init_rts7751r2d_IRQ,
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_rts7751r2d,
-#endif
-        .mv_irq_demux           = rts7751r2d_irq_demux,
-
-#ifdef CONFIG_USB_OHCI_HCD
-        .mv_consistent_alloc    = voyagergx_consistent_alloc,
-        .mv_consistent_free     = voyagergx_consistent_free,
-#endif
-};
-ALIAS_MV(rts7751r2d)
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index 2587fd1a0240..20597a6e6702 100644
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -1,31 +1,142 @@
 /*
- * linux/arch/sh/kernel/setup_rts7751r2d.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
  * Renesas Technology Sales RTS7751R2D Support.
  *
- * Modified for RTS7751R2D by
- * Atom Create Engineering Co., Ltd. 2002.
+ * Copyright (C) 2002 Atom Create Engineering Co., Ltd.
+ * Copyright (C) 2004 - 2006 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/serial_8250.h>
+#include <linux/pm.h>
 #include <asm/io.h>
-#include <asm/rts7751r2d/rts7751r2d.h>
+#include <asm/machvec.h>
+#include <asm/mach/rts7751r2d.h>
+#include <asm/voyagergx.h>
+
+extern void heartbeat_rts7751r2d(void);
+extern void init_rts7751r2d_IRQ(void);
+extern int rts7751r2d_irq_demux(int irq);
+
+extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
+extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
+
+static struct plat_serial8250_port uart_platform_data[] = {
+        {
+                .membase        = (void *)VOYAGER_UART_BASE,
+                .mapbase        = VOYAGER_UART_BASE,
+                .iotype         = UPIO_MEM,
+                .irq            = VOYAGER_UART0_IRQ,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .regshift       = 2,
+                .uartclk        = (9600 * 16),
+        }, {
+                .flags          = 0,
+        },
+};
+
+static void __init voyagergx_serial_init(void)
+{
+        unsigned long val;
+
+        /*
+         * GPIO Control
+         */
+        val = inl(GPIO_MUX_HIGH);
+        val |= 0x00001fe0;
+        outl(val, GPIO_MUX_HIGH);
+
+        /*
+         * Power Mode Gate
+         */
+        val = inl(POWER_MODE0_GATE);
+        val |= (POWER_MODE0_GATE_U0 | POWER_MODE0_GATE_U1);
+        outl(val, POWER_MODE0_GATE);
+
+        val = inl(POWER_MODE1_GATE);
+        val |= (POWER_MODE1_GATE_U0 | POWER_MODE1_GATE_U1);
+        outl(val, POWER_MODE1_GATE);
+}
+
+static struct platform_device uart_device = {
+        .name           = "serial8250",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = uart_platform_data,
+        },
+};
+
+static struct platform_device *rts7751r2d_devices[] __initdata = {
+        &uart_device,
+};
 
-unsigned int debug_counter;
+static int __init rts7751r2d_devices_setup(void)
+{
+        return platform_add_devices(rts7751r2d_devices,
+                                    ARRAY_SIZE(rts7751r2d_devices));
+}
 
-const char *get_system_type(void)
+static void rts7751r2d_power_off(void)
 {
-        return "RTS7751R2D";
+        ctrl_outw(0x0001, PA_POWOFF);
 }
 
 /*
  * Initialize the board
  */
-void __init platform_setup(void)
+static void __init rts7751r2d_setup(char **cmdline_p)
 {
-        printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
+        device_initcall(rts7751r2d_devices_setup);
+
         ctrl_outw(0x0000, PA_OUTPORT);
-        debug_counter = 0;
+        pm_power_off = rts7751r2d_power_off;
+
+        voyagergx_serial_init();
+
+        printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
 }
+
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_rts7751r2d __initmv = {
+        .mv_name                = "RTS7751R2D",
+        .mv_setup               = rts7751r2d_setup,
+        .mv_nr_irqs             = 72,
+
+        .mv_inb                 = rts7751r2d_inb,
+        .mv_inw                 = rts7751r2d_inw,
+        .mv_inl                 = rts7751r2d_inl,
+        .mv_outb                = rts7751r2d_outb,
+        .mv_outw                = rts7751r2d_outw,
+        .mv_outl                = rts7751r2d_outl,
+
+        .mv_inb_p               = rts7751r2d_inb_p,
+        .mv_inw_p               = rts7751r2d_inw,
+        .mv_inl_p               = rts7751r2d_inl,
+        .mv_outb_p              = rts7751r2d_outb_p,
+        .mv_outw_p              = rts7751r2d_outw,
+        .mv_outl_p              = rts7751r2d_outl,
+
+        .mv_insb                = rts7751r2d_insb,
+        .mv_insw                = rts7751r2d_insw,
+        .mv_insl                = rts7751r2d_insl,
+        .mv_outsb               = rts7751r2d_outsb,
+        .mv_outsw               = rts7751r2d_outsw,
+        .mv_outsl               = rts7751r2d_outsl,
+
+        .mv_init_irq            = init_rts7751r2d_IRQ,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = heartbeat_rts7751r2d,
+#endif
+        .mv_irq_demux           = rts7751r2d_irq_demux,
+
+#ifdef CONFIG_USB_SM501
+        .mv_consistent_alloc    = voyagergx_consistent_alloc,
+        .mv_consistent_free     = voyagergx_consistent_free,
+#endif
+};
+ALIAS_MV(rts7751r2d)
diff --git a/arch/sh/boards/renesas/sh7710voipgw/Makefile b/arch/sh/boards/renesas/sh7710voipgw/Makefile
new file mode 100644
index 000000000000..77037567633b
--- /dev/null
+++ b/arch/sh/boards/renesas/sh7710voipgw/Makefile
@@ -0,0 +1 @@
+obj-y    := setup.o
diff --git a/arch/sh/boards/renesas/sh7710voipgw/setup.c b/arch/sh/boards/renesas/sh7710voipgw/setup.c
new file mode 100644
index 000000000000..e57e7afab8c6
--- /dev/null
+++ b/arch/sh/boards/renesas/sh7710voipgw/setup.c
@@ -0,0 +1,109 @@
+/*
+ * Renesas Technology SH7710 VoIP Gateway
+ *
+ * Copyright (C) 2006  Ranjit Deshpande
+ * Kenati Technologies Inc.
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ */
+#include <linux/init.h>
+#include <asm/machvec.h>
+#include <asm/irq.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+
+/*
+ * Initialize IRQ setting
+ */
+static void __init sh7710voipgw_init_irq(void)
+{
+        /* Disable all interrupts in IPR registers */
+        ctrl_outw(0x0, INTC_IPRA);
+        ctrl_outw(0x0, INTC_IPRB);
+        ctrl_outw(0x0, INTC_IPRC);
+        ctrl_outw(0x0, INTC_IPRD);
+        ctrl_outw(0x0, INTC_IPRE);
+        ctrl_outw(0x0, INTC_IPRF);
+        ctrl_outw(0x0, INTC_IPRG);
+        ctrl_outw(0x0, INTC_IPRH);
+        ctrl_outw(0x0, INTC_IPRI);
+
+        /* Ack all interrupt sources in the IRR0 register */
+        ctrl_outb(0x3f, INTC_IRR0);
+
+        /* Use IRQ0 - IRQ3 as active low interrupt lines i.e. disable
+         * IRL mode.
+         */
+        ctrl_outw(0x2aa, INTC_ICR1);
+
+        /* Now make IPR interrupts */
+        make_ipr_irq(TIMER2_IRQ, TIMER2_IPR_ADDR,
+                        TIMER2_IPR_POS, TIMER2_PRIORITY);
+        make_ipr_irq(WDT_IRQ, WDT_IPR_ADDR, WDT_IPR_POS, WDT_PRIORITY);
+
+        /* SCIF0 */
+        make_ipr_irq(SCIF0_ERI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS,
+                        SCIF0_PRIORITY);
+        make_ipr_irq(SCIF0_RXI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS,
+                        SCIF0_PRIORITY);
+        make_ipr_irq(SCIF0_BRI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS,
+                        SCIF0_PRIORITY);
+        make_ipr_irq(SCIF0_TXI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS,
+                        SCIF0_PRIORITY);
+
+        /* DMAC-1 */
+        make_ipr_irq(DMTE0_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
+        make_ipr_irq(DMTE1_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
+        make_ipr_irq(DMTE2_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
+        make_ipr_irq(DMTE3_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
+
+        /* DMAC-2 */
+        make_ipr_irq(DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY);
+        make_ipr_irq(DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY);
+
+        /* IPSEC */
+        make_ipr_irq(IPSEC_IRQ, IPSEC_IPR_ADDR, IPSEC_IPR_POS, IPSEC_PRIORITY);
+
+        /* EDMAC */
+        make_ipr_irq(EDMAC0_IRQ, EDMAC0_IPR_ADDR, EDMAC0_IPR_POS,
+                        EDMAC0_PRIORITY);
+        make_ipr_irq(EDMAC1_IRQ, EDMAC1_IPR_ADDR, EDMAC1_IPR_POS,
+                        EDMAC1_PRIORITY);
+        make_ipr_irq(EDMAC2_IRQ, EDMAC2_IPR_ADDR, EDMAC2_IPR_POS,
+                        EDMAC2_PRIORITY);
+
+        /* SIOF0 */
+        make_ipr_irq(SIOF0_ERI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS,
+                        SIOF0_PRIORITY);
+        make_ipr_irq(SIOF0_TXI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS,
+                        SIOF0_PRIORITY);
+        make_ipr_irq(SIOF0_RXI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS,
+                        SIOF0_PRIORITY);
+        make_ipr_irq(SIOF0_CCI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS,
+                        SIOF0_PRIORITY);
+
+        /* SIOF1 */
+        make_ipr_irq(SIOF1_ERI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS,
+                        SIOF1_PRIORITY);
+        make_ipr_irq(SIOF1_TXI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS,
+                        SIOF1_PRIORITY);
+        make_ipr_irq(SIOF1_RXI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS,
+                        SIOF1_PRIORITY);
+        make_ipr_irq(SIOF1_CCI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS,
+                        SIOF1_PRIORITY);
+
+        /* SLIC IRQ's */
+        make_ipr_irq(IRQ1_IRQ, IRQ1_IPR_ADDR, IRQ1_IPR_POS, IRQ1_PRIORITY);
+        make_ipr_irq(IRQ2_IRQ, IRQ2_IPR_ADDR, IRQ2_IPR_POS, IRQ2_PRIORITY);
+}
+
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_sh7710voipgw __initmv = {
+        .mv_name                = "SH7710 VoIP Gateway",
+        .mv_nr_irqs             = 104,
+        .mv_init_irq            = sh7710voipgw_init_irq,
+};
+ALIAS_MV(sh7710voipgw)
diff --git a/arch/sh/boards/renesas/systemh/io.c b/arch/sh/boards/renesas/systemh/io.c
index cf979011aa94..cde6e5d192c4 100644
--- a/arch/sh/boards/renesas/systemh/io.c
+++ b/arch/sh/boards/renesas/systemh/io.c
@@ -5,66 +5,25 @@
  * Based largely on io_se.c.
  *
  * I/O routine for Hitachi 7751 Systemh.
- *
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <asm/systemh/7751systemh.h>
+#include <linux/pci.h>
+#include <asm/systemh7751.h>
 #include <asm/addrspace.h>
 #include <asm/io.h>
 
-#include <linux/pci.h>
-#include "../../drivers/pci/pci-sh7751.h"
-
-/*
- * The 7751 SystemH Engine uses the built-in PCI controller (PCIC)
- * of the 7751 processor, and has a SuperIO accessible on its memory
- * bus.
- */
-
-#define PCIIOBR         (volatile long *)PCI_REG(SH7751_PCIIOBR)
-#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
-#define PCI_IO_AREA     SH7751_PCI_IO_BASE
-#define PCI_MEM_AREA    SH7751_PCI_CONFIG_BASE
-
-#define PCI_IOMAP(adr)  (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
 #define ETHER_IOMAP(adr) (0xB3000000 + (adr)) /*map to 16bits access area
                                                 of smc lan chip*/
-
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
-
 static inline volatile __u16 *
 port2adr(unsigned int port)
 {
         if (port >= 0x2000)
                 return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-#if 0
-        else
-                return (volatile __u16 *) (PA_SUPERIO + (port << 1));
-#endif
-        maybebadio(name,(unsigned long)port);
+        maybebadio((unsigned long)port);
         return (volatile __u16*)port;
 }
 
-/* In case someone configures the kernel w/o PCI support: in that */
-/* scenario, don't ever bother to check for PCI-window addresses */
-
-/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
-#if defined(CONFIG_PCI)
-#define CHECK_SH7751_PCIIO(port) \
-  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
-#else
-#define CHECK_SH7751_PCIIO(port) (0)
-#endif
-
 /*
  * General outline: remap really low stuff [eventually] to SuperIO,
  * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
@@ -76,8 +35,8 @@ unsigned char sh7751systemh_inb(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned char *)PCI_IOMAP(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
@@ -90,13 +49,13 @@ unsigned char sh7751systemh_inb_p(unsigned long port)
 
         if (PXSEG(port))
                 v = *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(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;
-        delay();
+        ctrl_delay();
         return v;
 }
 
@@ -104,14 +63,14 @@ unsigned short sh7751systemh_inw(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned short *)PCI_IOMAP(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(inw, port);
+                maybebadio(port);
         return 0;
 }
 
@@ -119,14 +78,14 @@ unsigned int sh7751systemh_inl(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned long *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned int *)PCI_IOMAP(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(inl, port);
+                maybebadio(port);
         return 0;
 }
 
@@ -135,8 +94,8 @@ void sh7751systemh_outb(unsigned char value, unsigned long port)
 
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(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
@@ -147,37 +106,37 @@ void sh7751systemh_outb_p(unsigned char value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(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;
-        delay();
+        ctrl_delay();
 }
 
 void sh7751systemh_outw(unsigned short value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned short *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned short *)PCI_IOMAP(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(outw, port);
+                maybebadio(port);
 }
 
 void sh7751systemh_outl(unsigned int value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned long *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned long*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned long*)pci_ioaddr(port)) = value;
         else
-                maybebadio(outl, port);
+                maybebadio(port);
 }
 
 void sh7751systemh_insb(unsigned long port, void *addr, unsigned long count)
@@ -194,7 +153,7 @@ void sh7751systemh_insw(unsigned long port, void *addr, unsigned long count)
 
 void sh7751systemh_insl(unsigned long port, void *addr, unsigned long count)
 {
-        maybebadio(insl, port);
+        maybebadio(port);
 }
 
 void sh7751systemh_outsb(unsigned long port, const void *addr, unsigned long count)
@@ -211,73 +170,5 @@ void sh7751systemh_outsw(unsigned long port, const void *addr, unsigned long cou
 
 void sh7751systemh_outsl(unsigned long port, const void *addr, unsigned long count)
 {
-        maybebadio(outsw, port);
-}
-
-/* For read/write calls, just copy generic (pass-thru); PCIMBR is  */
-/* already set up.  For a larger memory space, these would need to */
-/* reset PCIMBR as needed on a per-call basis...                   */
-
-unsigned char sh7751systemh_readb(unsigned long addr)
-{
-        return *(volatile unsigned char*)addr;
-}
-
-unsigned short sh7751systemh_readw(unsigned long addr)
-{
-        return *(volatile unsigned short*)addr;
-}
-
-unsigned int sh7751systemh_readl(unsigned long addr)
-{
-        return *(volatile unsigned long*)addr;
-}
-
-void sh7751systemh_writeb(unsigned char b, unsigned long addr)
-{
-        *(volatile unsigned char*)addr = b;
-}
-
-void sh7751systemh_writew(unsigned short b, unsigned long addr)
-{
-        *(volatile unsigned short*)addr = b;
-}
-
-void sh7751systemh_writel(unsigned int b, unsigned long addr)
-{
-        *(volatile unsigned long*)addr = b;
-}
-
-
-
-/* Map ISA bus address to the real address. Only for PCMCIA.  */
-
-/* ISA page descriptor.  */
-static __u32 sh_isa_memmap[256];
-
-#if 0
-static int
-sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
-{
-        int idx;
-
-        if (start >= 0x100000 || (start & 0xfff) || (length != 0x1000))
-                return -1;
-
-        idx = start >> 12;
-        sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
-        printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
-               start, length, offset, idx, sh_isa_memmap[idx]);
-        return 0;
-}
-#endif
-
-unsigned long
-sh7751systemh_isa_port2addr(unsigned long offset)
-{
-        int idx;
-
-        idx = (offset >> 12) & 0xff;
-        offset &= 0xfff;
-        return sh_isa_memmap[idx] + offset;
+        maybebadio(port);
 }
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c
index 8372d967f601..8d016dae2333 100644
--- a/arch/sh/boards/renesas/systemh/irq.c
+++ b/arch/sh/boards/renesas/systemh/irq.c
@@ -15,7 +15,7 @@
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <asm/io.h>
-#include <asm/mach/7751systemh.h>
+#include <asm/systemh7751.h>
 #include <asm/smc37c93x.h>
 
 /* address of external interrupt mask register
@@ -57,12 +57,9 @@ static void shutdown_systemh_irq(unsigned int irq)
 static void disable_systemh_irq(unsigned int irq)
 {
         if (systemh_irq_mask_register) {
-                unsigned long flags;
                 unsigned long val, mask = 0x01 << 1;
 
                 /* Clear the "irq"th bit in the mask and set it in the request */
-                local_irq_save(flags);
-
                 val = ctrl_inl((unsigned long)systemh_irq_mask_register);
                 val &= ~mask;
                 ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
@@ -70,23 +67,18 @@ static void disable_systemh_irq(unsigned int irq)
                 val = ctrl_inl((unsigned long)systemh_irq_request_register);
                 val |= mask;
                 ctrl_outl(val, (unsigned long)systemh_irq_request_register);
-
-                local_irq_restore(flags);
         }
 }
 
 static void enable_systemh_irq(unsigned int irq)
 {
         if (systemh_irq_mask_register) {
-                unsigned long flags;
                 unsigned long val, mask = 0x01 << 1;
 
                 /* Set "irq"th bit in the mask register */
-                local_irq_save(flags);
                 val = ctrl_inl((unsigned long)systemh_irq_mask_register);
                 val |= mask;
                 ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
-                local_irq_restore(flags);
         }
 }
 
diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c
index 826fa3d7669c..a8467bf90c25 100644
--- a/arch/sh/boards/renesas/systemh/setup.c
+++ b/arch/sh/boards/renesas/systemh/setup.c
@@ -15,28 +15,21 @@
  * for more details.
  */
 #include <linux/init.h>
-#include <asm/mach/7751systemh.h>
-#include <asm/mach/io.h>
 #include <asm/machvec.h>
+#include <asm/systemh7751.h>
 
 extern void make_systemh_irq(unsigned int irq);
 
-const char *get_system_type(void)
-{
-        return "7751 SystemH";
-}
-
 /*
  * Initialize IRQ setting
  */
-void __init init_7751systemh_IRQ(void)
+static void __init sh7751systemh_init_irq(void)
 {
-/*      make_ipr_irq(10, BCR_ILCRD, 1, 0x0f-10); LAN */
-/*      make_ipr_irq(14, BCR_ILCRA, 2, 0x0f-4); */
         make_systemh_irq(0xb);  /* Ethernet interrupt */
 }
 
 struct sh_machine_vector mv_7751systemh __initmv = {
+        .mv_name                = "7751 SystemH",
         .mv_nr_irqs             = 72,
 
         .mv_inb                 = sh7751systemh_inb,
@@ -60,21 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = {
         .mv_outsw               = sh7751systemh_outsw,
         .mv_outsl               = sh7751systemh_outsl,
 
-        .mv_readb               = sh7751systemh_readb,
-        .mv_readw               = sh7751systemh_readw,
-        .mv_readl               = sh7751systemh_readl,
-        .mv_writeb              = sh7751systemh_writeb,
-        .mv_writew              = sh7751systemh_writew,
-        .mv_writel              = sh7751systemh_writel,
-
-        .mv_isa_port2addr       = sh7751systemh_isa_port2addr,
-
-        .mv_init_irq            = init_7751systemh_IRQ,
+        .mv_init_irq            = sh7751system_init_irq,
 };
 ALIAS_MV(7751systemh)
-
-int __init platform_setup(void)
-{
-        return 0;
-}
-
diff --git a/arch/sh/boards/saturn/setup.c b/arch/sh/boards/saturn/setup.c
index bea6c572ad82..a3a37c9aad2e 100644
--- a/arch/sh/boards/saturn/setup.c
+++ b/arch/sh/boards/saturn/setup.c
@@ -9,22 +9,17 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
-
 #include <asm/io.h>
 #include <asm/machvec.h>
 #include <asm/mach/io.h>
 
 extern int saturn_irq_demux(int irq_nr);
 
-const char *get_system_type(void)
-{
-        return "Sega Saturn";
-}
-
 /*
  * The Machine Vector
  */
 struct sh_machine_vector mv_saturn __initmv = {
+        .mv_name                = "Sega Saturn",
         .mv_nr_irqs             = 80,   /* Fix this later */
 
         .mv_isa_port2addr       = saturn_isa_port2addr,
@@ -33,11 +28,4 @@ struct sh_machine_vector mv_saturn __initmv = {
         .mv_ioremap             = saturn_ioremap,
         .mv_iounmap             = saturn_iounmap,
 };
-
 ALIAS_MV(saturn)
-
-int __init platform_setup(void)
-{
-        return 0;
-}
-
diff --git a/arch/sh/boards/se/7300/io.c b/arch/sh/boards/se/7300/io.c
index f449a94ddffd..8a03d7a52a7c 100644
--- a/arch/sh/boards/se/7300/io.c
+++ b/arch/sh/boards/se/7300/io.c
@@ -9,8 +9,8 @@
  */
 
 #include <linux/kernel.h>
-#include <asm/mach/se7300.h>
 #include <asm/io.h>
+#include <asm/se7300.h>
 
 #define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
 
@@ -99,6 +99,7 @@ bad_outb(struct iop *p, unsigned char value, unsigned long port)
         badio(inw, port);
 }
 
+#ifdef CONFIG_SMC91X
 /* MSTLANEX01 LAN at 0xb400:0000 */
 static struct iop laniop = {
         .start = 0x300,
@@ -110,6 +111,7 @@ static struct iop laniop = {
         .outb = simple_outb,
         .outw = simple_outw,
 };
+#endif
 
 /* NE2000 pc card NIC */
 static struct iop neiop = {
@@ -123,6 +125,7 @@ static struct iop neiop = {
         .outw = simple_outw,
 };
 
+#ifdef CONFIG_IDE
 /* CF in CF slot */
 static struct iop cfiop = {
         .base = 0xb0600000,
@@ -132,12 +135,13 @@ static struct iop cfiop = {
         .outb = pcc_outb,
         .outw = simple_outw,
 };
+#endif
 
 static __inline__ struct iop *
 port2iop(unsigned long port)
 {
         if (0) ;
-#if defined(CONFIG_SMC91111)
+#if defined(CONFIG_SMC91X)
         else if (laniop.check(&laniop, port))
                 return &laniop;
 #endif
diff --git a/arch/sh/boards/se/7300/irq.c b/arch/sh/boards/se/7300/irq.c
index 216a78d1a108..ad1034f98a29 100644
--- a/arch/sh/boards/se/7300/irq.c
+++ b/arch/sh/boards/se/7300/irq.c
@@ -11,7 +11,7 @@
 #include <linux/irq.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/mach/se7300.h>
+#include <asm/se7300.h>
 
 /*
  * Initialize IRQ setting
diff --git a/arch/sh/boards/se/7300/led.c b/arch/sh/boards/se/7300/led.c
index ad51f0a9c1e3..4d03bb7774be 100644
--- a/arch/sh/boards/se/7300/led.c
+++ b/arch/sh/boards/se/7300/led.c
@@ -12,24 +12,10 @@
  */
 
 #include <linux/sched.h>
-#include <asm/mach/se7300.h>
-
-static void
-mach_led(int position, int value)
-{
-        volatile unsigned short *p = (volatile unsigned short *) PA_LED;
-
-        if (value) {
-                *p |= (1 << 8);
-        } else {
-                *p &= ~(1 << 8);
-        }
-}
-
+#include <asm/se7300.h>
 
 /* Cycle the LED's in the clasic Knightrider/Sun pattern */
-void
-heartbeat_7300se(void)
+void heartbeat_7300se(void)
 {
         static unsigned int cnt = 0, period = 0;
         volatile unsigned short *p = (volatile unsigned short *) PA_LED;
diff --git a/arch/sh/boards/se/7300/setup.c b/arch/sh/boards/se/7300/setup.c
index ebcd98d4c081..6f082a722d42 100644
--- a/arch/sh/boards/se/7300/setup.c
+++ b/arch/sh/boards/se/7300/setup.c
@@ -9,23 +9,16 @@
 
 #include <linux/init.h>
 #include <asm/machvec.h>
-#include <asm/machvec_init.h>
-#include <asm/mach/io.h>
+#include <asm/se7300.h>
 
 void heartbeat_7300se(void);
 void init_7300se_IRQ(void);
 
-const char *
-get_system_type(void)
-{
-        return "SolutionEngine 7300";
-}
-
 /*
  * The Machine Vector
  */
-
 struct sh_machine_vector mv_7300se __initmv = {
+        .mv_name = "SolutionEngine 7300",
         .mv_nr_irqs = 109,
         .mv_inb = sh7300se_inb,
         .mv_inw = sh7300se_inw,
@@ -53,13 +46,4 @@ struct sh_machine_vector mv_7300se __initmv = {
         .mv_heartbeat = heartbeat_7300se,
 #endif
 };
-
 ALIAS_MV(7300se)
-/*
- * Initialize the board
- */
-void __init
-platform_setup(void)
-{
-
-}
diff --git a/arch/sh/boards/se/73180/io.c b/arch/sh/boards/se/73180/io.c
index 755df5ac4a4e..72715575458b 100644
--- a/arch/sh/boards/se/73180/io.c
+++ b/arch/sh/boards/se/73180/io.c
@@ -99,6 +99,7 @@ bad_outb(struct iop *p, unsigned char value, unsigned long port)
         badio(inw, port);
 }
 
+#ifdef CONFIG_SMC91X
 /* MSTLANEX01 LAN at 0xb400:0000 */
 static struct iop laniop = {
         .start = 0x300,
@@ -110,6 +111,7 @@ static struct iop laniop = {
         .outb = simple_outb,
         .outw = simple_outw,
 };
+#endif
 
 /* NE2000 pc card NIC */
 static struct iop neiop = {
@@ -123,6 +125,7 @@ static struct iop neiop = {
         .outw = simple_outw,
 };
 
+#ifdef CONFIG_IDE
 /* CF in CF slot */
 static struct iop cfiop = {
         .base = 0xb0600000,
@@ -132,12 +135,13 @@ static struct iop cfiop = {
         .outb = pcc_outb,
         .outw = simple_outw,
 };
+#endif
 
 static __inline__ struct iop *
 port2iop(unsigned long port)
 {
         if (0) ;
-#if defined(CONFIG_SMC91111)
+#if defined(CONFIG_SMC91X)
         else if (laniop.check(&laniop, port))
                 return &laniop;
 #endif
diff --git a/arch/sh/boards/se/73180/irq.c b/arch/sh/boards/se/73180/irq.c
index 4344d0ef24aa..2c62b8ea350e 100644
--- a/arch/sh/boards/se/73180/irq.c
+++ b/arch/sh/boards/se/73180/irq.c
@@ -7,7 +7,6 @@
  * Modified for SH-Mobile SolutionEngine 73180 Support
  *              by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
  *
- *
  */
 
 #include <linux/init.h>
@@ -17,14 +16,6 @@
 #include <asm/mach/se73180.h>
 
 static int
-intreq2irq(int i)
-{
-        if (i == 5)
-                return 10;
-        return 32 + 7 - i;
-}
-
-static int
 irq2intreq(int irq)
 {
         if (irq == 10)
diff --git a/arch/sh/boards/se/73180/led.c b/arch/sh/boards/se/73180/led.c
index 610439fde6ee..4b72e9a3ead9 100644
--- a/arch/sh/boards/se/73180/led.c
+++ b/arch/sh/boards/se/73180/led.c
@@ -14,21 +14,8 @@
 #include <linux/sched.h>
 #include <asm/mach/se73180.h>
 
-static void
-mach_led(int position, int value)
-{
-        volatile unsigned short *p = (volatile unsigned short *) PA_LED;
-
-        if (value) {
-                *p |= (1 << LED_SHIFT);
-        } else {
-                *p &= ~(1 << LED_SHIFT);
-        }
-}
-
 /* Cycle the LED's in the clasic Knightrider/Sun pattern */
-void
-heartbeat_73180se(void)
+void heartbeat_73180se(void)
 {
         static unsigned int cnt = 0, period = 0;
         volatile unsigned short *p = (volatile unsigned short *) PA_LED;
diff --git a/arch/sh/boards/se/73180/setup.c b/arch/sh/boards/se/73180/setup.c
index cdb7b5f8d942..b38ef50a160a 100644
--- a/arch/sh/boards/se/73180/setup.c
+++ b/arch/sh/boards/se/73180/setup.c
@@ -11,23 +11,17 @@
 
 #include <linux/init.h>
 #include <asm/machvec.h>
-#include <asm/machvec_init.h>
-#include <asm/mach/io.h>
+#include <asm/se73180.h>
+#include <asm/irq.h>
 
 void heartbeat_73180se(void);
 void init_73180se_IRQ(void);
 
-const char *
-get_system_type(void)
-{
-        return "SolutionEngine 73180";
-}
-
 /*
  * The Machine Vector
  */
-
 struct sh_machine_vector mv_73180se __initmv = {
+        .mv_name = "SolutionEngine 73180",
         .mv_nr_irqs = 108,
         .mv_inb = sh73180se_inb,
         .mv_inw = sh73180se_inw,
@@ -51,17 +45,9 @@ struct sh_machine_vector mv_73180se __initmv = {
         .mv_outsl = sh73180se_outsl,
 
         .mv_init_irq = init_73180se_IRQ,
+        .mv_irq_demux = shmse_irq_demux,
 #ifdef CONFIG_HEARTBEAT
         .mv_heartbeat = heartbeat_73180se,
 #endif
 };
-
 ALIAS_MV(73180se)
-/*
- * Initialize the board
- */
-void __init
-platform_setup(void)
-{
-
-}
diff --git a/arch/sh/boards/se/7343/Makefile b/arch/sh/boards/se/7343/Makefile
new file mode 100644
index 000000000000..4291069c0b4f
--- /dev/null
+++ b/arch/sh/boards/se/7343/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the 7343 SolutionEngine specific parts of the kernel
+#
+
+obj-y    := setup.o io.o irq.o
+
+obj-$(CONFIG_HEARTBEAT) += led.o
diff --git a/arch/sh/boards/se/7343/io.c b/arch/sh/boards/se/7343/io.c
new file mode 100644
index 000000000000..646661a146ad
--- /dev/null
+++ b/arch/sh/boards/se/7343/io.c
@@ -0,0 +1,275 @@
+/*
+ * arch/sh/boards/se/7343/io.c
+ *
+ * I/O routine for SH-Mobile3AS 7343 SolutionEngine.
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <asm/io.h>
+#include <asm/mach/se7343.h>
+
+#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
+
+struct iop {
+        unsigned long start, end;
+        unsigned long base;
+        struct iop *(*check) (struct iop * p, unsigned long port);
+        unsigned char (*inb) (struct iop * p, unsigned long port);
+        unsigned short (*inw) (struct iop * p, unsigned long port);
+        void (*outb) (struct iop * p, unsigned char value, unsigned long port);
+        void (*outw) (struct iop * p, unsigned short value, unsigned long port);
+};
+
+struct iop *
+simple_check(struct iop *p, unsigned long port)
+{
+        static int count;
+
+        if (count < 100)
+                count++;
+
+        port &= 0xFFFF;
+
+        if ((p->start <= port) && (port <= p->end))
+                return p;
+        else
+                badio(check, port);
+}
+
+struct iop *
+ide_check(struct iop *p, unsigned long port)
+{
+        if (((0x1f0 <= port) && (port <= 0x1f7)) || (port == 0x3f7))
+                return p;
+        return NULL;
+}
+
+unsigned char
+simple_inb(struct iop *p, unsigned long port)
+{
+        return *(unsigned char *) (p->base + port);
+}
+
+unsigned short
+simple_inw(struct iop *p, unsigned long port)
+{
+        return *(unsigned short *) (p->base + port);
+}
+
+void
+simple_outb(struct iop *p, unsigned char value, unsigned long port)
+{
+        *(unsigned char *) (p->base + port) = value;
+}
+
+void
+simple_outw(struct iop *p, unsigned short value, unsigned long port)
+{
+        *(unsigned short *) (p->base + port) = value;
+}
+
+unsigned char
+pcc_inb(struct iop *p, unsigned long port)
+{
+        unsigned long addr = p->base + port + 0x40000;
+        unsigned long v;
+
+        if (port & 1)
+                addr += 0x00400000;
+        v = *(volatile unsigned char *) addr;
+        return v;
+}
+
+void
+pcc_outb(struct iop *p, unsigned char value, unsigned long port)
+{
+        unsigned long addr = p->base + port + 0x40000;
+
+        if (port & 1)
+                addr += 0x00400000;
+        *(volatile unsigned char *) addr = value;
+}
+
+unsigned char
+bad_inb(struct iop *p, unsigned long port)
+{
+        badio(inb, port);
+}
+
+void
+bad_outb(struct iop *p, unsigned char value, unsigned long port)
+{
+        badio(inw, port);
+}
+
+#ifdef CONFIG_SMC91X
+/* MSTLANEX01 LAN at 0xb400:0000 */
+static struct iop laniop = {
+        .start = 0x00,
+        .end = 0x0F,
+        .base = 0x04000000,
+        .check = simple_check,
+        .inb = simple_inb,
+        .inw = simple_inw,
+        .outb = simple_outb,
+        .outw = simple_outw,
+};
+#endif
+
+#ifdef CONFIG_NE2000
+/* NE2000 pc card NIC */
+static struct iop neiop = {
+        .start = 0x280,
+        .end = 0x29f,
+        .base = 0xb0600000 + 0x80,      /* soft 0x280 -> hard 0x300 */
+        .check = simple_check,
+        .inb = pcc_inb,
+        .inw = simple_inw,
+        .outb = pcc_outb,
+        .outw = simple_outw,
+};
+#endif
+
+#ifdef CONFIG_IDE
+/* CF in CF slot */
+static struct iop cfiop = {
+        .base = 0xb0600000,
+        .check = ide_check,
+        .inb = pcc_inb,
+        .inw = simple_inw,
+        .outb = pcc_outb,
+        .outw = simple_outw,
+};
+#endif
+
+static __inline__ struct iop *
+port2iop(unsigned long port)
+{
+        if (0) ;
+#if defined(CONFIG_SMC91X)
+        else if (laniop.check(&laniop, port))
+                return &laniop;
+#endif
+#if defined(CONFIG_NE2000)
+        else if (neiop.check(&neiop, port))
+                return &neiop;
+#endif
+#if defined(CONFIG_IDE)
+        else if (cfiop.check(&cfiop, port))
+                return &cfiop;
+#endif
+        else
+                return NULL;
+}
+
+static inline void
+delay(void)
+{
+        ctrl_inw(0xac000000);
+        ctrl_inw(0xac000000);
+}
+
+unsigned char
+sh7343se_inb(unsigned long port)
+{
+        struct iop *p = port2iop(port);
+        return (p->inb) (p, port);
+}
+
+unsigned char
+sh7343se_inb_p(unsigned long port)
+{
+        unsigned char v = sh7343se_inb(port);
+        delay();
+        return v;
+}
+
+unsigned short
+sh7343se_inw(unsigned long port)
+{
+        struct iop *p = port2iop(port);
+        return (p->inw) (p, port);
+}
+
+unsigned int
+sh7343se_inl(unsigned long port)
+{
+        badio(inl, port);
+}
+
+void
+sh7343se_outb(unsigned char value, unsigned long port)
+{
+        struct iop *p = port2iop(port);
+        (p->outb) (p, value, port);
+}
+
+void
+sh7343se_outb_p(unsigned char value, unsigned long port)
+{
+        sh7343se_outb(value, port);
+        delay();
+}
+
+void
+sh7343se_outw(unsigned short value, unsigned long port)
+{
+        struct iop *p = port2iop(port);
+        (p->outw) (p, value, port);
+}
+
+void
+sh7343se_outl(unsigned int value, unsigned long port)
+{
+        badio(outl, port);
+}
+
+void
+sh7343se_insb(unsigned long port, void *addr, unsigned long count)
+{
+        unsigned char *a = addr;
+        struct iop *p = port2iop(port);
+        while (count--)
+                *a++ = (p->inb) (p, port);
+}
+
+void
+sh7343se_insw(unsigned long port, void *addr, unsigned long count)
+{
+        unsigned short *a = addr;
+        struct iop *p = port2iop(port);
+        while (count--)
+                *a++ = (p->inw) (p, port);
+}
+
+void
+sh7343se_insl(unsigned long port, void *addr, unsigned long count)
+{
+        badio(insl, port);
+}
+
+void
+sh7343se_outsb(unsigned long port, const void *addr, unsigned long count)
+{
+        unsigned char *a = (unsigned char *) addr;
+        struct iop *p = port2iop(port);
+        while (count--)
+                (p->outb) (p, *a++, port);
+}
+
+void
+sh7343se_outsw(unsigned long port, const void *addr, unsigned long count)
+{
+        unsigned short *a = (unsigned short *) addr;
+        struct iop *p = port2iop(port);
+        while (count--)
+                (p->outw) (p, *a++, port);
+}
+
+void
+sh7343se_outsl(unsigned long port, const void *addr, unsigned long count)
+{
+        badio(outsw, port);
+}
diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/se/7343/irq.c
new file mode 100644
index 000000000000..b41e3d4ea37c
--- /dev/null
+++ b/arch/sh/boards/se/7343/irq.c
@@ -0,0 +1,193 @@
+/*
+ * arch/sh/boards/se/7343/irq.c
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <asm/irq.h>
+#include <asm/io.h>
+#include <asm/mach/se7343.h>
+
+static void
+disable_intreq_irq(unsigned int irq)
+{
+        int bit = irq - OFFCHIP_IRQ_BASE;
+        u16 val;
+
+        val = ctrl_inw(PA_CPLD_IMSK);
+        val |= 1 << bit;
+        ctrl_outw(val, PA_CPLD_IMSK);
+}
+
+static void
+enable_intreq_irq(unsigned int irq)
+{
+        int bit = irq - OFFCHIP_IRQ_BASE;
+        u16 val;
+
+        val = ctrl_inw(PA_CPLD_IMSK);
+        val &= ~(1 << bit);
+        ctrl_outw(val, PA_CPLD_IMSK);
+}
+
+static void
+mask_and_ack_intreq_irq(unsigned int irq)
+{
+        disable_intreq_irq(irq);
+}
+
+static unsigned int
+startup_intreq_irq(unsigned int irq)
+{
+        enable_intreq_irq(irq);
+        return 0;
+}
+
+static void
+shutdown_intreq_irq(unsigned int irq)
+{
+        disable_intreq_irq(irq);
+}
+
+static void
+end_intreq_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+                enable_intreq_irq(irq);
+}
+
+static struct hw_interrupt_type intreq_irq_type = {
+        .typename = "FPGA-IRQ",
+        .startup = startup_intreq_irq,
+        .shutdown = shutdown_intreq_irq,
+        .enable = enable_intreq_irq,
+        .disable = disable_intreq_irq,
+        .ack = mask_and_ack_intreq_irq,
+        .end = end_intreq_irq
+};
+
+static void
+make_intreq_irq(unsigned int irq)
+{
+        disable_irq_nosync(irq);
+        irq_desc[irq].handler = &intreq_irq_type;
+        disable_intreq_irq(irq);
+}
+
+int
+shmse_irq_demux(int irq)
+{
+        int bit;
+        volatile u16 val;
+
+        if (irq == IRQ5_IRQ) {
+                /* Read status Register */
+                val = ctrl_inw(PA_CPLD_ST);
+                bit = ffs(val);
+                if (bit != 0)
+                        return OFFCHIP_IRQ_BASE + bit - 1;
+        }
+        return irq;
+}
+
+/* IRQ5 is multiplexed between the following sources:
+ * 1. PC Card socket
+ * 2. Extension slot
+ * 3. USB Controller
+ * 4. Serial Controller
+ *
+ * We configure IRQ5 as a cascade IRQ.
+ */
+static struct irqaction irq5 = { no_action, 0, CPU_MASK_NONE, "IRQ5-cascade",
+                                NULL, NULL};
+
+/*
+ * Initialize IRQ setting
+ */
+void __init
+init_7343se_IRQ(void)
+{
+        /* Setup Multiplexed interrupts */
+        ctrl_outw(8, PA_CPLD_MODESET);  /* Set all CPLD interrupts to active
+                                         * low.
+                                         */
+        /* Mask all CPLD controller interrupts */
+        ctrl_outw(0x0fff, PA_CPLD_IMSK);
+
+        /* PC Card interrupts */
+        make_intreq_irq(PC_IRQ0);
+        make_intreq_irq(PC_IRQ1);
+        make_intreq_irq(PC_IRQ2);
+        make_intreq_irq(PC_IRQ3);
+
+        /* Extension Slot Interrupts */
+        make_intreq_irq(EXT_IRQ0);
+        make_intreq_irq(EXT_IRQ1);
+        make_intreq_irq(EXT_IRQ2);
+        make_intreq_irq(EXT_IRQ3);
+
+        /* USB Controller interrupts */
+        make_intreq_irq(USB_IRQ0);
+        make_intreq_irq(USB_IRQ1);
+
+        /* Serial Controller interrupts */
+        make_intreq_irq(UART_IRQ0);
+        make_intreq_irq(UART_IRQ1);
+
+        /* Setup all external interrupts to be active low */
+        ctrl_outw(0xaaaa, INTC_ICR1);
+
+        make_ipr_irq(IRQ5_IRQ, IRQ5_IPR_ADDR+2, IRQ5_IPR_POS, IRQ5_PRIORITY);
+        setup_irq(IRQ5_IRQ, &irq5);
+        /* Set port control to use IRQ5 */
+        *(u16 *)0xA4050108 &= ~0xc;
+
+        make_ipr_irq(SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY);
+        make_ipr_irq(VPU_IRQ, VPU_IPR_ADDR, VPU_IPR_POS, 8);
+
+        ctrl_outb(0x0f, INTC_IMCR5);    /* enable SCIF IRQ */
+
+        make_ipr_irq(DMTE0_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY);
+        make_ipr_irq(DMTE1_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY);
+        make_ipr_irq(DMTE2_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY);
+        make_ipr_irq(DMTE3_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY);
+        make_ipr_irq(DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY);
+        make_ipr_irq(DMTE5_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY);
+
+        /* I2C block */
+        make_ipr_irq(IIC0_ALI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY);
+        make_ipr_irq(IIC0_TACKI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS,
+                     IIC0_PRIORITY);
+        make_ipr_irq(IIC0_WAITI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS,
+                     IIC0_PRIORITY);
+        make_ipr_irq(IIC0_DTEI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY);
+
+        make_ipr_irq(IIC1_ALI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS, IIC1_PRIORITY);
+        make_ipr_irq(IIC1_TACKI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS,
+                     IIC1_PRIORITY);
+        make_ipr_irq(IIC1_WAITI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS,
+                     IIC1_PRIORITY);
+        make_ipr_irq(IIC1_DTEI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS, IIC1_PRIORITY);
+
+        /* SIOF */
+        make_ipr_irq(SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY);
+
+        /* SIU */
+        make_ipr_irq(SIU_IRQ, SIU_IPR_ADDR, SIU_IPR_POS, SIU_PRIORITY);
+
+        /* VIO interrupt */
+        make_ipr_irq(CEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY);
+        make_ipr_irq(BEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY);
+        make_ipr_irq(VEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY);
+
+        /*MFI interrupt*/
+
+        make_ipr_irq(MFI_IRQ, MFI_IPR_ADDR, MFI_IPR_POS, MFI_PRIORITY);
+
+        /* LCD controller */
+        make_ipr_irq(LCDC_IRQ, LCDC_IPR_ADDR, LCDC_IPR_POS, LCDC_PRIORITY);
+        ctrl_outw(0x2000, PA_MRSHPC + 0x0c);    /* mrshpc irq enable */
+}
diff --git a/arch/sh/boards/se/7343/led.c b/arch/sh/boards/se/7343/led.c
new file mode 100644
index 000000000000..6a439cf83e46
--- /dev/null
+++ b/arch/sh/boards/se/7343/led.c
@@ -0,0 +1,46 @@
+/*
+ * arch/sh/boards/se/7343/led.c
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/sched.h>
+#include <asm/mach/se7343.h>
+
+/* Cycle the LED's in the clasic Knightrider/Sun pattern */
+void heartbeat_7343se(void)
+{
+        static unsigned int cnt = 0, period = 0;
+        volatile unsigned short *p = (volatile unsigned short *) PA_LED;
+        static unsigned bit = 0, up = 1;
+
+        cnt += 1;
+        if (cnt < period) {
+                return;
+        }
+
+        cnt = 0;
+
+        /* Go through the points (roughly!):
+         * f(0)=10, f(1)=16, f(2)=20, f(5)=35,f(inf)->110
+         */
+        period = 110 - ((300 << FSHIFT) / ((avenrun[0] / 5) + (3 << FSHIFT)));
+
+        if (up) {
+                if (bit == 7) {
+                        bit--;
+                        up = 0;
+                } else {
+                        bit++;
+                }
+        } else {
+                if (bit == 0) {
+                        bit++;
+                        up = 1;
+                } else {
+                        bit--;
+                }
+        }
+        *p = 1 << (bit + LED_SHIFT);
+
+}
diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c
new file mode 100644
index 000000000000..787322291fb3
--- /dev/null
+++ b/arch/sh/boards/se/7343/setup.c
@@ -0,0 +1,84 @@
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <asm/machvec.h>
+#include <asm/mach/se7343.h>
+#include <asm/irq.h>
+
+void heartbeat_7343se(void);
+void init_7343se_IRQ(void);
+
+static struct resource smc91x_resources[] = {
+        [0] = {
+                .start  = 0x10000000,
+                .end    = 0x1000000F,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /*
+                 * shared with other devices via externel
+                 * interrupt controller in FPGA...
+                 */
+                .start  = EXT_IRQ2,
+                .end    = EXT_IRQ2,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device smc91x_device = {
+        .name           = "smc91x",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(smc91x_resources),
+        .resource       = smc91x_resources,
+};
+
+static struct platform_device *smc91x_platform_devices[] __initdata = {
+        &smc91x_device,
+};
+
+static int __init sh7343se_devices_setup(void)
+{
+        return platform_add_devices(smc91x_platform_devices,
+                                    ARRAY_SIZE(smc91x_platform_devices));
+}
+
+static void __init sh7343se_setup(char **cmdline_p)
+{
+        device_initcall(sh7343se_devices_setup);
+}
+
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_7343se __initmv = {
+        .mv_name = "SolutionEngine 7343",
+        .mv_setup = sh7343se_setup,
+        .mv_nr_irqs = 108,
+        .mv_inb = sh7343se_inb,
+        .mv_inw = sh7343se_inw,
+        .mv_inl = sh7343se_inl,
+        .mv_outb = sh7343se_outb,
+        .mv_outw = sh7343se_outw,
+        .mv_outl = sh7343se_outl,
+
+        .mv_inb_p = sh7343se_inb_p,
+        .mv_inw_p = sh7343se_inw,
+        .mv_inl_p = sh7343se_inl,
+        .mv_outb_p = sh7343se_outb_p,
+        .mv_outw_p = sh7343se_outw,
+        .mv_outl_p = sh7343se_outl,
+
+        .mv_insb = sh7343se_insb,
+        .mv_insw = sh7343se_insw,
+        .mv_insl = sh7343se_insl,
+        .mv_outsb = sh7343se_outsb,
+        .mv_outsw = sh7343se_outsw,
+        .mv_outsl = sh7343se_outsl,
+
+        .mv_init_irq = init_7343se_IRQ,
+        .mv_irq_demux = shmse_irq_demux,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat = heartbeat_7343se,
+#endif
+};
+ALIAS_MV(7343se)
diff --git a/arch/sh/boards/se/770x/Makefile b/arch/sh/boards/se/770x/Makefile
index be89a73cc418..9a5035f80ec0 100644
--- a/arch/sh/boards/se/770x/Makefile
+++ b/arch/sh/boards/se/770x/Makefile
@@ -2,5 +2,5 @@
 # Makefile for the 770x SolutionEngine specific parts of the kernel
 #
 
-obj-y    := mach.o setup.o io.o irq.o led.o
-
+obj-y    := setup.o io.o irq.o
+obj-$(CONFIG_HEARTBEAT) += led.o
diff --git a/arch/sh/boards/se/770x/io.c b/arch/sh/boards/se/770x/io.c
index 9a39ee963143..9941949331ab 100644
--- a/arch/sh/boards/se/770x/io.c
+++ b/arch/sh/boards/se/770x/io.c
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.5 2004/02/22 23:08:43 kkojima Exp $
+/* $Id: io.c,v 1.7 2006/02/05 21:55:29 lethal Exp $
  *
  * linux/arch/sh/kernel/io_se.c
  *
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/io.h>
-#include <asm/se/se.h>
+#include <asm/se.h>
 
 /* SH pcmcia io window base, start and end.  */
 int sh_pcic_io_wbase = 0xb8400000;
@@ -20,11 +20,6 @@ int sh_pcic_io_stop;
 int sh_pcic_io_type;
 int sh_pcic_io_dummy;
 
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
-
 /* MS7750 requires special versions of in*, out* routines, since
    PC-like io ports are located at upper half byte of 16-bit word which
    can be accessed only with 16-bit wide.  */
@@ -52,10 +47,6 @@ shifted_port(unsigned long port)
                 return 1;
 }
 
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
 unsigned char se_inb(unsigned long port)
 {
         if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
@@ -76,7 +67,7 @@ unsigned char se_inb_p(unsigned long port)
                 v = (*port2adr(port) >> 8); 
         else
                 v = (*port2adr(port))&0xff; 
-        delay();
+        ctrl_delay();
         return v;
 }
 
@@ -86,13 +77,13 @@ unsigned short se_inw(unsigned long port)
             (sh_pcic_io_start <= port && port <= sh_pcic_io_stop))
                 return *port2adr(port);
         else
-                maybebadio(inw, port);
+                maybebadio(port);
         return 0;
 }
 
 unsigned int se_inl(unsigned long port)
 {
-        maybebadio(inl, port);
+        maybebadio(port);
         return 0;
 }
 
@@ -114,7 +105,7 @@ void se_outb_p(unsigned char value, unsigned long port)
                 *(port2adr(port)) = value << 8;
         else
                 *(port2adr(port)) = value;
-        delay();
+        ctrl_delay();
 }
 
 void se_outw(unsigned short value, unsigned long port)
@@ -123,12 +114,12 @@ void se_outw(unsigned short value, unsigned long port)
             (sh_pcic_io_start <= port && port <= sh_pcic_io_stop))
                 *port2adr(port) = value;
         else
-                maybebadio(outw, port);
+                maybebadio(port);
 }
 
 void se_outl(unsigned int value, unsigned long port)
 {
-        maybebadio(outl, port);
+        maybebadio(port);
 }
 
 void se_insb(unsigned long port, void *addr, unsigned long count)
@@ -159,7 +150,7 @@ void se_insw(unsigned long port, void *addr, unsigned long count)
 
 void se_insl(unsigned long port, void *addr, unsigned long count)
 {
-        maybebadio(insl, port);
+        maybebadio(port);
 }
 
 void se_outsb(unsigned long port, const void *addr, unsigned long count)
@@ -190,37 +181,5 @@ void se_outsw(unsigned long port, const void *addr, unsigned long count)
 
 void se_outsl(unsigned long port, const void *addr, unsigned long count)
 {
-        maybebadio(outsw, port);
-}
-
-/* Map ISA bus address to the real address. Only for PCMCIA.  */
-
-/* ISA page descriptor.  */
-static __u32 sh_isa_memmap[256];
-
-static int
-sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
-{
-        int idx;
-
-        if (start >= 0x100000 || (start & 0xfff) || (length != 0x1000))
-                return -1;
-
-        idx = start >> 12;
-        sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
-#if 0
-        printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
-               start, length, offset, idx, sh_isa_memmap[idx]);
-#endif
-        return 0;
-}
-
-unsigned long
-se_isa_port2addr(unsigned long offset)
-{
-        int idx;
-
-        idx = (offset >> 12) & 0xff;
-        offset &= 0xfff;
-        return sh_isa_memmap[idx] + offset;
+        maybebadio(port);
 }
diff --git a/arch/sh/boards/se/770x/irq.c b/arch/sh/boards/se/770x/irq.c
index 3e558716ce10..cff6700bbafd 100644
--- a/arch/sh/boards/se/770x/irq.c
+++ b/arch/sh/boards/se/770x/irq.c
@@ -11,7 +11,7 @@
 #include <linux/irq.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/se/se.h>
+#include <asm/se.h>
 
 /*
  * Initialize IRQ setting
diff --git a/arch/sh/boards/se/770x/led.c b/arch/sh/boards/se/770x/led.c
index 3cddbda025fc..daf7b1ee786a 100644
--- a/arch/sh/boards/se/770x/led.c
+++ b/arch/sh/boards/se/770x/led.c
@@ -9,22 +9,8 @@
  * This file contains Solution Engine specific LED code.
  */
 
-#include <asm/se/se.h>
-
-static void mach_led(int position, int value)
-{
-        volatile unsigned short* p = (volatile unsigned short*)PA_LED;
-
-        if (value) {
-                *p |= (1<<8);
-        } else {
-                *p &= ~(1<<8);
-        }
-}
-
-#ifdef CONFIG_HEARTBEAT
-
 #include <linux/sched.h>
+#include <asm/se.h>
 
 /* Cycle the LED's in the clasic Knightrider/Sun pattern */
 void heartbeat_se(void)
@@ -64,4 +50,3 @@ void heartbeat_se(void)
         *p = 1<<(bit+8);
 
 }
-#endif /* CONFIG_HEARTBEAT */
diff --git a/arch/sh/boards/se/770x/mach.c b/arch/sh/boards/se/770x/mach.c
deleted file mode 100644
index 6ec07bd3dcf1..000000000000
--- a/arch/sh/boards/se/770x/mach.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * linux/arch/sh/kernel/mach_se.c
- *
- * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the Hitachi SolutionEngine
- */
-
-#include <linux/init.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/machvec_init.h>
-
-#include <asm/se/io.h>
-
-void heartbeat_se(void);
-void setup_se(void);
-void init_se_IRQ(void);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_se __initmv = {
-#if defined(CONFIG_CPU_SH4)
-        .mv_nr_irqs             = 48,
-#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
-        .mv_nr_irqs             = 32,
-#elif defined(CONFIG_CPU_SUBTYPE_SH7709)
-        .mv_nr_irqs             = 61,
-#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
-        .mv_nr_irqs             = 86,
-#endif
-
-        .mv_inb                 = se_inb,
-        .mv_inw                 = se_inw,
-        .mv_inl                 = se_inl,
-        .mv_outb                = se_outb,
-        .mv_outw                = se_outw,
-        .mv_outl                = se_outl,
-
-        .mv_inb_p               = se_inb_p,
-        .mv_inw_p               = se_inw,
-        .mv_inl_p               = se_inl,
-        .mv_outb_p              = se_outb_p,
-        .mv_outw_p              = se_outw,
-        .mv_outl_p              = se_outl,
-
-        .mv_insb                = se_insb,
-        .mv_insw                = se_insw,
-        .mv_insl                = se_insl,
-        .mv_outsb               = se_outsb,
-        .mv_outsw               = se_outsw,
-        .mv_outsl               = se_outsl,
-
-        .mv_isa_port2addr       = se_isa_port2addr,
-
-        .mv_init_irq            = init_se_IRQ,
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_se,
-#endif
-};
-ALIAS_MV(se)
diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c
index 7d1a071727cc..f3f82b7c8217 100644
--- a/arch/sh/boards/se/770x/setup.c
+++ b/arch/sh/boards/se/770x/setup.c
@@ -7,15 +7,17 @@
  * Hitachi SolutionEngine Support.
  *
  */
-
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <asm/io.h>
-#include <asm/se/se.h>
-#include <asm/se/smc37c93x.h>
+#include <asm/se.h>
+#include <asm/smc37c93x.h>
+#include <asm/machvec.h>
+
+void heartbeat_se(void);
+void init_se_IRQ(void);
 
 /*
  * Configure the Super I/O chip
@@ -26,7 +28,8 @@ static void __init smsc_config(int index, int data)
         outb_p(data, DATA_PORT);
 }
 
-static void __init init_smsc(void)
+/* XXX: Another candidate for a more generic cchip machine vector */
+static void __init smsc_setup(char **cmdline_p)
 {
         outb_p(CONFIG_ENTER, CONFIG_PORT);
         outb_p(CONFIG_ENTER, CONFIG_PORT);
@@ -69,16 +72,46 @@ static void __init init_smsc(void)
         outb_p(CONFIG_EXIT, CONFIG_PORT);
 }
 
-const char *get_system_type(void)
-{
-        return "SolutionEngine";
-}
-
 /*
- * Initialize the board
+ * The Machine Vector
  */
-void __init platform_setup(void)
-{
-        init_smsc();
-        /* XXX: RTC setting comes here */
-}
+struct sh_machine_vector mv_se __initmv = {
+        .mv_name                = "SolutionEngine",
+        .mv_setup               = smsc_setup,
+#if defined(CONFIG_CPU_SH4)
+        .mv_nr_irqs             = 48,
+#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
+        .mv_nr_irqs             = 32,
+#elif defined(CONFIG_CPU_SUBTYPE_SH7709)
+        .mv_nr_irqs             = 61,
+#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
+        .mv_nr_irqs             = 86,
+#endif
+
+        .mv_inb                 = se_inb,
+        .mv_inw                 = se_inw,
+        .mv_inl                 = se_inl,
+        .mv_outb                = se_outb,
+        .mv_outw                = se_outw,
+        .mv_outl                = se_outl,
+
+        .mv_inb_p               = se_inb_p,
+        .mv_inw_p               = se_inw,
+        .mv_inl_p               = se_inl,
+        .mv_outb_p              = se_outb_p,
+        .mv_outw_p              = se_outw,
+        .mv_outl_p              = se_outl,
+
+        .mv_insb                = se_insb,
+        .mv_insw                = se_insw,
+        .mv_insl                = se_insl,
+        .mv_outsb               = se_outsb,
+        .mv_outsw               = se_outsw,
+        .mv_outsl               = se_outsl,
+
+        .mv_init_irq            = init_se_IRQ,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = heartbeat_se,
+#endif
+};
+ALIAS_MV(se)
diff --git a/arch/sh/boards/se/7751/Makefile b/arch/sh/boards/se/7751/Makefile
index ce7ca247f84d..188900c48321 100644
--- a/arch/sh/boards/se/7751/Makefile
+++ b/arch/sh/boards/se/7751/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the 7751 SolutionEngine specific parts of the kernel
 #
 
-obj-y    := mach.o setup.o io.o irq.o led.o
+obj-y    := setup.o io.o irq.o
 
 obj-$(CONFIG_PCI) += pci.o
-
+obj-$(CONFIG_HEARTBEAT) += led.o
diff --git a/arch/sh/boards/se/7751/io.c b/arch/sh/boards/se/7751/io.c
index 99041b269261..e8d846cec89d 100644
--- a/arch/sh/boards/se/7751/io.c
+++ b/arch/sh/boards/se/7751/io.c
@@ -1,6 +1,4 @@
-/* 
- * linux/arch/sh/kernel/io_7751se.c
- *
+/*
  * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
  * Based largely on io_se.c.
  *
@@ -10,96 +8,21 @@
  * placeholder code from io_se.c left in with the
  * expectation of later SuperIO and PCMCIA access.
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/pci.h>
 #include <asm/io.h>
-#include <asm/se7751/se7751.h>
+#include <asm/se7751.h>
 #include <asm/addrspace.h>
 
-#include <linux/pci.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-
-#if 0
-/******************************************************************
- * Variables from io_se.c, related to PCMCIA (not PCI); we're not
- * compiling them in, and have removed references from functions
- * which follow.  [Many checked for IO ports in the range bounded
- * by sh_pcic_io_start/stop, and used sh_pcic_io_wbase as offset.
- * As start/stop are uninitialized, only port 0x0 would match?]
- * When used, remember to adjust names to avoid clash with io_se?
- *****************************************************************/
-/* SH pcmcia io window base, start and end.  */
-int sh_pcic_io_wbase = 0xb8400000;
-int sh_pcic_io_start;
-int sh_pcic_io_stop;
-int sh_pcic_io_type;
-int sh_pcic_io_dummy;
-/*************************************************************/
-#endif
-
-/*
- * The 7751 Solution Engine uses the built-in PCI controller (PCIC)
- * of the 7751 processor, and has a SuperIO accessible via the PCI.
- * The board also includes a PCMCIA controller on its memory bus,
- * like the other Solution Engine boards.
- */ 
-
-#define PCIIOBR         (volatile long *)PCI_REG(SH7751_PCIIOBR)
-#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
-#define PCI_IO_AREA     SH7751_PCI_IO_BASE
-#define PCI_MEM_AREA    SH7751_PCI_CONFIG_BASE
-
-#define PCI_IOMAP(adr)  (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
-
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
-
-static inline volatile __u16 *
-port2adr(unsigned int port)
+static inline volatile u16 *port2adr(unsigned int port)
 {
         if (port >= 0x2000)
                 return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-#if 0
-        else
-                return (volatile __u16 *) (PA_SUPERIO + (port << 1));
-#endif
-        maybebadio(name,(unsigned long)port);
+        maybebadio((unsigned long)port);
         return (volatile __u16*)port;
 }
 
-#if 0
-/* The 7751 Solution Engine seems to have everything hooked */
-/* up pretty normally (nothing on high-bytes only...) so this */
-/* shouldn't be needed */
-static inline int
-shifted_port(unsigned long port)
-{
-        /* For IDE registers, value is not shifted */
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                return 0;
-        else
-                return 1;
-}
-#endif
-
-/* In case someone configures the kernel w/o PCI support: in that */
-/* scenario, don't ever bother to check for PCI-window addresses */
-
-/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
-#if defined(CONFIG_PCI)
-#define CHECK_SH7751_PCIIO(port) \
-  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
-#else
-#define CHECK_SH7751_PCIIO(port) (0)
-#endif
-
 /*
  * General outline: remap really low stuff [eventually] to SuperIO,
  * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
@@ -111,10 +34,10 @@ unsigned char sh7751se_inb(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned char *)pci_ioaddr(port);
         else
-                return (*port2adr(port))&0xff; 
+                return (*port2adr(port)) & 0xff;
 }
 
 unsigned char sh7751se_inb_p(unsigned long port)
@@ -123,11 +46,11 @@ unsigned char sh7751se_inb_p(unsigned long port)
 
         if (PXSEG(port))
                 v = *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                v = *(volatile unsigned char *)pci_ioaddr(port);
         else
-                v = (*port2adr(port))&0xff; 
-        delay();
+                v = (*port2adr(port)) & 0xff;
+        ctrl_delay();
         return v;
 }
 
@@ -135,12 +58,12 @@ unsigned short sh7751se_inw(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned short *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned short *)pci_ioaddr(port);
         else if (port >= 0x2000)
                 return *port2adr(port);
         else
-                maybebadio(inw, port);
+                maybebadio(port);
         return 0;
 }
 
@@ -148,12 +71,12 @@ unsigned int sh7751se_inl(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned long *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned int *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned int *)pci_ioaddr(port);
         else if (port >= 0x2000)
                 return *port2adr(port);
         else
-                maybebadio(inl, port);
+                maybebadio(port);
         return 0;
 }
 
@@ -162,8 +85,8 @@ void sh7751se_outb(unsigned char value, unsigned long port)
 
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
         else
                 *(port2adr(port)) = value;
 }
@@ -172,73 +95,41 @@ void sh7751se_outb_p(unsigned char value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
         else
                 *(port2adr(port)) = value;
-        delay();
+        ctrl_delay();
 }
 
 void sh7751se_outw(unsigned short value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned short *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned short *)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned short *)pci_ioaddr(port)) = value;
         else if (port >= 0x2000)
                 *port2adr(port) = value;
         else
-                maybebadio(outw, port);
+                maybebadio(port);
 }
 
 void sh7751se_outl(unsigned int value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned long *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned long*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned long*)pci_ioaddr(port)) = value;
         else
-                maybebadio(outl, port);
+                maybebadio(port);
 }
 
 void sh7751se_insl(unsigned long port, void *addr, unsigned long count)
 {
-        maybebadio(insl, port);
+        maybebadio(port);
 }
 
 void sh7751se_outsl(unsigned long port, const void *addr, unsigned long count)
 {
-        maybebadio(outsw, port);
-}
-
-/* Map ISA bus address to the real address. Only for PCMCIA.  */
-
-/* ISA page descriptor.  */
-static __u32 sh_isa_memmap[256];
-
-#if 0
-static int
-sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
-{
-        int idx;
-
-        if (start >= 0x100000 || (start & 0xfff) || (length != 0x1000))
-                return -1;
-
-        idx = start >> 12;
-        sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
-        printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
-               start, length, offset, idx, sh_isa_memmap[idx]);
-        return 0;
-}
-#endif
-
-unsigned long
-sh7751se_isa_port2addr(unsigned long offset)
-{
-        int idx;
-
-        idx = (offset >> 12) & 0xff;
-        offset &= 0xfff;
-        return sh_isa_memmap[idx] + offset;
+        maybebadio(port);
 }
diff --git a/arch/sh/boards/se/7751/irq.c b/arch/sh/boards/se/7751/irq.c
index bf6c023615df..c607b0a48479 100644
--- a/arch/sh/boards/se/7751/irq.c
+++ b/arch/sh/boards/se/7751/irq.c
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/irq.h>
-#include <asm/se7751/se7751.h>
+#include <asm/se7751.h>
 
 /*
  * Initialize IRQ setting
diff --git a/arch/sh/boards/se/7751/led.c b/arch/sh/boards/se/7751/led.c
index a878726d3c7c..ff0355dea81b 100644
--- a/arch/sh/boards/se/7751/led.c
+++ b/arch/sh/boards/se/7751/led.c
@@ -8,23 +8,8 @@
  *
  * This file contains Solution Engine specific LED code.
  */
-
-#include <asm/se7751/se7751.h>
-
-static void mach_led(int position, int value)
-{
-        volatile unsigned short* p = (volatile unsigned short*)PA_LED;
-
-        if (value) {
-                *p |= (1<<8);
-        } else {
-                *p &= ~(1<<8);
-        }
-}
-
-#ifdef CONFIG_HEARTBEAT
-
 #include <linux/sched.h>
+#include <asm/se7751.h>
 
 /* Cycle the LED's in the clasic Knightrider/Sun pattern */
 void heartbeat_7751se(void)
@@ -64,4 +49,3 @@ void heartbeat_7751se(void)
         *p = 1<<(bit+8);
 
 }
-#endif /* CONFIG_HEARTBEAT */
diff --git a/arch/sh/boards/se/7751/mach.c b/arch/sh/boards/se/7751/mach.c
deleted file mode 100644
index 62d8d3e62590..000000000000
--- a/arch/sh/boards/se/7751/mach.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * linux/arch/sh/kernel/mach_7751se.c
- *
- * Minor tweak of mach_se.c file to reference 7751se-specific items.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the Hitachi 7751 SolutionEngine
- */
-
-#include <linux/init.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/machvec_init.h>
-
-#include <asm/se7751/io.h>
-
-void heartbeat_7751se(void);
-void init_7751se_IRQ(void);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_7751se __initmv = {
-        .mv_nr_irqs             = 72,
-
-        .mv_inb                 = sh7751se_inb,
-        .mv_inw                 = sh7751se_inw,
-        .mv_inl                 = sh7751se_inl,
-        .mv_outb                = sh7751se_outb,
-        .mv_outw                = sh7751se_outw,
-        .mv_outl                = sh7751se_outl,
-
-        .mv_inb_p               = sh7751se_inb_p,
-        .mv_inw_p               = sh7751se_inw,
-        .mv_inl_p               = sh7751se_inl,
-        .mv_outb_p              = sh7751se_outb_p,
-        .mv_outw_p              = sh7751se_outw,
-        .mv_outl_p              = sh7751se_outl,
-
-        .mv_insl                = sh7751se_insl,
-        .mv_outsl               = sh7751se_outsl,
-
-        .mv_isa_port2addr       = sh7751se_isa_port2addr,
-
-        .mv_init_irq            = init_7751se_IRQ,
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_7751se,
-#endif
-};
-ALIAS_MV(7751se)
diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c
index 48dc5aee67d4..73e826310ba8 100644
--- a/arch/sh/boards/se/7751/setup.c
+++ b/arch/sh/boards/se/7751/setup.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * linux/arch/sh/kernel/setup_7751se.c
  *
  * Copyright (C) 2000  Kazumoto Kojima
@@ -11,78 +11,15 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
-
-#include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <asm/io.h>
-#include <asm/se7751/se7751.h>
+#include <asm/se7751.h>
 
-#ifdef CONFIG_SH_KGDB
-#include <asm/kgdb.h>
-#endif
-
-/*
- * Configure the Super I/O chip
- */
-#if 0
-/* Leftover code from regular Solution Engine, for reference. */
-/* The SH7751 Solution Engine has a different SuperIO. */
-static void __init smsc_config(int index, int data)
-{
-        outb_p(index, INDEX_PORT);
-        outb_p(data, DATA_PORT);
-}
-
-static void __init init_smsc(void)
-{
-        outb_p(CONFIG_ENTER, CONFIG_PORT);
-        outb_p(CONFIG_ENTER, CONFIG_PORT);
-
-        /* FDC */
-        smsc_config(CURRENT_LDN_INDEX, LDN_FDC);
-        smsc_config(ACTIVATE_INDEX, 0x01);
-        smsc_config(IRQ_SELECT_INDEX, 6); /* IRQ6 */
-
-        /* IDE1 */
-        smsc_config(CURRENT_LDN_INDEX, LDN_IDE1);
-        smsc_config(ACTIVATE_INDEX, 0x01);
-        smsc_config(IRQ_SELECT_INDEX, 14); /* IRQ14 */
-
-        /* AUXIO (GPIO): to use IDE1 */
-        smsc_config(CURRENT_LDN_INDEX, LDN_AUXIO);
-        smsc_config(GPIO46_INDEX, 0x00); /* nIOROP */
-        smsc_config(GPIO47_INDEX, 0x00); /* nIOWOP */
-
-        /* COM1 */
-        smsc_config(CURRENT_LDN_INDEX, LDN_COM1);
-        smsc_config(ACTIVATE_INDEX, 0x01);
-        smsc_config(IO_BASE_HI_INDEX, 0x03);
-        smsc_config(IO_BASE_LO_INDEX, 0xf8);
-        smsc_config(IRQ_SELECT_INDEX, 4); /* IRQ4 */
-
-        /* COM2 */
-        smsc_config(CURRENT_LDN_INDEX, LDN_COM2);
-        smsc_config(ACTIVATE_INDEX, 0x01);
-        smsc_config(IO_BASE_HI_INDEX, 0x02);
-        smsc_config(IO_BASE_LO_INDEX, 0xf8);
-        smsc_config(IRQ_SELECT_INDEX, 3); /* IRQ3 */
-
-        /* RTC */
-        smsc_config(CURRENT_LDN_INDEX, LDN_RTC);
-        smsc_config(ACTIVATE_INDEX, 0x01);
-        smsc_config(IRQ_SELECT_INDEX, 8); /* IRQ8 */
-
-        /* XXX: PARPORT, KBD, and MOUSE will come here... */
-        outb_p(CONFIG_EXIT, CONFIG_PORT);
-}
-#endif
-
-const char *get_system_type(void)
-{
-        return "7751 SolutionEngine";
-}
+void heartbeat_7751se(void);
+void init_7751se_IRQ(void);
 
 #ifdef CONFIG_SH_KGDB
+#include <asm/kgdb.h>
 static int kgdb_uart_setup(void);
 static struct kgdb_sermap kgdb_uart_sermap = 
 { "ttyS", 0, kgdb_uart_setup, NULL };
@@ -91,7 +28,7 @@ static struct kgdb_sermap kgdb_uart_sermap =
 /*
  * Initialize the board
  */
-void __init platform_setup(void)
+static void __init sh7751se_setup(char **cmdline_p)
 {
         /* Call init_smsc() replacement to set up SuperIO. */
         /* XXX: RTC setting comes here */
@@ -225,3 +162,37 @@ static int kgdb_uart_setup(void)
         return 0;
 }
 #endif /* CONFIG_SH_KGDB */
+
+
+/*
+ * The Machine Vector
+ */
+
+struct sh_machine_vector mv_7751se __initmv = {
+        .mv_name                = "7751 SolutionEngine",
+        .mv_setup               = sh7751se_setup,
+        .mv_nr_irqs             = 72,
+
+        .mv_inb                 = sh7751se_inb,
+        .mv_inw                 = sh7751se_inw,
+        .mv_inl                 = sh7751se_inl,
+        .mv_outb                = sh7751se_outb,
+        .mv_outw                = sh7751se_outw,
+        .mv_outl                = sh7751se_outl,
+
+        .mv_inb_p               = sh7751se_inb_p,
+        .mv_inw_p               = sh7751se_inw,
+        .mv_inl_p               = sh7751se_inl,
+        .mv_outb_p              = sh7751se_outb_p,
+        .mv_outw_p              = sh7751se_outw,
+        .mv_outl_p              = sh7751se_outl,
+
+        .mv_insl                = sh7751se_insl,
+        .mv_outsl               = sh7751se_outsl,
+
+        .mv_init_irq            = init_7751se_IRQ,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = heartbeat_7751se,
+#endif
+};
+ALIAS_MV(7751se)
diff --git a/arch/sh/boards/sh03/rtc.c b/arch/sh/boards/sh03/rtc.c
index d609863cfe53..0a9266bb51c5 100644
--- a/arch/sh/boards/sh03/rtc.c
+++ b/arch/sh/boards/sh03/rtc.c
@@ -10,9 +10,10 @@
 #include <linux/sched.h>
 #include <linux/time.h>
 #include <linux/bcd.h>
-#include <asm/io.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)
@@ -34,8 +35,6 @@
 #define RTC_BUSY        1
 #define RTC_STOP        2
 
-extern void (*rtc_get_time)(struct timespec *);
-extern int (*rtc_set_time)(const time_t);
 extern spinlock_t rtc_lock;
 
 unsigned long get_cmos_time(void)
@@ -128,6 +127,6 @@ int sh03_rtc_settimeofday(const time_t secs)
 
 void sh03_time_init(void)
 {
-        rtc_get_time = sh03_rtc_gettimeofday;
-        rtc_set_time = sh03_rtc_settimeofday;
+        rtc_sh_get_time = sh03_rtc_gettimeofday;
+        rtc_sh_set_time = sh03_rtc_settimeofday;
 }
diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c
index 60290f8f289c..6c310587ddfe 100644
--- a/arch/sh/boards/sh03/setup.c
+++ b/arch/sh/boards/sh03/setup.c
@@ -7,22 +7,13 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
-#include <linux/hdreg.h>
-#include <linux/ide.h>
 #include <asm/io.h>
+#include <asm/rtc.h>
 #include <asm/sh03/io.h>
 #include <asm/sh03/sh03.h>
 #include <asm/addrspace.h>
-#include "../../drivers/pci/pci-sh7751.h"
 
-extern void (*board_time_init)(void);
-
-const char *get_system_type(void)
-{
-        return "Interface CTP/PCI-SH03)";
-}
-
-void init_sh03_IRQ(void)
+static void __init init_sh03_IRQ(void)
 {
         ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
 
@@ -34,38 +25,34 @@ void init_sh03_IRQ(void)
 
 extern void *cf_io_base;
 
-unsigned long sh03_isa_port2addr(unsigned long port)
+static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size)
 {
         if (PXSEG(port))
-                return port;
+                return (void __iomem *)port;
         /* CompactFlash (IDE) */
-        if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6)) {
-                return (unsigned long)cf_io_base + port;
-        }
-        return port + SH7751_PCI_IO_BASE;
+        if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6))
+                return (void __iomem *)((unsigned long)cf_io_base + port);
+
+        return (void __iomem *)(port + PCI_IO_BASE);
 }
 
-/*
- * The Machine Vector
- */
+/* 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;
+}
 
 struct sh_machine_vector mv_sh03 __initmv = {
+        .mv_name                = "Interface (CTP/PCI-SH03)",
+        .mv_setup               = sh03_setup,
         .mv_nr_irqs             = 48,
-        .mv_isa_port2addr       = sh03_isa_port2addr,
+        .mv_ioport_map          = sh03_ioport_map,
         .mv_init_irq            = init_sh03_IRQ,
 
 #ifdef CONFIG_HEARTBEAT
         .mv_heartbeat           = heartbeat_sh03,
 #endif
 };
-
 ALIAS_MV(sh03)
-
-/* arch/sh/boards/sh03/rtc.c */
-void sh03_time_init(void);
-
-int __init platform_setup(void)
-{
-        board_time_init = sh03_time_init;
-        return 0;
-}
diff --git a/arch/sh/boards/sh2000/Makefile b/arch/sh/boards/sh2000/Makefile
deleted file mode 100644
index 05d390c3599c..000000000000
--- a/arch/sh/boards/sh2000/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for the SH2000 specific parts of the kernel
-#
-
-obj-y    := setup.o
-
diff --git a/arch/sh/boards/sh2000/setup.c b/arch/sh/boards/sh2000/setup.c
deleted file mode 100644
index 2fe6a11765e9..000000000000
--- a/arch/sh/boards/sh2000/setup.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * linux/arch/sh/kernel/setup_sh2000.c
- *
- * Copyright (C) 2001  SUGIOKA Tochinobu
- *
- * SH-2000 Support.
- *
- */
-
-#include <linux/init.h>
-#include <linux/irq.h>
-
-#include <asm/io.h>
-#include <asm/machvec.h>
-#include <asm/mach/sh2000.h>
-
-#define CF_CIS_BASE     0xb4200000
-
-#define PORT_PECR       0xa4000108
-#define PORT_PHCR       0xa400010E
-#define PORT_ICR1       0xa4000010
-#define PORT_IRR0       0xa4000004
-
-#define IDE_OFFSET      0xb6200000
-#define NIC_OFFSET      0xb6000000
-#define EXTBUS_OFFSET   0xba000000
-
-
-const char *get_system_type(void)
-{
-        return "sh2000";
-}
-
-static unsigned long sh2000_isa_port2addr(unsigned long offset)
-{
-        if((offset & ~7) == 0x1f0 || offset == 0x3f6)
-                return IDE_OFFSET + offset;
-        else if((offset & ~0x1f) == 0x300)
-                return NIC_OFFSET + offset;
-        return EXTBUS_OFFSET + offset;
-}
-
-/*
- * The Machine Vector
- */
-struct sh_machine_vector mv_sh2000 __initmv = {
-        .mv_nr_irqs             = 80,
-        .mv_isa_port2addr       = sh2000_isa_port2addr,
-};
-ALIAS_MV(sh2000)
-
-/*
- * Initialize the board
- */
-int __init platform_setup(void)
-{
-        /* XXX: RTC setting comes here */
-
-        /* These should be done by BIOS/IPL ... */
-        /* Enable nCE2A, nCE2B output */
-        ctrl_outw(ctrl_inw(PORT_PECR) & ~0xf00, PORT_PECR);
-        /* Enable the Compact Flash card, and set the level interrupt */
-        ctrl_outw(0x0042, CF_CIS_BASE+0x0200);
-        /* Enable interrupt */
-        ctrl_outw(ctrl_inw(PORT_PHCR) & ~0x03f3, PORT_PHCR);
-        ctrl_outw(1, PORT_ICR1);
-        ctrl_outw(ctrl_inw(PORT_IRR0) & ~0xff3f, PORT_IRR0);
-        printk(KERN_INFO "SH-2000 Setup...done\n");
-        return 0;
-}
diff --git a/arch/sh/boards/shmin/Makefile b/arch/sh/boards/shmin/Makefile
new file mode 100644
index 000000000000..3190cc72430e
--- /dev/null
+++ b/arch/sh/boards/shmin/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the SHMIN board.
+#
+
+obj-y    := setup.o
diff --git a/arch/sh/boards/shmin/setup.c b/arch/sh/boards/shmin/setup.c
new file mode 100644
index 000000000000..2f0c19706cf9
--- /dev/null
+++ b/arch/sh/boards/shmin/setup.c
@@ -0,0 +1,41 @@
+/*
+ * arch/sh/boards/shmin/setup.c
+ *
+ * Copyright (C) 2006 Takashi YOSHII
+ *
+ * SHMIN Support.
+ */
+#include <linux/init.h>
+#include <asm/machvec.h>
+#include <asm/shmin/shmin.h>
+#include <asm/clock.h>
+#include <asm/irq.h>
+#include <asm/io.h>
+
+#define PFC_PHCR        0xa400010e
+
+static void __init init_shmin_irq(void)
+{
+        ctrl_outw(0x2a00, PFC_PHCR);    // IRQ0-3=IRQ
+        ctrl_outw(0x0aaa, INTC_ICR1);   // IRQ0-3=IRQ-mode,Low-active.
+}
+
+static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
+{
+        static int dummy;
+
+        if ((port & ~0x1f) == SHMIN_NE_BASE)
+                return (void __iomem *)(SHMIN_IO_BASE + port);
+
+        dummy = 0;
+
+        return &dummy;
+
+}
+
+struct sh_machine_vector mv_shmin __initmv = {
+        .mv_name        = "SHMIN",
+        .mv_init_irq    = init_shmin_irq,
+        .mv_ioport_map  = shmin_ioport_map,
+};
+ALIAS_MV(shmin)
diff --git a/arch/sh/boards/snapgear/io.c b/arch/sh/boards/snapgear/io.c
index e2eb78fc381d..0f4824264557 100644
--- a/arch/sh/boards/snapgear/io.c
+++ b/arch/sh/boards/snapgear/io.c
@@ -1,6 +1,4 @@
-/* 
- * linux/arch/sh/kernel/io_7751se.c
- *
+/*
  * Copyright (C) 2002  David McCullough <davidm@snapgear.com>
  * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
  * Based largely on io_se.c.
@@ -11,67 +9,22 @@
  * placeholder code from io_se.c left in with the
  * expectation of later SuperIO and PCMCIA access.
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 
-#include <asm/pci.h>
-#include "../../drivers/pci/pci-sh7751.h"
-
 #ifdef CONFIG_SH_SECUREEDGE5410
 unsigned short secureedge5410_ioport;
 #endif
 
-/*
- * The SnapGear uses the built-in PCI controller (PCIC)
- * of the 7751 processor
- */ 
-
-#define PCIIOBR         (volatile long *)PCI_REG(SH7751_PCIIOBR)
-#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
-#define PCI_IO_AREA     SH7751_PCI_IO_BASE
-#define PCI_MEM_AREA    SH7751_PCI_CONFIG_BASE
-
-
-#define PCI_IOMAP(adr)  (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
-
-
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
-
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
-
-
 static inline volatile __u16 *port2adr(unsigned int port)
 {
-#if 0
-        if (port >= 0x2000)
-                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-#endif
-        maybebadio(name,(unsigned long)port);
+        maybebadio((unsigned long)port);
         return (volatile __u16*)port;
 }
 
-
-/* In case someone configures the kernel w/o PCI support: in that */
-/* scenario, don't ever bother to check for PCI-window addresses */
-
-/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
-#if defined(CONFIG_PCI)
-#define CHECK_SH7751_PCIIO(port) \
-  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
-#else
-#define CHECK_SH7751_PCIIO(port) (0)
-#endif
-
 /*
  * General outline: remap really low stuff [eventually] to SuperIO,
  * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
@@ -79,148 +32,106 @@ static inline volatile __u16 *port2adr(unsigned int port)
  * should be way beyond the window, and is used  w/o translation for
  * compatibility.
  */
-
 unsigned char snapgear_inb(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned char *)pci_ioaddr(port);
         else
-                return (*port2adr(port))&0xff; 
+                return (*port2adr(port)) & 0xff;
 }
 
-
 unsigned char snapgear_inb_p(unsigned long port)
 {
         unsigned char v;
 
         if (PXSEG(port))
                 v = *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                v = *(volatile unsigned char *)pci_ioaddr(port);
         else
-                v = (*port2adr(port))&0xff; 
-        delay();
+                v = (*port2adr(port))&0xff;
+        ctrl_delay();
         return v;
 }
 
-
 unsigned short snapgear_inw(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned short *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned short *)pci_ioaddr(port);
         else if (port >= 0x2000)
                 return *port2adr(port);
         else
-                maybebadio(inw, port);
+                maybebadio(port);
         return 0;
 }
 
-
 unsigned int snapgear_inl(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned long *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned int *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned int *)pci_ioaddr(port);
         else if (port >= 0x2000)
                 return *port2adr(port);
         else
-                maybebadio(inl, port);
+                maybebadio(port);
         return 0;
 }
 
-
 void snapgear_outb(unsigned char value, unsigned long port)
 {
 
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
         else
                 *(port2adr(port)) = value;
 }
 
-
 void snapgear_outb_p(unsigned char value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
         else
                 *(port2adr(port)) = value;
-        delay();
+        ctrl_delay();
 }
 
-
 void snapgear_outw(unsigned short value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned short *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned short *)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned short *)pci_ioaddr(port)) = value;
         else if (port >= 0x2000)
                 *port2adr(port) = value;
         else
-                maybebadio(outw, port);
+                maybebadio(port);
 }
 
-
 void snapgear_outl(unsigned int value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned long *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned long*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned long*)pci_ioaddr(port)) = value;
         else
-                maybebadio(outl, port);
+                maybebadio(port);
 }
 
 void snapgear_insl(unsigned long port, void *addr, unsigned long count)
 {
-        maybebadio(insl, port);
+        maybebadio(port);
 }
 
 void snapgear_outsl(unsigned long port, const void *addr, unsigned long count)
 {
-        maybebadio(outsw, port);
-}
-
-/* Map ISA bus address to the real address. Only for PCMCIA.  */
-
-
-/* ISA page descriptor.  */
-static __u32 sh_isa_memmap[256];
-
-
-#if 0
-static int sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
-{
-        int idx;
-
-        if (start >= 0x100000 || (start & 0xfff) || (length != 0x1000))
-                return -1;
-
-        idx = start >> 12;
-        sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
-#if 0
-        printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
-               start, length, offset, idx, sh_isa_memmap[idx]);
-#endif
-        return 0;
-}
-#endif
-
-unsigned long snapgear_isa_port2addr(unsigned long offset)
-{
-        int idx;
-
-        idx = (offset >> 12) & 0xff;
-        offset &= 0xfff;
-        return sh_isa_memmap[idx] + offset;
+        maybebadio(port);
 }
diff --git a/arch/sh/boards/snapgear/rtc.c b/arch/sh/boards/snapgear/rtc.c
index b71e009da35c..1659fdd6695a 100644
--- a/arch/sh/boards/snapgear/rtc.c
+++ b/arch/sh/boards/snapgear/rtc.c
@@ -17,14 +17,9 @@
 #include <linux/time.h>
 #include <linux/rtc.h>
 #include <linux/mc146818rtc.h>
-
 #include <asm/io.h>
-#include <asm/rtc.h>
-#include <asm/mc146818rtc.h>
-
-/****************************************************************************/
 
-static int use_ds1302 = 0;
+static int use_ds1302;
 
 /****************************************************************************/
 /*
@@ -82,10 +77,6 @@ static unsigned int ds1302_readbyte(unsigned int addr)
         unsigned int    val;
         unsigned long   flags;
 
-#if 0
-        printk("SnapGear RTC: ds1302_readbyte(addr=%x)\n", addr);
-#endif
-
         local_irq_save(flags);
         set_dirp(get_dirp() | RTC_RESET | RTC_IODATA | RTC_SCLK);
         set_dp(get_dp() & ~(RTC_RESET | RTC_IODATA | RTC_SCLK));
@@ -104,10 +95,6 @@ static void ds1302_writebyte(unsigned int addr, unsigned int val)
 {
         unsigned long   flags;
 
-#if 0
-        printk("SnapGear RTC: ds1302_writebyte(addr=%x)\n", addr);
-#endif
-
         local_irq_save(flags);
         set_dirp(get_dirp() | RTC_RESET | RTC_IODATA | RTC_SCLK);
         set_dp(get_dp() & ~(RTC_RESET | RTC_IODATA | RTC_SCLK));
@@ -168,11 +155,8 @@ void __init secureedge5410_rtc_init(void)
                 }
 
         if (use_ds1302) {
-                rtc_get_time = snapgear_rtc_gettimeofday;
-                rtc_set_time = snapgear_rtc_settimeofday;
-        } else {
-                rtc_get_time = sh_rtc_gettimeofday;
-                rtc_set_time = sh_rtc_settimeofday;
+                rtc_sh_get_time = snapgear_rtc_gettimeofday;
+                rtc_sh_set_time = snapgear_rtc_settimeofday;
         }
                 
         printk("SnapGear RTC: using %s rtc.\n", use_ds1302 ? "ds1302" : "internal");
@@ -187,10 +171,8 @@ void snapgear_rtc_gettimeofday(struct timespec *ts)
 {
         unsigned int sec, min, hr, day, mon, yr;
 
-        if (!use_ds1302) {
-                sh_rtc_gettimeofday(ts);
+        if (!use_ds1302)
                 return;
-        }
 
         sec = bcd2int(ds1302_readbyte(RTC_ADDR_SEC));
         min = bcd2int(ds1302_readbyte(RTC_ADDR_MIN));
@@ -231,7 +213,7 @@ int snapgear_rtc_settimeofday(const time_t secs)
         unsigned long nowtime;
 
         if (!use_ds1302)
-                return sh_rtc_settimeofday(secs);
+                return 0;
 
 /*
  *      This is called direct from the kernel timer handling code.
@@ -240,10 +222,6 @@ int snapgear_rtc_settimeofday(const time_t secs)
 
         nowtime = secs;
 
-#if 1
-        printk("SnapGear RTC: snapgear_rtc_settimeofday(nowtime=%ld)\n", nowtime);
-#endif
-
         /* STOP RTC */
         ds1302_writebyte(RTC_ADDR_SEC, ds1302_readbyte(RTC_ADDR_SEC) | 0x80);
 
@@ -329,5 +307,3 @@ void secureedge5410_cmos_write(unsigned char val, int addr)
         default:                                                      break;
         }
 }
-
-/****************************************************************************/
diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c
index f1f7c70c9402..f5e98c56b530 100644
--- a/arch/sh/boards/snapgear/setup.c
+++ b/arch/sh/boards/snapgear/setup.c
@@ -1,5 +1,4 @@
-/****************************************************************************/
-/* 
+/*
  * linux/arch/sh/boards/snapgear/setup.c
  *
  * Copyright (C) 2002  David McCullough <davidm@snapgear.com>
@@ -12,8 +11,6 @@
  *           Modified for 7751 Solution Engine by
  *           Ian da Silva and Jeremy Siegel, 2001.
  */
-/****************************************************************************/
-
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
@@ -21,14 +18,13 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/sched.h>
-
 #include <asm/machvec.h>
-#include <asm/mach/io.h>
+#include <asm/snapgear.h>
 #include <asm/irq.h>
 #include <asm/io.h>
+#include <asm/rtc.h>
 #include <asm/cpu/timer.h>
 
-extern void (*board_time_init)(void);
 extern void secureedge5410_rtc_init(void);
 extern void pcibios_init(void);
 
@@ -85,101 +81,20 @@ static void __init init_snapgear_IRQ(void)
         make_ipr_irq(IRL3_IRQ, IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY);
 }
 
-/****************************************************************************/
-/*
- *      Fast poll interrupt simulator.
- */
-
 /*
- * Leave all of the fast timer/fast poll stuff commented out for now, since
- * it's not clear whether it actually works or not. Since it wasn't being used
- * at all in 2.4, we'll assume it's not sane for 2.6 either.. -- PFM
- */
-#if 0
-#define FAST_POLL       1000
-//#define FAST_POLL_INTR
-
-#define FASTTIMER_IRQ   17
-#define FASTTIMER_IPR_ADDR  INTC_IPRA
-#define FASTTIMER_IPR_POS    2
-#define FASTTIMER_PRIORITY   3
-
-#ifdef FAST_POLL_INTR
-#define TMU1_TCR_INIT   0x0020
-#else
-#define TMU1_TCR_INIT   0
-#endif
-#define TMU_TSTR_INIT   1
-#define TMU1_TCR_CALIB  0x0000
-
-
-#ifdef FAST_POLL_INTR
-static void fast_timer_irq(int irq, void *dev_instance, struct pt_regs *regs)
-{
-        unsigned long timer_status;
-    timer_status = ctrl_inw(TMU1_TCR);
-        timer_status &= ~0x100;
-        ctrl_outw(timer_status, TMU1_TCR);
-}
-#endif
-
-/*
- * return the current ticks on the fast timer
- */
-
-unsigned long fast_timer_count(void)
-{
-        return(ctrl_inl(TMU1_TCNT));
-}
-
-/*
- * setup a fast timer for profiling etc etc
+ * Initialize the board
  */
-
-static void setup_fast_timer()
-{
-        unsigned long interval;
-
-#ifdef FAST_POLL_INTR
-        interval = (current_cpu_data.module_clock/4 + FAST_POLL/2) / FAST_POLL;
-
-        make_ipr_irq(FASTTIMER_IRQ, FASTTIMER_IPR_ADDR, FASTTIMER_IPR_POS,
-                        FASTTIMER_PRIORITY);
-
-        printk("SnapGear: %dHz fast timer on IRQ %d\n",FAST_POLL,FASTTIMER_IRQ);
-
-        if (request_irq(FASTTIMER_IRQ, fast_timer_irq, 0, "SnapGear fast timer",
-                        NULL) != 0)
-                printk("%s(%d): request_irq() failed?\n", __FILE__, __LINE__);
-#else
-        printk("SnapGear: fast timer running\n",FAST_POLL,FASTTIMER_IRQ);
-        interval = 0xffffffff;
-#endif
-
-        ctrl_outb(ctrl_inb(TMU_TSTR) & ~0x2, TMU_TSTR); /* disable timer 1 */
-        ctrl_outw(TMU1_TCR_INIT, TMU1_TCR);
-        ctrl_outl(interval, TMU1_TCOR);
-        ctrl_outl(interval, TMU1_TCNT);
-        ctrl_outb(ctrl_inb(TMU_TSTR) | 0x2, TMU_TSTR); /* enable timer 1 */
-
-        printk("Timer count 1 = 0x%x\n", fast_timer_count());
-        udelay(1000);
-        printk("Timer count 2 = 0x%x\n", fast_timer_count());
-}
-#endif
-
-/****************************************************************************/
-
-const char *get_system_type(void)
+static void __init snapgear_setup(char **cmdline_p)
 {
-        return "SnapGear SecureEdge5410";
+        board_time_init = secureedge5410_rtc_init;
 }
 
 /*
  * The Machine Vector
  */
-
 struct sh_machine_vector mv_snapgear __initmv = {
+        .mv_name                = "SnapGear SecureEdge5410",
+        .mv_setup               = snapgear_setup,
         .mv_nr_irqs             = 72,
 
         .mv_inb                 = snapgear_inb,
@@ -196,20 +111,6 @@ struct sh_machine_vector mv_snapgear __initmv = {
         .mv_outw_p              = snapgear_outw,
         .mv_outl_p              = snapgear_outl,
 
-        .mv_isa_port2addr       = snapgear_isa_port2addr,
-
         .mv_init_irq            = init_snapgear_IRQ,
 };
 ALIAS_MV(snapgear)
-
-/*
- * Initialize the board
- */
-
-int __init platform_setup(void)
-{
-        board_time_init = secureedge5410_rtc_init;
-
-        return 0;
-}
-
diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c
index 236398fbc083..8c64baa30364 100644
--- a/arch/sh/boards/superh/microdev/irq.c
+++ b/arch/sh/boards/superh/microdev/irq.c
@@ -11,14 +11,12 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/microdev.h>
 
 #define NUM_EXTERNAL_IRQS 16    /* IRL0 .. IRL15 */
 
-
 static const struct {
         unsigned char fpgaIrq;
         unsigned char mapped;
@@ -93,53 +91,42 @@ static struct hw_interrupt_type microdev_irq_type = {
 
 static void disable_microdev_irq(unsigned int irq)
 {
-        unsigned int flags;
         unsigned int fpgaIrq;
 
-        if (irq >= NUM_EXTERNAL_IRQS) return;
-        if (!fpgaIrqTable[irq].mapped) return;
+        if (irq >= NUM_EXTERNAL_IRQS)
+                return;
+        if (!fpgaIrqTable[irq].mapped)
+                return;
 
         fpgaIrq = fpgaIrqTable[irq].fpgaIrq;
 
-                /* disable interrupts */
-        local_irq_save(flags);
-
-                /* disable interupts on the FPGA INTC register */
+        /* disable interupts on the FPGA INTC register */
         ctrl_outl(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTDSB_REG);
-
-                /* restore interrupts */
-        local_irq_restore(flags);
 }
 
 static void enable_microdev_irq(unsigned int irq)
 {
         unsigned long priorityReg, priorities, pri;
-        unsigned int flags;
         unsigned int fpgaIrq;
 
-
-        if (irq >= NUM_EXTERNAL_IRQS) return;
-        if (!fpgaIrqTable[irq].mapped) return;
+        if (unlikely(irq >= NUM_EXTERNAL_IRQS))
+                return;
+        if (unlikely(!fpgaIrqTable[irq].mapped))
+                return;
 
         pri = 15 - irq;
 
         fpgaIrq = fpgaIrqTable[irq].fpgaIrq;
         priorityReg = MICRODEV_FPGA_INTPRI_REG(fpgaIrq);
 
-                /* disable interrupts */
-        local_irq_save(flags);
-
-                /* set priority for the interrupt */
+        /* set priority for the interrupt */
         priorities = ctrl_inl(priorityReg);
         priorities &= ~MICRODEV_FPGA_INTPRI_MASK(fpgaIrq);
         priorities |= MICRODEV_FPGA_INTPRI_LEVEL(fpgaIrq, pri);
         ctrl_outl(priorities, priorityReg);
 
-                /* enable interupts on the FPGA INTC register */
+        /* enable interupts on the FPGA INTC register */
         ctrl_outl(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTENB_REG);
-
-                /* restore interrupts */
-        local_irq_restore(flags);
 }
 
         /* This functions sets the desired irq handler to be a MicroDev type */
@@ -158,9 +145,7 @@ static void mask_and_ack_microdev(unsigned int irq)
 static void end_microdev_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-        {
                 enable_microdev_irq(irq);
-        }
 }
 
 extern void __init init_microdev_irq(void)
@@ -171,9 +156,7 @@ extern void __init init_microdev_irq(void)
         ctrl_outl(~0ul, MICRODEV_FPGA_INTDSB_REG);
 
         for (i = 0; i < NUM_EXTERNAL_IRQS; i++)
-        {
                 make_microdev_irq(i);
-        }
 }
 
 extern void microdev_print_fpga_intc_status(void)
diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/superh/microdev/setup.c
index 61b402a3f5d7..031c814e6e76 100644
--- a/arch/sh/boards/superh/microdev/setup.c
+++ b/arch/sh/boards/superh/microdev/setup.c
@@ -10,7 +10,6 @@
  * May be copied or modified under the terms of the GNU General Public
  * License.  See linux/COPYING for more information.
  */
-
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
@@ -21,41 +20,6 @@
 
 extern void microdev_heartbeat(void);
 
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_sh4202_microdev __initmv = {
-        .mv_nr_irqs             = 72,           /* QQQ need to check this - use the MACRO */
-
-        .mv_inb                 = microdev_inb,
-        .mv_inw                 = microdev_inw,
-        .mv_inl                 = microdev_inl,
-        .mv_outb                = microdev_outb,
-        .mv_outw                = microdev_outw,
-        .mv_outl                = microdev_outl,
-
-        .mv_inb_p               = microdev_inb_p,
-        .mv_inw_p               = microdev_inw_p,
-        .mv_inl_p               = microdev_inl_p,
-        .mv_outb_p              = microdev_outb_p,
-        .mv_outw_p              = microdev_outw_p,
-        .mv_outl_p              = microdev_outl_p,
-
-        .mv_insb                = microdev_insb,
-        .mv_insw                = microdev_insw,
-        .mv_insl                = microdev_insl,
-        .mv_outsb               = microdev_outsb,
-        .mv_outsw               = microdev_outsw,
-        .mv_outsl               = microdev_outsl,
-
-        .mv_init_irq            = init_microdev_irq,
-
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = microdev_heartbeat,
-#endif
-};
-ALIAS_MV(sh4202_microdev)
 
 /****************************************************************************/
 
@@ -113,11 +77,6 @@ ALIAS_MV(sh4202_microdev)
         /* assume a Keyboard Controller is present */
 int microdev_kbd_controller_present = 1;
 
-const char *get_system_type(void)
-{
-        return "SH4-202 MicroDev";
-}
-
 static struct resource smc91x_resources[] = {
         [0] = {
                 .start          = 0x300,
@@ -291,25 +250,9 @@ static int __init microdev_devices_setup(void)
         return platform_add_devices(microdev_devices, ARRAY_SIZE(microdev_devices));
 }
 
-__initcall(microdev_devices_setup);
-
-void __init platform_setup(void)
-{
-        int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul);
-        const int fpgaRevision = *fpgaRevisionRegister;
-        int * const CacheControlRegister = (int*)CCR;
-
-        printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n",
-                get_system_type(), fpgaRevision, *CacheControlRegister);
-}
-
-
-/****************************************************************************/
-
-
-        /*
-         * Setup for the SMSC FDC37C93xAPM
-         */
+/*
+ * Setup for the SMSC FDC37C93xAPM
+ */
 static int __init smsc_superio_setup(void)
 {
 
@@ -412,8 +355,52 @@ static int __init smsc_superio_setup(void)
         return 0;
 }
 
+static void __init microdev_setup(char **cmdline_p)
+{
+        int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul);
+        const int fpgaRevision = *fpgaRevisionRegister;
+        int * const CacheControlRegister = (int*)CCR;
+
+        device_initcall(microdev_devices_setup);
+        device_initcall(smsc_superio_setup);
 
-/* This is grotty, but, because kernel is always referenced on the link line
- * before any devices, this is safe.
+        printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n",
+                get_system_type(), fpgaRevision, *CacheControlRegister);
+}
+
+/*
+ * The Machine Vector
  */
-__initcall(smsc_superio_setup);
+struct sh_machine_vector mv_sh4202_microdev __initmv = {
+        .mv_name                = "SH4-202 MicroDev",
+        .mv_setup               = microdev_setup,
+        .mv_nr_irqs             = 72,           /* QQQ need to check this - use the MACRO */
+
+        .mv_inb                 = microdev_inb,
+        .mv_inw                 = microdev_inw,
+        .mv_inl                 = microdev_inl,
+        .mv_outb                = microdev_outb,
+        .mv_outw                = microdev_outw,
+        .mv_outl                = microdev_outl,
+
+        .mv_inb_p               = microdev_inb_p,
+        .mv_inw_p               = microdev_inw_p,
+        .mv_inl_p               = microdev_inl_p,
+        .mv_outb_p              = microdev_outb_p,
+        .mv_outw_p              = microdev_outw_p,
+        .mv_outl_p              = microdev_outl_p,
+
+        .mv_insb                = microdev_insb,
+        .mv_insw                = microdev_insw,
+        .mv_insl                = microdev_insl,
+        .mv_outsb               = microdev_outsb,
+        .mv_outsw               = microdev_outsw,
+        .mv_outsl               = microdev_outsl,
+
+        .mv_init_irq            = init_microdev_irq,
+
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = microdev_heartbeat,
+#endif
+};
+ALIAS_MV(sh4202_microdev)
diff --git a/arch/sh/boards/titan/Makefile b/arch/sh/boards/titan/Makefile
new file mode 100644
index 000000000000..08d753700062
--- /dev/null
+++ b/arch/sh/boards/titan/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Nimble Microsystems TITAN specific parts of the kernel
+#
+
+obj-y    := setup.o io.o
diff --git a/arch/sh/boards/titan/io.c b/arch/sh/boards/titan/io.c
new file mode 100644
index 000000000000..4730c1dd697d
--- /dev/null
+++ b/arch/sh/boards/titan/io.c
@@ -0,0 +1,126 @@
+/*
+ *      I/O routines for Titan
+ */
+#include <linux/pci.h>
+#include <asm/machvec.h>
+#include <asm/addrspace.h>
+#include <asm/titan.h>
+#include <asm/io.h>
+
+static inline unsigned int port2adr(unsigned int port)
+{
+        maybebadio((unsigned long)port);
+        return port;
+}
+
+u8 titan_inb(unsigned long port)
+{
+        if (PXSEG(port))
+                return ctrl_inb(port);
+        else if (is_pci_ioaddr(port))
+                return ctrl_inb(pci_ioaddr(port));
+        return ctrl_inw(port2adr(port)) & 0xff;
+}
+
+u8 titan_inb_p(unsigned long port)
+{
+        u8 v;
+
+        if (PXSEG(port))
+                v = ctrl_inb(port);
+        else if (is_pci_ioaddr(port))
+                v = ctrl_inb(pci_ioaddr(port));
+        else
+                v = ctrl_inw(port2adr(port)) & 0xff;
+        ctrl_delay();
+        return v;
+}
+
+u16 titan_inw(unsigned long port)
+{
+        if (PXSEG(port))
+                return ctrl_inw(port);
+        else if (is_pci_ioaddr(port))
+                return ctrl_inw(pci_ioaddr(port));
+        else if (port >= 0x2000)
+                return ctrl_inw(port2adr(port));
+        else
+                maybebadio(port);
+        return 0;
+}
+
+u32 titan_inl(unsigned long port)
+{
+        if (PXSEG(port))
+                return ctrl_inl(port);
+        else if (is_pci_ioaddr(port))
+                return ctrl_inl(pci_ioaddr(port));
+        else if (port >= 0x2000)
+                return ctrl_inw(port2adr(port));
+        else
+                maybebadio(port);
+        return 0;
+}
+
+void titan_outb(u8 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outb(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outb(value, pci_ioaddr(port));
+        else
+                ctrl_outw(value, port2adr(port));
+}
+
+void titan_outb_p(u8 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outb(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outb(value, pci_ioaddr(port));
+        else
+                ctrl_outw(value, port2adr(port));
+        ctrl_delay();
+}
+
+void titan_outw(u16 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outw(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outw(value, pci_ioaddr(port));
+        else if (port >= 0x2000)
+                ctrl_outw(value, port2adr(port));
+        else
+                maybebadio(port);
+}
+
+void titan_outl(u32 value, unsigned long port)
+{
+        if (PXSEG(port))
+                ctrl_outl(value, port);
+        else if (is_pci_ioaddr(port))
+                ctrl_outl(value, pci_ioaddr(port));
+        else
+                maybebadio(port);
+}
+
+void titan_insl(unsigned long port, void *dst, unsigned long count)
+{
+        maybebadio(port);
+}
+
+void titan_outsl(unsigned long port, const void *src, unsigned long count)
+{
+        maybebadio(port);
+}
+
+void __iomem *titan_ioport_map(unsigned long port, unsigned int size)
+{
+        if (PXSEG(port) || is_pci_memaddr(port))
+                return (void __iomem *)port;
+        else if (is_pci_ioaddr(port))
+                return (void __iomem *)pci_ioaddr(port);
+
+        return (void __iomem *)port2adr(port);
+}
diff --git a/arch/sh/boards/titan/setup.c b/arch/sh/boards/titan/setup.c
new file mode 100644
index 000000000000..52b66d8b8d2a
--- /dev/null
+++ b/arch/sh/boards/titan/setup.c
@@ -0,0 +1,48 @@
+/*
+ *      Setup for Titan
+ */
+
+#include <linux/init.h>
+#include <asm/irq.h>
+#include <asm/titan.h>
+#include <asm/io.h>
+
+extern void __init pcibios_init_platform(void);
+
+static void __init init_titan_irq(void)
+{
+        /* enable individual interrupt mode for externals */
+        ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
+
+        make_ipr_irq( TITAN_IRQ_WAN,   IRL0_IPR_ADDR, IRL0_IPR_POS, IRL0_PRIORITY); /* PCIRQ0 */
+        make_ipr_irq( TITAN_IRQ_LAN,   IRL1_IPR_ADDR, IRL1_IPR_POS, IRL1_PRIORITY); /* PCIRQ1 */
+        make_ipr_irq( TITAN_IRQ_MPCIA, IRL2_IPR_ADDR, IRL2_IPR_POS, IRL2_PRIORITY); /* PCIRQ2 */
+        make_ipr_irq( TITAN_IRQ_USB,   IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY); /* PCIRQ3 */
+}
+
+struct sh_machine_vector mv_titan __initmv = {
+        .mv_name =      "Titan",
+
+        .mv_inb =       titan_inb,
+        .mv_inw =       titan_inw,
+        .mv_inl =       titan_inl,
+        .mv_outb =      titan_outb,
+        .mv_outw =      titan_outw,
+        .mv_outl =      titan_outl,
+
+        .mv_inb_p =     titan_inb_p,
+        .mv_inw_p =     titan_inw,
+        .mv_inl_p =     titan_inl,
+        .mv_outb_p =    titan_outb_p,
+        .mv_outw_p =    titan_outw,
+        .mv_outl_p =    titan_outl,
+
+        .mv_insl =      titan_insl,
+        .mv_outsl =     titan_outsl,
+
+        .mv_ioport_map = titan_ioport_map,
+
+        .mv_init_irq =  init_titan_irq,
+        .mv_init_pci =  pcibios_init_platform,
+};
+ALIAS_MV(titan)
diff --git a/arch/sh/boards/unknown/setup.c b/arch/sh/boards/unknown/setup.c
index c5e4ed10876b..1c941370a2e3 100644
--- a/arch/sh/boards/unknown/setup.c
+++ b/arch/sh/boards/unknown/setup.c
@@ -14,19 +14,8 @@
  */
 #include <linux/init.h>
 #include <asm/machvec.h>
-#include <asm/irq.h>
 
 struct sh_machine_vector mv_unknown __initmv = {
-        .mv_nr_irqs             = NR_IRQS,
+        .mv_name                = "Unknown",
 };
 ALIAS_MV(unknown)
-
-const char *get_system_type(void)
-{
-        return "Unknown";
-}
-
-void __init platform_setup(void)
-{
-}
-
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile
index 75a6876bf6c6..e5f443790079 100644
--- a/arch/sh/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile
@@ -18,13 +18,20 @@ endif
 # Assign dummy values if these 2 variables are not defined,
 # in order to suppress error message.
 #
+CONFIG_PAGE_OFFSET      ?= 0x80000000
 CONFIG_MEMORY_START     ?= 0x0c000000
 CONFIG_BOOT_LINK_OFFSET ?= 0x00800000
-IMAGE_OFFSET := $(shell printf "0x%8x" $$[0x80000000+$(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET)])
+
+IMAGE_OFFSET    := $(shell printf "0x%08x" $$[$(CONFIG_PAGE_OFFSET)  + \
+                                              $(CONFIG_MEMORY_START) + \
+                                              $(CONFIG_BOOT_LINK_OFFSET)])
+
+LIBGCC  := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds
 
-$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
+
+$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE
         $(call if_changed,ld)
         @:
 
diff --git a/arch/sh/cchips/Kconfig b/arch/sh/cchips/Kconfig
index 155d139884c3..0582ca8346b6 100644
--- a/arch/sh/cchips/Kconfig
+++ b/arch/sh/cchips/Kconfig
@@ -65,6 +65,11 @@ config HD64461_IRQ
 
           Do not change this unless you know what you are doing.
 
+config HD64461_IOBASE
+        hex "HD64461 start address"
+        depends on HD64461
+        default "0xb0000000"
+
 config HD64461_ENABLER
         bool "HD64461 PCMCIA enabler"
         depends on HD64461
@@ -73,7 +78,6 @@ config HD64461_ENABLER
           via the HD64461 companion chip.
           Otherwise, say N.
 
-
 config HD64465_IOBASE
         hex "HD64465 start address"
         depends on HD64465
diff --git a/arch/sh/cchips/hd6446x/hd64461/io.c b/arch/sh/cchips/hd6446x/hd64461/io.c
index ac3062671db7..7909a1b7b512 100644
--- a/arch/sh/cchips/hd6446x/hd64461/io.c
+++ b/arch/sh/cchips/hd6446x/hd64461/io.c
@@ -1,11 +1,10 @@
 /*
- *      $Id: io.c,v 1.6 2004/03/16 00:07:50 lethal Exp $
  *      Copyright (C) 2000 YAEGASHI Takeshi
  *      Typical I/O routines for HD64461 system.
  */
 
 #include <asm/io.h>
-#include <asm/hd64461/hd64461.h>
+#include <asm/hd64461.h>
 
 #define MEM_BASE (CONFIG_HD64461_IOBASE - HD64461_STBCR)
 
@@ -54,11 +53,6 @@ static __inline__ unsigned long PORT2ADDR(unsigned long port)
         return 0xa0000000 + (port & 0x1fffffff);
 }
 
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
-
 unsigned char hd64461_inb(unsigned long port)
 {
         return *(volatile unsigned char*)PORT2ADDR(port);
@@ -67,7 +61,7 @@ unsigned char hd64461_inb(unsigned long port)
 unsigned char hd64461_inb_p(unsigned long port)
 {
         unsigned long v = *(volatile unsigned char*)PORT2ADDR(port);
-        delay();
+        ctrl_delay();
         return v;
 }
 
@@ -89,7 +83,7 @@ void hd64461_outb(unsigned char b, unsigned long port)
 void hd64461_outb_p(unsigned char b, unsigned long port)
 {
         *(volatile unsigned char*)PORT2ADDR(port) = b;
-        delay();
+        ctrl_delay();
 }
 
 void hd64461_outw(unsigned short b, unsigned long port)
@@ -144,13 +138,13 @@ void hd64461_outsl(unsigned long port, const void *buffer, unsigned long count)
         while(count--) *addr=*buf++;
 }
 
-unsigned short hd64461_readw(unsigned long addr)
+unsigned short hd64461_readw(void __iomem *addr)
 {
-        return *(volatile unsigned short*)(MEM_BASE+addr);
+        return ctrl_inw(MEM_BASE+(unsigned long __force)addr);
 }
 
-void hd64461_writew(unsigned short b, unsigned long addr)
+void hd64461_writew(unsigned short b, void __iomem *addr)
 {
-        *(volatile unsigned short*)(MEM_BASE+addr) = b;
+        ctrl_outw(b, MEM_BASE+(unsigned long __force)addr);
 }
 
diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c
index ad126016720f..38f1e8171a3a 100644
--- a/arch/sh/cchips/hd6446x/hd64461/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64461/setup.c
@@ -11,36 +11,28 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
-
-#include <asm/hd64461/hd64461.h>
+#include <asm/hd64461.h>
 
 static void disable_hd64461_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-        local_irq_save(flags);
         nimr = inw(HD64461_NIMR);
         nimr |= mask;
         outw(nimr, HD64461_NIMR);
-        local_irq_restore(flags);
 }
 
 static void enable_hd64461_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-        local_irq_save(flags);
         nimr = inw(HD64461_NIMR);
         nimr &= ~mask;
         outw(nimr, HD64461_NIMR);
-        local_irq_restore(flags);
 }
 
 static void mask_and_ack_hd64461(unsigned int irq)
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c
index d2b2851bc44b..30573d3e1966 100644
--- a/arch/sh/cchips/hd6446x/hd64465/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64465/setup.c
@@ -25,31 +25,25 @@
 
 static void disable_hd64465_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64465_IRQ_BASE);
 
         pr_debug("disable_hd64465_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         nimr = inw(HD64465_REG_NIMR);
         nimr |= mask;
         outw(nimr, HD64465_REG_NIMR);
-        local_irq_restore(flags);
 }
 
 
 static void enable_hd64465_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64465_IRQ_BASE);
 
         pr_debug("enable_hd64465_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         nimr = inw(HD64465_REG_NIMR);
         nimr &= ~mask;
         outw(nimr, HD64465_REG_NIMR);
-        local_irq_restore(flags);
 }
 
 
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
index 0dc1fb8f9687..392c8b12ce36 100644
--- a/arch/sh/cchips/voyagergx/irq.c
+++ b/arch/sh/cchips/voyagergx/irq.c
@@ -32,37 +32,30 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/rts7751r2d/rts7751r2d.h>
-#include <asm/rts7751r2d/voyagergx_reg.h>
+#include <asm/voyagergx.h>
 
 static void disable_voyagergx_irq(unsigned int irq)
 {
-        unsigned long flags, val;
-        unsigned long  mask = 1 << (irq - VOYAGER_IRQ_BASE);
+        unsigned long val;
+        unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
 
         pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         val = inl(VOYAGER_INT_MASK);
         val &= ~mask;
         outl(val, VOYAGER_INT_MASK);
-        local_irq_restore(flags);
 }
 
-
 static void enable_voyagergx_irq(unsigned int irq)
 {
-        unsigned long flags, val;
-        unsigned long  mask = 1 << (irq - VOYAGER_IRQ_BASE);
+        unsigned long val;
+        unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
 
         pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         val = inl(VOYAGER_INT_MASK);
         val |= mask;
         outl(val, VOYAGER_INT_MASK);
-        local_irq_restore(flags);
 }
 
-
 static void mask_and_ack_voyagergx(unsigned int irq)
 {
         disable_voyagergx_irq(irq);
@@ -95,7 +88,8 @@ static struct hw_interrupt_type voyagergx_irq_type = {
         .end = end_voyagergx_irq,
 };
 
-static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t voyagergx_interrupt(int irq, void *dev_id,
+                                      struct pt_regs *regs)
 {
         printk(KERN_INFO
                "VoyagerGX: spurious interrupt, status: 0x%x\n",
@@ -103,9 +97,6 @@ static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *re
         return IRQ_HANDLED;
 }
 
-
-/*====================================================*/
-
 static struct {
         int (*func)(int, void *);
         void *dev;
diff --git a/arch/sh/cchips/voyagergx/setup.c b/arch/sh/cchips/voyagergx/setup.c
index 139ca88ac9e6..66b2fedd7ad9 100644
--- a/arch/sh/cchips/voyagergx/setup.c
+++ b/arch/sh/cchips/voyagergx/setup.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <asm/io.h>
-#include <asm/rts7751r2d/voyagergx_reg.h>
+#include <asm/voyagergx.h>
 
 static int __init setup_voyagergx(void)
 {
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
new file mode 100644
index 000000000000..6b43316d03cf
--- /dev/null
+++ b/arch/sh/configs/landisk_defconfig
@@ -0,0 +1,1373 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.13-sh
+# Sun Sep 11 13:00:46 2005
+#
+CONFIG_SUPERH=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_IOMAP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# System type
+#
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_STB1_HARP is not set
+# CONFIG_SH_STB1_OVERDRIVE is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_CQREEK is not set
+# CONFIG_SH_DMIDA is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_CAT68701 is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_SH2000 is not set
+# CONFIG_SH_ADX is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+CONFIG_SH_LANDISK=y
+# CONFIG_SH_TITAN is not set
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH4=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+CONFIG_CPU_SUBTYPE_SH7751=y
+CONFIG_CPU_SUBTYPE_SH7751R=y
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+
+#
+# Memory management options
+#
+CONFIG_MMU=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x04000000
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SH_FPU=y
+# CONFIG_SH_STORE_QUEUES is not set
+
+#
+# Timer support
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_PCLK_FREQ_BOOL=y
+CONFIG_SH_PCLK_FREQ=33333333
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+CONFIG_SH_DMA=y
+CONFIG_NR_ONCHIP_DMA_CHANNELS=4
+# CONFIG_NR_DMA_CHANNELS_BOOL is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+CONFIG_HEARTBEAT=y
+
+#
+# Kernel features
+#
+CONFIG_KEXEC=y
+# CONFIG_PREEMPT is not set
+# CONFIG_SMP is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Bus options
+#
+CONFIG_ISA=y
+CONFIG_PCI=y
+CONFIG_SH_PCIDMA_NONCOHERENT=y
+CONFIG_PCI_AUTO=y
+CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
+CONFIG_PCI_LEGACY_PROC=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=y
+# CONFIG_PD6729 is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=y
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_CT_ACCT=y
+CONFIG_IP_NF_CONNTRACK_MARK=y
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+# CONFIG_IP_NF_PPTP is not set
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+CONFIG_IP_NF_MATCH_SCTP=m
+# CONFIG_IP_NF_MATCH_DCCP is not set
+CONFIG_IP_NF_MATCH_COMMENT=m
+CONFIG_IP_NF_MATCH_CONNMARK=m
+# CONFIG_IP_NF_MATCH_CONNBYTES is not set
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+# CONFIG_IP_NF_MATCH_STRING is not set
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+# CONFIG_IP_NF_TARGET_NFQUEUE is not set
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+# CONFIG_IP_NF_TARGET_TTL is not set
+CONFIG_IP_NF_TARGET_CONNMARK=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_TARGET_NOTRACK=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+CONFIG_ATALK=m
+# CONFIG_DEV_APPLETALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+# CONFIG_PNP is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_LBD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECS is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=y
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_BLK_DEV_OFFBOARD=y
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+CONFIG_IDEDMA_ONLYDISK=y
+CONFIG_BLK_DEV_AEC62XX=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+CONFIG_IDE_SH=y
+# CONFIG_IDE_ARM is not set
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=y
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA24XX is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+# CONFIG_CD_NO_IDESCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+# CONFIG_MD_RAID10 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_RAID6 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_BLK_DEV_DM is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_STNIC is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_SMC91X is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NE2000 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+CONFIG_8139CP=y
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_RTC is not set
+CONFIG_RS5C313_RTC=y
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_DRM is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+
+#
+# Video For Linux
+#
+
+#
+# Video Adapters
+#
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_DPC is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FONT_8x16=y
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+
+#
+# Open Sound System
+#
+CONFIG_SOUND_PRIME=m
+# CONFIG_SOUND_BT878 is not set
+# CONFIG_SOUND_CMPCI is not set
+# CONFIG_SOUND_EMU10K1 is not set
+# CONFIG_SOUND_FUSION is not set
+# CONFIG_SOUND_CS4281 is not set
+# CONFIG_SOUND_ES1370 is not set
+# CONFIG_SOUND_ES1371 is not set
+# CONFIG_SOUND_ESSSOLO1 is not set
+# CONFIG_SOUND_MAESTRO is not set
+# CONFIG_SOUND_MAESTRO3 is not set
+# CONFIG_SOUND_ICH is not set
+# CONFIG_SOUND_SONICVIBES is not set
+# CONFIG_SOUND_TRIDENT is not set
+# CONFIG_SOUND_MSNDCLAS is not set
+# CONFIG_SOUND_MSNDPIN is not set
+# CONFIG_SOUND_VIA82CXXX is not set
+# CONFIG_SOUND_ALI5455 is not set
+# CONFIG_SOUND_FORTE is not set
+# CONFIG_SOUND_RME96XX is not set
+# CONFIG_SOUND_AD1980 is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_OBSOLETE_OSS_USB_DRIVER=y
+CONFIG_USB_AUDIO=m
+# CONFIG_USB_BLUETOOTH_TTY is not set
+CONFIG_USB_MIDI=m
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+# CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_ITMTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Multimedia devices
+#
+CONFIG_USB_DABUSB=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+CONFIG_USB_PWC=m
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# SN Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+CONFIG_ROMFS_FS=y
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+# CONFIG_JOLIET is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+CONFIG_UFS_FS_WRITE=y
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_932=y
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_FRAME_POINTER is not set
+CONFIG_SH_STANDARD_BIOS=y
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
diff --git a/arch/sh/configs/r7780rp_defconfig b/arch/sh/configs/r7780rp_defconfig
new file mode 100644
index 000000000000..d597fc571549
--- /dev/null
+++ b/arch/sh/configs/r7780rp_defconfig
@@ -0,0 +1,1099 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.15-sh
+# Sat Jan  7 19:47:53 2006
+#
+CONFIG_SUPERH=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+# CONFIG_LBD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# System type
+#
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_STB1_HARP is not set
+# CONFIG_SH_STB1_OVERDRIVE is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_CQREEK is not set
+# CONFIG_SH_DMIDA is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_CAT68701 is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_SH2000 is not set
+# CONFIG_SH_ADX is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R77703DRP is not set
+CONFIG_SH_R7780RP=y
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_TITAN is not set
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH4=y
+CONFIG_CPU_SH4A=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+CONFIG_CPU_SUBTYPE_SH7780=y
+
+#
+# Memory management options
+#
+CONFIG_MMU=y
+CONFIG_32BIT=y
+CONFIG_HUGETLB_PAGE_SIZE_64K=y
+# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+CONFIG_MEMORY_START=0x08000000
+CONFIG_MEMORY_SIZE=0x08000000
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SH_FPU=y
+CONFIG_SH_STORE_QUEUES=y
+
+#
+# Timer support
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_PCLK_FREQ_BOOL=y
+CONFIG_SH_PCLK_FREQ=32000000
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+CONFIG_SH_DMA=y
+CONFIG_NR_ONCHIP_DMA_CHANNELS=6
+# CONFIG_NR_DMA_CHANNELS_BOOL is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+
+#
+# Kernel features
+#
+# CONFIG_KEXEC is not set
+CONFIG_PREEMPT=y
+# CONFIG_SMP is not set
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_INTC2_IRQ=y
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="mem=128M console=ttySC0,115200 root=/dev/hda1"
+
+#
+# Bus options
+#
+CONFIG_PCI=y
+CONFIG_SH_PCIDMA_NONCOHERENT=y
+CONFIG_PCI_AUTO=y
+CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
+CONFIG_PCI_LEGACY_PROC=y
+# CONFIG_PCI_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+CONFIG_BLK_DEV_IDE_SATA=y
+CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=m
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=m
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_AEC62XX=m
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+CONFIG_BLK_DEV_PDC202XX_NEW=m
+# CONFIG_PDC202XX_FORCE is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+CONFIG_BLK_DEV_SIIMAGE=m
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+CONFIG_IDE_SH=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA24XX is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_STNIC is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NE2000=y
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+CONFIG_E1000=m
+# CONFIG_E1000_NAPI is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=y
+# CONFIG_R8169_NAPI is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+CONFIG_HERMES=m
+# CONFIG_PLX_HERMES is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+CONFIG_PRISM54=m
+# CONFIG_HOSTAP is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+
+#
+# Open Sound System
+#
+CONFIG_SOUND_PRIME=m
+# CONFIG_OBSOLETE_OSS_DRIVER is not set
+# CONFIG_SOUND_FUSION is not set
+# CONFIG_SOUND_ICH is not set
+# CONFIG_SOUND_TRIDENT is not set
+# CONFIG_SOUND_MSNDCLAS is not set
+# CONFIG_SOUND_MSNDPIN is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# SN Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+CONFIG_MINIX_FS=y
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_TMPFS is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_932=y
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
+CONFIG_DEBUG_SPINLOCK=y
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_VM is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
diff --git a/arch/sh/configs/se73180_defconfig b/arch/sh/configs/se73180_defconfig
index d217e44c89a6..fe19feb95ca9 100644
--- a/arch/sh/configs/se73180_defconfig
+++ b/arch/sh/configs/se73180_defconfig
@@ -78,6 +78,7 @@ CONFIG_SH_73180_SOLUTION_ENGINE=y
 # CONFIG_SH_SECUREEDGE5410 is not set
 # CONFIG_SH_HS7751RVOIP is not set
 # CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
 # CONFIG_SH_EDOSK7705 is not set
 # CONFIG_SH_SH4202_MICRODEV is not set
 # CONFIG_SH_UNKNOWN is not set
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
new file mode 100644
index 000000000000..948e507b52be
--- /dev/null
+++ b/arch/sh/configs/se7343_defconfig
@@ -0,0 +1,997 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.17
+# Mon Aug  7 20:14:44 2006
+#
+CONFIG_SUPERH=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+# CONFIG_SHMEM is not set
+CONFIG_SLAB=y
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+CONFIG_OBSOLETE_INTERMODULE=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System type
+#
+CONFIG_SOLUTION_ENGINE=y
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+CONFIG_SH_7343_SOLUTION_ENGINE=y
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+# CONFIG_SH_7710VOIPGW is not set
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_TITAN is not set
+# CONFIG_SH_SHMIN is not set
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH4=y
+CONFIG_CPU_SH4A=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+CONFIG_CPU_SUBTYPE_SH7343=y
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+
+#
+# Memory management options
+#
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x01000000
+CONFIG_32BIT=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_SH_FPU is not set
+# CONFIG_SH_FPU_EMU is not set
+CONFIG_SH_DSP=y
+# CONFIG_SH_STORE_QUEUES is not set
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_SR_RB=y
+
+#
+# Timer support
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_PCLK_FREQ=27000000
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+CONFIG_HEARTBEAT=y
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_KEXEC is not set
+# CONFIG_SMP is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Bus options
+#
+# CONFIG_PCI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options (EXPERIMENTAL)
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_RAM=y
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_SOLUTIONENGINE is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_STNIC is not set
+CONFIG_SMC91X=y
+# CONFIG_NE2000 is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_UNIX98_PTYS is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+CONFIG_I2C_SH7343=y
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
+
+#
+# Video Capture Adapters
+#
+
+#
+# Video Capture Adapters
+#
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+
+#
+# Encoders and Decoders
+#
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_MAESTRO is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_FIRMWARE_EDID=y
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_EPSON1355 is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_MIXER_OSS is not set
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# SuperH devices
+#
+CONFIG_SH7343_SIU=m
+CONFIG_AK4537_CODEC=y
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+# CONFIG_NFSD_V3 is not set
+# CONFIG_NFSD_TCP is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
new file mode 100644
index 000000000000..ec9a3034daa5
--- /dev/null
+++ b/arch/sh/configs/sh7710voipgw_defconfig
@@ -0,0 +1,913 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.17
+# Mon Aug  7 17:07:06 2006
+#
+CONFIG_SUPERH=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+# CONFIG_SHMEM is not set
+CONFIG_SLAB=y
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+CONFIG_OBSOLETE_INTERMODULE=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System type
+#
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+CONFIG_SH_7710VOIPGW=y
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_TITAN is not set
+# CONFIG_SH_SHMIN is not set
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH3=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+CONFIG_CPU_SUBTYPE_SH7710=y
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+
+#
+# Memory management options
+#
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x00800000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_SH_FPU_EMU is not set
+CONFIG_SH_DSP=y
+# CONFIG_SH_ADC is not set
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_SR_RB=y
+
+#
+# Timer support
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_PCLK_FREQ=32768000
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_KEXEC is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_SMP is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Bus options
+#
+# CONFIG_PCI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options (EXPERIMENTAL)
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=y
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+# CONFIG_IP_NF_IRC is not set
+# CONFIG_IP_NF_NETBIOS_NS is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+CONFIG_IP_NF_PPTP=m
+# CONFIG_IP_NF_H323 is not set
+# CONFIG_IP_NF_QUEUE is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=y
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_NETEM is not set
+CONFIG_NET_SCH_INGRESS=y
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_TCINDEX=y
+CONFIG_NET_CLS_ROUTE4=y
+CONFIG_NET_CLS_ROUTE=y
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_U32=y
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_POLICE=y
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_ESTIMATOR=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_RAM=y
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_SOLUTIONENGINE is not set
+CONFIG_MTD_SH7710VOIPGW=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_STNIC is not set
+# CONFIG_SMC91X is not set
+# CONFIG_NE2000 is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+CONFIG_PHONE=y
+# CONFIG_PHONE_IXJ is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_UNIX98_PTYS is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
diff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig
new file mode 100644
index 000000000000..382b3bd3963b
--- /dev/null
+++ b/arch/sh/configs/shmin_defconfig
@@ -0,0 +1,827 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.17
+# Wed Aug  2 01:45:03 2006
+#
+CONFIG_SUPERH=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_PTRACE=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_SYSCTL is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_UID16 is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+# CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+# CONFIG_BUG is not set
+# CONFIG_ELF_CORE is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+# CONFIG_SHMEM is not set
+# CONFIG_SLAB is not set
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=1
+CONFIG_SLOB=y
+CONFIG_OBSOLETE_INTERMODULE=y
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
+# Block layer
+#
+# CONFIG_LBD is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# System type
+#
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7709_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_STB1_HARP is not set
+# CONFIG_SH_STB1_OVERDRIVE is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_CQREEK is not set
+# CONFIG_SH_DMIDA is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_CAT68701 is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_SH2000 is not set
+# CONFIG_SH_ADX is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_TITAN is not set
+CONFIG_SH_SHMIN=y
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH3=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+CONFIG_CPU_SUBTYPE_SH7706=y
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+
+#
+# Memory management options
+#
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x00800000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_SH_FPU_EMU is not set
+# CONFIG_SH_DSP is not set
+# CONFIG_SH_ADC is not set
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_SR_RB=y
+
+#
+# Timer support
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_PCLK_FREQ=32000000
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+
+#
+# Kernel features
+#
+# CONFIG_KEXEC is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_SMP is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00210000
+# CONFIG_UBC_WAKEUP is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttySC1,115200 root=1f01 mtdparts=phys_mapped_flash:64k(firm)ro,-(sys) netdev=34,0x300,eth0 "
+
+#
+# Bus options
+#
+# CONFIG_PCI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options (EXPERIMENTAL)
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0xa0000000
+CONFIG_MTD_PHYSMAP_LEN=0x80000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_STNIC is not set
+# CONFIG_SMC91X is not set
+CONFIG_NE2000=y
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+# CONFIG_SYSFS is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_UNWIND_INFO is not set
+CONFIG_SH_STANDARD_BIOS=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
new file mode 100644
index 000000000000..1db2904de9e5
--- /dev/null
+++ b/arch/sh/configs/titan_defconfig
@@ -0,0 +1,1367 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.14-sh
+# Wed Nov  9 00:35:56 2005
+#
+CONFIG_SUPERH=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_IOMAP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# System type
+#
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+CONFIG_SH_TITAN=y
+# CONFIG_SH_STB1_HARP is not set
+# CONFIG_SH_STB1_OVERDRIVE is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_CQREEK is not set
+# CONFIG_SH_DMIDA is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_CAT68701 is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_SH2000 is not set
+# CONFIG_SH_ADX is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH4=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+CONFIG_CPU_SUBTYPE_SH7751=y
+CONFIG_CPU_SUBTYPE_SH7751R=y
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+
+#
+# Memory management options
+#
+CONFIG_MMU=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+CONFIG_MEMORY_START=0x08030000
+CONFIG_MEMORY_SIZE=0x7fd0000
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SH_RTC=y
+CONFIG_SH_FPU=y
+# CONFIG_SH_STORE_QUEUES is not set
+
+#
+# Timer support
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_PCLK_FREQ_BOOL=y
+CONFIG_SH_PCLK_FREQ=30000000
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+CONFIG_SH_DMA=y
+CONFIG_NR_ONCHIP_DMA_CHANNELS=8
+# CONFIG_NR_DMA_CHANNELS_BOOL is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+
+#
+# Kernel features
+#
+# CONFIG_KEXEC is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_SMP is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x009e0000
+# CONFIG_UBC_WAKEUP is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf"
+
+#
+# Bus options
+#
+CONFIG_PCI=y
+CONFIG_SH_PCIDMA_NONCOHERENT=y
+CONFIG_PCI_AUTO=y
+CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
+CONFIG_PCI_LEGACY_PROC=y
+#CONFIG_PCI_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_FWMARK is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+CONFIG_IP_ROUTE_MULTIPATH_RR=m
+CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_DRR=m
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_CT_ACCT=y
+CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_EVENTS=y
+CONFIG_IP_NF_CONNTRACK_NETLINK=m
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_NETBIOS_NS=m
+CONFIG_IP_NF_TFTP=m
+# CONFIG_IP_NF_AMANDA is not set
+CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+# CONFIG_IP_NF_MATCH_PHYSDEV is not set
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_MATCH_SCTP is not set
+# CONFIG_IP_NF_MATCH_DCCP is not set
+CONFIG_IP_NF_MATCH_COMMENT=m
+CONFIG_IP_NF_MATCH_CONNMARK=m
+CONFIG_IP_NF_MATCH_CONNBYTES=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_STRING=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_TARGET_NFQUEUE=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CONNMARK=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_TARGET_NOTRACK=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_LIMIT=m
+CONFIG_IP6_NF_MATCH_MAC=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_MARK=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_LENGTH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+# CONFIG_IP6_NF_MATCH_PHYSDEV is not set
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_NFQUEUE=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_MARK=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_NET_CLS_IND=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+# CONFIG_NET_ACT_SIMP is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+CONFIG_CONNECTOR=m
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+CONFIG_BLK_SSFDC=y
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_LBD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA24XX is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+CONFIG_PHYLIB=m
+CONFIG_PHYCONTROL=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_STNIC is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_CASSINI=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_NE2000 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+CONFIG_8139TOO=y
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+# CONFIG_8139TOO_8129 is not set
+CONFIG_8139_OLD_RX_RESET=y
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+CONFIG_PRISM54=m
+# CONFIG_HOSTAP is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_ITMTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# SN Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+CONFIG_RELAYFS_FS=m
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_9P_FS=m
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_SCHEDSTATS is not set
+CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_FRAME_POINTER is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+CONFIG_EARLY_SCIF_CONSOLE=y
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index 0f15216cd39d..defc13c37d48 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -11,6 +11,8 @@ config SH_DMA
 config NR_ONCHIP_DMA_CHANNELS
         depends on SH_DMA
         int "Number of on-chip DMAC channels"
+        default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R
+        default "12" if CPU_SUBTYPE_SH7780
         default "4"
         help
           This allows you to specify the number of channels that the on-chip
@@ -52,4 +54,3 @@ config DMA_PAGE_OPS_CHANNEL
           are dual-address capable.
 
 endmenu
-
diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c
index 0f866f8789f0..9cb070924180 100644
--- a/arch/sh/drivers/dma/dma-g2.c
+++ b/arch/sh/drivers/dma/dma-g2.c
@@ -3,7 +3,7 @@
  *
  * G2 bus DMA support
  *
- * Copyright (C) 2003, 2004  Paul Mundt
+ * Copyright (C) 2003 - 2006  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
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-
+#include <asm/cacheflush.h>
 #include <asm/mach/sysasic.h>
 #include <asm/mach/dma.h>
 #include <asm/dma.h>
@@ -47,17 +47,31 @@ struct g2_dma_info {
 
 static volatile struct g2_dma_info *g2_dma = (volatile struct g2_dma_info *)0xa05f7800;
 
+#define g2_bytes_remaining(i) \
+        ((g2_dma->channel[i].size - \
+          g2_dma->status[i].size) & 0x0fffffff)
+
 static irqreturn_t g2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        /* FIXME: Do some meaningful completion work here.. */
-        return IRQ_HANDLED;
-}
+        int i;
 
-static struct irqaction g2_dma_irq = {
-        .name           = "g2 DMA handler",
-        .handler        = g2_dma_interrupt,
-        .flags          = IRQF_DISABLED,
-};
+        for (i = 0; i < G2_NR_DMA_CHANNELS; i++) {
+                if (g2_dma->status[i].status & 0x20000000) {
+                        unsigned int bytes = g2_bytes_remaining(i);
+
+                        if (likely(bytes == 0)) {
+                                struct dma_info *info = dev_id;
+                                struct dma_channel *chan = info->channels + i;
+
+                                wake_up(&chan->wait_queue);
+
+                                return IRQ_HANDLED;
+                        }
+                }
+        }
+
+        return IRQ_NONE;
+}
 
 static int g2_enable_dma(struct dma_channel *chan)
 {
@@ -135,8 +149,14 @@ static int g2_xfer_dma(struct dma_channel *chan)
         return 0;
 }
 
+static int g2_get_residue(struct dma_channel *chan)
+{
+        return g2_bytes_remaining(chan->chan);
+}
+
 static struct dma_ops g2_dma_ops = {
         .xfer           = g2_xfer_dma,
+        .get_residue    = g2_get_residue,
 };
 
 static struct dma_info g2_dma_info = {
@@ -148,13 +168,22 @@ static struct dma_info g2_dma_info = {
 
 static int __init g2_dma_init(void)
 {
-        setup_irq(HW_EVENT_G2_DMA, &g2_dma_irq);
+        int ret;
+
+        ret = request_irq(HW_EVENT_G2_DMA, g2_dma_interrupt, IRQF_DISABLED,
+                          "g2 DMA handler", &g2_dma_info);
+        if (unlikely(ret))
+                return -EINVAL;
 
         /* Magic */
         g2_dma->wait_state      = 27;
         g2_dma->magic           = 0x4659404f;
 
-        return register_dmac(&g2_dma_info);
+        ret = register_dmac(&g2_dma_info);
+        if (unlikely(ret != 0))
+                free_irq(HW_EVENT_G2_DMA, 0);
+
+        return ret;
 }
 
 static void __exit g2_dma_exit(void)
@@ -169,4 +198,3 @@ module_exit(g2_dma_exit);
 MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
 MODULE_DESCRIPTION("G2 bus DMA driver");
 MODULE_LICENSE("GPL");
-
diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c
index 30a580aa7cbd..3b0b0f60bb3c 100644
--- a/arch/sh/drivers/dma/dma-pvr2.c
+++ b/arch/sh/drivers/dma/dma-pvr2.c
@@ -18,8 +18,8 @@
 #include <asm/dma.h>
 #include <asm/io.h>
 
-static unsigned int xfer_complete = 0;
-static int count = 0;
+static unsigned int xfer_complete;
+static int count;
 
 static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
@@ -107,4 +107,3 @@ module_exit(pvr2_dma_exit);
 MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
 MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver");
 MODULE_LICENSE("GPL");
-
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index e028a2d2a4ea..cbbe8bce3d67 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -11,14 +11,10 @@
  * 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/interrupt.h>
 #include <linux/module.h>
 #include <asm/dreamcast/dma.h>
-#include <asm/signal.h>
-#include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include "dma-sh.h"
@@ -84,18 +80,23 @@ static irqreturn_t dma_tei(int irq, void *dev_id, struct pt_regs *regs)
 
 static int sh_dmac_request_dma(struct dma_channel *chan)
 {
-        char name[32];
+        if (unlikely(!chan->flags & DMA_TEI_CAPABLE))
+                return 0;
 
-        snprintf(name, sizeof(name), "DMAC Transfer End (Channel %d)",
+        chan->name = kzalloc(32, GFP_KERNEL);
+        if (unlikely(chan->name == NULL))
+                return -ENOMEM;
+        snprintf(chan->name, 32, "DMAC Transfer End (Channel %d)",
                  chan->chan);
 
         return request_irq(get_dmte_irq(chan->chan), dma_tei,
-                           IRQF_DISABLED, name, chan);
+                           IRQF_DISABLED, chan->name, chan);
 }
 
 static void sh_dmac_free_dma(struct dma_channel *chan)
 {
         free_irq(get_dmte_irq(chan->chan), chan);
+        kfree(chan->name);
 }
 
 static void
@@ -259,7 +260,7 @@ static int __init sh_dmac_init(void)
 #ifdef CONFIG_CPU_SH4
         make_ipr_irq(DMAE_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
         i = request_irq(DMAE_IRQ, dma_err, IRQF_DISABLED, "DMAC Address Error", 0);
-        if (i < 0)
+        if (unlikely(i < 0))
                 return i;
 #endif
 
@@ -274,7 +275,7 @@ static int __init sh_dmac_init(void)
          * been set.
          */
         i = dmaor_reset();
-        if (i < 0)
+        if (unlikely(i != 0))
                 return i;
 
         return register_dmac(info);
diff --git a/arch/sh/drivers/pci/Makefile b/arch/sh/drivers/pci/Makefile
index 365bc16a4a83..9e00cb8a39e9 100644
--- a/arch/sh/drivers/pci/Makefile
+++ b/arch/sh/drivers/pci/Makefile
@@ -6,7 +6,8 @@ obj-y					+= pci.o
 obj-$(CONFIG_PCI_AUTO)                  += pci-auto.o
 
 obj-$(CONFIG_CPU_SUBTYPE_ST40STB1)      += pci-st40.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7751)        += pci-sh7751.o 
+obj-$(CONFIG_CPU_SUBTYPE_SH7751)        += pci-sh7751.o ops-sh4.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += pci-sh7780.o ops-sh4.o
 
 obj-$(CONFIG_SH_DREAMCAST)              += ops-dreamcast.o fixups-dreamcast.o \
                                            dma-dreamcast.o
@@ -14,3 +15,6 @@ obj-$(CONFIG_SH_SECUREEDGE5410)		+= ops-snapgear.o
 obj-$(CONFIG_SH_BIGSUR)                 += ops-bigsur.o
 obj-$(CONFIG_SH_RTS7751R2D)             += ops-rts7751r2d.o fixups-rts7751r2d.o
 obj-$(CONFIG_SH_SH03)                   += ops-sh03.o fixups-sh03.o
+obj-$(CONFIG_SH_R7780RP)                += ops-r7780rp.o fixups-r7780rp.o
+obj-$(CONFIG_SH_TITAN)                  += ops-titan.o
+obj-$(CONFIG_SH_LANDISK)                += ops-landisk.o
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
index 63b1c6f4b8d2..c0af5f7ef414 100644
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -4,7 +4,7 @@
  * PCI fixups for the Sega Dreamcast
  *
  * Copyright (C) 2001, 2002  M. R. Brown
- * Copyright (C) 2002, 2003  Paul Mundt
+ * Copyright (C) 2002, 2003, 2006  Paul Mundt
  *
  * This file originally bore the message (with enclosed-$):
  *      Id: pci.c,v 1.3 2003/05/04 19:29:46 lethal Exp
@@ -45,36 +45,16 @@ static void __init gapspci_fixup_resources(struct pci_dev *dev)
                 printk("PCI: Failed resource fixup\n");
         }
 }
-
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, gapspci_fixup_resources);
 
-void __init pcibios_fixup_bus(struct pci_bus *bus)
+int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-        /* 
-         * We don't have any sub bus to fix up, and this is a rather
-         * stupid place to put general device fixups. Don't do it.
-         * Use the pcibios_fixups table or suffer the consequences.
+        /*
+         * The interrupt routing semantics here are quite trivial.
+         *
+         * We basically only support one interrupt, so we only bother
+         * updating a device's interrupt line with this single shared
+         * interrupt. Keeps routing quite simple, doesn't it?
          */
+        return GAPSPCI_IRQ;
 }
-
-void __init pcibios_fixup_irqs(void)
-{
-        struct pci_dev *dev = 0;
-
-        for_each_pci_dev(dev) {
-                /*
-                 * The interrupt routing semantics here are quite trivial.
-                 *
-                 * We basically only support one interrupt, so we only bother
-                 * updating a device's interrupt line with this single shared
-                 * interrupt. Keeps routing quite simple, doesn't it?
-                 */
-                printk(KERN_NOTICE "PCI: Fixing up IRQ routing for device %s\n",
-                       pci_name(dev));
-
-                dev->irq = GAPSPCI_IRQ;
-
-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-        }
-}
-
diff --git a/arch/sh/drivers/pci/fixups-r7780rp.c b/arch/sh/drivers/pci/fixups-r7780rp.c
new file mode 100644
index 000000000000..3e321df65d22
--- /dev/null
+++ b/arch/sh/drivers/pci/fixups-r7780rp.c
@@ -0,0 +1,45 @@
+/*
+ * arch/sh/drivers/pci/fixups-r7780rp.c
+ *
+ * Highlander R7780RP-1 PCI fixups
+ *
+ * Copyright (C) 2003  Lineo uSolutions, Inc.
+ * Copyright (C) 2004 - 2006  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/pci.h>
+#include "pci-sh4.h"
+#include <asm/io.h>
+
+int pci_fixup_pcic(void)
+{
+        pci_write_reg(0x000043ff, SH4_PCIINTM);
+        pci_write_reg(0x0000380f, SH4_PCIAINTM);
+
+        pci_write_reg(0xfbb00047, SH7780_PCICMD);
+        pci_write_reg(0x00000000, SH7780_PCIIBAR);
+
+        pci_write_reg(0x00011912, SH7780_PCISVID);
+        pci_write_reg(0x08000000, SH7780_PCICSCR0);
+        pci_write_reg(0x0000001b, SH7780_PCICSAR0);
+        pci_write_reg(0xfd000000, SH7780_PCICSCR1);
+        pci_write_reg(0x0000000f, SH7780_PCICSAR1);
+
+        pci_write_reg(0xfd000000, SH7780_PCIMBR0);
+        pci_write_reg(0x00fc0000, SH7780_PCIMBMR0);
+
+#ifdef CONFIG_32BIT
+        pci_write_reg(0xc0000000, SH7780_PCIMBR2);
+        pci_write_reg(0x20000000 - SH7780_PCI_IO_SIZE, SH7780_PCIMBMR2);
+#endif
+
+        /* Set IOBR for windows containing area specified in pci.h */
+        pci_write_reg((PCIBIOS_MIN_IO & ~(SH7780_PCI_IO_SIZE - 1)),
+                      SH7780_PCIIOBR);
+        pci_write_reg(((SH7780_PCI_IO_SIZE-1) & (7<<18)), SH7780_PCIIOBMR);
+
+        return 0;
+}
diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c
index 0c590fc7a081..e72ceb560d5b 100644
--- a/arch/sh/drivers/pci/fixups-rts7751r2d.c
+++ b/arch/sh/drivers/pci/fixups-rts7751r2d.c
@@ -10,8 +10,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
-#include "pci-sh7751.h"
-#include <asm/io.h>
+#include "pci-sh4.h"
 
 #define PCIMCR_MRSET_OFF        0xBFFFFFFF
 #define PCIMCR_RFSH_OFF         0xFFFFFFFB
@@ -22,22 +21,23 @@ int pci_fixup_pcic(void)
 
         bcr1 = inl(SH7751_BCR1);
         bcr1 |= 0x40080000;     /* Enable Bit 19 BREQEN, set PCIC to slave */
-        outl(bcr1, PCI_REG(SH7751_PCIBCR1));
+        pci_write_reg(bcr1, SH4_PCIBCR1);
 
         /* Enable all interrupts, so we known what to fix */
-        outl(0x0000c3ff, PCI_REG(SH7751_PCIINTM));
-        outl(0x0000380f, PCI_REG(SH7751_PCIAINTM));
+        pci_write_reg(0x0000c3ff, SH4_PCIINTM);
+        pci_write_reg(0x0000380f, SH4_PCIAINTM);
 
-        outl(0xfb900047, PCI_REG(SH7751_PCICONF1));
-        outl(0xab000001, PCI_REG(SH7751_PCICONF4));
+        pci_write_reg(0xfb900047, SH7751_PCICONF1);
+        pci_write_reg(0xab000001, SH7751_PCICONF4);
 
         mcr = inl(SH7751_MCR);
         mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
-        outl(mcr, PCI_REG(SH7751_PCIMCR));
+        pci_write_reg(mcr, SH4_PCIMCR);
+
+        pci_write_reg(0x0c000000, SH7751_PCICONF5);
+        pci_write_reg(0xd0000000, SH7751_PCICONF6);
+        pci_write_reg(0x0c000000, SH4_PCILAR0);
+        pci_write_reg(0x00000000, SH4_PCILAR1);
 
-        outl(0x0c000000, PCI_REG(SH7751_PCICONF5));
-        outl(0xd0000000, PCI_REG(SH7751_PCICONF6));
-        outl(0x0c000000, PCI_REG(SH7751_PCILAR0));
-        outl(0x00000000, PCI_REG(SH7751_PCILAR1));
         return 0;
 }
diff --git a/arch/sh/drivers/pci/fixups-sh03.c b/arch/sh/drivers/pci/fixups-sh03.c
index 57ac26c2171f..2e8a18b7ee53 100644
--- a/arch/sh/drivers/pci/fixups-sh03.c
+++ b/arch/sh/drivers/pci/fixups-sh03.c
@@ -3,11 +3,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 
-/*
- *      IRQ functions
- */
-
-int __init pcibios_map_platform_irq(u8 slot, u8 pin, struct pci_dev *dev)
+int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
         int irq;
 
@@ -17,8 +13,9 @@ int __init pcibios_map_platform_irq(u8 slot, u8 pin, struct pci_dev *dev)
                 case 8: return 5;       /* eth1       */
                 case 6: return 2;       /* PCI bridge */
                 default:
-                        printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
-                        return 2;
+                        printk(KERN_ERR "PCI: Bad IRQ mapping request "
+                                        "for slot %d\n", slot);
+                        return 2;
                 }
         } else {
                 switch (pin) {
@@ -32,30 +29,3 @@ int __init pcibios_map_platform_irq(u8 slot, u8 pin, struct pci_dev *dev)
         }
         return irq;
 }
-
-static u8 __init sh03_no_swizzle(struct pci_dev *dev, u8 *pin)
-{
-        /* no swizzling */
-        return PCI_SLOT(dev->devfn);
-}
-
-static int sh03_pci_lookup_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        int irq = -1;
-
-        /* now lookup the actual IRQ on a platform specific basis (pci-'platform'.c) */
-        irq = pcibios_map_platform_irq(slot, pin, dev);
-        if( irq < 0 ) {
-                pr_debug("PCI: Error mapping IRQ on device %s\n", pci_name(dev));
-                return irq;
-        }
-
-        pr_debug("Setting IRQ for slot %s to %d\n", pci_name(dev), irq);
-
-        return irq;
-}
-
-void __init pcibios_fixup_irqs(void)
-{
-        pci_fixup_irqs(sh03_no_swizzle, sh03_pci_lookup_irq);
-}
diff --git a/arch/sh/drivers/pci/ops-bigsur.c b/arch/sh/drivers/pci/ops-bigsur.c
index ae82c6ca05e5..5da501bd77b5 100644
--- a/arch/sh/drivers/pci/ops-bigsur.c
+++ b/arch/sh/drivers/pci/ops-bigsur.c
@@ -10,15 +10,12 @@
  *
  * PCI initialization for the Hitachi Big Sur Evaluation Board
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/delay.h>
 #include <linux/pci.h>
-
 #include <asm/io.h>
-#include "pci-sh7751.h"
+#include "pci-sh4.h"
 #include <asm/bigsur/bigsur.h>
 
 #define BIGSUR_PCI_IO   0x4000
@@ -41,11 +38,11 @@ static struct resource sh7751_mem_resource = {
 extern struct pci_ops sh7751_pci_ops;
 
 struct pci_channel board_pci_channels[] = {
-        { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
+        { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
         { 0, }
 };
 
-static struct sh7751_pci_address_map sh7751_pci_map = {
+static struct sh4_pci_address_map sh7751_pci_map = {
         .window0        = {
                 .base   = SH7751_CS3_BASE_ADDR,
                 .size   = BIGSUR_LSR0_SIZE,
@@ -58,7 +55,7 @@ static struct sh7751_pci_address_map sh7751_pci_map = {
 };
 
 /*
- * Initialize the Big Sur PCI interface 
+ * Initialize the Big Sur PCI interface
  * Setup hardware to be Central Funtion
  * Copy the BSR regs to the PCI interface
  * Setup PCI windows into local RAM
@@ -68,15 +65,15 @@ int __init pcibios_init_platform(void)
         return sh7751_pcic_init(&sh7751_pci_map);
 }
 
-int pcibios_map_platform_irq(u8 slot, u8 pin)
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
-        /* 
+        /*
          * The Big Sur can be used in a CPCI chassis, but the SH7751 PCI
          * interface is on the wrong end of the board so that it can also
          * support a V320 CPI interface chip...  Therefor the IRQ mapping is
          * somewhat use dependent... I'l assume a linear map for now, i.e.
          * INTA=slot0,pin0... INTD=slot3,pin0...
-         */ 
+         */
         int irq = (slot + pin-1) % 4 + BIGSUR_SH7751_PCI_IRQ_BASE;
 
         PCIDBG(2, "PCI: Mapping Big Sur IRQ for slot %d, pin %c to irq %d\n",
@@ -84,4 +81,3 @@ int pcibios_map_platform_irq(u8 slot, u8 pin)
 
         return irq;
 }
-
diff --git a/arch/sh/drivers/pci/ops-landisk.c b/arch/sh/drivers/pci/ops-landisk.c
new file mode 100644
index 000000000000..ada301c21fe7
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-landisk.c
@@ -0,0 +1,68 @@
+/*
+ * arch/sh/drivers/pci/ops-landisk.c
+ *
+ * PCI initialization for the I-O DATA Device, Inc. LANDISK board
+ *
+ * Copyright (C) 2006 kogiidena
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ */
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include "pci-sh4.h"
+
+static struct resource sh7751_io_resource = {
+        .name = "SH7751 IO",
+        .start = 0x4000,
+        .end = 0x4000 + SH7751_PCI_IO_SIZE - 1,
+        .flags = IORESOURCE_IO
+};
+
+static struct resource sh7751_mem_resource = {
+        .name = "SH7751 mem",
+        .start = SH7751_PCI_MEMORY_BASE,
+        .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
+        .flags = IORESOURCE_MEM
+};
+
+struct pci_channel board_pci_channels[] = {
+        {&sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0x3ff},
+        {NULL, NULL, NULL, 0, 0},
+};
+
+static struct sh4_pci_address_map sh7751_pci_map = {
+        .window0 = {
+                .base   = SH7751_CS3_BASE_ADDR,
+                .size   = (64 << 20),   /* 64MB */
+        },
+
+        .flags = SH4_PCIC_NO_RESET,
+};
+
+int __init pcibios_init_platform(void)
+{
+        return sh7751_pcic_init(&sh7751_pci_map);
+}
+
+int pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
+{
+        /*
+         * slot0: pin1-4 = irq5,6,7,8
+         * slot1: pin1-4 = irq6,7,8,5
+         * slot2: pin1-4 = irq7,8,5,6
+         * slot3: pin1-4 = irq8,5,6,7
+         */
+        int irq = ((slot + pin - 1) & 0x3) + 5;
+
+        if ((slot | (pin - 1)) > 0x3) {
+                printk("PCI: Bad IRQ mapping request for slot %d pin %c\n",
+                       slot, pin - 1 + 'A');
+                return -1;
+        }
+        return irq;
+}
diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c
new file mode 100644
index 000000000000..554d5ed2c586
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-r7780rp.c
@@ -0,0 +1,75 @@
+/*
+ * Author:  Ian DaSilva (idasilva@mvista.com)
+ *
+ * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ * PCI initialization for the Renesas SH7780 Highlander R7780RP-1 board
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <asm/r7780rp/r7780rp.h>
+#include <asm/io.h>
+#include "pci-sh4.h"
+
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
+{
+        switch (slot) {
+        case 0: return IRQ_PCISLOT1;            /* PCI Interrupt #1 */
+        case 1: return IRQ_PCISLOT2;            /* PCI Interrupt #2 */
+        case 2: return IRQ_PCISLOT3;            /* PCI Interrupt #3 */
+        case 3: return IRQ_PCISLOT4;            /* PCI Interrupt E4 */
+        default:
+                printk(KERN_ERR "PCI: Bad IRQ mapping "
+                       "request for slot %d, func %d\n", slot, pin-1);
+                return -1;
+        }
+}
+
+static struct resource sh7780_io_resource = {
+        .name   = "SH7780_IO",
+        .start  = 0x2000,
+        .end    = 0x2000 + SH7780_PCI_IO_SIZE - 1,
+        .flags  = IORESOURCE_IO
+};
+
+static struct resource sh7780_mem_resource = {
+        .name   = "SH7780_mem",
+        .start  = SH7780_PCI_MEMORY_BASE,
+        .end    = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
+        .flags  = IORESOURCE_MEM
+};
+
+extern struct pci_ops sh7780_pci_ops;
+
+struct pci_channel board_pci_channels[] = {
+        { &sh4_pci_ops, &sh7780_io_resource, &sh7780_mem_resource, 0, 0xff },
+        { NULL, NULL, NULL, 0, 0 },
+};
+EXPORT_SYMBOL(board_pci_channels);
+
+static struct sh4_pci_address_map sh7780_pci_map = {
+        .window0        = {
+                .base   = SH7780_CS2_BASE_ADDR,
+                .size   = 0x04000000,
+        },
+
+        .window1        = {
+                .base   = SH7780_CS3_BASE_ADDR,
+                .size   = 0x04000000,
+        },
+
+        .flags  = SH4_PCIC_NO_RESET,
+};
+
+int __init pcibios_init_platform(void)
+{
+        return sh7780_pcic_init(&sh7780_pci_map);
+}
diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c
index 83171d10141a..88f44e245424 100644
--- a/arch/sh/drivers/pci/ops-rts7751r2d.c
+++ b/arch/sh/drivers/pci/ops-rts7751r2d.c
@@ -17,12 +17,11 @@
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/module.h>
-
-#include <asm/io.h>
-#include "pci-sh7751.h"
 #include <asm/rts7751r2d/rts7751r2d.h>
+#include <asm/io.h>
+#include "pci-sh4.h"
 
-int __init pcibios_map_platform_irq(u8 slot, u8 pin)
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
         switch (slot) {
         case 0: return IRQ_PCISLOT1;    /* PCI Extend slot #1 */
@@ -52,12 +51,12 @@ static struct resource sh7751_mem_resource = {
 extern struct pci_ops sh7751_pci_ops;
 
 struct pci_channel board_pci_channels[] = {
-        { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
+        { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
         { NULL, NULL, NULL, 0, 0 },
 };
 EXPORT_SYMBOL(board_pci_channels);
 
-static struct sh7751_pci_address_map sh7751_pci_map = {
+static struct sh4_pci_address_map sh7751_pci_map = {
         .window0        = {
                 .base   = SH7751_CS3_BASE_ADDR,
                 .size   = 0x04000000,
@@ -68,7 +67,7 @@ static struct sh7751_pci_address_map sh7751_pci_map = {
                 .size   = 0x00000000,   /* Unused */
         },
 
-        .flags  = SH7751_PCIC_NO_RESET,
+        .flags  = SH4_PCIC_NO_RESET,
 };
 
 int __init pcibios_init_platform(void)
diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c
new file mode 100644
index 000000000000..2d4371009a5e
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-sh4.c
@@ -0,0 +1,164 @@
+/*
+ * Generic SH-4 / SH-4A PCIC operations (SH7751, SH7780).
+ *
+ * Copyright (C) 2002 - 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License v2. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/pci.h>
+#include <asm/addrspace.h>
+#include <asm/io.h>
+#include "pci-sh4.h"
+
+/*
+ * Direct access to PCI hardware...
+ */
+#define CONFIG_CMD(bus, devfn, where) \
+        P1SEGADDR((bus->number << 16) | (devfn << 8) | (where & ~3))
+
+static DEFINE_SPINLOCK(sh4_pci_lock);
+
+/*
+ * Functions for accessing PCI configuration space with type 1 accesses
+ */
+static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn,
+                           int where, int size, u32 *val)
+{
+        unsigned long flags;
+        u32 data;
+
+        /*
+         * PCIPDR may only be accessed as 32 bit words,
+         * so we must do byte alignment by hand
+         */
+        spin_lock_irqsave(&sh4_pci_lock, flags);
+        pci_write_reg(CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
+        data = pci_read_reg(SH4_PCIPDR);
+        spin_unlock_irqrestore(&sh4_pci_lock, flags);
+
+        switch (size) {
+        case 1:
+                *val = (data >> ((where & 3) << 3)) & 0xff;
+                break;
+        case 2:
+                *val = (data >> ((where & 2) << 3)) & 0xffff;
+                break;
+        case 4:
+                *val = data;
+                break;
+        default:
+                return PCIBIOS_FUNC_NOT_SUPPORTED;
+        }
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+/*
+ * Since SH4 only does 32bit access we'll have to do a read,
+ * mask,write operation.
+ * We'll allow an odd byte offset, though it should be illegal.
+ */
+static int sh4_pci_write(struct pci_bus *bus, unsigned int devfn,
+                         int where, int size, u32 val)
+{
+        unsigned long flags;
+        int shift;
+        u32 data;
+
+        spin_lock_irqsave(&sh4_pci_lock, flags);
+        pci_write_reg(CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
+        data = pci_read_reg(SH4_PCIPDR);
+        spin_unlock_irqrestore(&sh4_pci_lock, flags);
+
+        switch (size) {
+        case 1:
+                shift = (where & 3) << 3;
+                data &= ~(0xff << shift);
+                data |= ((val & 0xff) << shift);
+                break;
+        case 2:
+                shift = (where & 2) << 3;
+                data &= ~(0xffff << shift);
+                data |= ((val & 0xffff) << shift);
+                break;
+        case 4:
+                data = val;
+                break;
+        default:
+                return PCIBIOS_FUNC_NOT_SUPPORTED;
+        }
+
+        pci_write_reg(data, SH4_PCIPDR);
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+struct pci_ops sh4_pci_ops = {
+        .read           = sh4_pci_read,
+        .write          = sh4_pci_write,
+};
+
+/*
+ * Not really related to pci_ops, but it's common and not worth shoving
+ * somewhere else for now..
+ */
+static unsigned int pci_probe = PCI_PROBE_CONF1;
+
+int __init sh4_pci_check_direct(void)
+{
+        /*
+         * Check if configuration works.
+         */
+        if (pci_probe & PCI_PROBE_CONF1) {
+                unsigned int tmp = pci_read_reg(SH4_PCIPAR);
+
+                pci_write_reg(P1SEG, SH4_PCIPAR);
+
+                if (pci_read_reg(SH4_PCIPAR) == P1SEG) {
+                        pci_write_reg(tmp, SH4_PCIPAR);
+                        printk(KERN_INFO "PCI: Using configuration type 1\n");
+                        request_region(PCI_REG(SH4_PCIPAR), 8, "PCI conf1");
+
+                        return 0;
+                }
+
+                pci_write_reg(tmp, SH4_PCIPAR);
+        }
+
+        pr_debug("PCI: pci_check_direct failed\n");
+        return -EINVAL;
+}
+
+/* Handle generic fixups */
+static void __init pci_fixup_ide_bases(struct pci_dev *d)
+{
+        int i;
+
+        /*
+         * PCI IDE controllers use non-standard I/O port decoding, respect it.
+         */
+        if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
+                return;
+        pr_debug("PCI: IDE base address fixup for %s\n", pci_name(d));
+        for(i = 0; i < 4; i++) {
+                struct resource *r = &d->resource[i];
+
+                if ((r->start & ~0x80) == 0x374) {
+                        r->start |= 2;
+                        r->end = r->start;
+                }
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
+
+char * __init pcibios_setup(char *str)
+{
+        if (!strcmp(str, "off")) {
+                pci_probe = 0;
+                return NULL;
+        }
+
+        return str;
+}
diff --git a/arch/sh/drivers/pci/ops-snapgear.c b/arch/sh/drivers/pci/ops-snapgear.c
index 3cbd14dd28fe..53dd893d4e54 100644
--- a/arch/sh/drivers/pci/ops-snapgear.c
+++ b/arch/sh/drivers/pci/ops-snapgear.c
@@ -2,7 +2,7 @@
  * arch/sh/drivers/pci/ops-snapgear.c
  *
  * Author:  David McCullough <davidm@snapgear.com>
- * 
+ *
  * Ported to new API by Paul Mundt <lethal@linux-sh.org>
  *
  * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
@@ -12,15 +12,11 @@
  *
  * PCI initialization for the SnapGear boards
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/delay.h>
 #include <linux/pci.h>
-
-#include <asm/io.h>
-#include "pci-sh7751.h"
+#include "pci-sh4.h"
 
 #define SNAPGEAR_PCI_IO         0x4000
 #define SNAPGEAR_PCI_MEM        0xfd000000
@@ -43,14 +39,12 @@ static struct resource sh7751_mem_resource = {
         .flags          = IORESOURCE_MEM,
 };
 
-extern struct pci_ops sh7751_pci_ops;
-
 struct pci_channel board_pci_channels[] = {
-        { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
+        { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
         { 0, }
 };
 
-static struct sh7751_pci_address_map sh7751_pci_map = {
+static struct sh4_pci_address_map sh7751_pci_map = {
         .window0        = {
                 .base   = SH7751_CS2_BASE_ADDR,
                 .size   = SNAPGEAR_LSR0_SIZE,
@@ -61,11 +55,11 @@ static struct sh7751_pci_address_map sh7751_pci_map = {
                 .size   = SNAPGEAR_LSR1_SIZE,
         },
 
-        .flags  = SH7751_PCIC_NO_RESET,
+        .flags  = SH4_PCIC_NO_RESET,
 };
 
 /*
- * Initialize the SnapGear PCI interface 
+ * Initialize the SnapGear PCI interface
  * Setup hardware to be Central Funtion
  * Copy the BSR regs to the PCI interface
  * Setup PCI windows into local RAM
@@ -75,7 +69,7 @@ int __init pcibios_init_platform(void)
         return sh7751_pcic_init(&sh7751_pci_map);
 }
 
-int __init pcibios_map_platform_irq(u8 slot, u8 pin)
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
         int irq = -1;
 
@@ -98,4 +92,3 @@ void __init pcibios_fixup(void)
 {
         /* Nothing to fixup .. */
 }
-
diff --git a/arch/sh/drivers/pci/ops-titan.c b/arch/sh/drivers/pci/ops-titan.c
new file mode 100644
index 000000000000..c6097bcd97fd
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-titan.c
@@ -0,0 +1,83 @@
+/*
+ * arch/sh/drivers/pci/ops-titan.c
+ *
+ * Ported to new API by Paul Mundt <lethal@linux-sh.org>
+ *
+ * Modified from ops-snapgear.c written by  David McCullough
+ * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ * PCI initialization for the Titan boards
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+#include <asm/titan.h>
+#include "pci-sh4.h"
+
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
+{
+        int irq = -1;
+
+        switch (slot) {
+        case 0: irq = TITAN_IRQ_WAN;   break;   /* eth0 (WAN) */
+        case 1: irq = TITAN_IRQ_LAN;   break;   /* eth1 (LAN) */
+        case 2: irq = TITAN_IRQ_MPCIA; break;   /* mPCI A */
+        case 3: irq = TITAN_IRQ_MPCIB; break;   /* mPCI B */
+        case 4: irq = TITAN_IRQ_USB;   break;   /* USB */
+        default:
+                printk(KERN_INFO "PCI: Bad IRQ mapping "
+                                 "request for slot %d\n", slot);
+                return -1;
+        }
+
+        printk("PCI: Mapping TITAN IRQ for slot %d, pin %c to irq %d\n",
+                slot, pin - 1 + 'A', irq);
+
+        return irq;
+}
+
+static struct resource sh7751_io_resource = {
+        .name   = "SH7751_IO",
+        .start  = SH7751_PCI_IO_BASE,
+        .end    = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
+        .flags  = IORESOURCE_IO
+};
+
+static struct resource sh7751_mem_resource = {
+        .name   = "SH7751_mem",
+        .start  = SH7751_PCI_MEMORY_BASE,
+        .end    = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
+        .flags  = IORESOURCE_MEM
+};
+
+struct pci_channel board_pci_channels[] = {
+        { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
+        { NULL, NULL, NULL, 0, 0 },
+};
+EXPORT_SYMBOL(board_pci_channels);
+
+static struct sh4_pci_address_map sh7751_pci_map = {
+        .window0        = {
+                .base   = SH7751_CS2_BASE_ADDR,
+                .size   = SH7751_MEM_REGION_SIZE*2,     /* cs2 and cs3 */
+        },
+
+        .window1        = {
+                .base   = SH7751_CS2_BASE_ADDR,
+                .size   = SH7751_MEM_REGION_SIZE*2,
+        },
+
+        .flags  = SH4_PCIC_NO_RESET,
+};
+
+int __init pcibios_init_platform(void)
+{
+        return sh7751_pcic_init(&sh7751_pci_map);
+}
diff --git a/arch/sh/drivers/pci/pci-auto.c b/arch/sh/drivers/pci/pci-auto.c
index 4cef4d1d8c84..ecf16344f94a 100644
--- a/arch/sh/drivers/pci/pci-auto.c
+++ b/arch/sh/drivers/pci/pci-auto.c
@@ -45,11 +45,11 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 
-#undef  DEBUG
-#ifdef  DEBUG
+#define DEBUG
+#ifdef  DEBUG
 #define DBG(x...)       printk(x)
 #else
-#define DBG(x...)       
+#define DBG(x...)
 #endif
 
 /*
@@ -102,7 +102,7 @@ static u32 pciauto_upper_iospc;
 static u32 pciauto_lower_memspc;
 static u32 pciauto_upper_memspc;
 
-static void __init 
+static void __init
 pciauto_setup_bars(struct pci_channel *hose,
                    int top_bus,
                    int current_bus,
@@ -116,7 +116,6 @@ pciauto_setup_bars(struct pci_channel *hose,
         int found_mem64 = 0;
 
         for (bar = PCI_BASE_ADDRESS_0; bar <= bar_limit; bar+=4) {
-#if !defined(CONFIG_SH_HS7751RVOIP) && !defined(CONFIG_SH_RTS7751R2D)
                 u32 bar_addr;
 
                 /* Read the old BAR value */
@@ -125,7 +124,6 @@ pciauto_setup_bars(struct pci_channel *hose,
                                         pci_devfn,
                                         bar,
                                         &bar_addr);
-#endif
 
                 /* Tickle the BAR and get the response */
                 early_write_config_dword(hose, top_bus,
@@ -140,8 +138,7 @@ pciauto_setup_bars(struct pci_channel *hose,
                                         bar,
                                         &bar_response);
 
-#if !defined(CONFIG_SH_HS7751RVOIP) && !defined(CONFIG_SH_RTS7751R2D)
-                /* 
+                /*
                  * Write the old BAR value back out, only update the BAR
                  * if we implicitly want resources to be updated, which
                  * is done by the generic code further down. -- PFM.
@@ -151,7 +148,6 @@ pciauto_setup_bars(struct pci_channel *hose,
                                          pci_devfn,
                                          bar,
                                          bar_addr);
-#endif
 
                 /* If BAR is not implemented go to the next BAR */
                 if (!bar_response)
@@ -177,7 +173,7 @@ retry:
                             PCI_BASE_ADDRESS_MEM_TYPE_64)
                                 found_mem64 = 1;
 
-                        addr_mask = PCI_BASE_ADDRESS_MEM_MASK;          
+                        addr_mask = PCI_BASE_ADDRESS_MEM_MASK;
                         upper_limit = &pciauto_upper_memspc;
                         lower_limit = &pciauto_lower_memspc;
                         DBG("        Mem");
@@ -193,22 +189,22 @@ retry:
                 if ((bar_value + bar_size) > *upper_limit) {
                         if (bar_response & PCI_BASE_ADDRESS_SPACE) {
                                 if (io_resource_inuse->child) {
-                                        io_resource_inuse = 
+                                        io_resource_inuse =
                                                 io_resource_inuse->child;
-                                        pciauto_lower_iospc = 
+                                        pciauto_lower_iospc =
                                                 io_resource_inuse->start;
-                                        pciauto_upper_iospc = 
+                                        pciauto_upper_iospc =
                                                 io_resource_inuse->end + 1;
                                         goto retry;
                                 }
 
                         } else {
                                 if (mem_resource_inuse->child) {
-                                        mem_resource_inuse = 
+                                        mem_resource_inuse =
                                                 mem_resource_inuse->child;
-                                        pciauto_lower_memspc = 
+                                        pciauto_lower_memspc =
                                                 mem_resource_inuse->start;
-                                        pciauto_upper_memspc = 
+                                        pciauto_upper_memspc =
                                                 mem_resource_inuse->end + 1;
                                         goto retry;
                                 }
@@ -230,7 +226,7 @@ retry:
                  * If we are a 64-bit decoder then increment to the
                  * upper 32 bits of the bar and force it to locate
                  * in the lower 4GB of memory.
-                 */ 
+                 */
                 if (found_mem64) {
                         bar += 4;
                         early_write_config_dword(hose, top_bus,
@@ -362,7 +358,6 @@ pciauto_postscan_setup_cardbus_bridge(struct pci_channel *hose,
 {
         u32 temp;
 
-#if !defined(CONFIG_SH_HS7751RVOIP) && !defined(CONFIG_SH_RTS7751R2D)
         /*
          * [jsun] we always bump up baselines a little, so that if there
          * nothing behind P2P bridge, we don't wind up overlapping IO/MEM
@@ -370,7 +365,6 @@ pciauto_postscan_setup_cardbus_bridge(struct pci_channel *hose,
          */
         pciauto_lower_memspc += 1;
         pciauto_lower_iospc += 1;
-#endif
 
         /*
          * Configure subordinate bus number.  The PCI subsystem
@@ -396,11 +390,6 @@ pciauto_postscan_setup_cardbus_bridge(struct pci_channel *hose,
          * configured by this routine to happily live behind a
          * P2P bridge in a system.
          */
-#if defined(CONFIG_SH_HS7751RVOIP) || defined(CONFIG_SH_RTS7751R2D)
-        pciauto_lower_memspc += 0x00400000;
-        pciauto_lower_iospc += 0x00004000;
-#endif
-
         /* Align memory and I/O to 4KB and 4 byte boundaries. */
         pciauto_lower_memspc = (pciauto_lower_memspc + (0x1000 - 1))
                 & ~(0x1000 - 1);
@@ -433,12 +422,12 @@ pciauto_bus_scan(struct pci_channel *hose, int top_bus, int current_bus)
         int devfn_stop = 0xff;
 
         sub_bus = current_bus;
-        
+
         if (hose->first_devfn)
                 devfn_start = hose->first_devfn;
         if (hose->last_devfn)
                 devfn_stop = hose->last_devfn;
-        
+
         for (pci_devfn=devfn_start; pci_devfn<devfn_stop; pci_devfn++) {
 
                 if (PCI_FUNC(pci_devfn) && !found_multi)
@@ -471,9 +460,6 @@ pciauto_bus_scan(struct pci_channel *hose, int top_bus, int current_bus)
                 if ((pci_class >> 16) == PCI_CLASS_BRIDGE_PCI) {
                         DBG("        Bridge: primary=%.2x, secondary=%.2x\n",
                                 current_bus, sub_bus + 1);
-#if defined(CONFIG_SH_HS7751RVOIP) || defined(CONFIG_SH_RTS7751R2D)
-                        pciauto_setup_bars(hose, top_bus, current_bus, pci_devfn, PCI_BASE_ADDRESS_1);
-#endif
                         pciauto_prescan_setup_bridge(hose, top_bus, current_bus,
                                                      pci_devfn, sub_bus);
                         DBG("Scanning sub bus %.2x, I/O 0x%.8x, Mem 0x%.8x\n",
@@ -490,10 +476,10 @@ pciauto_bus_scan(struct pci_channel *hose, int top_bus, int current_bus)
                         DBG("PCI Autoconfig: Found CardBus bridge, device %d function %d\n", PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn));
                         /* Place CardBus Socket/ExCA registers */
                         pciauto_setup_bars(hose, top_bus, current_bus, pci_devfn, PCI_BASE_ADDRESS_0);
- 
+
                         pciauto_prescan_setup_cardbus_bridge(hose, top_bus,
                                         current_bus, pci_devfn, sub_bus);
- 
+
                         DBG("Scanning sub bus %.2x, I/O 0x%.8x, Mem 0x%.8x\n",
                                 sub_bus + 1,
                                 pciauto_lower_iospc, pciauto_lower_memspc);
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h
new file mode 100644
index 000000000000..5a61d6041f2c
--- /dev/null
+++ b/arch/sh/drivers/pci/pci-sh4.h
@@ -0,0 +1,180 @@
+#ifndef __PCI_SH4_H
+#define __PCI_SH4_H
+
+#ifdef CONFIG_CPU_SUBTYPE_SH7780
+#include "pci-sh7780.h"
+#else
+#include "pci-sh7751.h"
+#endif
+
+#include <asm/io.h>
+
+/* startup values */
+#define PCI_PROBE_BIOS          1
+#define PCI_PROBE_CONF1         2
+#define PCI_PROBE_CONF2         4
+#define PCI_NO_SORT             0x100
+#define PCI_BIOS_SORT           0x200
+#define PCI_NO_CHECKS           0x400
+#define PCI_ASSIGN_ROMS         0x1000
+#define PCI_BIOS_IRQ_SCAN       0x2000
+
+#define SH4_PCICR               0x100           /* PCI Control Register */
+  #define SH4_PCICR_PREFIX        0xA5000000    /* CR prefix for write */
+  #define SH4_PCICR_FTO           0x00000400    /* TRDY/IRDY Enable */
+  #define SH4_PCICR_TRSB          0x00000200    /* Target Read Single */
+  #define SH4_PCICR_BSWP          0x00000100    /* Target Byte Swap */
+  #define SH4_PCICR_PLUP          0x00000080    /* Enable PCI Pullup */
+  #define SH4_PCICR_ARBM          0x00000040    /* PCI Arbitration Mode */
+  #define SH4_PCICR_MD            0x00000030    /* MD9 and MD10 status */
+  #define SH4_PCICR_SERR          0x00000008    /* SERR output assert */
+  #define SH4_PCICR_INTA          0x00000004    /* INTA output assert */
+  #define SH4_PCICR_PRST          0x00000002    /* PCI Reset Assert */
+  #define SH4_PCICR_CFIN          0x00000001    /* Central Fun. Init Done */
+#define SH4_PCILSR0             0x104           /* PCI Local Space Register0 */
+#define SH4_PCILSR1             0x108           /* PCI Local Space Register1 */
+#define SH4_PCILAR0             0x10C           /* PCI Local Addr Register1 */
+#define SH4_PCILAR1             0x110           /* PCI Local Addr Register1 */
+#define SH4_PCIINT              0x114           /* PCI Interrupt Register */
+  #define SH4_PCIINT_MLCK         0x00008000    /* Master Lock Error */
+  #define SH4_PCIINT_TABT         0x00004000    /* Target Abort Error */
+  #define SH4_PCIINT_TRET         0x00000200    /* Target Retry Error */
+  #define SH4_PCIINT_MFDE         0x00000100    /* Master Func. Disable Error */
+  #define SH4_PCIINT_PRTY         0x00000080    /* Address Parity Error */
+  #define SH4_PCIINT_SERR         0x00000040    /* SERR Detection Error */
+  #define SH4_PCIINT_TWDP         0x00000020    /* Tgt. Write Parity Error */
+  #define SH4_PCIINT_TRDP         0x00000010    /* Tgt. Read Parity Err Det. */
+  #define SH4_PCIINT_MTABT        0x00000008    /* Master-Tgt. Abort Error */
+  #define SH4_PCIINT_MMABT        0x00000004    /* Master-Master Abort Error */
+  #define SH4_PCIINT_MWPD         0x00000002    /* Master Write PERR Detect */
+  #define SH4_PCIINT_MRPD         0x00000001    /* Master Read PERR Detect */
+#define SH4_PCIINTM             0x118           /* PCI Interrupt Mask */
+#define SH4_PCIALR              0x11C           /* Error Address Register */
+#define SH4_PCICLR              0x120           /* Error Command/Data */
+  #define SH4_PCICLR_MPIO         0x80000000
+  #define SH4_PCICLR_MDMA0        0x40000000    /* DMA0 Transfer Error */
+  #define SH4_PCICLR_MDMA1        0x20000000    /* DMA1 Transfer Error */
+  #define SH4_PCICLR_MDMA2        0x10000000    /* DMA2 Transfer Error */
+  #define SH4_PCICLR_MDMA3        0x08000000    /* DMA3 Transfer Error */
+  #define SH4_PCICLR_TGT          0x04000000    /* Target Transfer Error */
+  #define SH4_PCICLR_CMDL         0x0000000F    /* PCI Command at Error */
+#define SH4_PCIAINT             0x130           /* Arbiter Interrupt Register */
+  #define SH4_PCIAINT_MBKN        0x00002000    /* Master Broken Interrupt */
+  #define SH4_PCIAINT_TBTO        0x00001000    /* Target Bus Time Out */
+  #define SH4_PCIAINT_MBTO        0x00001000    /* Master Bus Time Out */
+  #define SH4_PCIAINT_TABT        0x00000008    /* Target Abort */
+  #define SH4_PCIAINT_MABT        0x00000004    /* Master Abort */
+  #define SH4_PCIAINT_RDPE        0x00000002    /* Read Data Parity Error */
+  #define SH4_PCIAINT_WDPE        0x00000001    /* Write Data Parity Error */
+#define SH4_PCIAINTM            0x134           /* Arbiter Int. Mask Register */
+#define SH4_PCIBMLR             0x138           /* Error Bus Master Register */
+  #define SH4_PCIBMLR_REQ4        0x00000010    /* REQ4 bus master at error */
+  #define SH4_PCIBMLR_REQ3        0x00000008    /* REQ3 bus master at error */
+  #define SH4_PCIBMLR_REQ2        0x00000004    /* REQ2 bus master at error */
+  #define SH4_PCIBMLR_REQ1        0x00000002    /* REQ1 bus master at error */
+  #define SH4_PCIBMLR_REQ0        0x00000001    /* REQ0 bus master at error */
+#define SH4_PCIDMABT            0x140           /* DMA Transfer Arb. Register */
+  #define SH4_PCIDMABT_RRBN       0x00000001    /* DMA Arbitor Round-Robin */
+#define SH4_PCIDPA0             0x180           /* DMA0 Transfer Addr. */
+#define SH4_PCIDLA0             0x184           /* DMA0 Local Addr. */
+#define SH4_PCIDTC0             0x188           /* DMA0 Transfer Cnt. */
+#define SH4_PCIDCR0             0x18C           /* DMA0 Control Register */
+  #define SH4_PCIDCR_ALGN         0x00000600    /* DMA Alignment Mode */
+  #define SH4_PCIDCR_MAST         0x00000100    /* DMA Termination Type */
+  #define SH4_PCIDCR_INTM         0x00000080    /* DMA Interrupt Done Mask*/
+  #define SH4_PCIDCR_INTS         0x00000040    /* DMA Interrupt Done Status */
+  #define SH4_PCIDCR_LHLD         0x00000020    /* Local Address Control */
+  #define SH4_PCIDCR_PHLD         0x00000010    /* PCI Address Control*/
+  #define SH4_PCIDCR_IOSEL        0x00000008    /* PCI Address Space Type */
+  #define SH4_PCIDCR_DIR          0x00000004    /* DMA Transfer Direction */
+  #define SH4_PCIDCR_STOP         0x00000002    /* Force DMA Stop */
+  #define SH4_PCIDCR_STRT         0x00000001    /* DMA Start */
+#define SH4_PCIDPA1             0x190           /* DMA1 Transfer Addr. */
+#define SH4_PCIDLA1             0x194           /* DMA1 Local Addr. */
+#define SH4_PCIDTC1             0x198           /* DMA1 Transfer Cnt. */
+#define SH4_PCIDCR1             0x19C           /* DMA1 Control Register */
+#define SH4_PCIDPA2             0x1A0           /* DMA2 Transfer Addr. */
+#define SH4_PCIDLA2             0x1A4           /* DMA2 Local Addr. */
+#define SH4_PCIDTC2             0x1A8           /* DMA2 Transfer Cnt. */
+#define SH4_PCIDCR2             0x1AC           /* DMA2 Control Register */
+#define SH4_PCIDPA3             0x1B0           /* DMA3 Transfer Addr. */
+#define SH4_PCIDLA3             0x1B4           /* DMA3 Local Addr. */
+#define SH4_PCIDTC3             0x1B8           /* DMA3 Transfer Cnt. */
+#define SH4_PCIDCR3             0x1BC           /* DMA3 Control Register */
+#define SH4_PCIPAR              0x1C0           /* PIO Address Register */
+  #define SH4_PCIPAR_CFGEN        0x80000000    /* Configuration Enable */
+  #define SH4_PCIPAR_BUSNO        0x00FF0000    /* Config. Bus Number */
+  #define SH4_PCIPAR_DEVNO        0x0000FF00    /* Config. Device Number */
+  #define SH4_PCIPAR_REGAD        0x000000FC    /* Register Address Number */
+#define SH4_PCIMBR              0x1C4           /* Memory Base Address */
+  #define SH4_PCIMBR_MASK         0xFF000000    /* Memory Space Mask */
+  #define SH4_PCIMBR_LOCK         0x00000001    /* Lock Memory Space */
+#define SH4_PCIIOBR             0x1C8           /* I/O Base Address Register */
+  #define SH4_PCIIOBR_MASK        0xFFFC0000    /* IO Space Mask */
+  #define SH4_PCIIOBR_LOCK        0x00000001    /* Lock IO Space */
+#define SH4_PCIPINT             0x1CC           /* Power Mgmnt Int. Register */
+  #define SH4_PCIPINT_D3          0x00000002    /* D3 Pwr Mgmt. Interrupt */
+  #define SH4_PCIPINT_D0          0x00000001    /* D0 Pwr Mgmt. Interrupt */
+#define SH4_PCIPINTM            0x1D0           /* Power Mgmnt Mask Register */
+#define SH4_PCICLKR             0x1D4           /* Clock Ctrl. Register */
+  #define SH4_PCICLKR_PCSTP       0x00000002    /* PCI Clock Stop */
+  #define SH4_PCICLKR_BCSTP       0x00000001    /* BCLK Clock Stop */
+/* For definitions of BCR, MCR see ... */
+#define SH4_PCIBCR1             0x1E0           /* Memory BCR1 Register */
+  #define SH4_PCIMBR0           SH4_PCIBCR1
+#define SH4_PCIBCR2             0x1E4           /* Memory BCR2 Register */
+  #define SH4_PCIMBMR0          SH4_PCIBCR2
+#define SH4_PCIWCR1             0x1E8           /* Wait Control 1 Register */
+#define SH4_PCIWCR2             0x1EC           /* Wait Control 2 Register */
+#define SH4_PCIWCR3             0x1F0           /* Wait Control 3 Register */
+  #define SH4_PCIMBR2           SH4_PCIWCR3
+#define SH4_PCIMCR              0x1F4           /* Memory Control Register */
+#define SH4_PCIBCR3             0x1f8           /* Memory BCR3 Register */
+#define SH4_PCIPCTR             0x200           /* Port Control Register */
+  #define SH4_PCIPCTR_P2EN        0x000400000   /* Port 2 Enable */
+  #define SH4_PCIPCTR_P1EN        0x000200000   /* Port 1 Enable */
+  #define SH4_PCIPCTR_P0EN        0x000100000   /* Port 0 Enable */
+  #define SH4_PCIPCTR_P2UP        0x000000020   /* Port2 Pull Up Enable */
+  #define SH4_PCIPCTR_P2IO        0x000000010   /* Port2 Output Enable */
+  #define SH4_PCIPCTR_P1UP        0x000000008   /* Port1 Pull Up Enable */
+  #define SH4_PCIPCTR_P1IO        0x000000004   /* Port1 Output Enable */
+  #define SH4_PCIPCTR_P0UP        0x000000002   /* Port0 Pull Up Enable */
+  #define SH4_PCIPCTR_P0IO        0x000000001   /* Port0 Output Enable */
+#define SH4_PCIPDTR             0x204           /* Port Data Register */
+  #define SH4_PCIPDTR_PB5         0x000000020   /* Port 5 Enable */
+  #define SH4_PCIPDTR_PB4         0x000000010   /* Port 4 Enable */
+  #define SH4_PCIPDTR_PB3         0x000000008   /* Port 3 Enable */
+  #define SH4_PCIPDTR_PB2         0x000000004   /* Port 2 Enable */
+  #define SH4_PCIPDTR_PB1         0x000000002   /* Port 1 Enable */
+  #define SH4_PCIPDTR_PB0         0x000000001   /* Port 0 Enable */
+#define SH4_PCIPDR              0x220           /* Port IO Data Register */
+
+/* Flags */
+#define SH4_PCIC_NO_RESET       0x0001
+
+/* arch/sh/kernel/drivers/pci/ops-sh4.c */
+extern struct pci_ops sh4_pci_ops;
+int sh4_pci_check_direct(void);
+int pci_fixup_pcic(void);
+
+struct sh4_pci_address_space {
+        unsigned long base;
+        unsigned long size;
+};
+
+struct sh4_pci_address_map {
+        struct sh4_pci_address_space window0;
+        struct sh4_pci_address_space window1;
+        unsigned long flags;
+};
+
+static inline void pci_write_reg(unsigned long val, unsigned long reg)
+{
+        outl(val, PCI_REG(reg));
+}
+
+static inline unsigned long pci_read_reg(unsigned long reg)
+{
+        return inl(PCI_REG(reg));
+}
+#endif /* __PCI_SH4_H */
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c
index 682f3dae305d..dbe837884983 100644
--- a/arch/sh/drivers/pci/pci-sh7751.c
+++ b/arch/sh/drivers/pci/pci-sh7751.c
@@ -15,180 +15,14 @@
 
 #undef DEBUG
 
-#include <linux/types.h>
-#include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
+#include <linux/types.h>
 #include <linux/errno.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
-
-#include <asm/machvec.h>
+#include "pci-sh4.h"
+#include <asm/addrspace.h>
 #include <asm/io.h>
-#include "pci-sh7751.h"
-
-static unsigned int pci_probe = PCI_PROBE_CONF1;
-extern int pci_fixup_pcic(void);
-
-void pcibios_fixup_irqs(void) __attribute__ ((weak));
-
-/*
- * Direct access to PCI hardware...
- */
-
-#define CONFIG_CMD(bus, devfn, where) (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3))
-
-/*
- * Functions for accessing PCI configuration space with type 1 accesses
- */
-static int sh7751_pci_read(struct pci_bus *bus, unsigned int devfn,
-                           int where, int size, u32 *val)
-{
-        unsigned long flags;
-        u32 data;
-
-        /* 
-         * PCIPDR may only be accessed as 32 bit words, 
-         * so we must do byte alignment by hand 
-         */
-        local_irq_save(flags);
-        outl(CONFIG_CMD(bus,devfn,where), PCI_REG(SH7751_PCIPAR));
-        data = inl(PCI_REG(SH7751_PCIPDR));
-        local_irq_restore(flags);
-
-        switch (size) {
-        case 1:
-                *val = (data >> ((where & 3) << 3)) & 0xff;
-                break;
-        case 2:
-                *val = (data >> ((where & 2) << 3)) & 0xffff;
-                break;
-        case 4:
-                *val = data;
-                break;
-        default:
-                return PCIBIOS_FUNC_NOT_SUPPORTED;
-        }
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-/* 
- * Since SH7751 only does 32bit access we'll have to do a read,
- * mask,write operation.
- * We'll allow an odd byte offset, though it should be illegal.
- */ 
-static int sh7751_pci_write(struct pci_bus *bus, unsigned int devfn,
-                            int where, int size, u32 val)
-{
-        unsigned long flags;
-        int shift;
-        u32 data;
-
-        local_irq_save(flags);
-        outl(CONFIG_CMD(bus,devfn,where), PCI_REG(SH7751_PCIPAR));
-        data = inl(PCI_REG(SH7751_PCIPDR));
-        local_irq_restore(flags);
-
-        switch (size) {
-        case 1:
-                shift = (where & 3) << 3;
-                data &= ~(0xff << shift);
-                data |= ((val & 0xff) << shift);
-                break;
-        case 2:
-                shift = (where & 2) << 3;
-                data &= ~(0xffff << shift);
-                data |= ((val & 0xffff) << shift);
-                break;
-        case 4:
-                data = val;
-                break;
-        default:
-                return PCIBIOS_FUNC_NOT_SUPPORTED;
-        }
-
-        outl(data, PCI_REG(SH7751_PCIPDR));
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-#undef CONFIG_CMD
-
-struct pci_ops sh7751_pci_ops = {
-        .read           = sh7751_pci_read,
-        .write          = sh7751_pci_write,
-};
-
-static int __init pci_check_direct(void)
-{
-        unsigned int tmp, id;
-
-        /* check for SH7751/SH7751R hardware */
-        id = inl(SH7751_PCIREG_BASE+SH7751_PCICONF0);
-        if (id != ((SH7751_DEVICE_ID << 16) | SH7751_VENDOR_ID) &&
-            id != ((SH7751R_DEVICE_ID << 16) | SH7751_VENDOR_ID)) {
-                pr_debug("PCI: This is not an SH7751(R) (%x)\n", id);
-                return -ENODEV;
-        }
-
-        /*
-         * Check if configuration works.
-         */
-        if (pci_probe & PCI_PROBE_CONF1) {
-                tmp = inl (PCI_REG(SH7751_PCIPAR));
-                outl (0x80000000, PCI_REG(SH7751_PCIPAR));
-                if (inl (PCI_REG(SH7751_PCIPAR)) == 0x80000000) {
-                        outl (tmp, PCI_REG(SH7751_PCIPAR));
-                        printk(KERN_INFO "PCI: Using configuration type 1\n");
-                        request_region(PCI_REG(SH7751_PCIPAR), 8, "PCI conf1");
-                        return 0;
-                }
-                outl (tmp, PCI_REG(SH7751_PCIPAR));
-        }
-
-        pr_debug("PCI: pci_check_direct failed\n");
-        return -EINVAL;
-}
-
-/***************************************************************************************/
-
-/*
- *  Handle bus scanning and fixups ....
- */
-
-static void __init pci_fixup_ide_bases(struct pci_dev *d)
-{
-        int i;
-
-        /*
-         * PCI IDE controllers use non-standard I/O port decoding, respect it.
-         */
-        if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
-                return;
-        pr_debug("PCI: IDE base address fixup for %s\n", pci_name(d));
-        for(i=0; i<4; i++) {
-                struct resource *r = &d->resource[i];
-                if ((r->start & ~0x80) == 0x374) {
-                        r->start |= 2;
-                        r->end = r->start;
-                }
-        }
-}
-
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
-
-/*
- *  Called after each bus is probed, but before its children
- *  are examined.
- */
-
-void __init pcibios_fixup_bus(struct pci_bus *b)
-{
-        pci_read_bridge_bases(b);
-}
 
 /*
  * Initialization. Try all known PCI access methods. Note that we support
@@ -196,25 +30,29 @@ void __init pcibios_fixup_bus(struct pci_bus *b)
  * to access config space.
  * 
  * Note that the platform specific initialization (BSC registers, and memory
- * space mapping) will be called via the machine vectors (sh_mv.mv_pci_init()) if it
- * exitst and via the platform defined function pcibios_init_platform().  
- * See pci_bigsur.c for implementation;
- * 
- * The BIOS version of the pci functions is not yet implemented but it is left
- * in for completeness.  Currently an error will be genereated at compile time. 
+ * space mapping) will be called via the platform defined function
+ * pcibios_init_platform().
  */
-
 static int __init sh7751_pci_init(void)
 {
+        unsigned int id;
         int ret;
 
         pr_debug("PCI: Starting intialization.\n");
-        if ((ret = pci_check_direct()) != 0)
+
+        /* check for SH7751/SH7751R hardware */
+        id = pci_read_reg(SH7751_PCICONF0);
+        if (id != ((SH7751_DEVICE_ID << 16) | SH7751_VENDOR_ID) &&
+            id != ((SH7751R_DEVICE_ID << 16) | SH7751_VENDOR_ID)) {
+                pr_debug("PCI: This is not an SH7751(R) (%x)\n", id);
+                return -ENODEV;
+        }
+
+        if ((ret = sh4_pci_check_direct()) != 0)
                 return ret;
 
         return pcibios_init_platform();
 }
-
 subsys_initcall(sh7751_pci_init);
 
 static int __init __area_sdram_check(unsigned int area)
@@ -223,26 +61,26 @@ static int __init __area_sdram_check(unsigned int area)
 
         word = inl(SH7751_BCR1);
         /* check BCR for SDRAM in area */
-        if(((word >> area) & 1) == 0) {
+        if (((word >> area) & 1) == 0) {
                 printk("PCI: Area %d is not configured for SDRAM. BCR1=0x%x\n",
                        area, word);
                 return 0;
         }
-        outl(word, PCI_REG(SH7751_PCIBCR1));
+        pci_write_reg(word, SH4_PCIBCR1);
 
         word = (u16)inw(SH7751_BCR2);
         /* check BCR2 for 32bit SDRAM interface*/
-        if(((word >> (area << 1)) & 0x3) != 0x3) {
+        if (((word >> (area << 1)) & 0x3) != 0x3) {
                 printk("PCI: Area %d is not 32 bit SDRAM. BCR2=0x%x\n",
                        area, word);
                 return 0;
         }
-        outl(word, PCI_REG(SH7751_PCIBCR2));
+        pci_write_reg(word, SH4_PCIBCR2);
 
         return 1;
 }
 
-int __init sh7751_pcic_init(struct sh7751_pci_address_map *map)
+int __init sh7751_pcic_init(struct sh4_pci_address_map *map)
 {
         u32 reg;
         u32 word;
@@ -251,39 +89,39 @@ int __init sh7751_pcic_init(struct sh7751_pci_address_map *map)
         reg = inl(SH7751_BCR1);
         reg |= 0x80000;
         outl(reg, SH7751_BCR1);
-        
+
         /* Turn the clocks back on (not done in reset)*/
-        outl(0, PCI_REG(SH7751_PCICLKR));
+        pci_write_reg(0, SH4_PCICLKR);
         /* Clear Powerdown IRQ's (not done in reset) */
-        word = SH7751_PCIPINT_D3 | SH7751_PCIPINT_D0;
-        outl(word, PCI_REG(SH7751_PCIPINT));
+        word = SH4_PCIPINT_D3 | SH4_PCIPINT_D0;
+        pci_write_reg(word, SH4_PCIPINT);
 
         /*
          * This code is unused for some boards as it is done in the
          * bootloader and doing it here means the MAC addresses loaded
          * by the bootloader get lost.
          */
-        if (!(map->flags & SH7751_PCIC_NO_RESET)) {
+        if (!(map->flags & SH4_PCIC_NO_RESET)) {
                 /* toggle PCI reset pin */
-                word = SH7751_PCICR_PREFIX | SH7751_PCICR_PRST;
-                outl(word,PCI_REG(SH7751_PCICR));
+                word = SH4_PCICR_PREFIX | SH4_PCICR_PRST;
+                pci_write_reg(word, SH4_PCICR);
                 /* Wait for a long time... not 1 sec. but long enough */
                 mdelay(100);
-                word = SH7751_PCICR_PREFIX;
-                outl(word,PCI_REG(SH7751_PCICR));
+                word = SH4_PCICR_PREFIX;
+                pci_write_reg(word, SH4_PCICR);
         }
-        
+
         /* set the command/status bits to:
          * Wait Cycle Control + Parity Enable + Bus Master +
          * Mem space enable
          */
         word = SH7751_PCICONF1_WCC | SH7751_PCICONF1_PER | 
                SH7751_PCICONF1_BUM | SH7751_PCICONF1_MES;
-        outl(word, PCI_REG(SH7751_PCICONF1));
+        pci_write_reg(word, SH7751_PCICONF1);
 
         /* define this host as the host bridge */
-        word = SH7751_PCI_HOST_BRIDGE << 24;
-        outl(word, PCI_REG(SH7751_PCICONF2));
+        word = PCI_BASE_CLASS_BRIDGE << 24;
+        pci_write_reg(word, SH7751_PCICONF2);
 
         /* Set IO and Mem windows to local address 
          * Make PCI and local address the same for easy 1 to 1 mapping 
@@ -291,46 +129,49 @@ int __init sh7751_pcic_init(struct sh7751_pci_address_map *map)
          * Window1 = map->window1.size @ cached area base = SDRAM 
          */
         word = map->window0.size - 1;
-        outl(word, PCI_REG(SH7751_PCILSR0));
+        pci_write_reg(word, SH4_PCILSR0);
         word = map->window1.size - 1;
-        outl(word, PCI_REG(SH7751_PCILSR1));
+        pci_write_reg(word, SH4_PCILSR1);
         /* Set the values on window 0 PCI config registers */
         word = P2SEGADDR(map->window0.base);
-        outl(word, PCI_REG(SH7751_PCILAR0));
-        outl(word, PCI_REG(SH7751_PCICONF5));
+        pci_write_reg(word, SH4_PCILAR0);
+        pci_write_reg(word, SH7751_PCICONF5);
         /* Set the values on window 1 PCI config registers */
         word =  PHYSADDR(map->window1.base);
-        outl(word, PCI_REG(SH7751_PCILAR1));
-        outl(word, PCI_REG(SH7751_PCICONF6));
+        pci_write_reg(word, SH4_PCILAR1);
+        pci_write_reg(word, SH7751_PCICONF6);
 
-        /* Set the local 16MB PCI memory space window to 
+        /* Set the local 16MB PCI memory space window to
          * the lowest PCI mapped address
          */
-        word = PCIBIOS_MIN_MEM & SH7751_PCIMBR_MASK;
-        PCIDBG(2,"PCI: Setting upper bits of Memory window to 0x%x\n", word);
-        outl(word , PCI_REG(SH7751_PCIMBR));
+        word = PCIBIOS_MIN_MEM & SH4_PCIMBR_MASK;
+        pr_debug("PCI: Setting upper bits of Memory window to 0x%x\n", word);
+        pci_write_reg(word , SH4_PCIMBR);
 
         /* Map IO space into PCI IO window
          * The IO window is 64K-PCIBIOS_MIN_IO in size
-         * IO addresses will be translated to the 
+         * IO addresses will be translated to the
          * PCI IO window base address
          */
-        PCIDBG(3,"PCI: Mapping IO address 0x%x - 0x%x to base 0x%x\n", PCIBIOS_MIN_IO,
-            (64*1024), SH7751_PCI_IO_BASE+PCIBIOS_MIN_IO);
+        pr_debug("PCI: Mapping IO address 0x%x - 0x%x to base 0x%x\n",
+                 PCIBIOS_MIN_IO, (64 << 10),
+                 SH4_PCI_IO_BASE + PCIBIOS_MIN_IO);
 
-        /* 
+        /*
          * XXX: For now, leave this board-specific. In the event we have other
          * boards that need to do similar work, this can be wrapped.
          */
 #ifdef CONFIG_SH_BIGSUR
-        bigsur_port_map(PCIBIOS_MIN_IO, (64*1024), SH7751_PCI_IO_BASE+PCIBIOS_MIN_IO,0);
+        bigsur_port_map(PCIBIOS_MIN_IO, (64 << 10),
+                        SH4_PCI_IO_BASE + PCIBIOS_MIN_IO, 0);
 #endif
 
-        /* Make sure the MSB's of IO window are set to access PCI space correctly */
-        word = PCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK;
-        PCIDBG(2,"PCI: Setting upper bits of IO window to 0x%x\n", word);
-        outl(word, PCI_REG(SH7751_PCIIOBR));
-        
+        /* Make sure the MSB's of IO window are set to access PCI space
+         * correctly */
+        word = PCIBIOS_MIN_IO & SH4_PCIIOBR_MASK;
+        pr_debug("PCI: Setting upper bits of IO window to 0x%x\n", word);
+        pci_write_reg(word, SH4_PCIIOBR);
+
         /* Set PCI WCRx, BCRx's, copy from BSC locations */
 
         /* check BCR for SDRAM in specified area */
@@ -349,13 +190,13 @@ int __init sh7751_pcic_init(struct sh7751_pci_address_map *map)
 
         /* configure the wait control registers */
         word = inl(SH7751_WCR1);
-        outl(word, PCI_REG(SH7751_PCIWCR1));
+        pci_write_reg(word, SH4_PCIWCR1);
         word = inl(SH7751_WCR2);
-        outl(word, PCI_REG(SH7751_PCIWCR2));
+        pci_write_reg(word, SH4_PCIWCR2);
         word = inl(SH7751_WCR3);
-        outl(word, PCI_REG(SH7751_PCIWCR3));
+        pci_write_reg(word, SH4_PCIWCR3);
         word = inl(SH7751_MCR);
-        outl(word, PCI_REG(SH7751_PCIMCR));
+        pci_write_reg(word, SH4_PCIMCR);
 
         /* NOTE: I'm ignoring the PCI error IRQs for now..
          * TODO: add support for the internal error interrupts and
@@ -368,49 +209,8 @@ int __init sh7751_pcic_init(struct sh7751_pci_address_map *map)
 
         /* SH7751 init done, set central function init complete */
         /* use round robin mode to stop a device starving/overruning */
-        word = SH7751_PCICR_PREFIX | SH7751_PCICR_CFIN | SH7751_PCICR_ARBM;
-        outl(word,PCI_REG(SH7751_PCICR)); 
+        word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM;
+        pci_write_reg(word, SH4_PCICR);
 
         return 1;
 }
-
-char * __init pcibios_setup(char *str)
-{
-        if (!strcmp(str, "off")) {
-                pci_probe = 0;
-                return NULL;
-        }
-
-        return str;
-}
-
-/* 
- *      IRQ functions 
- */
-static u8 __init sh7751_no_swizzle(struct pci_dev *dev, u8 *pin)
-{
-        /* no swizzling */
-        return PCI_SLOT(dev->devfn);
-}
-
-static int sh7751_pci_lookup_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        int irq = -1;
-
-        /* now lookup the actual IRQ on a platform specific basis (pci-'platform'.c) */
-        irq = pcibios_map_platform_irq(slot,pin);
-        if( irq < 0 ) {
-                pr_debug("PCI: Error mapping IRQ on device %s\n", pci_name(dev));
-                return irq;
-        }
-
-        pr_debug("Setting IRQ for slot %s to %d\n", pci_name(dev), irq);
-
-        return irq;
-}
-
-void __init pcibios_fixup_irqs(void)
-{
-        pci_fixup_irqs(sh7751_no_swizzle, sh7751_pci_lookup_irq);
-}
-
diff --git a/arch/sh/drivers/pci/pci-sh7751.h b/arch/sh/drivers/pci/pci-sh7751.h
index 1fee5cae10d1..68e3cb5e6bec 100644
--- a/arch/sh/drivers/pci/pci-sh7751.h
+++ b/arch/sh/drivers/pci/pci-sh7751.h
@@ -3,7 +3,7 @@
  *
  *  Dustin McIntire (dustin@sensoria.com) (c) 2001
  *  Paul Mundt (lethal@linux-sh.org) (c) 2003
- *      
+ *
  *  May be copied or modified under the terms of the GNU General Public
  *  License.  See linux/COPYING for more information.
  *
@@ -12,28 +12,6 @@
 #ifndef _PCI_SH7751_H_
 #define _PCI_SH7751_H_
 
-#include <linux/pci.h>
-
-/* set debug level 4=verbose...1=terse */
-//#define DEBUG_PCI 3
-#undef DEBUG_PCI
-
-#ifdef DEBUG_PCI
-#define PCIDBG(n, x...) { if(DEBUG_PCI>=n) printk(x); }
-#else
-#define PCIDBG(n, x...)
-#endif
-
-/* startup values */
-#define PCI_PROBE_BIOS 1
-#define PCI_PROBE_CONF1 2
-#define PCI_PROBE_CONF2 4
-#define PCI_NO_SORT 0x100
-#define PCI_BIOS_SORT 0x200
-#define PCI_NO_CHECKS 0x400
-#define PCI_ASSIGN_ROMS 0x1000
-#define PCI_BIOS_IRQ_SCAN 0x2000
-
 /* Platform Specific Values */
 #define SH7751_VENDOR_ID             0x1054
 #define SH7751_DEVICE_ID             0x3505
@@ -128,131 +106,6 @@
   #define SH7751_PCICONF17_PMEN      0x00010000  /* PME Enable */
   #define SH7751_PCICONF17_PWST      0x00000003  /* Power State */
 /* SH7715 Internal PCI Registers */
-#define SH7751_PCICR               0x100         /* PCI Control Register */
-  #define SH7751_PCICR_PREFIX        0xA5000000  /* CR prefix for write */
-  #define SH7751_PCICR_TRSB          0x00000200  /* Target Read Single */
-  #define SH7751_PCICR_BSWP          0x00000100  /* Target Byte Swap */
-  #define SH7751_PCICR_PLUP          0x00000080  /* Enable PCI Pullup */
-  #define SH7751_PCICR_ARBM          0x00000040  /* PCI Arbitration Mode */
-  #define SH7751_PCICR_MD            0x00000030  /* MD9 and MD10 status */
-  #define SH7751_PCICR_SERR          0x00000008  /* SERR output assert */
-  #define SH7751_PCICR_INTA          0x00000004  /* INTA output assert */
-  #define SH7751_PCICR_PRST          0x00000002  /* PCI Reset Assert */
-  #define SH7751_PCICR_CFIN          0x00000001  /* Central Fun. Init Done */
-#define SH7751_PCILSR0             0x104         /* PCI Local Space Register0 */
-#define SH7751_PCILSR1             0x108         /* PCI Local Space Register1 */
-#define SH7751_PCILAR0             0x10C         /* PCI Local Address Register1 */
-#define SH7751_PCILAR1             0x110         /* PCI Local Address Register1 */
-#define SH7751_PCIINT              0x114         /* PCI Interrupt Register */
-  #define SH7751_PCIINT_MLCK         0x00008000  /* Master Lock Error */
-  #define SH7751_PCIINT_TABT         0x00004000  /* Target Abort Error */
-  #define SH7751_PCIINT_TRET         0x00000200  /* Target Retry Error */
-  #define SH7751_PCIINT_MFDE         0x00000100  /* Master Func. Disable Error */
-  #define SH7751_PCIINT_PRTY         0x00000080  /* Address Parity Error */
-  #define SH7751_PCIINT_SERR         0x00000040  /* SERR Detection Error */
-  #define SH7751_PCIINT_TWDP         0x00000020  /* Tgt. Write Parity Error */
-  #define SH7751_PCIINT_TRDP         0x00000010  /* Tgt. Read Parity Error Det. */
-  #define SH7751_PCIINT_MTABT        0x00000008  /* Master-Tgt. Abort Error */
-  #define SH7751_PCIINT_MMABT        0x00000004  /* Master-Master Abort Error */
-  #define SH7751_PCIINT_MWPD         0x00000002  /* Master Write PERR Detect */
-  #define SH7751_PCIINT_MRPD         0x00000002  /* Master Read PERR Detect */
-#define SH7751_PCIINTM             0x118         /* PCI Interrupt Mask Register */
-#define SH7751_PCIALR              0x11C         /* Error Address Register */
-#define SH7751_PCICLR              0x120         /* Error Command/Data Register */
-  #define SH7751_PCICLR_MPIO         0x80000000  /* Error Command/Data Register */
-  #define SH7751_PCICLR_MDMA0        0x40000000  /* DMA0 Transfer Error */
-  #define SH7751_PCICLR_MDMA1        0x20000000  /* DMA1 Transfer Error */
-  #define SH7751_PCICLR_MDMA2        0x10000000  /* DMA2 Transfer Error */
-  #define SH7751_PCICLR_MDMA3        0x08000000  /* DMA3 Transfer Error */
-  #define SH7751_PCICLR_TGT          0x04000000  /* Target Transfer Error */
-  #define SH7751_PCICLR_CMDL         0x0000000F  /* PCI Command at Error */
-#define SH7751_PCIAINT             0x130         /* Arbiter Interrupt Register */
-  #define SH7751_PCIAINT_MBKN        0x00002000  /* Master Broken Interrupt */
-  #define SH7751_PCIAINT_TBTO        0x00001000  /* Target Bus Time Out */
-  #define SH7751_PCIAINT_MBTO        0x00001000  /* Master Bus Time Out */
-  #define SH7751_PCIAINT_TABT        0x00000008  /* Target Abort */
-  #define SH7751_PCIAINT_MABT        0x00000004  /* Master Abort */
-  #define SH7751_PCIAINT_RDPE        0x00000002  /* Read Data Parity Error */
-  #define SH7751_PCIAINT_WDPE        0x00000002  /* Write Data Parity Error */
-#define SH7751_PCIAINTM            0x134         /* Arbiter Int. Mask Register */
-#define SH7751_PCIBMLR             0x138         /* Error Bus Master Register */
-  #define SH7751_PCIBMLR_REQ4        0x00000010  /* REQ4 bus master at error */
-  #define SH7751_PCIBMLR_REQ3        0x00000008  /* REQ3 bus master at error */
-  #define SH7751_PCIBMLR_REQ2        0x00000004  /* REQ2 bus master at error */
-  #define SH7751_PCIBMLR_REQ1        0x00000002  /* REQ1 bus master at error */
-  #define SH7751_PCIBMLR_REQ0        0x00000001  /* REQ0 bus master at error */
-#define SH7751_PCIDMABT            0x140         /* DMA Transfer Arb. Register */
-  #define SH7751_PCIDMABT_RRBN       0x00000001  /* DMA Arbitor Round-Robin */
-#define SH7751_PCIDPA0             0x180         /* DMA0 Transfer Addr. Register */
-#define SH7751_PCIDLA0             0x184         /* DMA0 Local Addr. Register */
-#define SH7751_PCIDTC0             0x188         /* DMA0 Transfer Cnt. Register */
-#define SH7751_PCIDCR0             0x18C         /* DMA0 Control Register */
-  #define SH7751_PCIDCR_ALGN         0x00000600  /* DMA Alignment Mode */
-  #define SH7751_PCIDCR_MAST         0x00000100  /* DMA Termination Type */
-  #define SH7751_PCIDCR_INTM         0x00000080  /* DMA Interrupt Done Mask*/
-  #define SH7751_PCIDCR_INTS         0x00000040  /* DMA Interrupt Done Status */
-  #define SH7751_PCIDCR_LHLD         0x00000020  /* Local Address Control */
-  #define SH7751_PCIDCR_PHLD         0x00000010  /* PCI Address Control*/
-  #define SH7751_PCIDCR_IOSEL        0x00000008  /* PCI Address Space Type */
-  #define SH7751_PCIDCR_DIR          0x00000004  /* DMA Transfer Direction */
-  #define SH7751_PCIDCR_STOP         0x00000002  /* Force DMA Stop */
-  #define SH7751_PCIDCR_STRT         0x00000001  /* DMA Start */
-#define SH7751_PCIDPA1             0x190         /* DMA1 Transfer Addr. Register */
-#define SH7751_PCIDLA1             0x194         /* DMA1 Local Addr. Register */
-#define SH7751_PCIDTC1             0x198         /* DMA1 Transfer Cnt. Register */
-#define SH7751_PCIDCR1             0x19C         /* DMA1 Control Register */
-#define SH7751_PCIDPA2             0x1A0         /* DMA2 Transfer Addr. Register */
-#define SH7751_PCIDLA2             0x1A4         /* DMA2 Local Addr. Register */
-#define SH7751_PCIDTC2             0x1A8         /* DMA2 Transfer Cnt. Register */
-#define SH7751_PCIDCR2             0x1AC         /* DMA2 Control Register */
-#define SH7751_PCIDPA3             0x1B0         /* DMA3 Transfer Addr. Register */
-#define SH7751_PCIDLA3             0x1B4         /* DMA3 Local Addr. Register */
-#define SH7751_PCIDTC3             0x1B8         /* DMA3 Transfer Cnt. Register */
-#define SH7751_PCIDCR3             0x1BC         /* DMA3 Control Register */
-#define SH7751_PCIPAR              0x1C0         /* PIO Address Register */
-  #define SH7751_PCIPAR_CFGEN        0x80000000  /* Configuration Enable */
-  #define SH7751_PCIPAR_BUSNO        0x00FF0000  /* Config. Bus Number */
-  #define SH7751_PCIPAR_DEVNO        0x0000FF00  /* Config. Device Number */
-  #define SH7751_PCIPAR_REGAD        0x000000FC  /* Register Address Number */
-#define SH7751_PCIMBR              0x1C4         /* Memory Base Address Register */
-  #define SH7751_PCIMBR_MASK         0xFF000000  /* Memory Space Mask */
-  #define SH7751_PCIMBR_LOCK         0x00000001  /* Lock Memory Space */
-#define SH7751_PCIIOBR             0x1C8         /* I/O Base Address Register */
-  #define SH7751_PCIIOBR_MASK         0xFFFC0000 /* IO Space Mask */
-  #define SH7751_PCIIOBR_LOCK         0x00000001 /* Lock IO Space */
-#define SH7751_PCIPINT             0x1CC         /* Power Mgmnt Int. Register */
-  #define SH7751_PCIPINT_D3           0x00000002 /* D3 Pwr Mgmt. Interrupt */
-  #define SH7751_PCIPINT_D0           0x00000001 /* D0 Pwr Mgmt. Interrupt */  
-#define SH7751_PCIPINTM            0x1D0         /* Power Mgmnt Mask Register */
-#define SH7751_PCICLKR             0x1D4         /* Clock Ctrl. Register */
-  #define SH7751_PCICLKR_PCSTP        0x00000002 /* PCI Clock Stop */
-  #define SH7751_PCICLKR_BCSTP        0x00000002 /* BCLK Clock Stop */
-/* For definitions of BCR, MCR see ... */
-#define SH7751_PCIBCR1             0x1E0         /* Memory BCR1 Register */
-#define SH7751_PCIBCR2             0x1E4         /* Memory BCR2 Register */
-#define SH7751_PCIWCR1             0x1E8         /* Wait Control 1 Register */
-#define SH7751_PCIWCR2             0x1EC         /* Wait Control 2 Register */
-#define SH7751_PCIWCR3             0x1F0         /* Wait Control 3 Register */
-#define SH7751_PCIMCR              0x1F4         /* Memory Control Register */
-#define SH7751_PCIBCR3             0x1f8         /* Memory BCR3 Register */
-#define SH7751_PCIPCTR             0x200         /* Port Control Register */
-  #define SH7751_PCIPCTR_P2EN        0x000400000 /* Port 2 Enable */
-  #define SH7751_PCIPCTR_P1EN        0x000200000 /* Port 1 Enable */
-  #define SH7751_PCIPCTR_P0EN        0x000100000 /* Port 0 Enable */
-  #define SH7751_PCIPCTR_P2UP        0x000000020 /* Port2 Pull Up Enable */
-  #define SH7751_PCIPCTR_P2IO        0x000000010 /* Port2 Output Enable */
-  #define SH7751_PCIPCTR_P1UP        0x000000008 /* Port1 Pull Up Enable */
-  #define SH7751_PCIPCTR_P1IO        0x000000004 /* Port1 Output Enable */
-  #define SH7751_PCIPCTR_P0UP        0x000000002 /* Port0 Pull Up Enable */
-  #define SH7751_PCIPCTR_P0IO        0x000000001 /* Port0 Output Enable */
-#define SH7751_PCIPDTR             0x204         /* Port Data Register */
-  #define SH7751_PCIPDTR_PB5         0x000000020 /* Port 5 Enable */
-  #define SH7751_PCIPDTR_PB4         0x000000010 /* Port 4 Enable */
-  #define SH7751_PCIPDTR_PB3         0x000000008 /* Port 3 Enable */
-  #define SH7751_PCIPDTR_PB2         0x000000004 /* Port 2 Enable */
-  #define SH7751_PCIPDTR_PB1         0x000000002 /* Port 1 Enable */
-  #define SH7751_PCIPDTR_PB0         0x000000001 /* Port 0 Enable */
-#define SH7751_PCIPDR              0x220         /* Port IO Data Register */
 
 /* Memory Control Registers */
 #define SH7751_BCR1                0xFF800000    /* Memory BCR1 Register */
@@ -274,30 +127,9 @@
 #define SH7751_CS5_BASE_ADDR       (SH7751_CS4_BASE_ADDR + SH7751_MEM_REGION_SIZE)
 #define SH7751_CS6_BASE_ADDR       (SH7751_CS5_BASE_ADDR + SH7751_MEM_REGION_SIZE)
 
-/* General PCI values */
-#define SH7751_PCI_HOST_BRIDGE          0x6
-
-/* Flags */
-#define SH7751_PCIC_NO_RESET    0x0001
-
-/* External functions defined per platform i.e. Big Sur, SE... (these could be routed 
- * through the machine vectors... */
-extern int pcibios_init_platform(void);
-extern int pcibios_map_platform_irq(u8 slot, u8 pin);
-
-struct sh7751_pci_address_space {
-        unsigned long base;
-        unsigned long size;
-};
-
-struct sh7751_pci_address_map {
-        struct sh7751_pci_address_space window0;
-        struct sh7751_pci_address_space window1;
-        unsigned long flags;
-};
+struct sh4_pci_address_map;
 
 /* arch/sh/drivers/pci/pci-sh7751.c */
-extern int sh7751_pcic_init(struct sh7751_pci_address_map *map);
+int sh7751_pcic_init(struct sh4_pci_address_map *map);
 
 #endif /* _PCI_SH7751_H_ */
-
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
new file mode 100644
index 000000000000..bd3064a82087
--- /dev/null
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -0,0 +1,139 @@
+/*
+ *      Low-Level PCI Support for the SH7780
+ *
+ *  Dustin McIntire (dustin@sensoria.com)
+ *      Derived from arch/i386/kernel/pci-*.c which bore the message:
+ *      (c) 1999--2000 Martin Mares <mj@ucw.cz>
+ *
+ *  Ported to the new API by Paul Mundt <lethal@linux-sh.org>
+ *  With cleanup by Paul van Gool <pvangool@mimotech.com>
+ *
+ *  May be copied or modified under the terms of the GNU General Public
+ *  License.  See linux/COPYING for more information.
+ *
+ */
+
+#undef DEBUG
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include "pci-sh4.h"
+
+/*
+ * Initialization. Try all known PCI access methods. Note that we support
+ * using both PCI BIOS and direct access: in such cases, we use I/O ports
+ * to access config space.
+ *
+ * Note that the platform specific initialization (BSC registers, and memory
+ * space mapping) will be called via the platform defined function
+ * pcibios_init_platform().
+ */
+static int __init sh7780_pci_init(void)
+{
+        unsigned int id;
+        int ret;
+
+        pr_debug("PCI: Starting intialization.\n");
+
+        outl(0x00000001, SH7780_PCI_VCR2); /* Enable PCIC */
+
+        /* check for SH7780/SH7780R hardware */
+        id = pci_read_reg(SH7780_PCIVID);
+        if ((id != ((SH7780_DEVICE_ID << 16) | SH7780_VENDOR_ID)) &&
+            (id != ((SH7781_DEVICE_ID << 16) | SH7780_VENDOR_ID))) {
+                printk(KERN_ERR "PCI: This is not an SH7780 (%x)\n", id);
+                return -ENODEV;
+        }
+
+        /* Setup the INTC */
+        ctrl_outl(0x00200000, INTC_ICR0);       /* INTC SH-4 Mode */
+        ctrl_outl(0x00078000, INTC_INT2MSKCR);  /* enable PCIINTA - PCIINTD */
+        ctrl_outl(0x40000000, INTC_INTMSK1);    /* disable IRL4-7 Interrupt */
+        ctrl_outl(0x0000fffe, INTC_INTMSK2);    /* disable IRL4-7 Interrupt */
+        ctrl_outl(0x80000000, INTC_INTMSKCLR1); /* enable IRL0-3 Interrupt */
+        ctrl_outl(0xfffe0000, INTC_INTMSKCLR2); /* enable IRL0-3 Interrupt */
+
+        if ((ret = sh4_pci_check_direct()) != 0)
+                return ret;
+
+        return pcibios_init_platform();
+}
+core_initcall(sh7780_pci_init);
+
+int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
+{
+        u32 word;
+
+        /*
+         * This code is unused for some boards as it is done in the
+         * bootloader and doing it here means the MAC addresses loaded
+         * by the bootloader get lost.
+         */
+        if (!(map->flags & SH4_PCIC_NO_RESET)) {
+                /* toggle PCI reset pin */
+                word = SH4_PCICR_PREFIX | SH4_PCICR_PRST;
+                pci_write_reg(word, SH4_PCICR);
+                /* Wait for a long time... not 1 sec. but long enough */
+                mdelay(100);
+                word = SH4_PCICR_PREFIX;
+                pci_write_reg(word, SH4_PCICR);
+        }
+
+        /* set the command/status bits to:
+         * Wait Cycle Control + Parity Enable + Bus Master +
+         * Mem space enable
+         */
+        pci_write_reg(0x00000046, SH7780_PCICMD);
+
+        /* define this host as the host bridge */
+        word = PCI_BASE_CLASS_BRIDGE << 24;
+        pci_write_reg(word, SH7780_PCIRID);
+
+        /* Set IO and Mem windows to local address
+         * Make PCI and local address the same for easy 1 to 1 mapping
+         * Window0 = map->window0.size @ non-cached area base = SDRAM
+         * Window1 = map->window1.size @ cached area base = SDRAM
+         */
+        word = ((map->window0.size - 1) & 0x1ff00001) | 0x01;
+        pci_write_reg(0x07f00001, SH4_PCILSR0);
+        word = ((map->window1.size - 1) & 0x1ff00001) | 0x01;
+        pci_write_reg(0x00000001, SH4_PCILSR1);
+        /* Set the values on window 0 PCI config registers */
+        word = P2SEGADDR(map->window0.base);
+        pci_write_reg(0xa8000000, SH4_PCILAR0);
+        pci_write_reg(0x08000000, SH7780_PCIMBAR0);
+        /* Set the values on window 1 PCI config registers */
+        word = P2SEGADDR(map->window1.base);
+        pci_write_reg(0x00000000, SH4_PCILAR1);
+        pci_write_reg(0x00000000, SH7780_PCIMBAR1);
+
+        /* Map IO space into PCI IO window
+         * The IO window is 64K-PCIBIOS_MIN_IO in size
+         * IO addresses will be translated to the
+         * PCI IO window base address
+         */
+        pr_debug("PCI: Mapping IO address 0x%x - 0x%x to base 0x%x\n",
+                 PCIBIOS_MIN_IO, (64 << 10),
+                 SH7780_PCI_IO_BASE + PCIBIOS_MIN_IO);
+
+        /* NOTE: I'm ignoring the PCI error IRQs for now..
+         * TODO: add support for the internal error interrupts and
+         * DMA interrupts...
+         */
+
+#ifdef CONFIG_SH_R7780RP
+        pci_fixup_pcic();
+#endif
+
+        /* SH7780 init done, set central function init complete */
+        /* use round robin mode to stop a device starving/overruning */
+        word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO;
+        pci_write_reg(word, SH4_PCICR);
+
+        return 1;
+}
diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h
new file mode 100644
index 000000000000..f02d2180a4bc
--- /dev/null
+++ b/arch/sh/drivers/pci/pci-sh7780.h
@@ -0,0 +1,94 @@
+/*
+ *      Low-Level PCI Support for SH7780 targets
+ *
+ *  Dustin McIntire (dustin@sensoria.com) (c) 2001
+ *  Paul Mundt (lethal@linux-sh.org) (c) 2003
+ *
+ *  May be copied or modified under the terms of the GNU General Public
+ *  License.  See linux/COPYING for more information.
+ *
+ */
+
+#ifndef _PCI_SH7780_H_
+#define _PCI_SH7780_H_
+
+/* Platform Specific Values */
+#define SH7780_VENDOR_ID        0x1912
+#define SH7780_DEVICE_ID        0x0002
+#define SH7781_DEVICE_ID        0x0001
+
+/* SH7780 Control Registers */
+#define SH7780_PCI_VCR0         0xFE000000
+#define SH7780_PCI_VCR1         0xFE000004
+#define SH7780_PCI_VCR2         0xFE000008
+
+/* SH7780 Specific Values */
+#define SH7780_PCI_CONFIG_BASE  0xFD000000      /* Config space base addr */
+#define SH7780_PCI_CONFIG_SIZE  0x01000000      /* Config space size */
+
+#define SH7780_PCI_MEMORY_BASE  0xFD000000      /* Memory space base addr */
+#define SH7780_PCI_MEM_SIZE     0x01000000      /* Size of Memory window */
+
+#define SH7780_PCI_IO_BASE      0xFE400000      /* IO space base address */
+#define SH7780_PCI_IO_SIZE      0x00400000      /* Size of IO window */
+
+#define SH7780_PCIREG_BASE      0xFE040000      /* PCI regs base address */
+#define PCI_REG(n)              (SH7780_PCIREG_BASE+n)
+
+/* SH7780 PCI Config Registers */
+#define SH7780_PCIVID           0x000           /* Vendor ID */
+#define SH7780_PCIDID           0x002           /* Device ID */
+#define SH7780_PCICMD           0x004           /* Command */
+#define SH7780_PCISTATUS        0x006           /* Status */
+#define SH7780_PCIRID           0x008           /* Revision ID */
+#define SH7780_PCIPIF           0x009           /* Program Interface */
+#define SH7780_PCISUB           0x00a           /* Sub class code */
+#define SH7780_PCIBCC           0x00b           /* Base class code */
+#define SH7780_PCICLS           0x00c           /* Cache line size */
+#define SH7780_PCILTM           0x00d           /* latency timer */
+#define SH7780_PCIHDR           0x00e           /* Header type */
+#define SH7780_PCIBIST          0x00f           /* BIST */
+#define SH7780_PCIIBAR          0x010           /* IO Base address */
+#define SH7780_PCIMBAR0         0x014           /* Memory base address0 */
+#define SH7780_PCIMBAR1         0x018           /* Memory base address1 */
+#define SH7780_PCISVID          0x02c           /* Sub system vendor ID */
+#define SH7780_PCISID           0x02e           /* Sub system ID */
+#define SH7780_PCICP            0x034
+#define SH7780_PCIINTLINE       0x03c           /* Interrupt line */
+#define SH7780_PCIINTPIN        0x03d           /* Interrupt pin */
+#define SH7780_PCIMINGNT        0x03e           /* Minumum grand */
+#define SH7780_PCIMAXLAT        0x03f           /* Maxmum latency */
+#define SH7780_PCICID           0x040
+#define SH7780_PCINIP           0x041
+#define SH7780_PCIPMC           0x042
+#define SH7780_PCIPMCSR         0x044
+#define SH7780_PCIPMCSR_BSE     0x046
+#define SH7780_PCICDD           0x047
+
+#define SH7780_PCIMBR0          0x1E0
+#define SH7780_PCIMBMR0         0x1E4
+#define SH7780_PCIMBR2          0x1F0
+#define SH7780_PCIMBMR2         0x1F4
+#define SH7780_PCIIOBR          0x1F8
+#define SH7780_PCIIOBMR         0x1FC
+#define SH7780_PCICSCR0         0x210           /* Cache Snoop1 Cnt. Register */
+#define SH7780_PCICSCR1         0x214           /* Cache Snoop2 Cnt. Register */
+#define SH7780_PCICSAR0         0x218   /* Cache Snoop1 Addr. Register */
+#define SH7780_PCICSAR1         0x21C   /* Cache Snoop2 Addr. Register */
+
+/* General Memory Config Addresses */
+#define SH7780_CS0_BASE_ADDR    0x0
+#define SH7780_MEM_REGION_SIZE  0x04000000
+#define SH7780_CS1_BASE_ADDR    (SH7780_CS0_BASE_ADDR + SH7780_MEM_REGION_SIZE)
+#define SH7780_CS2_BASE_ADDR    (SH7780_CS1_BASE_ADDR + SH7780_MEM_REGION_SIZE)
+#define SH7780_CS3_BASE_ADDR    (SH7780_CS2_BASE_ADDR + SH7780_MEM_REGION_SIZE)
+#define SH7780_CS4_BASE_ADDR    (SH7780_CS3_BASE_ADDR + SH7780_MEM_REGION_SIZE)
+#define SH7780_CS5_BASE_ADDR    (SH7780_CS4_BASE_ADDR + SH7780_MEM_REGION_SIZE)
+#define SH7780_CS6_BASE_ADDR    (SH7780_CS5_BASE_ADDR + SH7780_MEM_REGION_SIZE)
+
+struct sh4_pci_address_map;
+
+/* arch/sh/drivers/pci/pci-sh7780.c */
+int sh7780_pcic_init(struct sh4_pci_address_map *map);
+
+#endif /* _PCI_SH7780_H_ */
diff --git a/arch/sh/drivers/pci/pci-st40.c b/arch/sh/drivers/pci/pci-st40.c
index 7c81b8b65bb5..4ab5ea6b35fb 100644
--- a/arch/sh/drivers/pci/pci-st40.c
+++ b/arch/sh/drivers/pci/pci-st40.c
@@ -70,12 +70,6 @@
 static void pci_set_rbar_region(unsigned int region,     unsigned long localAddr,
                          unsigned long pciOffset, unsigned long regionSize);
 
-/*
- * The pcibios_map_platform_irq function is defined in the appropriate
- * board specific code and referenced here
- */
-extern int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin);
-
 static __init void SetPCIPLL(void)
 {
         {
@@ -422,13 +416,6 @@ struct pci_ops st40pci_config_ops = {
 /* Everything hangs off this */
 static struct pci_bus *pci_root_bus;
 
-
-static u8 __init no_swizzle(struct pci_dev *dev, u8 * pin)
-{
-        return PCI_SLOT(dev->devfn);
-}
-
-
 static int __init pcibios_init(void)
 {
         extern unsigned long memory_start, memory_end;
@@ -465,17 +452,11 @@ static int __init pcibios_init(void)
         /* ok, do the scan man */
         pci_root_bus = pci_scan_bus(0, &st40pci_config_ops, NULL);
         pci_assign_unassigned_resources();
-        pci_fixup_irqs(no_swizzle, pcibios_map_platform_irq);
 
         return 0;
 }
-
 subsys_initcall(pcibios_init);
 
-void __init pcibios_fixup_bus(struct pci_bus *bus)
-{
-}
-
 /*
  * Publish a region of local address space over the PCI bus
  * to other devices.
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 3d546ba329cf..d439336d2e18 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -1,21 +1,45 @@
-/* arch/sh/kernel/pci.c
- * $Id: pci.c,v 1.1 2003/08/24 19:15:45 lethal Exp $
+/*
+ * arch/sh/drivers/pci/pci.c
  *
  * Copyright (c) 2002 M. R. Brown  <mrbrown@linux-sh.org>
- * 
- * 
+ * Copyright (c) 2004 - 2006 Paul Mundt  <lethal@linux-sh.org>
+ *
  * These functions are collected here to reduce duplication of common
  * code amongst the many platform-specific PCI support code files.
- * 
+ *
  * These routines require the following board-specific routines:
  * void pcibios_fixup_irqs();
  *
  * See include/asm-sh/pci.h for more information.
+ *
+ * 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/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <asm/io.h>
+
+static inline u8 bridge_swizzle(u8 pin, u8 slot)
+{
+        return (((pin - 1) + slot) % 4) + 1;
+}
+
+static u8 __init simple_swizzle(struct pci_dev *dev, u8 *pinp)
+{
+        u8 pin = *pinp;
+
+        while (dev->bus->parent) {
+                pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
+                /* Move up the chain of bridges. */
+                dev = dev->bus->self;
+        }
+        *pinp = pin;
+
+        /* The slot is the slot of the last bridge. */
+        return PCI_SLOT(dev->devfn);
+}
 
 static int __init pcibios_init(void)
 {
@@ -26,26 +50,32 @@ static int __init pcibios_init(void)
 #ifdef CONFIG_PCI_AUTO
         /* assign resources */
         busno = 0;
-        for (p = board_pci_channels; p->pci_ops != NULL; p++) {
+        for (p = board_pci_channels; p->pci_ops != NULL; p++)
                 busno = pciauto_assign_resources(busno, p) + 1;
-        }
 #endif
 
         /* scan the buses */
         busno = 0;
-        for (p= board_pci_channels; p->pci_ops != NULL; p++) {
+        for (p = board_pci_channels; p->pci_ops != NULL; p++) {
                 bus = pci_scan_bus(busno, p->pci_ops, p);
-                busno = bus->subordinate+1;
+                busno = bus->subordinate + 1;
         }
 
-        /* board-specific fixups */
-        pcibios_fixup_irqs();
+        pci_fixup_irqs(simple_swizzle, pcibios_map_platform_irq);
 
         return 0;
 }
-
 subsys_initcall(pcibios_init);
 
+/*
+ *  Called after each bus is probed, but before its children
+ *  are examined.
+ */
+void __init pcibios_fixup_bus(struct pci_bus *bus)
+{
+        pci_read_bridge_bases(bus);
+}
+
 void
 pcibios_update_resource(struct pci_dev *dev, struct resource *root,
                         struct resource *res, int resource)
@@ -61,13 +91,17 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root,
                 new |= PCI_ROM_ADDRESS_ENABLE;
                 reg = dev->rom_base_reg;
         } else {
-                /* Somebody might have asked allocation of a non-standard resource */
+                /*
+                 * Somebody might have asked allocation of a non-standard
+                 * resource
+                 */
                 return;
         }
-        
+
         pci_write_config_dword(dev, reg, new);
         pci_read_config_dword(dev, reg, &check);
-        if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) {
+        if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ?
+                PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) {
                 printk(KERN_ERR "PCI: Error while updating region "
                        "%s/%d (%08x != %08x)\n", pci_name(dev), resource,
                        new, check);
@@ -145,7 +179,8 @@ void pcibios_set_master(struct pci_dev *dev)
                 lat = pcibios_max_latency;
         else
                 return;
-        printk(KERN_INFO "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);
+        printk(KERN_INFO "PCI: Setting latency timer of device %s to %d\n",
+               pci_name(dev), lat);
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }
 
@@ -153,3 +188,39 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
 {
         pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
+
+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+        unsigned long start = pci_resource_start(dev, bar);
+        unsigned long len = pci_resource_len(dev, bar);
+        unsigned long flags = pci_resource_flags(dev, bar);
+
+        if (unlikely(!len || !start))
+                return NULL;
+        if (maxlen && len > maxlen)
+                len = maxlen;
+
+        /*
+         * Presently the IORESOURCE_MEM case is a bit special, most
+         * SH7751 style PCI controllers have PCI memory at a fixed
+         * location in the address space where no remapping is desired
+         * (typically at 0xfd000000, but is_pci_memaddr() will know
+         * best). With the IORESOURCE_MEM case more care has to be taken
+         * to inhibit page table mapping for legacy cores, but this is
+         * punted off to __ioremap().
+         *                                      -- PFM.
+         */
+        if (flags & IORESOURCE_IO)
+                return ioport_map(start, len);
+        if (flags & IORESOURCE_MEM)
+                return ioremap(start, len);
+
+        return NULL;
+}
+EXPORT_SYMBOL(pci_iomap);
+
+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
+{
+        iounmap(addr);
+}
+EXPORT_SYMBOL(pci_iounmap);
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index f05cd96f8867..5da88a43d350 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -6,9 +6,10 @@ extra-y	:= head.o init_task.o vmlinux.lds
 
 obj-y   := process.o signal.o entry.o traps.o irq.o \
         ptrace.o setup.o time.o sys_sh.o semaphore.o \
-        io.o io_generic.o sh_ksyms.o
+        io.o io_generic.o sh_ksyms.o syscalls.o
 
 obj-y                           += cpu/ timers/
+obj-$(CONFIG_VSYSCALL)          += vsyscall/
 
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_CF_ENABLER)        += cf-enabler.o
@@ -18,3 +19,5 @@ obj-$(CONFIG_SH_CPU_FREQ)	+= cpufreq.o
 obj-$(CONFIG_MODULES)           += module.o
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
+obj-$(CONFIG_APM)               += apm.o
+obj-$(CONFIG_PM)                += pm.o
diff --git a/arch/sh/kernel/apm.c b/arch/sh/kernel/apm.c
new file mode 100644
index 000000000000..871e7d640002
--- /dev/null
+++ b/arch/sh/kernel/apm.c
@@ -0,0 +1,539 @@
+/*
+ * bios-less APM driver for hp680
+ *
+ * Copyright 2005 (c) Andriy Skulysh <askulysh@gmail.com>
+ *
+ * based on ARM APM driver by
+ *  Jamey Hicks <jamey@crl.dec.com>
+ *
+ * adapted from the APM BIOS driver for Linux by
+ *  Stephen Rothwell (sfr@linuxcare.com)
+ *
+ * APM 1.2 Reference:
+ *   Intel Corporation, Microsoft Corporation. Advanced Power Management
+ *   (APM) BIOS Interface Specification, Revision 1.2, February 1996.
+ *
+ * [This document is available from Microsoft at:
+ *    http://www.microsoft.com/hwdev/busbios/amp_12.htm]
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/poll.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/proc_fs.h>
+#include <linux/miscdevice.h>
+#include <linux/apm_bios.h>
+#include <linux/pm.h>
+#include <linux/pm_legacy.h>
+#include <asm/apm.h>
+
+#define MODNAME "apm"
+
+/*
+ * The apm_bios device is one of the misc char devices.
+ * This is its minor number.
+ */
+#define APM_MINOR_DEV                   134
+
+/*
+ * Maximum number of events stored
+ */
+#define APM_MAX_EVENTS                  16
+
+struct apm_queue {
+        unsigned int            event_head;
+        unsigned int            event_tail;
+        apm_event_t             events[APM_MAX_EVENTS];
+};
+
+/*
+ * The per-file APM data
+ */
+struct apm_user {
+        struct list_head        list;
+
+        unsigned int            suser: 1;
+        unsigned int            writer: 1;
+        unsigned int            reader: 1;
+
+        int                     suspend_result;
+        unsigned int            suspend_state;
+#define SUSPEND_NONE    0               /* no suspend pending */
+#define SUSPEND_PENDING 1               /* suspend pending read */
+#define SUSPEND_READ    2               /* suspend read, pending ack */
+#define SUSPEND_ACKED   3               /* suspend acked */
+#define SUSPEND_DONE    4               /* suspend completed */
+
+        struct apm_queue        queue;
+};
+
+/*
+ * Local variables
+ */
+static int suspends_pending;
+
+static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);
+static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
+
+/*
+ * This is a list of everyone who has opened /dev/apm_bios
+ */
+static DECLARE_RWSEM(user_list_lock);
+static LIST_HEAD(apm_user_list);
+
+/*
+ * kapmd info.  kapmd provides us a process context to handle
+ * "APM" events within - specifically necessary if we're going
+ * to be suspending the system.
+ */
+static DECLARE_WAIT_QUEUE_HEAD(kapmd_wait);
+static DECLARE_COMPLETION(kapmd_exit);
+static DEFINE_SPINLOCK(kapmd_queue_lock);
+static struct apm_queue kapmd_queue;
+
+int apm_suspended;
+EXPORT_SYMBOL(apm_suspended);
+
+/* Platform-specific apm_read_proc(). */
+int (*apm_get_info)(char *buf, char **start, off_t fpos, int length);
+EXPORT_SYMBOL(apm_get_info);
+
+/*
+ * APM event queue management.
+ */
+static inline int queue_empty(struct apm_queue *q)
+{
+        return q->event_head == q->event_tail;
+}
+
+static inline apm_event_t queue_get_event(struct apm_queue *q)
+{
+        q->event_tail = (q->event_tail + 1) % APM_MAX_EVENTS;
+        return q->events[q->event_tail];
+}
+
+static void queue_add_event(struct apm_queue *q, apm_event_t event)
+{
+        q->event_head = (q->event_head + 1) % APM_MAX_EVENTS;
+        if (q->event_head == q->event_tail) {
+                static int notified;
+
+                if (notified++ == 0)
+                        printk(KERN_ERR "apm: an event queue overflowed\n");
+
+                q->event_tail = (q->event_tail + 1) % APM_MAX_EVENTS;
+        }
+        q->events[q->event_head] = event;
+}
+
+static void queue_event_one_user(struct apm_user *as, apm_event_t event)
+{
+        if (as->suser && as->writer) {
+                switch (event) {
+                case APM_SYS_SUSPEND:
+                case APM_USER_SUSPEND:
+                        /*
+                         * If this user already has a suspend pending,
+                         * don't queue another one.
+                         */
+                        if (as->suspend_state != SUSPEND_NONE)
+                                return;
+
+                        as->suspend_state = SUSPEND_PENDING;
+                        suspends_pending++;
+                        break;
+                }
+        }
+        queue_add_event(&as->queue, event);
+}
+
+static void queue_event(apm_event_t event, struct apm_user *sender)
+{
+        struct apm_user *as;
+
+        down_read(&user_list_lock);
+
+        list_for_each_entry(as, &apm_user_list, list)
+                if (as != sender && as->reader)
+                        queue_event_one_user(as, event);
+
+        up_read(&user_list_lock);
+        wake_up_interruptible(&apm_waitqueue);
+}
+
+/**
+ * apm_queue_event - queue an APM event for kapmd
+ * @event: APM event
+ *
+ * Queue an APM event for kapmd to process and ultimately take the
+ * appropriate action.  Only a subset of events are handled:
+ *   %APM_LOW_BATTERY
+ *   %APM_POWER_STATUS_CHANGE
+ *   %APM_USER_SUSPEND
+ *   %APM_SYS_SUSPEND
+ *   %APM_CRITICAL_SUSPEND
+ */
+void apm_queue_event(apm_event_t event)
+{
+        spin_lock_irq(&kapmd_queue_lock);
+        queue_add_event(&kapmd_queue, event);
+        spin_unlock_irq(&kapmd_queue_lock);
+
+        wake_up_interruptible(&kapmd_wait);
+}
+EXPORT_SYMBOL(apm_queue_event);
+
+static void apm_suspend(void)
+{
+        struct apm_user *as;
+        int err;
+
+        apm_suspended = 1;
+        err = pm_suspend(PM_SUSPEND_MEM);
+
+        /*
+         * Anyone on the APM queues will think we're still suspended.
+         * Send a message so everyone knows we're now awake again.
+         */
+        queue_event(APM_NORMAL_RESUME, NULL);
+
+        /*
+         * Finally, wake up anyone who is sleeping on the suspend.
+         */
+        down_read(&user_list_lock);
+        list_for_each_entry(as, &apm_user_list, list) {
+                as->suspend_result = err;
+                as->suspend_state = SUSPEND_DONE;
+        }
+        up_read(&user_list_lock);
+
+        wake_up(&apm_suspend_waitqueue);
+        apm_suspended = 0;
+}
+
+static ssize_t apm_read(struct file *fp, char __user *buf,
+                        size_t count, loff_t *ppos)
+{
+        struct apm_user *as = fp->private_data;
+        apm_event_t event;
+        int i = count, ret = 0;
+
+        if (count < sizeof(apm_event_t))
+                return -EINVAL;
+
+        if (queue_empty(&as->queue) && fp->f_flags & O_NONBLOCK)
+                return -EAGAIN;
+
+        wait_event_interruptible(apm_waitqueue, !queue_empty(&as->queue));
+
+        while ((i >= sizeof(event)) && !queue_empty(&as->queue)) {
+                event = queue_get_event(&as->queue);
+
+                ret = -EFAULT;
+                if (copy_to_user(buf, &event, sizeof(event)))
+                        break;
+
+                if (event == APM_SYS_SUSPEND || event == APM_USER_SUSPEND)
+                        as->suspend_state = SUSPEND_READ;
+
+                buf += sizeof(event);
+                i -= sizeof(event);
+        }
+
+        if (i < count)
+                ret = count - i;
+
+        return ret;
+}
+
+static unsigned int apm_poll(struct file *fp, poll_table * wait)
+{
+        struct apm_user *as = fp->private_data;
+
+        poll_wait(fp, &apm_waitqueue, wait);
+        return queue_empty(&as->queue) ? 0 : POLLIN | POLLRDNORM;
+}
+
+/*
+ * apm_ioctl - handle APM ioctl
+ *
+ * APM_IOC_SUSPEND
+ *   This IOCTL is overloaded, and performs two functions.  It is used to:
+ *     - initiate a suspend
+ *     - acknowledge a suspend read from /dev/apm_bios.
+ *   Only when everyone who has opened /dev/apm_bios with write permission
+ *   has acknowledge does the actual suspend happen.
+ */
+static int
+apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
+{
+        struct apm_user *as = filp->private_data;
+        unsigned long flags;
+        int err = -EINVAL;
+
+        if (!as->suser || !as->writer)
+                return -EPERM;
+
+        switch (cmd) {
+        case APM_IOC_SUSPEND:
+                as->suspend_result = -EINTR;
+
+                if (as->suspend_state == SUSPEND_READ) {
+                        /*
+                         * If we read a suspend command from /dev/apm_bios,
+                         * then the corresponding APM_IOC_SUSPEND ioctl is
+                         * interpreted as an acknowledge.
+                         */
+                        as->suspend_state = SUSPEND_ACKED;
+                        suspends_pending--;
+                } else {
+                        /*
+                         * Otherwise it is a request to suspend the system.
+                         * Queue an event for all readers, and expect an
+                         * acknowledge from all writers who haven't already
+                         * acknowledged.
+                         */
+                        queue_event(APM_USER_SUSPEND, as);
+                }
+
+                /*
+                 * If there are no further acknowledges required, suspend
+                 * the system.
+                 */
+                if (suspends_pending == 0)
+                        apm_suspend();
+
+                /*
+                 * Wait for the suspend/resume to complete.  If there are
+                 * pending acknowledges, we wait here for them.
+                 *
+                 * Note that we need to ensure that the PM subsystem does
+                 * not kick us out of the wait when it suspends the threads.
+                 */
+                flags = current->flags;
+                current->flags |= PF_NOFREEZE;
+
+                /*
+                 * Note: do not allow a thread which is acking the suspend
+                 * to escape until the resume is complete.
+                 */
+                if (as->suspend_state == SUSPEND_ACKED)
+                        wait_event(apm_suspend_waitqueue,
+                                         as->suspend_state == SUSPEND_DONE);
+                else
+                        wait_event_interruptible(apm_suspend_waitqueue,
+                                         as->suspend_state == SUSPEND_DONE);
+
+                current->flags = flags;
+                err = as->suspend_result;
+                as->suspend_state = SUSPEND_NONE;
+                break;
+        }
+
+        return err;
+}
+
+static int apm_release(struct inode * inode, struct file * filp)
+{
+        struct apm_user *as = filp->private_data;
+        filp->private_data = NULL;
+
+        down_write(&user_list_lock);
+        list_del(&as->list);
+        up_write(&user_list_lock);
+
+        /*
+         * We are now unhooked from the chain.  As far as new
+         * events are concerned, we no longer exist.  However, we
+         * need to balance suspends_pending, which means the
+         * possibility of sleeping.
+         */
+        if (as->suspend_state != SUSPEND_NONE) {
+                suspends_pending -= 1;
+                if (suspends_pending == 0)
+                        apm_suspend();
+        }
+
+        kfree(as);
+        return 0;
+}
+
+static int apm_open(struct inode * inode, struct file * filp)
+{
+        struct apm_user *as;
+
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
+        if (as) {
+                /*
+                 * XXX - this is a tiny bit broken, when we consider BSD
+                 * process accounting. If the device is opened by root, we
+                 * instantly flag that we used superuser privs. Who knows,
+                 * we might close the device immediately without doing a
+                 * privileged operation -- cevans
+                 */
+                as->suser = capable(CAP_SYS_ADMIN);
+                as->writer = (filp->f_mode & FMODE_WRITE) == FMODE_WRITE;
+                as->reader = (filp->f_mode & FMODE_READ) == FMODE_READ;
+
+                down_write(&user_list_lock);
+                list_add(&as->list, &apm_user_list);
+                up_write(&user_list_lock);
+
+                filp->private_data = as;
+        }
+
+        return as ? 0 : -ENOMEM;
+}
+
+static struct file_operations apm_bios_fops = {
+        .owner          = THIS_MODULE,
+        .read           = apm_read,
+        .poll           = apm_poll,
+        .ioctl          = apm_ioctl,
+        .open           = apm_open,
+        .release        = apm_release,
+};
+
+static struct miscdevice apm_device = {
+        .minor          = APM_MINOR_DEV,
+        .name           = "apm_bios",
+        .fops           = &apm_bios_fops
+};
+
+
+#ifdef CONFIG_PROC_FS
+/*
+ * Arguments, with symbols from linux/apm_bios.h.
+ *
+ *   0) Linux driver version (this will change if format changes)
+ *   1) APM BIOS Version.  Usually 1.0, 1.1 or 1.2.
+ *   2) APM flags from APM Installation Check (0x00):
+ *      bit 0: APM_16_BIT_SUPPORT
+ *      bit 1: APM_32_BIT_SUPPORT
+ *      bit 2: APM_IDLE_SLOWS_CLOCK
+ *      bit 3: APM_BIOS_DISABLED
+ *      bit 4: APM_BIOS_DISENGAGED
+ *   3) AC line status
+ *      0x00: Off-line
+ *      0x01: On-line
+ *      0x02: On backup power (BIOS >= 1.1 only)
+ *      0xff: Unknown
+ *   4) Battery status
+ *      0x00: High
+ *      0x01: Low
+ *      0x02: Critical
+ *      0x03: Charging
+ *      0x04: Selected battery not present (BIOS >= 1.2 only)
+ *      0xff: Unknown
+ *   5) Battery flag
+ *      bit 0: High
+ *      bit 1: Low
+ *      bit 2: Critical
+ *      bit 3: Charging
+ *      bit 7: No system battery
+ *      0xff: Unknown
+ *   6) Remaining battery life (percentage of charge):
+ *      0-100: valid
+ *      -1: Unknown
+ *   7) Remaining battery life (time units):
+ *      Number of remaining minutes or seconds
+ *      -1: Unknown
+ *   8) min = minutes; sec = seconds
+ */
+static int apm_read_proc(char *buf, char **start, off_t fpos, int length)
+{
+        if (likely(apm_get_info))
+                return apm_get_info(buf, start, fpos, length);
+
+        return -EINVAL;
+}
+#endif
+
+static int kapmd(void *arg)
+{
+        daemonize("kapmd");
+        current->flags |= PF_NOFREEZE;
+
+        do {
+                apm_event_t event;
+
+                wait_event_interruptible(kapmd_wait,
+                                !queue_empty(&kapmd_queue) || !pm_active);
+
+                if (!pm_active)
+                        break;
+
+                spin_lock_irq(&kapmd_queue_lock);
+                event = 0;
+                if (!queue_empty(&kapmd_queue))
+                        event = queue_get_event(&kapmd_queue);
+                spin_unlock_irq(&kapmd_queue_lock);
+
+                switch (event) {
+                case 0:
+                        break;
+
+                case APM_LOW_BATTERY:
+                case APM_POWER_STATUS_CHANGE:
+                        queue_event(event, NULL);
+                        break;
+
+                case APM_USER_SUSPEND:
+                case APM_SYS_SUSPEND:
+                        queue_event(event, NULL);
+                        if (suspends_pending == 0)
+                                apm_suspend();
+                        break;
+
+                case APM_CRITICAL_SUSPEND:
+                        apm_suspend();
+                        break;
+                }
+        } while (1);
+
+        complete_and_exit(&kapmd_exit, 0);
+}
+
+static int __init apm_init(void)
+{
+        int ret;
+
+        pm_active = 1;
+
+        ret = kernel_thread(kapmd, NULL, CLONE_KERNEL);
+        if (unlikely(ret < 0)) {
+                pm_active = 0;
+                return ret;
+        }
+
+        create_proc_info_entry("apm", 0, NULL, apm_read_proc);
+
+        ret = misc_register(&apm_device);
+        if (unlikely(ret != 0)) {
+                remove_proc_entry("apm", NULL);
+
+                pm_active = 0;
+                wake_up(&kapmd_wait);
+                wait_for_completion(&kapmd_exit);
+        }
+
+        return ret;
+}
+
+static void __exit apm_exit(void)
+{
+        misc_deregister(&apm_device);
+        remove_proc_entry("apm", NULL);
+
+        pm_active = 0;
+        wake_up(&kapmd_wait);
+        wait_for_completion(&kapmd_exit);
+}
+
+module_init(apm_init);
+module_exit(apm_exit);
+
+MODULE_AUTHOR("Stephen Rothwell, Andriy Skulysh");
+MODULE_DESCRIPTION("Advanced Power Management");
+MODULE_LICENSE("GPL");
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c
index f1f9ab87f0b0..3e5fa1e24df0 100644
--- a/arch/sh/kernel/cf-enabler.c
+++ b/arch/sh/kernel/cf-enabler.c
@@ -10,7 +10,8 @@
  */
 
 #include <linux/init.h>
-
+#include <linux/mm.h>
+#include <linux/vmalloc.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
@@ -32,8 +33,6 @@
 /* SH4 can't access PCMCIA interface through P2 area.
  * we must remap it with appropreate attribute bit of the page set.
  * this part is based on Greg Banks' hd64465_ss.c implementation - Masahiro Abe */
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
 
 #if defined(CONFIG_CF_AREA6)
 #define slot_no 0
@@ -41,9 +40,6 @@
 #define slot_no 1
 #endif
 
-/* defined in mm/ioremap.c */
-extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags);
-
 /* use this pointer to access to directly connected compact flash io area*/
 void *cf_io_base;
 
@@ -62,7 +58,7 @@ static int __init allocate_cf_area(void)
                 return -ENOMEM;
         }
 /*      printk("p3_ioremap(paddr=0x%08lx, psize=0x%08lx, prot=0x%08lx)=0x%08lx\n",
-                paddrbase, psize, prot.pgprot, cf_io_base);*/
+                paddrbase, psize, prot.pgprot, cf_io_base);*/
 
         /* XXX : do we need attribute and common-memory area also? */
 
@@ -87,7 +83,7 @@ static int __init cf_init_default(void)
 }
 
 #if defined(CONFIG_SH_SOLUTION_ENGINE)
-#include <asm/se/se.h>
+#include <asm/se.h>
 
 /*
  * SolutionEngine
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index 59d5b748752f..fb5dac069382 100644
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -8,6 +8,5 @@ obj-$(CONFIG_CPU_SH2)		+= sh2/
 obj-$(CONFIG_CPU_SH3)           += sh3/
 obj-$(CONFIG_CPU_SH4)           += sh4/
 
-obj-$(CONFIG_SH_RTC)            += rtc.o
 obj-$(CONFIG_UBC_WAKEUP)        += ubc.o
 obj-$(CONFIG_SH_ADC)            += adc.o
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
index 97fa37f42b84..51ec64cdf348 100644
--- a/arch/sh/kernel/cpu/clock.c
+++ b/arch/sh/kernel/cpu/clock.c
@@ -1,7 +1,7 @@
 /*
  * arch/sh/kernel/cpu/clock.c - SuperH clock framework
  *
- *  Copyright (C) 2005  Paul Mundt
+ *  Copyright (C) 2005, 2006  Paul Mundt
  *
  * This clock framework is derived from the OMAP version by:
  *
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/kref.h>
 #include <linux/seq_file.h>
@@ -24,7 +25,7 @@
 
 static LIST_HEAD(clock_list);
 static DEFINE_SPINLOCK(clock_lock);
-static DECLARE_MUTEX(clock_list_sem);
+static DEFINE_MUTEX(clock_list_sem);
 
 /*
  * Each subtype is expected to define the init routines for these clocks,
@@ -140,21 +141,21 @@ void clk_disable(struct clk *clk)
 
 int clk_register(struct clk *clk)
 {
-        down(&clock_list_sem);
+        mutex_lock(&clock_list_sem);
 
         list_add(&clk->node, &clock_list);
         kref_init(&clk->kref);
 
-        up(&clock_list_sem);
+        mutex_unlock(&clock_list_sem);
 
         return 0;
 }
 
 void clk_unregister(struct clk *clk)
 {
-        down(&clock_list_sem);
+        mutex_lock(&clock_list_sem);
         list_del(&clk->node);
-        up(&clock_list_sem);
+        mutex_unlock(&clock_list_sem);
 }
 
 inline unsigned long clk_get_rate(struct clk *clk)
@@ -198,14 +199,14 @@ struct clk *clk_get(const char *id)
 {
         struct clk *p, *clk = ERR_PTR(-ENOENT);
 
-        down(&clock_list_sem);
+        mutex_lock(&clock_list_sem);
         list_for_each_entry(p, &clock_list, node) {
                 if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                         clk = p;
                         break;
                 }
         }
-        up(&clock_list_sem);
+        mutex_unlock(&clock_list_sem);
 
         return clk;
 }
@@ -225,7 +226,7 @@ int __init clk_init(void)
 {
         int i, ret = 0;
 
-        BUG_ON(unlikely(!master_clk.rate));
+        BUG_ON(!master_clk.rate);
 
         for (i = 0; i < ARRAY_SIZE(onchip_clocks); i++) {
                 struct clk *clk = onchip_clocks[i];
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 868e68b28880..bfb90eb0b7a6 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -4,6 +4,7 @@
  * CPU init code
  *
  * Copyright (C) 2002, 2003  Paul Mundt
+ * Copyright (C) 2003  Richard Curnow
  *
  * 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
@@ -13,6 +14,7 @@
 #include <linux/kernel.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
+#include <asm/page.h>
 #include <asm/system.h>
 #include <asm/cacheflush.h>
 #include <asm/cache.h>
@@ -51,7 +53,15 @@ static void __init cache_init(void)
         ccr = ctrl_inl(CCR);
 
         /*
-         * If the cache is already enabled .. flush it.
+         * At this point we don't know whether the cache is enabled or not - a
+         * bootloader may have enabled it.  There are at least 2 things that
+         * could be dirty in the cache at this point:
+         * 1. kernel command line set up by boot loader
+         * 2. spilled registers from the prolog of this function
+         * => before re-initialising the cache, we must do a purge of the whole
+         * cache out to memory for safety.  As long as nothing is spilled
+         * during the loop to lines that have already been done, this is safe.
+         * - RPC
          */
         if (ccr & CCR_CACHE_ENABLE) {
                 unsigned long ways, waysize, addrstart;
@@ -98,6 +108,8 @@ static void __init cache_init(void)
         /* Force EMODE if possible */
         if (cpu_data->dcache.ways > 1)
                 flags |= CCR_CACHE_EMODE;
+        else
+                flags &= ~CCR_CACHE_EMODE;
 #endif
 
 #ifdef CONFIG_SH_WRITETHROUGH
@@ -112,6 +124,9 @@ static void __init cache_init(void)
         /* Turn on OCRAM -- halve the OC */
         flags |= CCR_CACHE_ORA;
         cpu_data->dcache.sets >>= 1;
+
+        cpu_data->dcache.way_size = cpu_data->dcache.sets *
+                                    cpu_data->dcache.linesz;
 #endif
 
         ctrl_outl(flags, CCR);
@@ -184,6 +199,10 @@ asmlinkage void __init sh_cpu_init(void)
         /* Init the cache */
         cache_init();
 
+        shm_align_mask = max_t(unsigned long,
+                               cpu_data->dcache.way_size - 1,
+                               PAGE_SIZE - 1);
+
         /* Disable the FPU */
         if (fpu_disabled) {
                 printk("FPU Disabled\n");
diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
index e3cccea15e1d..1c034c283f59 100644
--- a/arch/sh/kernel/cpu/irq/Makefile
+++ b/arch/sh/kernel/cpu/irq/Makefile
@@ -3,5 +3,6 @@
 #
 obj-y   += ipr.o imask.o
 
-obj-$(CONFIG_CPU_HAS_PINT_IRQ)  += pint.o
-obj-$(CONFIG_CPU_HAS_INTC2_IRQ) += intc2.o
+obj-$(CONFIG_CPU_HAS_PINT_IRQ)          += pint.o
+obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)       += maskreg.o
+obj-$(CONFIG_CPU_HAS_INTC2_IRQ)         += intc2.o
diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index 30064bf6e154..e30e4b7aa70e 100644
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -241,9 +241,9 @@ static struct intc2_init {
         /* 110-111 reserved/unused */
 #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
         { TIMER_IRQ, 0, 24, 0, INTC_TMU0_MSK, 2},
-#ifdef CONFIG_SH_RTC
-        { RTC_IRQ, 4, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
-#endif
+        { 21, 1, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
+        { 22, 1, 1, 0, INTC_RTC_MSK, TIMER_PRIORITY },
+        { 23, 1, 2, 0, INTC_RTC_MSK, TIMER_PRIORITY },
         { SCIF0_ERI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
         { SCIF0_RXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
         { SCIF0_BRI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index 0f545941fb4f..f785822cd5de 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -57,31 +57,27 @@ static struct hw_interrupt_type ipr_irq_type = {
 
 static void disable_ipr_irq(unsigned int irq)
 {
-        unsigned long val, flags;
+        unsigned long val;
         unsigned int addr = ipr_data[irq].addr;
         unsigned short mask = 0xffff ^ (0x0f << ipr_data[irq].shift);
 
         /* Set the priority in IPR to 0 */
-        local_irq_save(flags);
         val = ctrl_inw(addr);
         val &= mask;
         ctrl_outw(val, addr);
-        local_irq_restore(flags);
 }
 
 static void enable_ipr_irq(unsigned int irq)
 {
-        unsigned long val, flags;
+        unsigned long val;
         unsigned int addr = ipr_data[irq].addr;
         int priority = ipr_data[irq].priority;
         unsigned short value = (priority << ipr_data[irq].shift);
 
         /* Set priority in IPR back to original value */
-        local_irq_save(flags);
         val = ctrl_inw(addr);
         val |= value;
         ctrl_outw(val, addr);
-        local_irq_restore(flags);
 }
 
 static void mask_and_ack_ipr(unsigned int irq)
@@ -89,6 +85,7 @@ static void mask_and_ack_ipr(unsigned int irq)
         disable_ipr_irq(irq);
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7706) || \
     defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
         /* This is needed when we use edge triggered setting */
         /* XXX: Is it really needed? */
@@ -123,7 +120,7 @@ void __init init_IRQ(void)
 #ifndef CONFIG_CPU_SUBTYPE_SH7780
         make_ipr_irq(TIMER_IRQ, TIMER_IPR_ADDR, TIMER_IPR_POS, TIMER_PRIORITY);
         make_ipr_irq(TIMER1_IRQ, TIMER1_IPR_ADDR, TIMER1_IPR_POS, TIMER1_PRIORITY);
-#if defined(CONFIG_SH_RTC)
+#ifdef RTC_IRQ
         make_ipr_irq(RTC_IRQ, RTC_IPR_ADDR, RTC_IPR_POS, RTC_PRIORITY);
 #endif
 
@@ -162,6 +159,7 @@ void __init init_IRQ(void)
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7706) || \
     defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
         /*
          * Initialize the Interrupt Controller (INTC)
@@ -192,6 +190,8 @@ void __init init_IRQ(void)
         /* Perform the machine specific initialisation */
         if (sh_mv.mv_init_irq != NULL)
                 sh_mv.mv_init_irq();
+
+        irq_ctx_init(smp_processor_id());
 }
 
 #if !defined(CONFIG_CPU_HAS_PINT_IRQ)
diff --git a/arch/sh/boards/adx/irq_maskreg.c b/arch/sh/kernel/cpu/irq/maskreg.c
index 4b2abe5eb165..492db31b3cab 100644
--- a/arch/sh/boards/adx/irq_maskreg.c
+++ b/arch/sh/kernel/cpu/irq/maskreg.c
@@ -1,30 +1,23 @@
 /*
- * linux/arch/sh/kernel/irq_maskreg.c
+ * Interrupt handling for Simple external interrupt mask register
  *
  * Copyright (C) 2001 A&D Co., Ltd. <http://www.aandd.co.jp>
  *
- * This file may be copied or modified under the terms of the GNU
- * General Public License.  See linux/COPYING for more information.
- *
- * Interrupt handling for Simple external interrupt mask register
- *
  * This is for the machine which have single 16 bit register
  * for masking external IRQ individually.
- * Each bit of the register is for masking each interrupt.  
+ * Each bit of the register is for masking each interrupt.
+ *
+ * This file may be copied or modified under the terms of the GNU
+ * General Public License.  See linux/COPYING for more information.
  */
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/machvec.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? */
-unsigned short *irq_mask_register = 0;
+/* address of external interrupt mask register */
+unsigned long irq_mask_register;
 
 /* forward declaration */
 static unsigned int startup_maskreg_irq(unsigned int irq);
@@ -36,7 +29,7 @@ static void end_maskreg_irq(unsigned int irq);
 
 /* hw_interrupt_type */
 static struct hw_interrupt_type maskreg_irq_type = {
-        .typename = " Mask Register",
+        .typename = "Mask Register",
         .startup = startup_maskreg_irq,
         .shutdown = shutdown_maskreg_irq,
         .enable = enable_maskreg_irq,
@@ -47,7 +40,7 @@ static struct hw_interrupt_type maskreg_irq_type = {
 
 /* actual implementatin */
 static unsigned int startup_maskreg_irq(unsigned int irq)
-{ 
+{
         enable_maskreg_irq(irq);
         return 0; /* never anything pending */
 }
@@ -59,32 +52,26 @@ static void shutdown_maskreg_irq(unsigned int irq)
 
 static void disable_maskreg_irq(unsigned int irq)
 {
-        if (irq_mask_register) {
-                unsigned long flags;
-                unsigned short val, mask = 0x01 << irq;
+        unsigned short val, mask = 0x01 << irq;
+
+        BUG_ON(!irq_mask_register);
 
-                /* Set "irq"th bit */
-                local_irq_save(flags);
-                val = ctrl_inw((unsigned long)irq_mask_register);
-                val |= mask;
-                ctrl_outw(val, (unsigned long)irq_mask_register);
-                local_irq_restore(flags);
-        }
+        /* Set "irq"th bit */
+        val = ctrl_inw(irq_mask_register);
+        val |= mask;
+        ctrl_outw(val, irq_mask_register);
 }
 
 static void enable_maskreg_irq(unsigned int irq)
 {
-        if (irq_mask_register) {
-                unsigned long flags;
-                unsigned short val, mask = ~(0x01 << irq);
+        unsigned short val, mask = ~(0x01 << irq);
+
+        BUG_ON(!irq_mask_register);
 
-                /* Clear "irq"th bit */
-                local_irq_save(flags);
-                val = ctrl_inw((unsigned long)irq_mask_register);
-                val &= mask;
-                ctrl_outw(val, (unsigned long)irq_mask_register);
-                local_irq_restore(flags);
-        }
+        /* Clear "irq"th bit */
+        val = ctrl_inw(irq_mask_register);
+        val &= mask;
+        ctrl_outw(val, irq_mask_register);
 }
 
 static void mask_and_ack_maskreg(unsigned int irq)
@@ -101,6 +88,6 @@ static void end_maskreg_irq(unsigned int irq)
 void make_maskreg_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].chip = &maskreg_irq_type;
+        irq_desc[irq].handler = &maskreg_irq_type;
         disable_maskreg_irq(irq);
 }
diff --git a/arch/sh/kernel/cpu/irq/pint.c b/arch/sh/kernel/cpu/irq/pint.c
index 80cd8108d36a..17f47b373d6e 100644
--- a/arch/sh/kernel/cpu/irq/pint.c
+++ b/arch/sh/kernel/cpu/irq/pint.c
@@ -48,26 +48,22 @@ static struct hw_interrupt_type pint_irq_type = {
 
 static void disable_pint_irq(unsigned int irq)
 {
-        unsigned long val, flags;
+        unsigned long val;
 
-        local_irq_save(flags);
         val = ctrl_inw(INTC_INTER);
         val &= ~(1 << (irq - PINT_IRQ_BASE));
         ctrl_outw(val, INTC_INTER);     /* disable PINTn */
         portcr_mask &= ~(3 << (irq - PINT_IRQ_BASE)*2);
-        local_irq_restore(flags);
 }
 
 static void enable_pint_irq(unsigned int irq)
 {
-        unsigned long val, flags;
+        unsigned long val;
 
-        local_irq_save(flags);
         val = ctrl_inw(INTC_INTER);
         val |= 1 << (irq - PINT_IRQ_BASE);
         ctrl_outw(val, INTC_INTER);     /* enable PINTn */
         portcr_mask |= 3 << (irq - PINT_IRQ_BASE)*2;
-        local_irq_restore(flags);
 }
 
 static void mask_and_ack_pint(unsigned int irq)
diff --git a/arch/sh/kernel/cpu/rtc.c b/arch/sh/kernel/cpu/rtc.c
deleted file mode 100644
index 4304cf75cfa2..000000000000
--- a/arch/sh/kernel/cpu/rtc.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * linux/arch/sh/kernel/rtc.c -- SH3 / SH4 on-chip RTC support
- *
- *  Copyright (C) 2000  Philipp Rumpf <prumpf@tux.org>
- *  Copyright (C) 1999  Tetsuya Okada & Niibe Yutaka
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/time.h>
-#include <linux/bcd.h>
-#include <asm/io.h>
-#include <asm/rtc.h>
-
-void sh_rtc_gettimeofday(struct timespec *ts)
-{
-        unsigned int sec128, sec, sec2, min, hr, wk, day, mon, yr, yr100, cf_bit;
-        unsigned long flags;
-
- again:
-        do {
-                local_irq_save(flags);
-                ctrl_outb(0, RCR1);  /* Clear CF-bit */
-                sec128 = ctrl_inb(R64CNT);
-                sec = ctrl_inb(RSECCNT);
-                min = ctrl_inb(RMINCNT);
-                hr  = ctrl_inb(RHRCNT);
-                wk  = ctrl_inb(RWKCNT);
-                day = ctrl_inb(RDAYCNT);
-                mon = ctrl_inb(RMONCNT);
-#if defined(CONFIG_CPU_SH4)
-                yr  = ctrl_inw(RYRCNT);
-                yr100 = (yr >> 8);
-                yr &= 0xff;
-#else
-                yr  = ctrl_inb(RYRCNT);
-                yr100 = (yr == 0x99) ? 0x19 : 0x20;
-#endif
-                sec2 = ctrl_inb(R64CNT);
-                cf_bit = ctrl_inb(RCR1) & RCR1_CF;
-                local_irq_restore(flags);
-        } while (cf_bit != 0 || ((sec128 ^ sec2) & RTC_BIT_INVERTED) != 0);
-
-        BCD_TO_BIN(yr100);
-        BCD_TO_BIN(yr);
-        BCD_TO_BIN(mon);
-        BCD_TO_BIN(day);
-        BCD_TO_BIN(hr);
-        BCD_TO_BIN(min);
-        BCD_TO_BIN(sec);
-
-        if (yr > 99 || mon < 1 || mon > 12 || day > 31 || day < 1 ||
-            hr > 23 || min > 59 || sec > 59) {
-                printk(KERN_ERR
-                       "SH RTC: invalid value, resetting to 1 Jan 2000\n");
-                local_irq_save(flags);
-                ctrl_outb(RCR2_RESET, RCR2);  /* Reset & Stop */
-                ctrl_outb(0, RSECCNT);
-                ctrl_outb(0, RMINCNT);
-                ctrl_outb(0, RHRCNT);
-                ctrl_outb(6, RWKCNT);
-                ctrl_outb(1, RDAYCNT);
-                ctrl_outb(1, RMONCNT);
-#if defined(CONFIG_CPU_SH4)
-                ctrl_outw(0x2000, RYRCNT);
-#else
-                ctrl_outb(0, RYRCNT);
-#endif
-                ctrl_outb(RCR2_RTCEN|RCR2_START, RCR2);  /* Start */
-                goto again;
-        }
-
-#if RTC_BIT_INVERTED != 0
-        if ((sec128 & RTC_BIT_INVERTED))
-                sec--;
-#endif
-
-        ts->tv_sec = mktime(yr100 * 100 + yr, mon, day, hr, min, sec);
-        ts->tv_nsec = ((sec128 * 1000000) / 128) * 1000;
-}
-
-/*
- * Changed to only care about tv_sec, and not the full timespec struct
- * (i.e. tv_nsec).  It can easily be switched to timespec for future cpus
- * that support setting usec or nsec RTC values.
- */
-int sh_rtc_settimeofday(const time_t secs)
-{
-        int retval = 0;
-        int real_seconds, real_minutes, cmos_minutes;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        ctrl_outb(RCR2_RESET, RCR2);  /* Reset pre-scaler & stop RTC */
-
-        cmos_minutes = ctrl_inb(RMINCNT);
-        BCD_TO_BIN(cmos_minutes);
-
-        /*
-         * since we're only adjusting minutes and seconds,
-         * don't interfere with hour overflow. This avoids
-         * messing with unknown time zones but requires your
-         * RTC not to be off by more than 15 minutes
-         */
-        real_seconds = secs % 60;
-        real_minutes = secs / 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) {
-                BIN_TO_BCD(real_seconds);
-                BIN_TO_BCD(real_minutes);
-                ctrl_outb(real_seconds, RSECCNT);
-                ctrl_outb(real_minutes, RMINCNT);
-        } else {
-                printk(KERN_WARNING
-                       "set_rtc_time: can't update from %d to %d\n",
-                       cmos_minutes, real_minutes);
-                retval = -1;
-        }
-
-        ctrl_outb(RCR2_RTCEN|RCR2_START, RCR2);  /* Start RTC */
-        local_irq_restore(flags);
-
-        return retval;
-}
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index b54dbb9a0c86..58d3815695ff 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -4,10 +4,21 @@
 
 obj-y   := ex.o probe.o
 
+# CPU subtype setup
+obj-$(CONFIG_CPU_SUBTYPE_SH7705)        += setup-sh7705.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7706)        += setup-sh7709.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7707)        += setup-sh7709.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7708)        += setup-sh7708.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7709)        += setup-sh7709.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7300)        += setup-sh7300.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7710)        += setup-sh7710.o
+
+# Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH3)                 := clock-sh3.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7300)      := clock-sh7300.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7705)      := clock-sh7705.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7706)      := clock-sh7706.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7709)      := clock-sh7709.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7710)      := clock-sh7300.o
 
 obj-y   += $(clock-y)
-
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7706.c b/arch/sh/kernel/cpu/sh3/clock-sh7706.c
new file mode 100644
index 000000000000..0cf96f9833bc
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/clock-sh7706.c
@@ -0,0 +1,84 @@
+/*
+ * arch/sh/kernel/cpu/sh3/clock-sh7706.c
+ *
+ * SH7706 support for the clock framework
+ *
+ *  Copyright (C) 2006  Takashi YOSHII
+ *
+ * Based on arch/sh/kernel/cpu/sh3/clock-sh7709.c
+ *  Copyright (C) 2005  Andriy Skulysh
+ *
+ * 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/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+
+static int stc_multipliers[] = { 1, 2, 4, 1, 3, 6, 1, 1 };
+static int ifc_divisors[]    = { 1, 2, 4, 1, 3, 1, 1, 1 };
+static int pfc_divisors[]    = { 1, 2, 4, 1, 3, 6, 1, 1 };
+
+static void master_clk_init(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x2000) >> 11) | (frqcr & 0x0003);
+
+        clk->rate *= pfc_divisors[idx];
+}
+
+static struct clk_ops sh7706_master_clk_ops = {
+        .init           = master_clk_init,
+};
+
+static void module_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x2000) >> 11) | (frqcr & 0x0003);
+
+        clk->rate = clk->parent->rate / pfc_divisors[idx];
+}
+
+static struct clk_ops sh7706_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+
+static void bus_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x8000) >> 13) | ((frqcr & 0x0030) >> 4);
+
+        clk->rate = clk->parent->rate / stc_multipliers[idx];
+}
+
+static struct clk_ops sh7706_bus_clk_ops = {
+        .recalc         = bus_clk_recalc,
+};
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x4000) >> 12) | ((frqcr & 0x000c) >> 2);
+
+        clk->rate = clk->parent->rate / ifc_divisors[idx];
+}
+
+static struct clk_ops sh7706_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7706_clk_ops[] = {
+        &sh7706_master_clk_ops,
+        &sh7706_module_clk_ops,
+        &sh7706_bus_clk_ops,
+        &sh7706_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7706_clk_ops))
+                *ops = sh7706_clk_ops[idx];
+}
diff --git a/arch/sh/kernel/cpu/sh3/ex.S b/arch/sh/kernel/cpu/sh3/ex.S
index cc04e9e239ff..44daf44833f9 100644
--- a/arch/sh/kernel/cpu/sh3/ex.S
+++ b/arch/sh/kernel/cpu/sh3/ex.S
@@ -84,8 +84,12 @@ ENTRY(interrupt_table)
         .long   do_IRQ  !      rovi
         .long   do_IRQ                  
         .long   do_IRQ                  /* 5E0 */
-#if  defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-     defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+#if  defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+     defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+     defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+     defined(CONFIG_CPU_SUBTYPE_SH7300) || \
+     defined(CONFIG_CPU_SUBTYPE_SH7705) || \
+     defined(CONFIG_CPU_SUBTYPE_SH7710)
         .long   do_IRQ  ! 32 IRQ  irq0  /* 600 */
         .long   do_IRQ  ! 33      irq1
         .long   do_IRQ  ! 34      irq2
@@ -147,6 +151,51 @@ ENTRY(interrupt_table)
         .long   do_IRQ  ! 62 PCC  pcc0i
         .long   do_IRQ  ! 63      pcc1i /* 9E0 */
 #endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+        .long   exception_none  ! 61    /* 9A0 */
+        .long   exception_none  ! 62
+        .long   exception_none  ! 63
+        .long   exception_none  ! 64    /* A00 */
+        .long   exception_none  ! 65
+        .long   exception_none  ! 66
+        .long   exception_none  ! 67
+        .long   exception_none  ! 68
+        .long   exception_none  ! 69
+        .long   exception_none  ! 70
+        .long   exception_none  ! 71
+        .long   exception_none  ! 72    /* B00 */
+        .long   exception_none  ! 73
+        .long   exception_none  ! 74
+        .long   exception_none  ! 75
+        .long   do_IRQ  ! 76 DMAC2 dei4 /* B80 */
+        .long   do_IRQ  ! 77 DMAC2 dei5
+        .long   exception_none  ! 78
+        .long   do_IRQ  ! 79 IPSEC ipseci /* BE0 */
+        .long   do_IRQ  ! 80 EDMAC eint0 /* C00 */
+        .long   do_IRQ  ! 81 EDMAC eint1
+        .long   do_IRQ  ! 82 EDMAC eint2
+        .long   exception_none  ! 83    /* C60 */
+        .long   exception_none  ! 84
+        .long   exception_none  ! 85
+        .long   exception_none  ! 86
+        .long   exception_none  ! 87
+        .long   exception_none  ! 88    /* D00 */
+        .long   exception_none  ! 89
+        .long   exception_none  ! 90
+        .long   exception_none  ! 91
+        .long   exception_none  ! 92
+        .long   exception_none  ! 93
+        .long   exception_none  ! 94
+        .long   exception_none  ! 95
+        .long   do_IRQ  ! 96 SIOF eri0  /* E00 */
+        .long   do_IRQ  ! 97      txi0
+        .long   do_IRQ  ! 98      rxi0
+        .long   do_IRQ  ! 99      cci0
+        .long   do_IRQ  ! 100     eri1  /* E80 */
+        .long   do_IRQ  ! 101     txi1
+        .long   do_IRQ  ! 102     rxi2
+        .long   do_IRQ  ! 103     cci3
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7300)
         .long   do_IRQ  ! 64
         .long   do_IRQ  ! 65
@@ -195,4 +244,3 @@ ENTRY(interrupt_table)
         .long   do_IRQ  ! 108
 #endif
 #endif
-
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index 5cdc88638601..e67098836290 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -72,6 +72,12 @@ int __init detect_cpu_and_cache_system(void)
                 cpu_data->dcache.sets           = 256;
                 cpu_data->type = CPU_SH7729;
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7706)
+                cpu_data->type = CPU_SH7706;
+#endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+                cpu_data->type = CPU_SH7710;
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
                 cpu_data->type = CPU_SH7705;
 
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7300.c b/arch/sh/kernel/cpu/sh3/setup-sh7300.c
new file mode 100644
index 000000000000..ab4d204bfba5
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7300.c
@@ -0,0 +1,43 @@
+/*
+ * SH7300 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xa4430000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCI,
+                .irqs           = { 80, 80, 80, 80 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7300_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7300_devices_setup(void)
+{
+        return platform_add_devices(sh7300_devices,
+                                    ARRAY_SIZE(sh7300_devices));
+}
+__initcall(sh7300_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
new file mode 100644
index 000000000000..a8e41c5241fa
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -0,0 +1,48 @@
+/*
+ * SH7705 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xa4400000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 52, 53, 55, 54 },
+        }, {
+                .mapbase        = 0xa4410000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 56, 57, 59, 58 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7705_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7705_devices_setup(void)
+{
+        return platform_add_devices(sh7705_devices,
+                                    ARRAY_SIZE(sh7705_devices));
+}
+__initcall(sh7705_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7708.c b/arch/sh/kernel/cpu/sh3/setup-sh7708.c
new file mode 100644
index 000000000000..f933723911ca
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7708.c
@@ -0,0 +1,43 @@
+/*
+ * SH7708 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xfffffe80,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCI,
+                .irqs           = { 23, 24, 25, 0 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7708_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7708_devices_setup(void)
+{
+        return platform_add_devices(sh7708_devices,
+                                    ARRAY_SIZE(sh7708_devices));
+}
+__initcall(sh7708_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7709.c b/arch/sh/kernel/cpu/sh3/setup-sh7709.c
new file mode 100644
index 000000000000..ff43ef2a1f0c
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7709.c
@@ -0,0 +1,53 @@
+/*
+ * SH7707/SH7709 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xfffffe80,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCI,
+                .irqs           = { 23, 24, 25, 0 },
+        }, {
+                .mapbase        = 0xa4000150,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 56, 57, 59, 58 },
+        }, {
+                .mapbase        = 0xa4000140,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_IRDA,
+                .irqs           = { 52, 53, 55, 54 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7709_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7709_devices_setup(void)
+{
+        return platform_add_devices(sh7709_devices,
+                                    ARRAY_SIZE(sh7709_devices));
+}
+__initcall(sh7709_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
new file mode 100644
index 000000000000..895f99ee6a95
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -0,0 +1,43 @@
+/*
+ * SH7710 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xa4400000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 52, 53, 55, 54 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7710_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7710_devices_setup(void)
+{
+        return platform_add_devices(sh7710_devices,
+                                    ARRAY_SIZE(sh7710_devices));
+}
+__initcall(sh7710_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile
index 3d5cafc71ae3..8dbf3895ece7 100644
--- a/arch/sh/kernel/cpu/sh4/Makefile
+++ b/arch/sh/kernel/cpu/sh4/Makefile
@@ -7,6 +7,16 @@ obj-y	:= ex.o probe.o
 obj-$(CONFIG_SH_FPU)                    += fpu.o
 obj-$(CONFIG_SH_STORE_QUEUES)           += sq.o
 
+# CPU subtype setup
+obj-$(CONFIG_CPU_SUBTYPE_SH7750)        += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7751)        += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7760)        += setup-sh7760.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7770)        += setup-sh7770.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += setup-sh7780.o
+obj-$(CONFIG_CPU_SUBTYPE_SH73180)       += setup-sh73180.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7343)        += setup-sh7343.o
+obj-$(CONFIG_CPU_SUBTYPE_SH4_202)       += setup-sh4-202.o
+
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH4)                 := clock-sh4.o
 clock-$(CONFIG_CPU_SUBTYPE_SH73180)     := clock-sh73180.o
diff --git a/arch/sh/kernel/cpu/sh4/ex.S b/arch/sh/kernel/cpu/sh4/ex.S
index 26a27df06505..7146893a6cca 100644
--- a/arch/sh/kernel/cpu/sh4/ex.S
+++ b/arch/sh/kernel/cpu/sh4/ex.S
@@ -72,6 +72,7 @@ ENTRY(interrupt_table)
         .long   do_IRQ  ! 1110
         .long   exception_error         
         ! Internal hardware
+#ifndef CONFIG_CPU_SUBTYPE_SH7780
         .long   do_IRQ  ! TMU0 tuni0    /* 400 */
         .long   do_IRQ  ! TMU1 tuni1
         .long   do_IRQ  ! TMU2 tuni2
@@ -122,6 +123,13 @@ ENTRY(interrupt_table)
         .long   do_IRQ  ! 45      dmte5
         .long   do_IRQ  ! 46      dmte6
         .long   do_IRQ  ! 47      dmte7         /* 7E0 */
+#elif defined(CONFIG_CPU_SUBTYPE_SH7343)
+        .long   do_IRQ  ! 44 IIC1 ali           /* 780 */
+        .long   do_IRQ  ! 45      tacki
+        .long   do_IRQ  ! 46      waiti
+        .long   do_IRQ  ! 47      dtei          /* 7E0 */
+        .long   do_IRQ  ! 48 DMAC dei0          /* 800 */
+        .long   do_IRQ  ! 49      dei1          /* 820 */
 #else
         .long   exception_error                 ! 44    /* 780 */
         .long   exception_error                 ! 45
@@ -131,7 +139,8 @@ ENTRY(interrupt_table)
 #if defined(CONFIG_SH_FPU)
         .long   do_fpu_state_restore    ! 48    /* 800 */
         .long   do_fpu_state_restore    ! 49    /* 820 */
-#else
+#elif !defined(CONFIG_CPU_SUBTYPE_SH7343) && \
+      !defined(CONFIG_CPU_SUBTYPE_SH73180)
         .long   exception_error
         .long   exception_error
 #endif
@@ -224,7 +233,7 @@ ENTRY(interrupt_table)
         .long   exception_error
         .long   do_IRQ  ! ADC   adi
         .long   do_IRQ  ! CMT   cmti    /* FA0 */
-#elif defined(CONFIG_CPU_SUBTYPE_SH73180)
+#elif defined(CONFIG_CPU_SUBTYPE_SH73180) || defined(CONFIG_CPU_SUBTYPE_SH7343)
         .long   do_IRQ  !  50 0x840
         .long   do_IRQ  !  51 0x860
         .long   do_IRQ  !  52 0x880
@@ -379,5 +388,168 @@ ENTRY(interrupt_table)
         .long   exception_error                 ! 141 0x13a0
         .long   exception_error                 ! 142 0x13c0
         .long   exception_error                 ! 143 0x13e0
+#elif defined(CONFIG_CPU_SUBTYPE_SH7770)
+        .long   do_IRQ  !  50 0x840
+        .long   do_IRQ  !  51 0x860
+        .long   do_IRQ  !  52 0x880
+        .long   do_IRQ  !  53 0x8a0
+        .long   do_IRQ  !  54 0x8c0
+        .long   do_IRQ  !  55 0x8e0
+        .long   do_IRQ  !  56 0x900
+        .long   do_IRQ  !  57 0x920
+        .long   do_IRQ  !  58 0x940
+        .long   do_IRQ  !  59 0x960
+        .long   do_IRQ  !  60 0x980
+        .long   do_IRQ  !  61 0x9a0
+        .long   do_IRQ  !  62 0x9c0
+        .long   do_IRQ  !  63 0x9e0
+        .long   do_IRQ  !  64 0xa00
+        .long   do_IRQ  !  65 0xa20
+        .long   do_IRQ  !  66 0xa4d
+        .long   do_IRQ  !  67 0xa60
+        .long   do_IRQ  !  68 0xa80
+        .long   do_IRQ  !  69 0xaa0
+        .long   do_IRQ  !  70 0xac0
+        .long   do_IRQ  !  71 0xae0
+        .long   do_IRQ  !  72 0xb00
+        .long   do_IRQ  !  73 0xb20
+        .long   do_IRQ  !  74 0xb40
+        .long   do_IRQ  !  75 0xb60
+        .long   do_IRQ  !  76 0xb80
+        .long   do_IRQ  !  77 0xba0
+        .long   do_IRQ  !  78 0xbc0
+        .long   do_IRQ  !  79 0xbe0
+        .long   do_IRQ  !  80 0xc00
+        .long   do_IRQ  !  81 0xc20
+        .long   do_IRQ  !  82 0xc40
+        .long   do_IRQ  !  83 0xc60
+        .long   do_IRQ  !  84 0xc80
+        .long   do_IRQ  !  85 0xca0
+        .long   do_IRQ  !  86 0xcc0
+        .long   do_IRQ  !  87 0xce0
+        .long   do_IRQ  !  88 0xd00
+        .long   do_IRQ  !  89 0xd20
+        .long   do_IRQ  !  90 0xd40
+        .long   do_IRQ  !  91 0xd60
+        .long   do_IRQ  !  92 0xd80
+        .long   do_IRQ  !  93 0xda0
+        .long   do_IRQ  !  94 0xdc0
+        .long   do_IRQ  !  95 0xde0
+        .long   do_IRQ  !  96 0xe00
+        .long   do_IRQ  !  97 0xe20
+        .long   do_IRQ  !  98 0xe40
+        .long   do_IRQ  !  99 0xe60
+        .long   do_IRQ  ! 100 0xe80
+        .long   do_IRQ  ! 101 0xea0
+        .long   do_IRQ  ! 102 0xec0
+        .long   do_IRQ  ! 103 0xee0
+        .long   do_IRQ  ! 104 0xf00
+        .long   do_IRQ  ! 105 0xf20
+        .long   do_IRQ  ! 106 0xf40
+        .long   do_IRQ  ! 107 0xf60
+        .long   do_IRQ  ! 108 0xf80
+#endif
+#else
+        .long   exception_error         /* 400 */
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! RTC   ati
+        .long   do_IRQ  !       pri
+        .long   do_IRQ  !       cui
+        .long   exception_error
+        .long   exception_error         /* 500 */
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! WDT   iti     /* 560 */
+        .long   do_IRQ  ! TMU-ch0
+        .long   do_IRQ  ! TMU-ch1
+        .long   do_IRQ  ! TMU-ch2
+        .long   do_IRQ  ! ticpi2        /* 5E0 */
+        .long   do_IRQ  ! 32 Hitachi UDI        /* 600 */
+        .long   exception_error
+        .long   do_IRQ  ! 34 DMAC dmte0
+        .long   do_IRQ  ! 35      dmte1
+        .long   do_IRQ  ! 36      dmte2
+        .long   do_IRQ  ! 37      dmte3
+        .long   do_IRQ  ! 38      dmae
+        .long   exception_error                 ! 39    /* 6E0 */
+        .long   do_IRQ  ! 40 SCIF-ch0 eri               /* 700 */
+        .long   do_IRQ  ! 41          rxi
+        .long   do_IRQ  ! 42          bri
+        .long   do_IRQ  ! 43          txi
+        .long   do_IRQ  ! 44 DMAC dmte4         /* 780 */
+        .long   do_IRQ  ! 45      dmte5
+        .long   do_IRQ  ! 46      dmte6
+        .long   do_IRQ  ! 47      dmte7         /* 7E0 */
+#if defined(CONFIG_SH_FPU)
+        .long   do_fpu_state_restore    ! 48    /* 800 */
+        .long   do_fpu_state_restore    ! 49    /* 820 */
+#else
+        .long   exception_error
+        .long   exception_error
+#endif
+        .long   exception_error                 /* 840 */
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! 56 CMT        /* 900 */
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! 60 HAC
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! PCI serr      /* A00 */
+        .long   do_IRQ  !     INTA
+        .long   do_IRQ  !     INTB
+        .long   do_IRQ  !     INTC
+        .long   do_IRQ  !     INTD
+        .long   do_IRQ  !     err
+        .long   do_IRQ  !     pwd3
+        .long   do_IRQ  !     pwd2
+        .long   do_IRQ  !     pwd1      /* B00 */
+        .long   do_IRQ  !     pwd0
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! SCIF-ch1 eri  /* B80 */
+        .long   do_IRQ  !          rxi
+        .long   do_IRQ  !          bri
+        .long   do_IRQ  !          txi
+        .long   do_IRQ  ! SIOF          /* C00 */
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! HSPI          /* C80 */
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! MMCIF fatat   /* D00 */
+        .long   do_IRQ  !       tran
+        .long   do_IRQ  !       err
+        .long   do_IRQ  !       frdy
+        .long   do_IRQ  ! DMAC dmint8   /* D80 */
+        .long   do_IRQ  !      dmint9
+        .long   do_IRQ  !      dmint10
+        .long   do_IRQ  !      dmint11
+        .long   do_IRQ  ! TMU-ch3       /* E00 */
+        .long   do_IRQ  ! TMU-ch4
+        .long   do_IRQ  ! TMU-ch5
+        .long   exception_error
+        .long   do_IRQ  ! SSI
+        .long   exception_error
+        .long   exception_error
+        .long   exception_error
+        .long   do_IRQ  ! FLCTL flste   /* F00 */
+        .long   do_IRQ  !       fltend
+        .long   do_IRQ  !       fltrq0
+        .long   do_IRQ  !       fltrq1
+        .long   do_IRQ  ! GPIO gpioi0   /* F80 */
+        .long   do_IRQ  !      gpioi1
+        .long   do_IRQ  !      gpioi2
+        .long   do_IRQ  !      gpioi3
 #endif
 
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 42427b79697b..c294de1e14a3 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -3,7 +3,7 @@
  *
  * CPU Subtype Probing for SH-4.
  *
- * Copyright (C) 2001, 2002, 2003, 2004  Paul Mundt
+ * Copyright (C) 2001 - 2006  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -29,7 +29,7 @@ int __init detect_cpu_and_cache_system(void)
                 [9] = (1 << 16)
         };
 
-        pvr = (ctrl_inl(CCN_PVR) >> 8) & 0xffff;
+        pvr = (ctrl_inl(CCN_PVR) >> 8) & 0xffffff;
         prr = (ctrl_inl(CCN_PRR) >> 4) & 0xff;
         cvr = (ctrl_inl(CCN_CVR));
 
@@ -38,7 +38,6 @@ int __init detect_cpu_and_cache_system(void)
          */
         cpu_data->icache.way_incr       = (1 << 13);
         cpu_data->icache.entry_shift    = 5;
-        cpu_data->icache.entry_mask     = 0x1fe0;
         cpu_data->icache.sets           = 256;
         cpu_data->icache.ways           = 1;
         cpu_data->icache.linesz         = L1_CACHE_BYTES;
@@ -48,13 +47,29 @@ int __init detect_cpu_and_cache_system(void)
          */
         cpu_data->dcache.way_incr       = (1 << 14);
         cpu_data->dcache.entry_shift    = 5;
-        cpu_data->dcache.entry_mask     = 0x3fe0;
         cpu_data->dcache.sets           = 512;
         cpu_data->dcache.ways           = 1;
         cpu_data->dcache.linesz         = L1_CACHE_BYTES;
 
-        /* Set the FPU flag, virtually all SH-4's have one */
-        cpu_data->flags |= CPU_HAS_FPU;
+        /*
+         * Setup some generic flags we can probe
+         * (L2 and DSP detection only work on SH-4A)
+         */
+        if (((pvr >> 16) & 0xff) == 0x10) {
+                if ((cvr & 0x02000000) == 0)
+                        cpu_data->flags |= CPU_HAS_L2_CACHE;
+                if ((cvr & 0x10000000) == 0)
+                        cpu_data->flags |= CPU_HAS_DSP;
+
+                cpu_data->flags |= CPU_HAS_LLSC;
+        }
+
+        /* FPU detection works for everyone */
+        if ((cvr & 0x20000000) == 1)
+                cpu_data->flags |= CPU_HAS_FPU;
+
+        /* Mask off the upper chip ID */
+        pvr &= 0xffff;
 
         /*
          * Probe the underlying processor version/revision and
@@ -63,56 +78,101 @@ int __init detect_cpu_and_cache_system(void)
         switch (pvr) {
         case 0x205:
                 cpu_data->type = CPU_SH7750;
-                cpu_data->flags |= CPU_HAS_P2_FLUSH_BUG | CPU_HAS_PERF_COUNTER;
+                cpu_data->flags |= CPU_HAS_P2_FLUSH_BUG | CPU_HAS_FPU |
+                                   CPU_HAS_PERF_COUNTER | CPU_HAS_PTEA;
                 break;
         case 0x206:
                 cpu_data->type = CPU_SH7750S;
-                cpu_data->flags |= CPU_HAS_P2_FLUSH_BUG | CPU_HAS_PERF_COUNTER;
+                cpu_data->flags |= CPU_HAS_P2_FLUSH_BUG | CPU_HAS_FPU |
+                                   CPU_HAS_PERF_COUNTER | CPU_HAS_PTEA;
                 break;
         case 0x1100:
                 cpu_data->type = CPU_SH7751;
+                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
                 break;
         case 0x2000:
                 cpu_data->type = CPU_SH73180;
                 cpu_data->icache.ways = 4;
                 cpu_data->dcache.ways = 4;
-                cpu_data->flags &= ~CPU_HAS_FPU;
+                cpu_data->flags |= CPU_HAS_LLSC;
+                break;
+        case 0x2001:
+        case 0x2004:
+                cpu_data->type = CPU_SH7770;
+                cpu_data->icache.ways = 4;
+                cpu_data->dcache.ways = 4;
+
+                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_LLSC;
+                break;
+        case 0x2006:
+        case 0x200A:
+                if (prr == 0x61)
+                        cpu_data->type = CPU_SH7781;
+                else
+                        cpu_data->type = CPU_SH7780;
+
+                cpu_data->icache.ways = 4;
+                cpu_data->dcache.ways = 4;
+
+                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PERF_COUNTER |
+                                   CPU_HAS_LLSC;
+                break;
+        case 0x3000:
+        case 0x3003:
+                cpu_data->type = CPU_SH7343;
+                cpu_data->icache.ways = 4;
+                cpu_data->dcache.ways = 4;
+                cpu_data->flags |= CPU_HAS_LLSC;
                 break;
         case 0x8000:
                 cpu_data->type = CPU_ST40RA;
+                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
                 break;
         case 0x8100:
                 cpu_data->type = CPU_ST40GX1;
+                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
                 break;
         case 0x700:
                 cpu_data->type = CPU_SH4_501;
                 cpu_data->icache.ways = 2;
                 cpu_data->dcache.ways = 2;
-
-                /* No FPU on the SH4-500 series.. */
-                cpu_data->flags &= ~CPU_HAS_FPU;
+                cpu_data->flags |= CPU_HAS_PTEA;
                 break;
         case 0x600:
                 cpu_data->type = CPU_SH4_202;
                 cpu_data->icache.ways = 2;
                 cpu_data->dcache.ways = 2;
+                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
                 break;
         case 0x500 ... 0x501:
                 switch (prr) {
-                    case 0x10: cpu_data->type = CPU_SH7750R; break;
-                    case 0x11: cpu_data->type = CPU_SH7751R; break;
-                    case 0x50: cpu_data->type = CPU_SH7760;  break;
+                case 0x10:
+                        cpu_data->type = CPU_SH7750R;
+                        break;
+                case 0x11:
+                        cpu_data->type = CPU_SH7751R;
+                        break;
+                case 0x50 ... 0x5f:
+                        cpu_data->type = CPU_SH7760;
+                        break;
                 }
 
                 cpu_data->icache.ways = 2;
                 cpu_data->dcache.ways = 2;
 
+                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
+
                 break;
         default:
                 cpu_data->type = CPU_SH_NONE;
                 break;
         }
 
+#ifdef CONFIG_SH_DIRECT_MAPPED
+        cpu_data->icache.ways = 1;
+        cpu_data->dcache.ways = 1;
+#endif
+
         /*
          * On anything that's not a direct-mapped cache, look to the CVR
          * for I/D-cache specifics.
@@ -121,18 +181,56 @@ int __init detect_cpu_and_cache_system(void)
                 size = sizes[(cvr >> 20) & 0xf];
                 cpu_data->icache.way_incr       = (size >> 1);
                 cpu_data->icache.sets           = (size >> 6);
-                cpu_data->icache.entry_mask     =
-                        (cpu_data->icache.way_incr - (1 << 5));
+
         }
 
+        /* Setup the rest of the I-cache info */
+        cpu_data->icache.entry_mask = cpu_data->icache.way_incr -
+                                      cpu_data->icache.linesz;
+
+        cpu_data->icache.way_size = cpu_data->icache.sets *
+                                    cpu_data->icache.linesz;
+
+        /* And the rest of the D-cache */
         if (cpu_data->dcache.ways > 1) {
                 size = sizes[(cvr >> 16) & 0xf];
                 cpu_data->dcache.way_incr       = (size >> 1);
                 cpu_data->dcache.sets           = (size >> 6);
-                cpu_data->dcache.entry_mask     =
-                        (cpu_data->dcache.way_incr - (1 << 5));
+        }
+
+        cpu_data->dcache.entry_mask = cpu_data->dcache.way_incr -
+                                      cpu_data->dcache.linesz;
+
+        cpu_data->dcache.way_size = cpu_data->dcache.sets *
+                                    cpu_data->dcache.linesz;
+
+        /*
+         * Setup the L2 cache desc
+         *
+         * SH-4A's have an optional PIPT L2.
+         */
+        if (cpu_data->flags & CPU_HAS_L2_CACHE) {
+                /*
+                 * Size calculation is much more sensible
+                 * than it is for the L1.
+                 *
+                 * Sizes are 128KB, 258KB, 512KB, and 1MB.
+                 */
+                size = (cvr & 0xf) << 17;
+
+                BUG_ON(!size);
+
+                cpu_data->scache.way_incr       = (1 << 16);
+                cpu_data->scache.entry_shift    = 5;
+                cpu_data->scache.ways           = 4;
+                cpu_data->scache.linesz         = L1_CACHE_BYTES;
+                cpu_data->scache.entry_mask     =
+                        (cpu_data->scache.way_incr - cpu_data->scache.linesz);
+                cpu_data->scache.sets           = size /
+                        (cpu_data->scache.linesz * cpu_data->scache.ways);
+                cpu_data->scache.way_size       =
+                        (cpu_data->scache.sets * cpu_data->scache.linesz);
         }
 
         return 0;
 }
-
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
new file mode 100644
index 000000000000..6e4e96541358
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -0,0 +1,43 @@
+/*
+ * SH4-202 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe80000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 40, 41, 43, 42 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh4202_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh4202_devices_setup(void)
+{
+        return platform_add_devices(sh4202_devices,
+                                    ARRAY_SIZE(sh4202_devices));
+}
+__initcall(sh4202_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh73180.c b/arch/sh/kernel/cpu/sh4/setup-sh73180.c
new file mode 100644
index 000000000000..cc9ea1e2e5df
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh73180.c
@@ -0,0 +1,43 @@
+/*
+ * SH73180 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe80000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 80, 81, 83, 82 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh73180_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh73180_devices_setup(void)
+{
+        return platform_add_devices(sh73180_devices,
+                                    ARRAY_SIZE(sh73180_devices));
+}
+__initcall(sh73180_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7343.c b/arch/sh/kernel/cpu/sh4/setup-sh7343.c
new file mode 100644
index 000000000000..91d61cf91ba1
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7343.c
@@ -0,0 +1,43 @@
+/*
+ * SH7343 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 80, 81, 83, 82 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7343_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7343_devices_setup(void)
+{
+        return platform_add_devices(sh7343_devices,
+                                    ARRAY_SIZE(sh7343_devices));
+}
+__initcall(sh7343_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
new file mode 100644
index 000000000000..50812d57c1c1
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -0,0 +1,48 @@
+/*
+ * SH7750/SH7751 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCI,
+                .irqs           = { 23, 24, 25, 0 },
+        }, {
+                .mapbase        = 0xffe80000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 40, 41, 43, 42 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7750_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7750_devices_setup(void)
+{
+        return platform_add_devices(sh7750_devices,
+                                    ARRAY_SIZE(sh7750_devices));
+}
+__initcall(sh7750_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
new file mode 100644
index 000000000000..97f1c9af35d6
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -0,0 +1,53 @@
+/*
+ * SH7760 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xfe600000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 52, 53, 55, 54 },
+        }, {
+                .mapbase        = 0xfe610000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 72, 73, 75, 74 },
+        }, {
+                .mapbase        = 0xfe620000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 76, 77, 79, 78 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7760_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7760_devices_setup(void)
+{
+        return platform_add_devices(sh7760_devices,
+                                    ARRAY_SIZE(sh7760_devices));
+}
+__initcall(sh7760_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7770.c b/arch/sh/kernel/cpu/sh4/setup-sh7770.c
new file mode 100644
index 000000000000..6a04cc5f5aca
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7770.c
@@ -0,0 +1,53 @@
+/*
+ * SH7770 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xff923000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 61, 61, 61, 61 },
+        }, {
+                .mapbase        = 0xff924000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 62, 62, 62, 62 },
+        }, {
+                .mapbase        = 0xff925000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 63, 63, 63, 63 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7770_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7770_devices_setup(void)
+{
+        return platform_add_devices(sh7770_devices,
+                                    ARRAY_SIZE(sh7770_devices));
+}
+__initcall(sh7770_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7780.c b/arch/sh/kernel/cpu/sh4/setup-sh7780.c
new file mode 100644
index 000000000000..72493f259edc
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7780.c
@@ -0,0 +1,79 @@
+/*
+ * SH7780 Setup
+ *
+ *  Copyright (C) 2006  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/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = 0xffe80000,
+                .end    = 0xffe80000 + 0x58 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                /* Period IRQ */
+                .start  = 21,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* Carry IRQ */
+                .start  = 22,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                /* Alarm IRQ */
+                .start  = 23,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 40, 41, 43, 42 },
+        }, {
+                .mapbase        = 0xffe10000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 76, 77, 79, 78 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7780_devices[] __initdata = {
+        &rtc_device,
+        &sci_device,
+};
+
+static int __init sh7780_devices_setup(void)
+{
+        return platform_add_devices(sh7780_devices,
+                                    ARRAY_SIZE(sh7780_devices));
+}
+__initcall(sh7780_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index b09805f3ee23..7bcc73f9b8df 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -1,49 +1,52 @@
 /*
- * arch/sh/kernel/cpu/sq.c
+ * arch/sh/kernel/cpu/sh4/sq.c
  *
  * General management API for SH-4 integrated Store Queues
  *
- * Copyright (C) 2001, 2002, 2003, 2004  Paul Mundt
+ * Copyright (C) 2001 - 2006  Paul Mundt
  * Copyright (C) 2001, 2002  M. R. Brown
  *
- * Some of this code has been adopted directly from the old arch/sh/mm/sq.c
- * hack that was part of the LinuxDC project. For all intents and purposes,
- * this is a completely new interface that really doesn't have much in common
- * with the old zone-based approach at all. In fact, it's only listed here for
- * general completeness.
- *
  * 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/cpu.h>
+#include <linux/bitmap.h>
+#include <linux/sysdev.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/proc_fs.h>
-#include <linux/miscdevice.h>
 #include <linux/vmalloc.h>
-
+#include <linux/mm.h>
 #include <asm/io.h>
 #include <asm/page.h>
-#include <asm/mmu_context.h>
+#include <asm/cacheflush.h>
 #include <asm/cpu/sq.h>
 
-static LIST_HEAD(sq_mapping_list);
+struct sq_mapping;
+
+struct sq_mapping {
+        const char *name;
+
+        unsigned long sq_addr;
+        unsigned long addr;
+        unsigned int size;
+
+        struct sq_mapping *next;
+};
+
+static struct sq_mapping *sq_mapping_list;
 static DEFINE_SPINLOCK(sq_mapping_lock);
+static kmem_cache_t *sq_cache;
+static unsigned long *sq_bitmap;
 
-/**
- * sq_flush - Flush (prefetch) the store queue cache
- * @addr: the store queue address to flush
- *
- * Executes a prefetch instruction on the specified store queue cache,
- * so that the cached data is written to physical memory.
- */
-inline void sq_flush(void *addr)
-{
-        __asm__ __volatile__ ("pref @%0" : : "r" (addr) : "memory");
-}
+#define store_queue_barrier()                   \
+do {                                            \
+        (void)ctrl_inl(P4SEG_STORE_QUE);        \
+        ctrl_outl(0, P4SEG_STORE_QUE + 0);      \
+        ctrl_outl(0, P4SEG_STORE_QUE + 8);      \
+} while (0);
 
 /**
  * sq_flush_range - Flush (prefetch) a specific SQ range
@@ -56,152 +59,73 @@ inline void sq_flush(void *addr)
 void sq_flush_range(unsigned long start, unsigned int len)
 {
         volatile unsigned long *sq = (unsigned long *)start;
-        unsigned long dummy;
 
         /* Flush the queues */
         for (len >>= 5; len--; sq += 8)
-                sq_flush((void *)sq);
+                prefetchw((void *)sq);
 
         /* Wait for completion */
-        dummy = ctrl_inl(P4SEG_STORE_QUE);
-
-        ctrl_outl(0, P4SEG_STORE_QUE + 0);
-        ctrl_outl(0, P4SEG_STORE_QUE + 8);
+        store_queue_barrier();
 }
 
-static struct sq_mapping *__sq_alloc_mapping(unsigned long virt, unsigned long phys, unsigned long size, const char *name)
+static inline void sq_mapping_list_add(struct sq_mapping *map)
 {
-        struct sq_mapping *map;
-
-        if (virt + size > SQ_ADDRMAX)
-                return ERR_PTR(-ENOSPC);
-
-        map = kmalloc(sizeof(struct sq_mapping), GFP_KERNEL);
-        if (!map)
-                return ERR_PTR(-ENOMEM);
+        struct sq_mapping **p, *tmp;
 
-        INIT_LIST_HEAD(&map->list);
+        spin_lock_irq(&sq_mapping_lock);
 
-        map->sq_addr    = virt;
-        map->addr       = phys;
-        map->size       = size + 1;
-        map->name       = name;
+        p = &sq_mapping_list;
+        while ((tmp = *p) != NULL)
+                p = &tmp->next;
 
-        list_add(&map->list, &sq_mapping_list);
+        map->next = tmp;
+        *p = map;
 
-        return map;
+        spin_unlock_irq(&sq_mapping_lock);
 }
 
-static unsigned long __sq_get_next_addr(void)
+static inline void sq_mapping_list_del(struct sq_mapping *map)
 {
-        if (!list_empty(&sq_mapping_list)) {
-                struct list_head *pos, *tmp;
-
-                /*
-                 * Read one off the list head, as it will have the highest
-                 * mapped allocation. Set the next one up right above it.
-                 *
-                 * This is somewhat sub-optimal, as we don't look at
-                 * gaps between allocations or anything lower then the
-                 * highest-level allocation.
-                 *
-                 * However, in the interest of performance and the general
-                 * lack of desire to do constant list rebalancing, we don't
-                 * worry about it.
-                 */
-                list_for_each_safe(pos, tmp, &sq_mapping_list) {
-                        struct sq_mapping *entry;
-
-                        entry = list_entry(pos, typeof(*entry), list);
-
-                        return entry->sq_addr + entry->size;
+        struct sq_mapping **p, *tmp;
+
+        spin_lock_irq(&sq_mapping_lock);
+
+        for (p = &sq_mapping_list; (tmp = *p); p = &tmp->next)
+                if (tmp == map) {
+                        *p = tmp->next;
+                        break;
                 }
-        }
 
-        return P4SEG_STORE_QUE;
+        spin_unlock_irq(&sq_mapping_lock);
 }
 
-/**
- * __sq_remap - Perform a translation from the SQ to a phys addr
- * @map: sq mapping containing phys and store queue addresses.
- *
- * Maps the store queue address specified in the mapping to the physical
- * address specified in the mapping.
- */
-static struct sq_mapping *__sq_remap(struct sq_mapping *map)
+static int __sq_remap(struct sq_mapping *map, unsigned long flags)
 {
-        unsigned long flags, pteh, ptel;
+#if defined(CONFIG_MMU)
         struct vm_struct *vma;
-        pgprot_t pgprot;
-
-        /*
-         * Without an MMU (or with it turned off), this is much more
-         * straightforward, as we can just load up each queue's QACR with
-         * the physical address appropriately masked.
-         */
-
-        ctrl_outl(((map->addr >> 26) << 2) & 0x1c, SQ_QACR0);
-        ctrl_outl(((map->addr >> 26) << 2) & 0x1c, SQ_QACR1);
 
-#ifdef CONFIG_MMU
-        /*
-         * With an MMU on the other hand, things are slightly more involved.
-         * Namely, we have to have a direct mapping between the SQ addr and
-         * the associated physical address in the UTLB by way of setting up
-         * a virt<->phys translation by hand. We do this by simply specifying
-         * the SQ addr in UTLB.VPN and the associated physical address in
-         * UTLB.PPN.
-         *
-         * Notably, even though this is a special case translation, and some
-         * of the configuration bits are meaningless, we're still required
-         * to have a valid ASID context in PTEH.
-         *
-         * We could also probably get by without explicitly setting PTEA, but
-         * we do it here just for good measure.
-         */
-        spin_lock_irqsave(&sq_mapping_lock, flags);
-
-        pteh = map->sq_addr;
-        ctrl_outl((pteh & MMU_VPN_MASK) | get_asid(), MMU_PTEH);
-
-        ptel = map->addr & PAGE_MASK;
-        ctrl_outl(((ptel >> 28) & 0xe) | (ptel & 0x1), MMU_PTEA);
-
-        pgprot = pgprot_noncached(PAGE_KERNEL);
-
-        ptel &= _PAGE_FLAGS_HARDWARE_MASK;
-        ptel |= pgprot_val(pgprot);
-        ctrl_outl(ptel, MMU_PTEL);
-
-        __asm__ __volatile__ ("ldtlb" : : : "memory");
-
-        spin_unlock_irqrestore(&sq_mapping_lock, flags);
-
-        /*
-         * Next, we need to map ourselves in the kernel page table, so that
-         * future accesses after a TLB flush will be handled when we take a
-         * page fault.
-         *
-         * Theoretically we could just do this directly and not worry about
-         * setting up the translation by hand ahead of time, but for the
-         * cases where we want a one-shot SQ mapping followed by a quick
-         * writeout before we hit the TLB flush, we do it anyways. This way
-         * we at least save ourselves the initial page fault overhead.
-         */
         vma = __get_vm_area(map->size, VM_ALLOC, map->sq_addr, SQ_ADDRMAX);
         if (!vma)
-                return ERR_PTR(-ENOMEM);
+                return -ENOMEM;
 
         vma->phys_addr = map->addr;
 
         if (remap_area_pages((unsigned long)vma->addr, vma->phys_addr,
-                             map->size, pgprot_val(pgprot))) {
+                             map->size, flags)) {
                 vunmap(vma->addr);
-                return NULL;
+                return -EAGAIN;
         }
-#endif /* CONFIG_MMU */
+#else
+        /*
+         * Without an MMU (or with it turned off), this is much more
+         * straightforward, as we can just load up each queue's QACR with
+         * the physical address appropriately masked.
+         */
+        ctrl_outl(((map->addr >> 26) << 2) & 0x1c, SQ_QACR0);
+        ctrl_outl(((map->addr >> 26) << 2) & 0x1c, SQ_QACR1);
+#endif
 
-        return map;
+        return 0;
 }
 
 /**
@@ -209,42 +133,65 @@ static struct sq_mapping *__sq_remap(struct sq_mapping *map)
  * @phys: Physical address of mapping.
  * @size: Length of mapping.
  * @name: User invoking mapping.
+ * @flags: Protection flags.
  *
  * Remaps the physical address @phys through the next available store queue
  * address of @size length. @name is logged at boot time as well as through
- * the procfs interface.
- *
- * A pre-allocated and filled sq_mapping pointer is returned, and must be
- * cleaned up with a call to sq_unmap() when the user is done with the
- * mapping.
+ * the sysfs interface.
  */
-struct sq_mapping *sq_remap(unsigned long phys, unsigned int size, const char *name)
+unsigned long sq_remap(unsigned long phys, unsigned int size,
+                       const char *name, unsigned long flags)
 {
         struct sq_mapping *map;
-        unsigned long virt, end;
+        unsigned long end;
         unsigned int psz;
+        int ret, page;
 
         /* Don't allow wraparound or zero size */
         end = phys + size - 1;
-        if (!size || end < phys)
-                return NULL;
+        if (unlikely(!size || end < phys))
+                return -EINVAL;
         /* Don't allow anyone to remap normal memory.. */
-        if (phys < virt_to_phys(high_memory))
-                return NULL;
+        if (unlikely(phys < virt_to_phys(high_memory)))
+                return -EINVAL;
 
         phys &= PAGE_MASK;
+        size = PAGE_ALIGN(end + 1) - phys;
+
+        map = kmem_cache_alloc(sq_cache, GFP_KERNEL);
+        if (unlikely(!map))
+                return -ENOMEM;
+
+        map->addr = phys;
+        map->size = size;
+        map->name = name;
+
+        page = bitmap_find_free_region(sq_bitmap, 0x04000000,
+                                       get_order(map->size));
+        if (unlikely(page < 0)) {
+                ret = -ENOSPC;
+                goto out;
+        }
+
+        map->sq_addr = P4SEG_STORE_QUE + (page << PAGE_SHIFT);
+
+        ret = __sq_remap(map, flags);
+        if (unlikely(ret != 0))
+                goto out;
+
+        psz = (size + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
+        pr_info("sqremap: %15s  [%4d page%s]  va 0x%08lx   pa 0x%08lx\n",
+                likely(map->name) ? map->name : "???",
+                psz, psz == 1 ? " " : "s",
+                map->sq_addr, map->addr);
 
-        size  = PAGE_ALIGN(end + 1) - phys;
-        virt  = __sq_get_next_addr();
-        psz   = (size + (PAGE_SIZE - 1)) / PAGE_SIZE;
-        map   = __sq_alloc_mapping(virt, phys, size, name);
+        sq_mapping_list_add(map);
 
-        printk("sqremap: %15s  [%4d page%s]  va 0x%08lx   pa 0x%08lx\n",
-               map->name ? map->name : "???",
-               psz, psz == 1 ? " " : "s",
-               map->sq_addr, map->addr);
+        return map->sq_addr;
 
-        return __sq_remap(map);
+out:
+        kmem_cache_free(sq_cache, map);
+        return ret;
 }
 
 /**
@@ -255,188 +202,198 @@ struct sq_mapping *sq_remap(unsigned long phys, unsigned int size, const char *n
  * sq_remap(). Also frees up the pte that was previously inserted into
  * the kernel page table and discards the UTLB translation.
  */
-void sq_unmap(struct sq_mapping *map)
+void sq_unmap(unsigned long vaddr)
 {
-        if (map->sq_addr > (unsigned long)high_memory)
-                vfree((void *)(map->sq_addr & PAGE_MASK));
+        struct sq_mapping **p, *map;
+        struct vm_struct *vma;
+        int page;
 
-        list_del(&map->list);
-        kfree(map);
-}
+        for (p = &sq_mapping_list; (map = *p); p = &map->next)
+                if (map->sq_addr == vaddr)
+                        break;
 
-/**
- * sq_clear - Clear a store queue range
- * @addr: Address to start clearing from.
- * @len: Length to clear.
- *
- * A quick zero-fill implementation for clearing out memory that has been
- * remapped through the store queues.
- */
-void sq_clear(unsigned long addr, unsigned int len)
-{
-        int i;
+        if (unlikely(!map)) {
+                printk("%s: bad store queue address 0x%08lx\n",
+                       __FUNCTION__, vaddr);
+                return;
+        }
 
-        /* Clear out both queues linearly */
-        for (i = 0; i < 8; i++) {
-                ctrl_outl(0, addr + i + 0);
-                ctrl_outl(0, addr + i + 8);
+        page = (map->sq_addr - P4SEG_STORE_QUE) >> PAGE_SHIFT;
+        bitmap_release_region(sq_bitmap, page, get_order(map->size));
+
+#ifdef CONFIG_MMU
+        vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
+        if (!vma) {
+                printk(KERN_ERR "%s: bad address 0x%08lx\n",
+                       __FUNCTION__, map->sq_addr);
+                return;
         }
+#endif
+
+        sq_mapping_list_del(map);
 
-        sq_flush_range(addr, len);
+        kmem_cache_free(sq_cache, map);
 }
 
-/**
- * sq_vma_unmap - Unmap a VMA range
- * @area: VMA containing range.
- * @addr: Start of range.
- * @len: Length of range.
+/*
+ * Needlessly complex sysfs interface. Unfortunately it doesn't seem like
+ * there is any other easy way to add things on a per-cpu basis without
+ * putting the directory entries somewhere stupid and having to create
+ * links in sysfs by hand back in to the per-cpu directories.
  *
- * Searches the sq_mapping_list for a mapping matching the sq addr @addr,
- * and subsequently frees up the entry. Further cleanup is done by generic
- * code.
+ * Some day we may want to have an additional abstraction per store
+ * queue, but considering the kobject hell we already have to deal with,
+ * it's simply not worth the trouble.
  */
-static void sq_vma_unmap(struct vm_area_struct *area,
-                         unsigned long addr, size_t len)
-{
-        struct list_head *pos, *tmp;
+static struct kobject *sq_kobject[NR_CPUS];
 
-        list_for_each_safe(pos, tmp, &sq_mapping_list) {
-                struct sq_mapping *entry;
+struct sq_sysfs_attr {
+        struct attribute attr;
+        ssize_t (*show)(char *buf);
+        ssize_t (*store)(const char *buf, size_t count);
+};
 
-                entry = list_entry(pos, typeof(*entry), list);
+#define to_sq_sysfs_attr(attr)  container_of(attr, struct sq_sysfs_attr, attr)
 
-                if (entry->sq_addr == addr) {
-                        /*
-                         * We could probably get away without doing the tlb flush
-                         * here, as generic code should take care of most of this
-                         * when unmapping the rest of the VMA range for us. Leave
-                         * it in for added sanity for the time being..
-                         */
-                        __flush_tlb_page(get_asid(), entry->sq_addr & PAGE_MASK);
+static ssize_t sq_sysfs_show(struct kobject *kobj, struct attribute *attr,
+                             char *buf)
+{
+        struct sq_sysfs_attr *sattr = to_sq_sysfs_attr(attr);
 
-                        list_del(&entry->list);
-                        kfree(entry);
+        if (likely(sattr->show))
+                return sattr->show(buf);
 
-                        return;
-                }
-        }
+        return -EIO;
 }
 
-/**
- * sq_vma_sync - Sync a VMA range
- * @area: VMA containing range.
- * @start: Start of range.
- * @len: Length of range.
- * @flags: Additional flags.
- *
- * Synchronizes an sq mapped range by flushing the store queue cache for
- * the duration of the mapping.
- *
- * Used internally for user mappings, which must use msync() to prefetch
- * the store queue cache.
- */
-static int sq_vma_sync(struct vm_area_struct *area,
-                       unsigned long start, size_t len, unsigned int flags)
+static ssize_t sq_sysfs_store(struct kobject *kobj, struct attribute *attr,
+                              const char *buf, size_t count)
 {
-        sq_flush_range(start, len);
+        struct sq_sysfs_attr *sattr = to_sq_sysfs_attr(attr);
 
-        return 0;
+        if (likely(sattr->store))
+                return sattr->store(buf, count);
+
+        return -EIO;
 }
 
-static struct vm_operations_struct sq_vma_ops = {
-        .unmap  = sq_vma_unmap,
-        .sync   = sq_vma_sync,
-};
+static ssize_t mapping_show(char *buf)
+{
+        struct sq_mapping **list, *entry;
+        char *p = buf;
 
-/**
- * sq_mmap - mmap() for /dev/cpu/sq
- * @file: unused.
- * @vma: VMA to remap.
- *
- * Remap the specified vma @vma through the store queues, and setup associated
- * information for the new mapping. Also build up the page tables for the new
- * area.
- */
-static int sq_mmap(struct file *file, struct vm_area_struct *vma)
+        for (list = &sq_mapping_list; (entry = *list); list = &entry->next)
+                p += sprintf(p, "%08lx-%08lx [%08lx]: %s\n",
+                             entry->sq_addr, entry->sq_addr + entry->size,
+                             entry->addr, entry->name);
+
+        return p - buf;
+}
+
+static ssize_t mapping_store(const char *buf, size_t count)
 {
-        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-        unsigned long size = vma->vm_end - vma->vm_start;
-        struct sq_mapping *map;
+        unsigned long base = 0, len = 0;
 
-        /*
-         * We're not interested in any arbitrary virtual address that has
-         * been stuck in the VMA, as we already know what addresses we
-         * want. Save off the size, and reposition the VMA to begin at
-         * the next available sq address.
-         */
-        vma->vm_start = __sq_get_next_addr();
-        vma->vm_end   = vma->vm_start + size;
+        sscanf(buf, "%lx %lx", &base, &len);
+        if (!base)
+                return -EIO;
 
-        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+        if (likely(len)) {
+                int ret = sq_remap(base, len, "Userspace",
+                                   pgprot_val(PAGE_SHARED));
+                if (ret < 0)
+                        return ret;
+        } else
+                sq_unmap(base);
 
-        vma->vm_flags |= VM_IO | VM_RESERVED;
+        return count;
+}
 
-        map = __sq_alloc_mapping(vma->vm_start, offset, size, "Userspace");
+static struct sq_sysfs_attr mapping_attr =
+        __ATTR(mapping, 0644, mapping_show, mapping_store);
 
-        if (io_remap_pfn_range(vma, map->sq_addr, map->addr >> PAGE_SHIFT,
-                                size, vma->vm_page_prot))
-                return -EAGAIN;
+static struct attribute *sq_sysfs_attrs[] = {
+        &mapping_attr.attr,
+        NULL,
+};
 
-        vma->vm_ops = &sq_vma_ops;
+static struct sysfs_ops sq_sysfs_ops = {
+        .show   = sq_sysfs_show,
+        .store  = sq_sysfs_store,
+};
 
-        return 0;
-}
+static struct kobj_type ktype_percpu_entry = {
+        .sysfs_ops      = &sq_sysfs_ops,
+        .default_attrs  = sq_sysfs_attrs,
+};
 
-#ifdef CONFIG_PROC_FS
-static int sq_mapping_read_proc(char *buf, char **start, off_t off,
-                                int len, int *eof, void *data)
+static int __devinit sq_sysdev_add(struct sys_device *sysdev)
 {
-        struct list_head *pos;
-        char *p = buf;
+        unsigned int cpu = sysdev->id;
+        struct kobject *kobj;
 
-        list_for_each_prev(pos, &sq_mapping_list) {
-                struct sq_mapping *entry;
+        sq_kobject[cpu] = kzalloc(sizeof(struct kobject), GFP_KERNEL);
+        if (unlikely(!sq_kobject[cpu]))
+                return -ENOMEM;
 
-                entry = list_entry(pos, typeof(*entry), list);
+        kobj = sq_kobject[cpu];
+        kobj->parent = &sysdev->kobj;
+        kobject_set_name(kobj, "%s", "sq");
+        kobj->ktype = &ktype_percpu_entry;
 
-                p += sprintf(p, "%08lx-%08lx [%08lx]: %s\n", entry->sq_addr,
-                             entry->sq_addr + entry->size - 1, entry->addr,
-                             entry->name);
-        }
-
-        return p - buf;
+        return kobject_register(kobj);
 }
-#endif
 
-static struct file_operations sq_fops = {
-        .owner          = THIS_MODULE,
-        .mmap           = sq_mmap,
-};
+static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
+{
+        unsigned int cpu = sysdev->id;
+        struct kobject *kobj = sq_kobject[cpu];
 
-static struct miscdevice sq_dev = {
-        .minor          = STORE_QUEUE_MINOR,
-        .name           = "sq",
-        .fops           = &sq_fops,
+        kobject_unregister(kobj);
+        return 0;
+}
+
+static struct sysdev_driver sq_sysdev_driver = {
+        .add            = sq_sysdev_add,
+        .remove         = __devexit_p(sq_sysdev_remove),
 };
 
 static int __init sq_api_init(void)
 {
-        int ret;
+        unsigned int nr_pages = 0x04000000 >> PAGE_SHIFT;
+        unsigned int size = (nr_pages + (BITS_PER_LONG - 1)) / BITS_PER_LONG;
+        int ret = -ENOMEM;
+
         printk(KERN_NOTICE "sq: Registering store queue API.\n");
 
-        create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0);
+        sq_cache = kmem_cache_create("store_queue_cache",
+                                sizeof(struct sq_mapping), 0, 0,
+                                NULL, NULL);
+        if (unlikely(!sq_cache))
+                return ret;
 
-        ret = misc_register(&sq_dev);
-        if (ret)
-                remove_proc_entry("sq_mapping", NULL);
+        sq_bitmap = kzalloc(size, GFP_KERNEL);
+        if (unlikely(!sq_bitmap))
+                goto out;
+
+        ret = sysdev_driver_register(&cpu_sysdev_class, &sq_sysdev_driver);
+        if (unlikely(ret != 0))
+                goto out;
+
+        return 0;
+
+out:
+        kfree(sq_bitmap);
+        kmem_cache_destroy(sq_cache);
 
         return ret;
 }
 
 static void __exit sq_api_exit(void)
 {
-        misc_deregister(&sq_dev);
-        remove_proc_entry("sq_mapping", NULL);
+        sysdev_driver_unregister(&cpu_sysdev_class, &sq_sysdev_driver);
+        kfree(sq_bitmap);
+        kmem_cache_destroy(sq_cache);
 }
 
 module_init(sq_api_init);
@@ -445,11 +402,7 @@ module_exit(sq_api_exit);
 MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, M. R. Brown <mrbrown@0xd6.org>");
 MODULE_DESCRIPTION("Simple API for SH-4 integrated Store Queues");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(STORE_QUEUE_MINOR);
 
 EXPORT_SYMBOL(sq_remap);
 EXPORT_SYMBOL(sq_unmap);
-EXPORT_SYMBOL(sq_clear);
-EXPORT_SYMBOL(sq_flush);
 EXPORT_SYMBOL(sq_flush_range);
-
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 1378db375e17..a00022722e9e 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 1999, 2000  Niibe Yutaka
  *  Copyright (C) 2002  M. R. Brown
- *  Copyright (C) 2004  Paul Mundt
+ *  Copyright (C) 2004 - 2006  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
@@ -49,7 +49,7 @@ static int __init sh_console_setup(struct console *co, char *options)
         return 0;
 }
 
-static struct console early_console = {
+static struct console bios_console = {
         .name           = "bios",
         .write          = sh_console_write,
         .setup          = sh_console_setup,
@@ -59,34 +59,43 @@ static struct console early_console = {
 #endif
 
 #ifdef CONFIG_EARLY_SCIF_CONSOLE
+#include <linux/serial_core.h>
+#include "../../../drivers/serial/sh-sci.h"
+
+#ifdef CONFIG_CPU_SH4
 #define SCIF_REG        0xffe80000
+#elif defined(CONFIG_CPU_SUBTYPE_SH72060)
+#define SCIF_REG        0xfffe9800
+#else
+#error "Undefined SCIF for this subtype"
+#endif
+
+static struct uart_port scif_port = {
+        .mapbase        = SCIF_REG,
+        .membase        = (char __iomem *)SCIF_REG,
+};
 
 static void scif_sercon_putc(int c)
 {
-        while (!(ctrl_inw(SCIF_REG + 0x10) & 0x20)) ;
+        while (((sci_in(&scif_port, SCFDR) & 0x1f00 >> 8) == 16))
+                ;
 
-        ctrl_outb(c, SCIF_REG + 12);
-        ctrl_outw((ctrl_inw(SCIF_REG + 0x10) & 0x9f), SCIF_REG + 0x10);
+        sci_out(&scif_port, SCxTDR, c);
+        sci_in(&scif_port, SCxSR);
+        sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40));
+
+        while ((sci_in(&scif_port, SCxSR) & 0x40) == 0);
+                ;
 
         if (c == '\n')
                 scif_sercon_putc('\r');
 }
 
-static void scif_sercon_flush(void)
-{
-        ctrl_outw((ctrl_inw(SCIF_REG + 0x10) & 0xbf), SCIF_REG + 0x10);
-
-        while (!(ctrl_inw(SCIF_REG + 0x10) & 0x40)) ;
-
-        ctrl_outw((ctrl_inw(SCIF_REG + 0x10) & 0xbf), SCIF_REG + 0x10);
-}
-
-static void scif_sercon_write(struct console *con, const char *s, unsigned count)
+static void scif_sercon_write(struct console *con, const char *s,
+                              unsigned count)
 {
         while (count-- > 0)
                 scif_sercon_putc(*s++);
-
-        scif_sercon_flush();
 }
 
 static int __init scif_sercon_setup(struct console *con, char *options)
@@ -96,7 +105,7 @@ static int __init scif_sercon_setup(struct console *con, char *options)
         return 0;
 }
 
-static struct console early_console = {
+static struct console scif_console = {
         .name           = "sercon",
         .write          = scif_sercon_write,
         .setup          = scif_sercon_setup,
@@ -104,7 +113,7 @@ static struct console early_console = {
         .index          = -1,
 };
 
-void scif_sercon_init(int baud)
+static void scif_sercon_init(int baud)
 {
         ctrl_outw(0, SCIF_REG + 8);
         ctrl_outw(0, SCIF_REG);
@@ -122,16 +131,61 @@ void scif_sercon_init(int baud)
 }
 #endif
 
-void __init enable_early_printk(void)
+/*
+ * Setup a default console, if more than one is compiled in, rely on the
+ * earlyprintk= parsing to give priority.
+ */
+static struct console *early_console =
+#ifdef CONFIG_SH_STANDARD_BIOS
+        &bios_console
+#elif defined(CONFIG_EARLY_SCIF_CONSOLE)
+        &scif_console
+#else
+        NULL
+#endif
+        ;
+
+static int __initdata keep_early;
+
+int __init setup_early_printk(char *opt)
 {
-#ifdef CONFIG_EARLY_SCIF_CONSOLE
-        scif_sercon_init(115200);
+        char *space;
+        char buf[256];
+
+        strlcpy(buf, opt, sizeof(buf));
+        space = strchr(buf, ' ');
+        if (space)
+                *space = 0;
+
+        if (strstr(buf, "keep"))
+                keep_early = 1;
+
+#ifdef CONFIG_SH_STANDARD_BIOS
+        if (!strncmp(buf, "bios", 4))
+                early_console = &bios_console;
+#endif
+#if defined(CONFIG_EARLY_SCIF_CONSOLE)
+        if (!strncmp(buf, "serial", 6)) {
+                early_console = &scif_console;
+
+#ifdef CONFIG_CPU_SH4
+                scif_sercon_init(115200);
+#endif
+        }
 #endif
-        register_console(&early_console);
+
+        if (likely(early_console))
+                register_console(early_console);
+
+        return 1;
 }
+__setup("earlyprintk=", setup_early_printk);
 
-void disable_early_printk(void)
+void __init disable_early_printk(void)
 {
-        unregister_console(&early_console);
+        if (!keep_early) {
+                printk("disabling early console\n");
+                unregister_console(early_console);
+        } else
+                printk("keeping early console\n");
 }
-
diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S
index 7dfd2ba75f7f..fe8221855b28 100644
--- a/arch/sh/kernel/entry.S
+++ b/arch/sh/kernel/entry.S
@@ -18,24 +18,6 @@
 #include <asm/cpu/mmu_context.h>
 #include <asm/unistd.h>
 
-#if !defined(CONFIG_NFSD) && !defined(CONFIG_NFSD_MODULE)
-#define sys_nfsservctl          sys_ni_syscall
-#endif
-
-#if !defined(CONFIG_MMU)
-#define sys_madvise             sys_ni_syscall
-#define sys_readahead           sys_ni_syscall
-#define sys_mprotect            sys_ni_syscall
-#define sys_msync               sys_ni_syscall
-#define sys_mlock               sys_ni_syscall
-#define sys_munlock             sys_ni_syscall
-#define sys_mlockall            sys_ni_syscall
-#define sys_munlockall          sys_ni_syscall
-#define sys_mremap              sys_ni_syscall
-#define sys_mincore             sys_ni_syscall
-#define sys_remap_file_pages    sys_ni_syscall
-#endif
-
 ! NOTE:
 ! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address
 ! to be jumped is too far, but it causes illegal slot exception.
@@ -326,7 +308,7 @@ ENTRY(exception_error)
         .align  2
 ret_from_exception:
         preempt_stop()
-ret_from_irq:
+ENTRY(ret_from_irq)
         !
         mov     #OFF_SR, r0
         mov.l   @(r0,r15), r0   ! get status register
@@ -389,11 +371,12 @@ work_pending:
         ! r8: current_thread_info
         ! t:  result of "tst    #_TIF_NEED_RESCHED, r0"
         bf/s    work_resched
-         tst    #_TIF_SIGPENDING, r0
+         tst    #(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r0
 work_notifysig:
         bt/s    restore_all
          mov    r15, r4
-        mov     #0, r5
+        mov     r12, r5         ! set arg1(save_r0)
+        mov     r0, r6
         mov.l   2f, r1
         mova    restore_all, r0
         jmp     @r1
@@ -431,7 +414,7 @@ work_resched:
 
         .align  2
 1:      .long   schedule
-2:      .long   do_signal
+2:      .long   do_notify_resume
 
         .align  2
 syscall_exit_work:
@@ -552,6 +535,7 @@ syscall_call:
         mov.l   @r9, r8
         jsr     @r8             ! jump to specific syscall handler
          nop
+        mov.l   @(OFF_R0,r15), r12              ! save r0
         mov.l   r0, @(OFF_R0,r15)               ! save the return value
         !
 syscall_exit:
@@ -644,7 +628,7 @@ skip_restore:
         !
 #if defined(CONFIG_KGDB_NMI)
         ! Clear in_nmi
-        mov.l   4f, k0
+        mov.l   6f, k0
         mov     #0, k1
         mov.b   k1, @k0
 #endif
@@ -722,7 +706,7 @@ interrupt:
 !
 !
         .align  2
-handle_exception:
+ENTRY(handle_exception)
         ! Using k0, k1 for scratch registers (r0_bank1, r1_bank),
         ! save all registers onto stack.
         !
@@ -732,8 +716,8 @@ handle_exception:
         bt/s    1f              ! It's a kernel to kernel transition.
          mov    r15, k0         ! save original stack to k0
         /* User space to kernel */
-        mov     #0x20, k1
-        shll8   k1              ! k1 := 8192 (== THREAD_SIZE)
+        mov     #(THREAD_SIZE >> 8), k1
+        shll8   k1              ! k1 := THREAD_SIZE
         add     current, k1
         mov     k1, r15         ! change to kernel stack
         !
@@ -838,300 +822,3 @@ ENTRY(exception_none)
         rts
          nop
 
-        .data
-ENTRY(sys_call_table)
-        .long sys_ni_syscall    /* 0  -  old "setup()" system call*/
-        .long sys_exit
-        .long sys_fork
-        .long sys_read
-        .long sys_write
-        .long sys_open          /* 5 */
-        .long sys_close
-        .long sys_waitpid
-        .long sys_creat
-        .long sys_link
-        .long sys_unlink                /* 10 */
-        .long sys_execve
-        .long sys_chdir
-        .long sys_time
-        .long sys_mknod
-        .long sys_chmod         /* 15 */
-        .long sys_lchown16
-        .long sys_ni_syscall    /* old break syscall holder */
-        .long sys_stat
-        .long sys_lseek
-        .long sys_getpid                /* 20 */
-        .long sys_mount
-        .long sys_oldumount
-        .long sys_setuid16
-        .long sys_getuid16
-        .long sys_stime         /* 25 */
-        .long sys_ptrace
-        .long sys_alarm
-        .long sys_fstat
-        .long sys_pause
-        .long sys_utime         /* 30 */
-        .long sys_ni_syscall    /* old stty syscall holder */
-        .long sys_ni_syscall    /* old gtty syscall holder */
-        .long sys_access
-        .long sys_nice
-        .long sys_ni_syscall    /* 35 */                /* old ftime syscall holder */
-        .long sys_sync
-        .long sys_kill
-        .long sys_rename
-        .long sys_mkdir
-        .long sys_rmdir         /* 40 */
-        .long sys_dup
-        .long sys_pipe
-        .long sys_times
-        .long sys_ni_syscall    /* old prof syscall holder */
-        .long sys_brk           /* 45 */
-        .long sys_setgid16
-        .long sys_getgid16
-        .long sys_signal
-        .long sys_geteuid16
-        .long sys_getegid16     /* 50 */
-        .long sys_acct
-        .long sys_umount                /* recycled never used phys() */
-        .long sys_ni_syscall    /* old lock syscall holder */
-        .long sys_ioctl
-        .long sys_fcntl         /* 55 */
-        .long sys_ni_syscall    /* old mpx syscall holder */
-        .long sys_setpgid
-        .long sys_ni_syscall    /* old ulimit syscall holder */
-        .long sys_ni_syscall    /* sys_olduname */
-        .long sys_umask         /* 60 */
-        .long sys_chroot
-        .long sys_ustat
-        .long sys_dup2
-        .long sys_getppid
-        .long sys_getpgrp               /* 65 */
-        .long sys_setsid
-        .long sys_sigaction
-        .long sys_sgetmask
-        .long sys_ssetmask
-        .long sys_setreuid16    /* 70 */
-        .long sys_setregid16
-        .long sys_sigsuspend
-        .long sys_sigpending
-        .long sys_sethostname
-        .long sys_setrlimit     /* 75 */
-        .long sys_old_getrlimit
-        .long sys_getrusage
-        .long sys_gettimeofday
-        .long sys_settimeofday
-        .long sys_getgroups16   /* 80 */
-        .long sys_setgroups16
-        .long sys_ni_syscall    /* sys_oldselect */
-        .long sys_symlink
-        .long sys_lstat
-        .long sys_readlink              /* 85 */
-        .long sys_uselib
-        .long sys_swapon
-        .long sys_reboot
-        .long old_readdir
-        .long old_mmap          /* 90 */
-        .long sys_munmap
-        .long sys_truncate
-        .long sys_ftruncate
-        .long sys_fchmod
-        .long sys_fchown16              /* 95 */
-        .long sys_getpriority
-        .long sys_setpriority
-        .long sys_ni_syscall    /* old profil syscall holder */
-        .long sys_statfs
-        .long sys_fstatfs               /* 100 */
-        .long sys_ni_syscall    /* ioperm */
-        .long sys_socketcall
-        .long sys_syslog
-        .long sys_setitimer
-        .long sys_getitimer     /* 105 */
-        .long sys_newstat
-        .long sys_newlstat
-        .long sys_newfstat
-        .long sys_uname
-        .long sys_ni_syscall    /* 110 */ /* iopl */
-        .long sys_vhangup
-        .long sys_ni_syscall    /* idle */
-        .long sys_ni_syscall    /* vm86old */
-        .long sys_wait4
-        .long sys_swapoff               /* 115 */
-        .long sys_sysinfo
-        .long sys_ipc
-        .long sys_fsync
-        .long sys_sigreturn
-        .long sys_clone         /* 120 */
-        .long sys_setdomainname
-        .long sys_newuname
-        .long sys_ni_syscall    /* sys_modify_ldt */
-        .long sys_adjtimex
-        .long sys_mprotect              /* 125 */
-        .long sys_sigprocmask
-        .long sys_ni_syscall    /* old "create_module" */
-        .long sys_init_module
-        .long sys_delete_module
-        .long sys_ni_syscall    /* 130: old "get_kernel_syms" */
-        .long sys_quotactl
-        .long sys_getpgid
-        .long sys_fchdir
-        .long sys_bdflush
-        .long sys_sysfs         /* 135 */
-        .long sys_personality
-        .long sys_ni_syscall    /* for afs_syscall */
-        .long sys_setfsuid16
-        .long sys_setfsgid16
-        .long sys_llseek                /* 140 */
-        .long sys_getdents
-        .long sys_select
-        .long sys_flock
-        .long sys_msync
-        .long sys_readv         /* 145 */
-        .long sys_writev
-        .long sys_getsid
-        .long sys_fdatasync
-        .long sys_sysctl
-        .long sys_mlock         /* 150 */
-        .long sys_munlock
-        .long sys_mlockall
-        .long sys_munlockall
-        .long sys_sched_setparam
-        .long sys_sched_getparam   /* 155 */
-        .long sys_sched_setscheduler
-        .long sys_sched_getscheduler
-        .long sys_sched_yield
-        .long sys_sched_get_priority_max
-        .long sys_sched_get_priority_min  /* 160 */
-        .long sys_sched_rr_get_interval
-        .long sys_nanosleep
-        .long sys_mremap
-        .long sys_setresuid16
-        .long sys_getresuid16   /* 165 */
-        .long sys_ni_syscall    /* vm86 */
-        .long sys_ni_syscall    /* old "query_module" */
-        .long sys_poll
-        .long sys_nfsservctl
-        .long sys_setresgid16   /* 170 */
-        .long sys_getresgid16
-        .long sys_prctl
-        .long sys_rt_sigreturn
-        .long sys_rt_sigaction
-        .long sys_rt_sigprocmask        /* 175 */
-        .long sys_rt_sigpending
-        .long sys_rt_sigtimedwait
-        .long sys_rt_sigqueueinfo
-        .long sys_rt_sigsuspend
-        .long sys_pread_wrapper    /* 180 */
-        .long sys_pwrite_wrapper
-        .long sys_chown16
-        .long sys_getcwd
-        .long sys_capget
-        .long sys_capset           /* 185 */
-        .long sys_sigaltstack
-        .long sys_sendfile
-        .long sys_ni_syscall    /* streams1 */
-        .long sys_ni_syscall    /* streams2 */
-        .long sys_vfork            /* 190 */
-        .long sys_getrlimit
-        .long sys_mmap2
-        .long sys_truncate64
-        .long sys_ftruncate64
-        .long sys_stat64                /* 195 */
-        .long sys_lstat64
-        .long sys_fstat64
-        .long sys_lchown
-        .long sys_getuid
-        .long sys_getgid                /* 200 */
-        .long sys_geteuid
-        .long sys_getegid
-        .long sys_setreuid
-        .long sys_setregid
-        .long sys_getgroups     /* 205 */
-        .long sys_setgroups
-        .long sys_fchown
-        .long sys_setresuid
-        .long sys_getresuid
-        .long sys_setresgid     /* 210 */
-        .long sys_getresgid
-        .long sys_chown
-        .long sys_setuid
-        .long sys_setgid
-        .long sys_setfsuid              /* 215 */
-        .long sys_setfsgid
-        .long sys_pivot_root
-        .long sys_mincore
-        .long sys_madvise
-        .long sys_getdents64    /* 220 */
-        .long sys_fcntl64
-        .long sys_ni_syscall    /* reserved for TUX */
-        .long sys_ni_syscall    /* Reserved for Security */
-        .long sys_gettid
-        .long sys_readahead     /* 225 */
-        .long sys_setxattr
-        .long sys_lsetxattr
-        .long sys_fsetxattr
-        .long sys_getxattr
-        .long sys_lgetxattr     /* 230 */
-        .long sys_fgetxattr
-        .long sys_listxattr
-        .long sys_llistxattr
-        .long sys_flistxattr
-        .long sys_removexattr   /* 235 */
-        .long sys_lremovexattr
-        .long sys_fremovexattr
-        .long sys_tkill
-        .long sys_sendfile64
-        .long sys_futex         /* 240 */
-        .long sys_sched_setaffinity
-        .long sys_sched_getaffinity
-        .long sys_ni_syscall
-        .long sys_ni_syscall
-        .long sys_io_setup      /* 245 */
-        .long sys_io_destroy
-        .long sys_io_getevents
-        .long sys_io_submit
-        .long sys_io_cancel
-        .long sys_fadvise64     /* 250 */
-        .long sys_ni_syscall
-        .long sys_exit_group
-        .long sys_lookup_dcookie
-        .long sys_epoll_create
-        .long sys_epoll_ctl     /* 255 */
-        .long sys_epoll_wait
-        .long sys_remap_file_pages
-        .long sys_set_tid_address
-        .long sys_timer_create
-        .long sys_timer_settime         /* 260 */
-        .long sys_timer_gettime
-        .long sys_timer_getoverrun
-        .long sys_timer_delete
-        .long sys_clock_settime
-        .long sys_clock_gettime         /* 265 */
-        .long sys_clock_getres
-        .long sys_clock_nanosleep
-        .long sys_statfs64
-        .long sys_fstatfs64     
-        .long sys_tgkill                /* 270 */
-        .long sys_utimes
-        .long sys_fadvise64_64_wrapper
-        .long sys_ni_syscall    /* Reserved for vserver */
-        .long sys_ni_syscall    /* Reserved for mbind */
-        .long sys_ni_syscall    /* 275 - get_mempolicy */
-        .long sys_ni_syscall    /* set_mempolicy */
-        .long sys_mq_open
-        .long sys_mq_unlink
-        .long sys_mq_timedsend
-        .long sys_mq_timedreceive       /* 280 */
-        .long sys_mq_notify
-        .long sys_mq_getsetattr
-        .long sys_ni_syscall    /* Reserved for kexec */
-        .long sys_waitid
-        .long sys_add_key               /* 285 */
-        .long sys_request_key
-        .long sys_keyctl
-        .long sys_ioprio_set
-        .long sys_ioprio_get
-        .long sys_inotify_init          /* 290 */
-        .long sys_inotify_add_watch
-        .long sys_inotify_rm_watch
-
-/* End of entry.S */
diff --git a/arch/sh/kernel/head.S b/arch/sh/kernel/head.S
index 9b9e6ef626ce..f5f53d14f245 100644
--- a/arch/sh/kernel/head.S
+++ b/arch/sh/kernel/head.S
@@ -11,6 +11,18 @@
  * Head.S contains the SH exception handlers and startup code.
  */
 #include <linux/linkage.h>
+#include <asm/thread_info.h>
+
+#ifdef CONFIG_CPU_SH4A
+#define SYNCO()         synco
+
+#define PREFI(label, reg)       \
+        mov.l   label, reg;     \
+        prefi   @reg
+#else
+#define SYNCO()
+#define PREFI(label, reg)
+#endif
 
         .section        .empty_zero_page, "aw"
 ENTRY(empty_zero_page)
@@ -42,18 +54,25 @@ ENTRY(_stext)
         !                       Initialize global interrupt mask
         mov     #0, r0
         ldc     r0, r6_bank
+
+        /*
+         * Prefetch if possible to reduce cache miss penalty.
+         *
+         * We do this early on for SH-4A as a micro-optimization,
+         * as later on we will have speculative execution enabled
+         * and this will become less of an issue.
+         */
+        PREFI(5f, r0)
+        PREFI(6f, r0)
+
         !
         mov.l   2f, r0
         mov     r0, r15         ! Set initial r15 (stack pointer)
-        mov     #0x20, r1       !
-        shll8   r1              ! r1 = 8192
+        mov     #(THREAD_SIZE >> 8), r1
+        shll8   r1              ! r1 = THREAD_SIZE
         sub     r1, r0          !
         ldc     r0, r7_bank     ! ... and initial thread_info
-        !
-        !                       Additional CPU initialization
-        mov.l   6f, r0
-        jsr     @r0
-         nop
+
         !                       Clear BSS area
         mov.l   3f, r1
         add     #4, r1
@@ -62,6 +81,14 @@ ENTRY(_stext)
 9:      cmp/hs  r2, r1
         bf/s    9b              ! while (r1 < r2)
          mov.l  r0,@-r2
+
+        !                       Additional CPU initialization
+        mov.l   6f, r0
+        jsr     @r0
+         nop
+
+        SYNCO()                 ! Wait for pending instructions..
+
         !                       Start kernel
         mov.l   5f, r0
         jmp     @r0
@@ -69,7 +96,7 @@ ENTRY(_stext)
 
         .balign 4
 1:      .long   0x400080F0              ! MD=1, RB=0, BL=0, FD=1, IMASK=0xF
-2:      .long   stack
+2:      .long   init_thread_union+THREAD_SIZE
 3:      .long   __bss_start
 4:      .long   _end
 5:      .long   start_kernel
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 71c9fde2fd90..501fe03e3715 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -61,6 +61,73 @@ void memset_io(volatile void __iomem *dst, int c, unsigned long count)
 }
 EXPORT_SYMBOL(memset_io);
 
+void __raw_readsl(unsigned long addr, void *datap, int len)
+{
+        u32 *data;
+
+        for (data = datap; (len != 0) && (((u32)data & 0x1f) != 0); len--)
+                *data++ = ctrl_inl(addr);
+
+        if (likely(len >= (0x20 >> 2))) {
+                int tmp2, tmp3, tmp4, tmp5, tmp6;
+
+                __asm__ __volatile__(
+                        "1:                     \n\t"
+                        "mov.l  @%7, r0         \n\t"
+                        "mov.l  @%7, %2         \n\t"
+#ifdef CONFIG_CPU_SH4
+                        "movca.l r0, @%0        \n\t"
+#else
+                        "mov.l  r0, @%0         \n\t"
+#endif
+                        "mov.l  @%7, %3         \n\t"
+                        "mov.l  @%7, %4         \n\t"
+                        "mov.l  @%7, %5         \n\t"
+                        "mov.l  @%7, %6         \n\t"
+                        "mov.l  @%7, r7         \n\t"
+                        "mov.l  @%7, r0         \n\t"
+                        "mov.l  %2, @(0x04,%0)  \n\t"
+                        "mov    #0x20>>2, %2    \n\t"
+                        "mov.l  %3, @(0x08,%0)  \n\t"
+                        "sub    %2, %1          \n\t"
+                        "mov.l  %4, @(0x0c,%0)  \n\t"
+                        "cmp/hi %1, %2          ! T if 32 > len \n\t"
+                        "mov.l  %5, @(0x10,%0)  \n\t"
+                        "mov.l  %6, @(0x14,%0)  \n\t"
+                        "mov.l  r7, @(0x18,%0)  \n\t"
+                        "mov.l  r0, @(0x1c,%0)  \n\t"
+                        "bf.s   1b              \n\t"
+                        " add   #0x20, %0       \n\t"
+                        : "=&r" (data), "=&r" (len),
+                          "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4),
+                          "=&r" (tmp5), "=&r" (tmp6)
+                        : "r"(addr), "0" (data), "1" (len)
+                        : "r0", "r7", "t", "memory");
+        }
+
+        for (; len != 0; len--)
+                *data++ = ctrl_inl(addr);
+}
+EXPORT_SYMBOL(__raw_readsl);
+
+void __raw_writesl(unsigned long addr, const void *data, int len)
+{
+        if (likely(len != 0)) {
+                int tmp1;
+
+                __asm__ __volatile__ (
+                        "1:                             \n\t"
+                        "mov.l  @%0+, %1        \n\t"
+                        "dt             %3              \n\t"
+                        "bf.s           1b              \n\t"
+                        " mov.l %1, @%4         \n\t"
+                        : "=&r" (data), "=&r" (tmp1)
+                        : "0" (data), "r" (len), "r"(addr)
+                        : "t", "memory");
+        }
+}
+EXPORT_SYMBOL(__raw_writesl);
+
 void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
         return sh_mv.mv_ioport_map(port, nr);
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index c2e07f7f3496..c7ebd6aec951 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -1,5 +1,4 @@
-/* $Id: irq.c,v 1.20 2004/01/13 05:52:11 kkojima Exp $
- *
+/*
  * linux/arch/sh/kernel/irq.c
  *
  *      Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
@@ -7,13 +6,15 @@
  *
  * SuperH version:  Copyright (C) 1999  Niibe Yutaka
  */
-
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/kernel_stat.h>
 #include <linux/seq_file.h>
 #include <asm/irq.h>
 #include <asm/processor.h>
+#include <asm/uaccess.h>
+#include <asm/thread_info.h>
 #include <asm/cpu/mmu_context.h>
 
 /*
@@ -60,15 +61,46 @@ unlock:
 }
 #endif
 
+#ifdef CONFIG_4KSTACKS
+/*
+ * per-CPU IRQ handling contexts (thread information and stack)
+ */
+union irq_ctx {
+        struct thread_info      tinfo;
+        u32                     stack[THREAD_SIZE/sizeof(u32)];
+};
+
+static union irq_ctx *hardirq_ctx[NR_CPUS];
+static union irq_ctx *softirq_ctx[NR_CPUS];
+#endif
 
 asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
                       unsigned long r6, unsigned long r7,
                       struct pt_regs regs)
 {
         int irq = r4;
+#ifdef CONFIG_4KSTACKS
+        union irq_ctx *curctx, *irqctx;
+#endif
 
         irq_enter();
 
+#ifdef CONFIG_DEBUG_STACKOVERFLOW
+        /* Debugging check for stack overflow: is there less than 1KB free? */
+        {
+                long sp;
+
+                __asm__ __volatile__ ("and r15, %0" :
+                                        "=r" (sp) : "0" (THREAD_SIZE - 1));
+
+                if (unlikely(sp < (sizeof(struct thread_info) + STACK_WARN))) {
+                        printk("do_IRQ: stack overflow: %ld\n",
+                               sp - sizeof(struct thread_info));
+                        dump_stack();
+                }
+        }
+#endif
+
 #ifdef CONFIG_CPU_HAS_INTEVT
         __asm__ __volatile__ (
 #ifdef CONFIG_CPU_HAS_SR_RB
@@ -87,7 +119,135 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
 #endif
 
         irq = irq_demux(irq);
-        __do_IRQ(irq, &regs);
+
+#ifdef CONFIG_4KSTACKS
+        curctx = (union irq_ctx *)current_thread_info();
+        irqctx = hardirq_ctx[smp_processor_id()];
+
+        /*
+         * this is where we switch to the IRQ stack. However, if we are
+         * already using the IRQ stack (because we interrupted a hardirq
+         * handler) we can't do that and just have to keep using the
+         * current stack (which is the irq stack already after all)
+         */
+        if (curctx != irqctx) {
+                u32 *isp;
+
+                isp = (u32 *)((char *)irqctx + sizeof(*irqctx));
+                irqctx->tinfo.task = curctx->tinfo.task;
+                irqctx->tinfo.previous_sp = current_stack_pointer;
+
+                __asm__ __volatile__ (
+                        "mov    %0, r4          \n"
+                        "mov    %1, r5          \n"
+                        "mov    r15, r9         \n"
+                        "jsr    @%2             \n"
+                        /* swith to the irq stack */
+                        " mov   %3, r15         \n"
+                        /* restore the stack (ring zero) */
+                        "mov    r9, r15         \n"
+                        : /* no outputs */
+                        : "r" (irq), "r" (&regs), "r" (__do_IRQ), "r" (isp)
+                        /* XXX: A somewhat excessive clobber list? -PFM */
+                        : "memory", "r0", "r1", "r2", "r3", "r4",
+                          "r5", "r6", "r7", "r8", "t", "pr"
+                );
+        } else
+#endif
+                __do_IRQ(irq, &regs);
+
         irq_exit();
+
         return 1;
 }
+
+#ifdef CONFIG_4KSTACKS
+/*
+ * These should really be __section__(".bss.page_aligned") as well, but
+ * gcc's 3.0 and earlier don't handle that correctly.
+ */
+static char softirq_stack[NR_CPUS * THREAD_SIZE]
+                __attribute__((__aligned__(THREAD_SIZE)));
+
+static char hardirq_stack[NR_CPUS * THREAD_SIZE]
+                __attribute__((__aligned__(THREAD_SIZE)));
+
+/*
+ * allocate per-cpu stacks for hardirq and for softirq processing
+ */
+void irq_ctx_init(int cpu)
+{
+        union irq_ctx *irqctx;
+
+        if (hardirq_ctx[cpu])
+                return;
+
+        irqctx = (union irq_ctx *)&hardirq_stack[cpu * THREAD_SIZE];
+        irqctx->tinfo.task              = NULL;
+        irqctx->tinfo.exec_domain       = NULL;
+        irqctx->tinfo.cpu               = cpu;
+        irqctx->tinfo.preempt_count     = HARDIRQ_OFFSET;
+        irqctx->tinfo.addr_limit        = MAKE_MM_SEG(0);
+
+        hardirq_ctx[cpu] = irqctx;
+
+        irqctx = (union irq_ctx *)&softirq_stack[cpu * THREAD_SIZE];
+        irqctx->tinfo.task              = NULL;
+        irqctx->tinfo.exec_domain       = NULL;
+        irqctx->tinfo.cpu               = cpu;
+        irqctx->tinfo.preempt_count     = SOFTIRQ_OFFSET;
+        irqctx->tinfo.addr_limit        = MAKE_MM_SEG(0);
+
+        softirq_ctx[cpu] = irqctx;
+
+        printk("CPU %u irqstacks, hard=%p soft=%p\n",
+                cpu, hardirq_ctx[cpu], softirq_ctx[cpu]);
+}
+
+void irq_ctx_exit(int cpu)
+{
+        hardirq_ctx[cpu] = NULL;
+}
+
+extern asmlinkage void __do_softirq(void);
+
+asmlinkage void do_softirq(void)
+{
+        unsigned long flags;
+        struct thread_info *curctx;
+        union irq_ctx *irqctx;
+        u32 *isp;
+
+        if (in_interrupt())
+                return;
+
+        local_irq_save(flags);
+
+        if (local_softirq_pending()) {
+                curctx = current_thread_info();
+                irqctx = softirq_ctx[smp_processor_id()];
+                irqctx->tinfo.task = curctx->task;
+                irqctx->tinfo.previous_sp = current_stack_pointer;
+
+                /* build the stack frame on the softirq stack */
+                isp = (u32 *)((char *)irqctx + sizeof(*irqctx));
+
+                __asm__ __volatile__ (
+                        "mov    r15, r9         \n"
+                        "jsr    @%0             \n"
+                        /* switch to the softirq stack */
+                        " mov   %1, r15         \n"
+                        /* restore the thread stack */
+                        "mov    r9, r15         \n"
+                        : /* no outputs */
+                        : "r" (__do_softirq), "r" (isp)
+                        /* XXX: A somewhat excessive clobber list? -PFM */
+                        : "memory", "r0", "r1", "r2", "r3", "r4",
+                          "r5", "r6", "r7", "r8", "r9", "r15", "t", "pr"
+                );
+        }
+
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(do_softirq);
+#endif
diff --git a/arch/sh/kernel/kgdb_stub.c b/arch/sh/kernel/kgdb_stub.c
index 42638b92b51c..9c6315f0335d 100644
--- a/arch/sh/kernel/kgdb_stub.c
+++ b/arch/sh/kernel/kgdb_stub.c
@@ -101,16 +101,17 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 
+#ifdef CONFIG_SH_KGDB_CONSOLE
+#include <linux/console.h>
+#endif
+
 #include <asm/system.h>
 #include <asm/current.h>
 #include <asm/signal.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
 #include <asm/kgdb.h>
-
-#ifdef CONFIG_SH_KGDB_CONSOLE
-#include <linux/console.h>
-#endif
+#include <asm/io.h>
 
 /* Function pointers for linkage */
 kgdb_debug_hook_t *kgdb_debug_hook;
@@ -240,7 +241,6 @@ static jmp_buf rem_com_env;
 /* Misc static */
 static int stepped_address;
 static short stepped_opcode;
-static const char hexchars[] = "0123456789abcdef";
 static char in_buffer[BUFMAX];
 static char out_buffer[OUTBUFMAX];
 
@@ -253,29 +253,6 @@ typedef unsigned char threadref[8];
 #define BUF_THREAD_ID_SIZE 16
 #endif
 
-/* Return addr as a real volatile address */
-static inline unsigned int ctrl_inl(const unsigned long addr)
-{
-        return *(volatile unsigned long *) addr;
-}
-
-/* Correctly set *addr using volatile */
-static inline void ctrl_outl(const unsigned int b, unsigned long addr)
-{
-        *(volatile unsigned long *) addr = b;
-}
-
-/* Get high hex bits */
-static char highhex(const int x)
-{
-        return hexchars[(x >> 4) & 0xf];
-}
-
-/* Get low hex bits */
-static char lowhex(const int x)
-{
-        return hexchars[x & 0xf];
-}
 
 /* Convert ch to hex */
 static int hex(const char ch)
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c
index 6bcd8d92399f..08587cdb64d6 100644
--- a/arch/sh/kernel/machine_kexec.c
+++ b/arch/sh/kernel/machine_kexec.c
@@ -29,12 +29,6 @@ extern const unsigned char relocate_new_kernel[];
 extern const unsigned int relocate_new_kernel_size;
 extern void *gdb_vbr_vector;
 
-/*
- * Provide a dummy crash_notes definition while crash dump arrives to ppc.
- * This prevents breakage of crash_notes attribute in kernel/ksysfs.c.
- */
-void *crash_notes = NULL;
-
 void machine_shutdown(void)
 {
 }
diff --git a/arch/sh/kernel/pm.c b/arch/sh/kernel/pm.c
new file mode 100644
index 000000000000..10ab62c9aede
--- /dev/null
+++ b/arch/sh/kernel/pm.c
@@ -0,0 +1,88 @@
+/*
+ * Generic Power Management Routine
+ *
+ * Copyright (c) 2006 Andriy Skulysh <askulsyh@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License.
+ */
+#include <linux/suspend.h>
+#include <linux/delay.h>
+#include <linux/gfp.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+#include <asm/watchdog.h>
+#include <asm/pm.h>
+
+#define INTR_OFFSET     0x600
+
+#define STBCR           0xffffff82
+#define STBCR2          0xffffff88
+
+#define STBCR_STBY      0x80
+#define STBCR_MSTP2     0x04
+
+#define MCR             0xffffff68
+#define RTCNT           0xffffff70
+
+#define MCR_RMODE       2
+#define MCR_RFSH        4
+
+void pm_enter(void)
+{
+        u8 stbcr, csr;
+        u16 frqcr, mcr;
+        u32 vbr_new, vbr_old;
+
+        set_bl_bit();
+
+        /* set wdt */
+        csr = sh_wdt_read_csr();
+        csr &= ~WTCSR_TME;
+        csr |= WTCSR_CKS_4096;
+        sh_wdt_write_csr(csr);
+        csr = sh_wdt_read_csr();
+        sh_wdt_write_cnt(0);
+
+        /* disable PLL1 */
+        frqcr = ctrl_inw(FRQCR);
+        frqcr &= ~(FRQCR_PLLEN | FRQCR_PSTBY);
+        ctrl_outw(frqcr, FRQCR);
+
+        /* enable standby */
+        stbcr = ctrl_inb(STBCR);
+        ctrl_outb(stbcr | STBCR_STBY | STBCR_MSTP2, STBCR);
+
+        /* set self-refresh */
+        mcr = ctrl_inw(MCR);
+        ctrl_outw(mcr & ~MCR_RFSH, MCR);
+
+        /* set interrupt handler */
+        asm volatile("stc vbr, %0" : "=r" (vbr_old));
+        vbr_new = get_zeroed_page(GFP_ATOMIC);
+        udelay(50);
+        memcpy((void*)(vbr_new + INTR_OFFSET),
+               &wakeup_start, &wakeup_end - &wakeup_start);
+        asm volatile("ldc %0, vbr" : : "r" (vbr_new));
+
+        ctrl_outw(0, RTCNT);
+        ctrl_outw(mcr | MCR_RFSH | MCR_RMODE, MCR);
+
+        cpu_sleep();
+
+        asm volatile("ldc %0, vbr" : : "r" (vbr_old));
+
+        free_page(vbr_new);
+
+        /* enable PLL1 */
+        frqcr = ctrl_inw(FRQCR);
+        frqcr |= FRQCR_PSTBY;
+        ctrl_outw(frqcr, FRQCR);
+        udelay(50);
+        frqcr |= FRQCR_PLLEN;
+        ctrl_outw(frqcr, FRQCR);
+
+        ctrl_outb(stbcr, STBCR);
+
+        clear_bl_bit();
+}
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index f2031314cb2b..0b1d5dd7a93b 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -81,16 +81,6 @@ void cpu_idle(void)
 
 void machine_restart(char * __unused)
 {
-
-#ifdef CONFIG_KEXEC
-        struct kimage *image;
-        image = xchg(&kexec_image, 0);
-        if (image) {
-                machine_shutdown();
-                machine_kexec(image);
-        }
-#endif
-
         /* SR.BL=1 and invoke address error to let CPU reset (manual reset) */
         asm volatile("ldc %0, sr\n\t"
                      "mov.l @%1, %0" : : "r" (0x10000000), "r" (0x80000001));
@@ -263,6 +253,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
+        struct thread_info *ti = task_thread_info(p);
         struct pt_regs *childregs;
 #if defined(CONFIG_SH_FPU)
         struct task_struct *tsk = current;
@@ -277,8 +268,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 
         if (user_mode(regs)) {
                 childregs->regs[15] = usp;
+                ti->addr_limit = USER_DS;
         } else {
                 childregs->regs[15] = (unsigned long)task_stack_page(p) + THREAD_SIZE;
+                ti->addr_limit = KERNEL_DS;
         }
         if (clone_flags & CLONE_SETTLS) {
                 childregs->gbr = childregs->regs[0];
@@ -299,13 +292,15 @@ ubc_set_tracing(int asid, unsigned long pc)
 {
         ctrl_outl(pc, UBC_BARA);
 
+#ifdef CONFIG_MMU
         /* We don't have any ASID settings for the SH-2! */
         if (cpu_data->type != CPU_SH7604)
                 ctrl_outb(asid, UBC_BASRA);
+#endif
 
         ctrl_outl(0, UBC_BAMRA);
 
-        if (cpu_data->type == CPU_SH7729) {
+        if (cpu_data->type == CPU_SH7729 || cpu_data->type == CPU_SH7710) {
                 ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA);
                 ctrl_outl(BRCR_PCBA | BRCR_PCTE, UBC_BRCR);
         } else {
@@ -344,6 +339,7 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
         }
 #endif
 
+#ifdef CONFIG_MMU
         /*
          * Restore the kernel mode register
          *      k7 (r7_bank1)
@@ -351,19 +347,21 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
         asm volatile("ldc       %0, r7_bank"
                      : /* no output */
                      : "r" (task_thread_info(next)));
+#endif
 
-#ifdef CONFIG_MMU
         /* If no tasks are using the UBC, we're done */
         if (ubc_usercnt == 0)
                 /* If no tasks are using the UBC, we're done */;
         else if (next->thread.ubc_pc && next->mm) {
-                ubc_set_tracing(next->mm->context & MMU_CONTEXT_ASID_MASK,
-                                next->thread.ubc_pc);
+                int asid = 0;
+#ifdef CONFIG_MMU
+                asid |= next->mm->context.id & MMU_CONTEXT_ASID_MASK;
+#endif
+                ubc_set_tracing(asid, next->thread.ubc_pc);
         } else {
                 ctrl_outw(0, UBC_BBRA);
                 ctrl_outw(0, UBC_BBRB);
         }
-#endif
 
         return prev;
 }
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index f7eebbde3291..04ca13a041c1 100644
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -224,7 +224,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
         case PTRACE_SETDSPREGS: {
                 unsigned long dp;
-                int i;
 
                 ret = -EIO;
                 dp = ((unsigned long) child) + THREAD_SIZE -
diff --git a/arch/sh/kernel/semaphore.c b/arch/sh/kernel/semaphore.c
index a3c24dcbf01d..184119eeae56 100644
--- a/arch/sh/kernel/semaphore.c
+++ b/arch/sh/kernel/semaphore.c
@@ -14,7 +14,7 @@
 #include <asm/semaphore.h>
 #include <asm/semaphore-helper.h>
 
-spinlock_t semaphore_wake_lock;
+DEFINE_SPINLOCK(semaphore_wake_lock);
 
 /*
  * Semaphores are implemented using a two-way counter:
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index e75189cb1db7..5f587332234a 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -43,27 +43,14 @@ extern void * __rd_start, * __rd_end;
  * The bigger value means no problem.
  */
 struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };
+#ifdef CONFIG_VT
 struct screen_info screen_info;
+#endif
 
 #if defined(CONFIG_SH_UNKNOWN)
 struct sh_machine_vector sh_mv;
 #endif
 
-/* We need this to satisfy some external references. */
-struct screen_info screen_info = {
-        0, 25,                  /* orig-x, orig-y */
-        0,                      /* unused */
-        0,                      /* orig-video-page */
-        0,                      /* orig-video-mode */
-        80,                     /* orig-video-cols */
-        0,0,0,                  /* ega_ax, ega_bx, ega_cx */
-        25,                     /* orig-video-lines */
-        0,                      /* orig-video-isVGA */
-        16                      /* orig-video-points */
-};
-
-extern void platform_setup(void);
-extern char *get_system_type(void);
 extern int root_mountflags;
 
 #define MV_NAME_SIZE 32
@@ -90,29 +77,8 @@ static struct sh_machine_vector* __init get_mv_byname(const char* name);
 
 static char command_line[COMMAND_LINE_SIZE] = { 0, };
 
-struct resource standard_io_resources[] = {
-        { "dma1", 0x00, 0x1f },
-        { "pic1", 0x20, 0x3f },
-        { "timer", 0x40, 0x5f },
-        { "keyboard", 0x60, 0x6f },
-        { "dma page reg", 0x80, 0x8f },
-        { "pic2", 0xa0, 0xbf },
-        { "dma2", 0xc0, 0xdf },
-        { "fpu", 0xf0, 0xff }
-};
-
-#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
-
-/* System RAM - interrupted by the 640kB-1M hole */
-#define code_resource (ram_resources[3])
-#define data_resource (ram_resources[4])
-static struct resource ram_resources[] = {
-        { "System RAM", 0x000000, 0x09ffff, IORESOURCE_BUSY },
-        { "System RAM", 0x100000, 0x100000, IORESOURCE_BUSY },
-        { "Video RAM area", 0x0a0000, 0x0bffff },
-        { "Kernel code", 0x100000, 0 },
-        { "Kernel data", 0, 0 }
-};
+static struct resource code_resource = { .name = "Kernel code", };
+static struct resource data_resource = { .name = "Kernel data", };
 
 unsigned long memory_start, memory_end;
 
@@ -145,6 +111,24 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
                                 memory_end = memory_start + mem_size;
                         }
                 }
+
+#ifdef CONFIG_EARLY_PRINTK
+                if (c == ' ' && !memcmp(from, "earlyprintk=", 12)) {
+                        char *ep_end;
+
+                        if (to != command_line)
+                                to--;
+
+                        from += 12;
+                        ep_end = strchr(from, ' ');
+
+                        setup_early_printk(from);
+                        printk("early console enabled\n");
+
+                        from = ep_end;
+                }
+#endif
+
                 if (c == ' ' && !memcmp(from, "sh_mv=", 6)) {
                         char* mv_end;
                         char* mv_comma;
@@ -237,6 +221,9 @@ static int __init sh_mv_setup(char **cmdline_p)
         __set_io_port_base(mv_io_base);
 #endif
 
+        if (!sh_mv.mv_nr_irqs)
+                sh_mv.mv_nr_irqs = NR_IRQS;
+
         return 0;
 }
 
@@ -245,11 +232,6 @@ void __init setup_arch(char **cmdline_p)
         unsigned long bootmap_size;
         unsigned long start_pfn, max_pfn, max_low_pfn;
 
-#ifdef CONFIG_EARLY_PRINTK
-        extern void enable_early_printk(void);
-
-        enable_early_printk();
-#endif
 #ifdef CONFIG_CMDLINE_BOOL
         strcpy(COMMAND_LINE, CONFIG_CMDLINE);
 #endif
@@ -368,14 +350,14 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
         /* Perform the machine specific initialisation */
-        platform_setup();
+        if (likely(sh_mv.mv_setup))
+                sh_mv.mv_setup(cmdline_p);
 
         paging_init();
 }
 
 struct sh_machine_vector* __init get_mv_byname(const char* name)
 {
-        extern int strcasecmp(const char *, const char *);
         extern long __machvec_start, __machvec_end;
         struct sh_machine_vector *all_vecs =
                 (struct sh_machine_vector *)&__machvec_start;
@@ -410,25 +392,18 @@ static int __init topology_init(void)
 subsys_initcall(topology_init);
 
 static const char *cpu_name[] = {
-        [CPU_SH7604]    = "SH7604",
-        [CPU_SH7705]    = "SH7705",
-        [CPU_SH7708]    = "SH7708",
-        [CPU_SH7729]    = "SH7729",
-        [CPU_SH7300]    = "SH7300",
-        [CPU_SH7750]    = "SH7750",
-        [CPU_SH7750S]   = "SH7750S",
-        [CPU_SH7750R]   = "SH7750R",
-        [CPU_SH7751]    = "SH7751",
-        [CPU_SH7751R]   = "SH7751R",
-        [CPU_SH7760]    = "SH7760",
-        [CPU_SH73180]   = "SH73180",
-        [CPU_ST40RA]    = "ST40RA",
-        [CPU_ST40GX1]   = "ST40GX1",
-        [CPU_SH4_202]   = "SH4-202",
-        [CPU_SH4_501]   = "SH4-501",
-        [CPU_SH7770]    = "SH7770",
-        [CPU_SH7780]    = "SH7780",
-        [CPU_SH7781]    = "SH7781",
+        [CPU_SH7604]    = "SH7604",     [CPU_SH7300]    = "SH7300",
+        [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
+        [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
+        [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",
+        [CPU_SH7729]    = "SH7729",     [CPU_SH7750]    = "SH7750",
+        [CPU_SH7750S]   = "SH7750S",    [CPU_SH7750R]   = "SH7750R",
+        [CPU_SH7751]    = "SH7751",     [CPU_SH7751R]   = "SH7751R",
+        [CPU_SH7760]    = "SH7760",     [CPU_SH73180]   = "SH73180",
+        [CPU_ST40RA]    = "ST40RA",     [CPU_ST40GX1]   = "ST40GX1",
+        [CPU_SH4_202]   = "SH4-202",    [CPU_SH4_501]   = "SH4-501",
+        [CPU_SH7770]    = "SH7770",     [CPU_SH7780]    = "SH7780",
+        [CPU_SH7781]    = "SH7781",     [CPU_SH7343]    = "SH7343",
         [CPU_SH_NONE]   = "Unknown"
 };
 
@@ -438,8 +413,10 @@ const char *get_cpu_subtype(void)
 }
 
 #ifdef CONFIG_PROC_FS
+/* Symbolic CPU flags, keep in sync with asm/cpu-features.h */
 static const char *cpu_flags[] = {
-        "none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr", "ptea", NULL
+        "none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr",
+        "ptea", "llsc", "l2", NULL
 };
 
 static void show_cpuflags(struct seq_file *m)
@@ -460,7 +437,8 @@ static void show_cpuflags(struct seq_file *m)
         seq_printf(m, "\n");
 }
 
-static void show_cacheinfo(struct seq_file *m, const char *type, struct cache_info info)
+static void show_cacheinfo(struct seq_file *m, const char *type,
+                           struct cache_info info)
 {
         unsigned int cache_size;
 
@@ -493,7 +471,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
          * unified cache on the SH-2 and SH-3, as well as the harvard
          * style cache on the SH-4.
          */
-        if (test_bit(SH_CACHE_COMBINED, &(boot_cpu_data.icache.flags))) {
+        if (boot_cpu_data.icache.flags & SH_CACHE_COMBINED) {
                 seq_printf(m, "unified\n");
                 show_cacheinfo(m, "cache", boot_cpu_data.icache);
         } else {
@@ -502,6 +480,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 show_cacheinfo(m, "dcache", boot_cpu_data.dcache);
         }
 
+        /* Optional secondary cache */
+        if (boot_cpu_data.flags & CPU_HAS_L2_CACHE)
+                show_cacheinfo(m, "scache", boot_cpu_data.scache);
+
         seq_printf(m, "bogomips\t: %lu.%02lu\n",
                      boot_cpu_data.loops_per_jiffy/(500000/HZ),
                      (boot_cpu_data.loops_per_jiffy/(5000/HZ)) % 100);
@@ -617,4 +599,3 @@ static int __init kgdb_parse_options(char *options)
 }
 __setup("kgdb=", kgdb_parse_options);
 #endif /* CONFIG_SH_KGDB */
-
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 245ed8f945e8..d3cbfa2ad4a7 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -27,21 +27,11 @@ EXPORT_SYMBOL(sh_mv);
 
 /* platform dependent support */
 EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(iounmap);
-EXPORT_SYMBOL(enable_irq);
-EXPORT_SYMBOL(disable_irq);
-EXPORT_SYMBOL(probe_irq_mask);
 EXPORT_SYMBOL(kernel_thread);
-EXPORT_SYMBOL(disable_irq_nosync);
 EXPORT_SYMBOL(irq_desc);
 EXPORT_SYMBOL(no_irq_type);
 
-EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strncat);
 
 /* PCI exports */
 #ifdef CONFIG_PCI
@@ -52,13 +42,8 @@ EXPORT_SYMBOL(pci_free_consistent);
 /* mem exports */
 EXPORT_SYMBOL(memchr);
 EXPORT_SYMBOL(memcpy);
-EXPORT_SYMBOL(memcpy_fromio);
-EXPORT_SYMBOL(memcpy_toio);
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(memset_io);
 EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(memcmp);
-EXPORT_SYMBOL(memscan);
 EXPORT_SYMBOL(__copy_user);
 EXPORT_SYMBOL(boot_cpu_data);
 
@@ -94,7 +79,9 @@ EXPORT_SYMBOL(strcpy);
 DECLARE_EXPORT(__movstr_i4_even);
 DECLARE_EXPORT(__movstr_i4_odd);
 DECLARE_EXPORT(__movstrSI12_i4);
+#endif
 
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
 /* needed by some modules */
 EXPORT_SYMBOL(flush_cache_all);
 EXPORT_SYMBOL(flush_cache_range);
@@ -102,11 +89,9 @@ EXPORT_SYMBOL(flush_dcache_page);
 EXPORT_SYMBOL(__flush_purge_region);
 #endif
 
-#if defined(CONFIG_SH7705_CACHE_32KB)
-EXPORT_SYMBOL(flush_cache_all);
-EXPORT_SYMBOL(flush_cache_range);
-EXPORT_SYMBOL(flush_dcache_page);
-EXPORT_SYMBOL(__flush_purge_region);
+#if defined(CONFIG_MMU) && (defined(CONFIG_CPU_SH4) || \
+        defined(CONFIG_SH7705_CACHE_32KB))
+EXPORT_SYMBOL(clear_user_page);
 #endif
 
 EXPORT_SYMBOL(flush_tlb_page);
@@ -116,7 +101,12 @@ EXPORT_SYMBOL(__down_trylock);
 EXPORT_SYMBOL(synchronize_irq);
 #endif
 
+#ifdef CONFIG_PM
+EXPORT_SYMBOL(pm_suspend);
+#endif
+
 EXPORT_SYMBOL(csum_partial);
+#ifdef CONFIG_IPV6
 EXPORT_SYMBOL(csum_ipv6_magic);
-EXPORT_SYMBOL(consistent_sync);
+#endif
 EXPORT_SYMBOL(clear_page);
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c
index b475c4d2405f..5213f5bc6ce0 100644
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal.c
@@ -8,7 +8,6 @@
  *  SuperH version:  Copyright (C) 1999, 2000  Niibe Yutaka & Kaz Kojima
  *
  */
-
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
@@ -21,6 +20,7 @@
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/tty.h>
+#include <linux/elf.h>
 #include <linux/personality.h>
 #include <linux/binfmts.h>
 
@@ -29,12 +29,8 @@
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
 
-#define DEBUG_SIG 0
-
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
-
 /*
  * Atomically swap in the new signal mask, and wait for a signal.
  */
@@ -43,51 +39,17 @@ sys_sigsuspend(old_sigset_t mask,
                unsigned long r5, unsigned long r6, unsigned long r7,
                struct pt_regs regs)
 {
-        sigset_t saveset;
-
         mask &= _BLOCKABLE;
         spin_lock_irq(&current->sighand->siglock);
-        saveset = current->blocked;
+        current->saved_sigmask = current->blocked;
         siginitset(&current->blocked, mask);
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
 
-        regs.regs[0] = -EINTR;
-        while (1) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                if (do_signal(&regs, &saveset))
-                        return -EINTR;
-        }
-}
-
-asmlinkage int
-sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize,
-                  unsigned long r6, unsigned long r7,
-                  struct pt_regs regs)
-{
-        sigset_t saveset, newset;
-
-        /* XXX: Don't preclude handling different sized sigset_t's.  */
-        if (sigsetsize != sizeof(sigset_t))
-                return -EINVAL;
-
-        if (copy_from_user(&newset, unewset, sizeof(newset)))
-                return -EFAULT;
-        sigdelsetmask(&newset, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        saveset = current->blocked;
-        current->blocked = newset;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-
-        regs.regs[0] = -EINTR;
-        while (1) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                if (do_signal(&regs, &saveset))
-                        return -EINTR;
-        }
+        current->state = TASK_INTERRUPTIBLE;
+        schedule();
+        set_thread_flag(TIF_RESTORE_SIGMASK);
+        return -ERESTARTNOHAND;
 }
 
 asmlinkage int 
@@ -348,7 +310,12 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
         return (void __user *)((sp - frame_size) & -8ul);
 }
 
-static void setup_frame(int sig, struct k_sigaction *ka,
+/* These symbols are defined with the addresses in the vsyscall page.
+   See vsyscall-trapa.S.  */
+extern void __user __kernel_sigreturn;
+extern void __user __kernel_rt_sigreturn;
+
+static int setup_frame(int sig, struct k_sigaction *ka,
                         sigset_t *set, struct pt_regs *regs)
 {
         struct sigframe __user *frame;
@@ -368,15 +335,18 @@ static void setup_frame(int sig, struct k_sigaction *ka,
 
         err |= setup_sigcontext(&frame->sc, regs, set->sig[0]);
 
-        if (_NSIG_WORDS > 1) {
+        if (_NSIG_WORDS > 1)
                 err |= __copy_to_user(frame->extramask, &set->sig[1],
                                       sizeof(frame->extramask));
-        }
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
         if (ka->sa.sa_flags & SA_RESTORER) {
                 regs->pr = (unsigned long) ka->sa.sa_restorer;
+#ifdef CONFIG_VSYSCALL
+        } else if (likely(current->mm->context.vdso)) {
+                regs->pr = VDSO_SYM(&__kernel_sigreturn);
+#endif
         } else {
                 /* Generate return code (system call to sigreturn) */
                 err |= __put_user(MOVW(7), &frame->retcode[0]);
@@ -402,21 +372,22 @@ static void setup_frame(int sig, struct k_sigaction *ka,
 
         set_fs(USER_DS);
 
-#if DEBUG_SIG
-        printk("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
-                current->comm, current->pid, frame, regs->pc, regs->pr);
-#endif
+        pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
+                 current->comm, current->pid, frame, regs->pc, regs->pr);
 
         flush_cache_sigtramp(regs->pr);
+
         if ((-regs->pr & (L1_CACHE_BYTES-1)) < sizeof(frame->retcode))
                 flush_cache_sigtramp(regs->pr + L1_CACHE_BYTES);
-        return;
+
+        return 0;
 
 give_sigsegv:
         force_sigsegv(sig, current);
+        return -EFAULT;
 }
 
-static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                            sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
@@ -452,6 +423,10 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
            already in userspace.  */
         if (ka->sa.sa_flags & SA_RESTORER) {
                 regs->pr = (unsigned long) ka->sa.sa_restorer;
+#ifdef CONFIG_VSYSCALL
+        } else if (likely(current->mm->context.vdso)) {
+                regs->pr = VDSO_SYM(&__kernel_rt_sigreturn);
+#endif
         } else {
                 /* Generate return code (system call to rt_sigreturn) */
                 err |= __put_user(MOVW(7), &frame->retcode[0]);
@@ -477,28 +452,31 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         set_fs(USER_DS);
 
-#if DEBUG_SIG
-        printk("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
-                current->comm, current->pid, frame, regs->pc, regs->pr);
-#endif
+        pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
+                 current->comm, current->pid, frame, regs->pc, regs->pr);
 
         flush_cache_sigtramp(regs->pr);
+
         if ((-regs->pr & (L1_CACHE_BYTES-1)) < sizeof(frame->retcode))
                 flush_cache_sigtramp(regs->pr + L1_CACHE_BYTES);
-        return;
+
+        return 0;
 
 give_sigsegv:
         force_sigsegv(sig, current);
+        return -EFAULT;
 }
 
 /*
  * OK, we're invoking a handler
  */
 
-static void
+static int
 handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
               sigset_t *oldset, struct pt_regs *regs)
 {
+        int ret;
+
         /* Are we from a system call? */
         if (regs->tra >= 0) {
                 /* If so, check system call restarting.. */
@@ -539,19 +517,23 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
 
         /* Set up the stack frame */
         if (ka->sa.sa_flags & SA_SIGINFO)
-                setup_rt_frame(sig, ka, info, oldset, regs);
+                ret = setup_rt_frame(sig, ka, info, oldset, regs);
         else
-                setup_frame(sig, ka, oldset, regs);
+                ret = setup_frame(sig, ka, oldset, regs);
 
         if (ka->sa.sa_flags & SA_ONESHOT)
                 ka->sa.sa_handler = SIG_DFL;
 
-        spin_lock_irq(&current->sighand->siglock);
-        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-        if (!(ka->sa.sa_flags & SA_NODEFER))
-                sigaddset(&current->blocked,sig);
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        if (ret == 0) {
+                spin_lock_irq(&current->sighand->siglock);
+                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+                if (!(ka->sa.sa_flags & SA_NODEFER))
+                        sigaddset(&current->blocked,sig);
+                recalc_sigpending();
+                spin_unlock_irq(&current->sighand->siglock);
+        }
+
+        return ret;
 }
 
 /*
@@ -563,11 +545,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
  * the kernel can handle, and then we build all the user-level signal handling
  * stack-frames in one go after that.
  */
-int do_signal(struct pt_regs *regs, sigset_t *oldset)
+static void do_signal(struct pt_regs *regs, unsigned int save_r0)
 {
         siginfo_t info;
         int signr;
         struct k_sigaction ka;
+        sigset_t *oldset;
 
         /*
          * We want the common case to go fast, which
@@ -576,19 +559,27 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
          * if so.
          */
         if (!user_mode(regs))
-                return 1;
+                return;
 
         if (try_to_freeze())
                 goto no_signal;
 
-        if (!oldset)
+        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                oldset = &current->saved_sigmask;
+        else
                 oldset = &current->blocked;
 
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
         if (signr > 0) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &ka, &info, oldset, regs);
-                return 1;
+                if (handle_signal(signr, &ka, &info, oldset, regs) == 0) {
+                        /* a signal was successfully delivered; the saved
+                         * sigmask will have been stored in the signal frame,
+                         * and will be restored by sigreturn, so we can simply
+                         * clear the TIF_RESTORE_SIGMASK flag */
+                        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                }
         }
 
  no_signal:
@@ -597,10 +588,27 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
                 /* Restart the system call - no handlers present */
                 if (regs->regs[0] == -ERESTARTNOHAND ||
                     regs->regs[0] == -ERESTARTSYS ||
-                    regs->regs[0] == -ERESTARTNOINTR ||
-                    regs->regs[0] == -ERESTART_RESTARTBLOCK) {
+                    regs->regs[0] == -ERESTARTNOINTR) {
+                        regs->regs[0] = save_r0;
+                        regs->pc -= 2;
+                } else if (regs->regs[0] == -ERESTART_RESTARTBLOCK) {
                         regs->pc -= 2;
+                        regs->regs[3] = __NR_restart_syscall;
                 }
         }
-        return 0;
+
+        /* if there's no signal to deliver, we just put the saved sigmask
+         * back */
+        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
+                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
+        }
+}
+
+asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0,
+                                 __u32 thread_info_flags)
+{
+        /* deal with pending signal delivery */
+        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
+                do_signal(regs, save_r0);
 }
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c
index 917b2f32f260..b68ff705f067 100644
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@@ -21,7 +21,8 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
-
+#include <linux/module.h>
+#include <asm/cacheflush.h>
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
 
@@ -44,11 +45,16 @@ asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,
         return error;
 }
 
-#if defined(HAVE_ARCH_UNMAPPED_AREA)
+unsigned long shm_align_mask = PAGE_SIZE - 1;   /* Sane caches */
+
+EXPORT_SYMBOL(shm_align_mask);
+
 /*
- * To avoid cache alias, we map the shard page with same color.
+ * To avoid cache aliases, we map the shared page with same color.
  */
-#define COLOUR_ALIGN(addr)      (((addr)+SHMLBA-1)&~(SHMLBA-1))
+#define COLOUR_ALIGN(addr, pgoff)                               \
+        ((((addr) + shm_align_mask) & ~shm_align_mask) +        \
+         (((pgoff) << PAGE_SHIFT) & shm_align_mask))
 
 unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
         unsigned long len, unsigned long pgoff, unsigned long flags)
@@ -56,43 +62,52 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma;
         unsigned long start_addr;
+        int do_colour_align;
 
         if (flags & MAP_FIXED) {
                 /* We do not accept a shared mapping if it would violate
                  * cache aliasing constraints.
                  */
-                if ((flags & MAP_SHARED) && (addr & (SHMLBA - 1)))
+                if ((flags & MAP_SHARED) && (addr & shm_align_mask))
                         return -EINVAL;
                 return addr;
         }
 
-        if (len > TASK_SIZE)
+        if (unlikely(len > TASK_SIZE))
                 return -ENOMEM;
 
+        do_colour_align = 0;
+        if (filp || (flags & MAP_SHARED))
+                do_colour_align = 1;
+
         if (addr) {
-                if (flags & MAP_PRIVATE)
-                        addr = PAGE_ALIGN(addr);
+                if (do_colour_align)
+                        addr = COLOUR_ALIGN(addr, pgoff);
                 else
-                        addr = COLOUR_ALIGN(addr);
+                        addr = PAGE_ALIGN(addr);
+
                 vma = find_vma(mm, addr);
                 if (TASK_SIZE - len >= addr &&
                     (!vma || addr + len <= vma->vm_start))
                         return addr;
         }
-        if (len <= mm->cached_hole_size) {
+
+        if (len > mm->cached_hole_size) {
+                start_addr = addr = mm->free_area_cache;
+        } else {
                 mm->cached_hole_size = 0;
-                mm->free_area_cache = TASK_UNMAPPED_BASE;
+                start_addr = addr = TASK_UNMAPPED_BASE;
         }
-        if (flags & MAP_PRIVATE)
-                addr = PAGE_ALIGN(mm->free_area_cache);
-        else
-                addr = COLOUR_ALIGN(mm->free_area_cache);
-        start_addr = addr;
 
 full_search:
+        if (do_colour_align)
+                addr = COLOUR_ALIGN(addr, pgoff);
+        else
+                addr = PAGE_ALIGN(mm->free_area_cache);
+
         for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
                 /* At this point:  (!vma || addr < vma->vm_end). */
-                if (TASK_SIZE - len < addr) {
+                if (unlikely(TASK_SIZE - len < addr)) {
                         /*
                          * Start a new search - just in case we missed
                          * some holes.
@@ -104,7 +119,7 @@ full_search:
                         }
                         return -ENOMEM;
                 }
-                if (!vma || addr + len <= vma->vm_start) {
+                if (likely(!vma || addr + len <= vma->vm_start)) {
                         /*
                          * Remember the place where we stopped the search:
                          */
@@ -115,11 +130,10 @@ full_search:
                         mm->cached_hole_size = vma->vm_start - addr;
 
                 addr = vma->vm_end;
-                if (!(flags & MAP_PRIVATE))
-                        addr = COLOUR_ALIGN(addr);
+                if (do_colour_align)
+                        addr = COLOUR_ALIGN(addr, pgoff);
         }
 }
-#endif
 
 static inline long
 do_mmap2(unsigned long addr, unsigned long len, unsigned long prot, 
diff --git a/arch/sh/kernel/syscalls.S b/arch/sh/kernel/syscalls.S
new file mode 100644
index 000000000000..768334e95075
--- /dev/null
+++ b/arch/sh/kernel/syscalls.S
@@ -0,0 +1,353 @@
+/*
+ * arch/sh/kernel/syscalls.S
+ *
+ * System call table for SuperH
+ *
+ *  Copyright (C) 1999, 2000, 2002  Niibe Yutaka
+ *  Copyright (C) 2003  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/sys.h>
+#include <linux/linkage.h>
+
+#if !defined(CONFIG_NFSD) && !defined(CONFIG_NFSD_MODULE)
+#define sys_nfsservctl          sys_ni_syscall
+#endif
+
+#if !defined(CONFIG_MMU)
+#define sys_madvise             sys_ni_syscall
+#define sys_readahead           sys_ni_syscall
+#define sys_mprotect            sys_ni_syscall
+#define sys_msync               sys_ni_syscall
+#define sys_mlock               sys_ni_syscall
+#define sys_munlock             sys_ni_syscall
+#define sys_mlockall            sys_ni_syscall
+#define sys_munlockall          sys_ni_syscall
+#define sys_mremap              sys_ni_syscall
+#define sys_mincore             sys_ni_syscall
+#define sys_remap_file_pages    sys_ni_syscall
+#endif
+
+        .data
+ENTRY(sys_call_table)
+        .long sys_restart_syscall       /* 0  -  old "setup()" system call*/
+        .long sys_exit
+        .long sys_fork
+        .long sys_read
+        .long sys_write
+        .long sys_open          /* 5 */
+        .long sys_close
+        .long sys_waitpid
+        .long sys_creat
+        .long sys_link
+        .long sys_unlink                /* 10 */
+        .long sys_execve
+        .long sys_chdir
+        .long sys_time
+        .long sys_mknod
+        .long sys_chmod         /* 15 */
+        .long sys_lchown16
+        .long sys_ni_syscall    /* old break syscall holder */
+        .long sys_stat
+        .long sys_lseek
+        .long sys_getpid                /* 20 */
+        .long sys_mount
+        .long sys_oldumount
+        .long sys_setuid16
+        .long sys_getuid16
+        .long sys_stime         /* 25 */
+        .long sys_ptrace
+        .long sys_alarm
+        .long sys_fstat
+        .long sys_pause
+        .long sys_utime         /* 30 */
+        .long sys_ni_syscall    /* old stty syscall holder */
+        .long sys_ni_syscall    /* old gtty syscall holder */
+        .long sys_access
+        .long sys_nice
+        .long sys_ni_syscall    /* 35 */                /* old ftime syscall holder */
+        .long sys_sync
+        .long sys_kill
+        .long sys_rename
+        .long sys_mkdir
+        .long sys_rmdir         /* 40 */
+        .long sys_dup
+        .long sys_pipe
+        .long sys_times
+        .long sys_ni_syscall    /* old prof syscall holder */
+        .long sys_brk           /* 45 */
+        .long sys_setgid16
+        .long sys_getgid16
+        .long sys_signal
+        .long sys_geteuid16
+        .long sys_getegid16     /* 50 */
+        .long sys_acct
+        .long sys_umount                /* recycled never used phys() */
+        .long sys_ni_syscall    /* old lock syscall holder */
+        .long sys_ioctl
+        .long sys_fcntl         /* 55 */
+        .long sys_ni_syscall    /* old mpx syscall holder */
+        .long sys_setpgid
+        .long sys_ni_syscall    /* old ulimit syscall holder */
+        .long sys_ni_syscall    /* sys_olduname */
+        .long sys_umask         /* 60 */
+        .long sys_chroot
+        .long sys_ustat
+        .long sys_dup2
+        .long sys_getppid
+        .long sys_getpgrp               /* 65 */
+        .long sys_setsid
+        .long sys_sigaction
+        .long sys_sgetmask
+        .long sys_ssetmask
+        .long sys_setreuid16    /* 70 */
+        .long sys_setregid16
+        .long sys_sigsuspend
+        .long sys_sigpending
+        .long sys_sethostname
+        .long sys_setrlimit     /* 75 */
+        .long sys_old_getrlimit
+        .long sys_getrusage
+        .long sys_gettimeofday
+        .long sys_settimeofday
+        .long sys_getgroups16   /* 80 */
+        .long sys_setgroups16
+        .long sys_ni_syscall    /* sys_oldselect */
+        .long sys_symlink
+        .long sys_lstat
+        .long sys_readlink              /* 85 */
+        .long sys_uselib
+        .long sys_swapon
+        .long sys_reboot
+        .long old_readdir
+        .long old_mmap          /* 90 */
+        .long sys_munmap
+        .long sys_truncate
+        .long sys_ftruncate
+        .long sys_fchmod
+        .long sys_fchown16              /* 95 */
+        .long sys_getpriority
+        .long sys_setpriority
+        .long sys_ni_syscall    /* old profil syscall holder */
+        .long sys_statfs
+        .long sys_fstatfs               /* 100 */
+        .long sys_ni_syscall    /* ioperm */
+        .long sys_socketcall
+        .long sys_syslog
+        .long sys_setitimer
+        .long sys_getitimer     /* 105 */
+        .long sys_newstat
+        .long sys_newlstat
+        .long sys_newfstat
+        .long sys_uname
+        .long sys_ni_syscall    /* 110 */ /* iopl */
+        .long sys_vhangup
+        .long sys_ni_syscall    /* idle */
+        .long sys_ni_syscall    /* vm86old */
+        .long sys_wait4
+        .long sys_swapoff               /* 115 */
+        .long sys_sysinfo
+        .long sys_ipc
+        .long sys_fsync
+        .long sys_sigreturn
+        .long sys_clone         /* 120 */
+        .long sys_setdomainname
+        .long sys_newuname
+        .long sys_ni_syscall    /* sys_modify_ldt */
+        .long sys_adjtimex
+        .long sys_mprotect              /* 125 */
+        .long sys_sigprocmask
+        .long sys_ni_syscall    /* old "create_module" */
+        .long sys_init_module
+        .long sys_delete_module
+        .long sys_ni_syscall    /* 130: old "get_kernel_syms" */
+        .long sys_quotactl
+        .long sys_getpgid
+        .long sys_fchdir
+        .long sys_bdflush
+        .long sys_sysfs         /* 135 */
+        .long sys_personality
+        .long sys_ni_syscall    /* for afs_syscall */
+        .long sys_setfsuid16
+        .long sys_setfsgid16
+        .long sys_llseek                /* 140 */
+        .long sys_getdents
+        .long sys_select
+        .long sys_flock
+        .long sys_msync
+        .long sys_readv         /* 145 */
+        .long sys_writev
+        .long sys_getsid
+        .long sys_fdatasync
+        .long sys_sysctl
+        .long sys_mlock         /* 150 */
+        .long sys_munlock
+        .long sys_mlockall
+        .long sys_munlockall
+        .long sys_sched_setparam
+        .long sys_sched_getparam   /* 155 */
+        .long sys_sched_setscheduler
+        .long sys_sched_getscheduler
+        .long sys_sched_yield
+        .long sys_sched_get_priority_max
+        .long sys_sched_get_priority_min  /* 160 */
+        .long sys_sched_rr_get_interval
+        .long sys_nanosleep
+        .long sys_mremap
+        .long sys_setresuid16
+        .long sys_getresuid16   /* 165 */
+        .long sys_ni_syscall    /* vm86 */
+        .long sys_ni_syscall    /* old "query_module" */
+        .long sys_poll
+        .long sys_nfsservctl
+        .long sys_setresgid16   /* 170 */
+        .long sys_getresgid16
+        .long sys_prctl
+        .long sys_rt_sigreturn
+        .long sys_rt_sigaction
+        .long sys_rt_sigprocmask        /* 175 */
+        .long sys_rt_sigpending
+        .long sys_rt_sigtimedwait
+        .long sys_rt_sigqueueinfo
+        .long sys_rt_sigsuspend
+        .long sys_pread_wrapper    /* 180 */
+        .long sys_pwrite_wrapper
+        .long sys_chown16
+        .long sys_getcwd
+        .long sys_capget
+        .long sys_capset           /* 185 */
+        .long sys_sigaltstack
+        .long sys_sendfile
+        .long sys_ni_syscall    /* streams1 */
+        .long sys_ni_syscall    /* streams2 */
+        .long sys_vfork            /* 190 */
+        .long sys_getrlimit
+        .long sys_mmap2
+        .long sys_truncate64
+        .long sys_ftruncate64
+        .long sys_stat64                /* 195 */
+        .long sys_lstat64
+        .long sys_fstat64
+        .long sys_lchown
+        .long sys_getuid
+        .long sys_getgid                /* 200 */
+        .long sys_geteuid
+        .long sys_getegid
+        .long sys_setreuid
+        .long sys_setregid
+        .long sys_getgroups     /* 205 */
+        .long sys_setgroups
+        .long sys_fchown
+        .long sys_setresuid
+        .long sys_getresuid
+        .long sys_setresgid     /* 210 */
+        .long sys_getresgid
+        .long sys_chown
+        .long sys_setuid
+        .long sys_setgid
+        .long sys_setfsuid              /* 215 */
+        .long sys_setfsgid
+        .long sys_pivot_root
+        .long sys_mincore
+        .long sys_madvise
+        .long sys_getdents64    /* 220 */
+        .long sys_fcntl64
+        .long sys_ni_syscall    /* reserved for TUX */
+        .long sys_ni_syscall    /* Reserved for Security */
+        .long sys_gettid
+        .long sys_readahead     /* 225 */
+        .long sys_setxattr
+        .long sys_lsetxattr
+        .long sys_fsetxattr
+        .long sys_getxattr
+        .long sys_lgetxattr     /* 230 */
+        .long sys_fgetxattr
+        .long sys_listxattr
+        .long sys_llistxattr
+        .long sys_flistxattr
+        .long sys_removexattr   /* 235 */
+        .long sys_lremovexattr
+        .long sys_fremovexattr
+        .long sys_tkill
+        .long sys_sendfile64
+        .long sys_futex         /* 240 */
+        .long sys_sched_setaffinity
+        .long sys_sched_getaffinity
+        .long sys_ni_syscall
+        .long sys_ni_syscall
+        .long sys_io_setup      /* 245 */
+        .long sys_io_destroy
+        .long sys_io_getevents
+        .long sys_io_submit
+        .long sys_io_cancel
+        .long sys_fadvise64     /* 250 */
+        .long sys_ni_syscall
+        .long sys_exit_group
+        .long sys_lookup_dcookie
+        .long sys_epoll_create
+        .long sys_epoll_ctl     /* 255 */
+        .long sys_epoll_wait
+        .long sys_remap_file_pages
+        .long sys_set_tid_address
+        .long sys_timer_create
+        .long sys_timer_settime         /* 260 */
+        .long sys_timer_gettime
+        .long sys_timer_getoverrun
+        .long sys_timer_delete
+        .long sys_clock_settime
+        .long sys_clock_gettime         /* 265 */
+        .long sys_clock_getres
+        .long sys_clock_nanosleep
+        .long sys_statfs64
+        .long sys_fstatfs64
+        .long sys_tgkill                /* 270 */
+        .long sys_utimes
+        .long sys_fadvise64_64_wrapper
+        .long sys_ni_syscall    /* Reserved for vserver */
+        .long sys_ni_syscall    /* Reserved for mbind */
+        .long sys_ni_syscall    /* 275 - get_mempolicy */
+        .long sys_ni_syscall    /* set_mempolicy */
+        .long sys_mq_open
+        .long sys_mq_unlink
+        .long sys_mq_timedsend
+        .long sys_mq_timedreceive       /* 280 */
+        .long sys_mq_notify
+        .long sys_mq_getsetattr
+        .long sys_kexec_load
+        .long sys_waitid
+        .long sys_ni_syscall            /* 285 */
+        .long sys_add_key
+        .long sys_request_key
+        .long sys_keyctl
+        .long sys_ioprio_set
+        .long sys_ioprio_get            /* 290 */
+        .long sys_inotify_init
+        .long sys_inotify_add_watch
+        .long sys_inotify_rm_watch
+        .long sys_migrate_pages
+        .long sys_openat                /* 295 */
+        .long sys_mkdirat
+        .long sys_mknodat
+        .long sys_fchownat
+        .long sys_futimesat
+        .long sys_fstatat64             /* 300 */
+        .long sys_unlinkat
+        .long sys_renameat
+        .long sys_linkat
+        .long sys_symlinkat
+        .long sys_readlinkat            /* 305 */
+        .long sys_fchmodat
+        .long sys_faccessat
+        .long sys_pselect6
+        .long sys_ppoll
+        .long sys_unshare               /* 310 */
+        .long sys_set_robust_list
+        .long sys_get_robust_list
+        .long sys_splice
+        .long sys_sync_file_range
+        .long sys_tee                   /* 315 */
+        .long sys_vmsplice
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index a1589f85499d..149d9713eddf 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -3,13 +3,12 @@
  *
  *  Copyright (C) 1999  Tetsuya Okada & Niibe Yutaka
  *  Copyright (C) 2000  Philipp Rumpf <prumpf@tux.org>
- *  Copyright (C) 2002, 2003, 2004, 2005  Paul Mundt
+ *  Copyright (C) 2002 - 2006  Paul Mundt
  *  Copyright (C) 2002  M. R. Brown  <mrbrown@linux-sh.org>
  *
  *  Some code taken from i386 version.
  *    Copyright (C) 1991, 1992, 1995  Linus Torvalds
  */
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -26,15 +25,20 @@ struct sys_timer *sys_timer;
 DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL(rtc_lock);
 
-/* XXX: Can we initialize this in a routine somewhere?  Dreamcast doesn't want
- * these routines anywhere... */
-#ifdef CONFIG_SH_RTC
-void (*rtc_get_time)(struct timespec *) = sh_rtc_gettimeofday;
-int (*rtc_set_time)(const time_t) = sh_rtc_settimeofday;
-#else
-void (*rtc_get_time)(struct timespec *);
-int (*rtc_set_time)(const time_t);
-#endif
+/* Dummy RTC ops */
+static void null_rtc_get_time(struct timespec *tv)
+{
+        tv->tv_sec = mktime(2000, 1, 1, 0, 0, 0);
+        tv->tv_nsec = 0;
+}
+
+static int null_rtc_set_time(const time_t secs)
+{
+        return 0;
+}
+
+void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time;
+int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time;
 
 /*
  * Scheduler clock - returns current time in nanosec units.
@@ -70,7 +74,6 @@ void do_gettimeofday(struct timeval *tv)
         tv->tv_sec = sec;
         tv->tv_usec = usec;
 }
-
 EXPORT_SYMBOL(do_gettimeofday);
 
 int do_settimeofday(struct timespec *tv)
@@ -103,7 +106,6 @@ int do_settimeofday(struct timespec *tv)
 
         return 0;
 }
-
 EXPORT_SYMBOL(do_settimeofday);
 
 /* last time the RTC clock got updated */
@@ -135,7 +137,7 @@ void handle_timer_tick(struct pt_regs *regs)
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
-                if (rtc_set_time(xtime.tv_sec) == 0)
+                if (rtc_sh_set_time(xtime.tv_sec) == 0)
                         last_rtc_update = xtime.tv_sec;
                 else
                         /* do it again in 60s */
@@ -143,8 +145,33 @@ void handle_timer_tick(struct pt_regs *regs)
         }
 }
 
+#ifdef CONFIG_PM
+int timer_suspend(struct sys_device *dev, pm_message_t state)
+{
+        struct sys_timer *sys_timer = container_of(dev, struct sys_timer, dev);
+
+        sys_timer->ops->stop();
+
+        return 0;
+}
+
+int timer_resume(struct sys_device *dev)
+{
+        struct sys_timer *sys_timer = container_of(dev, struct sys_timer, dev);
+
+        sys_timer->ops->start();
+
+        return 0;
+}
+#else
+#define timer_suspend NULL
+#define timer_resume NULL
+#endif
+
 static struct sysdev_class timer_sysclass = {
         set_kset_name("timer"),
+        .suspend = timer_suspend,
+        .resume  = timer_resume,
 };
 
 static int __init timer_init_sysfs(void)
@@ -156,7 +183,6 @@ static int __init timer_init_sysfs(void)
         sys_timer->dev.cls = &timer_sysclass;
         return sysdev_register(&sys_timer->dev);
 }
-
 device_initcall(timer_init_sysfs);
 
 void (*board_time_init)(void);
@@ -168,15 +194,9 @@ void __init time_init(void)
 
         clk_init();
 
-        if (rtc_get_time) {
-                rtc_get_time(&xtime);
-        } else {
-                xtime.tv_sec = mktime(2000, 1, 1, 0, 0, 0);
-                xtime.tv_nsec = 0;
-        }
-
-        set_normalized_timespec(&wall_to_monotonic,
-                                -xtime.tv_sec, -xtime.tv_nsec);
+        rtc_sh_get_time(&xtime);
+        set_normalized_timespec(&wall_to_monotonic,
+                                -xtime.tv_sec, -xtime.tv_nsec);
 
         /*
          * Find the timer to use as the system timer, it will be
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index d4212add53b2..205816fcf0da 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -132,17 +132,17 @@ static unsigned long tmu_timer_get_frequency(void)
         ctrl_outl(0xffffffff, TMU0_TCOR);
         ctrl_outl(0xffffffff, TMU0_TCNT);
 
-        rtc_get_time(&ts2);
+        rtc_sh_get_time(&ts2);
 
         do {
-                rtc_get_time(&ts1);
+                rtc_sh_get_time(&ts1);
         } while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
 
         /* actually start the timer */
         ctrl_outb(TMU_TSTR_INIT, TMU_TSTR);
 
         do {
-                rtc_get_time(&ts2);
+                rtc_sh_get_time(&ts2);
         } while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
 
         freq = 0xffffffff - ctrl_inl(TMU0_TCNT);
@@ -188,6 +188,18 @@ static struct clk tmu0_clk = {
         .ops            = &tmu_clk_ops,
 };
 
+static int tmu_timer_start(void)
+{
+        ctrl_outb(TMU_TSTR_INIT, TMU_TSTR);
+        return 0;
+}
+
+static int tmu_timer_stop(void)
+{
+        ctrl_outb(0, TMU_TSTR);
+        return 0;
+}
+
 static int tmu_timer_init(void)
 {
         unsigned long interval;
@@ -197,7 +209,7 @@ static int tmu_timer_init(void)
         tmu0_clk.parent = clk_get("module_clk");
 
         /* Start TMU0 */
-        ctrl_outb(0, TMU_TSTR);
+        tmu_timer_stop();
 #if !defined(CONFIG_CPU_SUBTYPE_SH7300) && !defined(CONFIG_CPU_SUBTYPE_SH7760)
         ctrl_outb(TMU_TOCR_INIT, TMU_TOCR);
 #endif
@@ -211,13 +223,15 @@ static int tmu_timer_init(void)
         ctrl_outl(interval, TMU0_TCOR);
         ctrl_outl(interval, TMU0_TCNT);
 
-        ctrl_outb(TMU_TSTR_INIT, TMU_TSTR);
+        tmu_timer_start();
 
         return 0;
 }
 
 struct sys_timer_ops tmu_timer_ops = {
         .init           = tmu_timer_init,
+        .start          = tmu_timer_start,
+        .stop           = tmu_timer_stop,
         .get_frequency  = tmu_timer_get_frequency,
         .get_offset     = tmu_timer_get_offset,
 };
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index d9db1180f770..c2c597e09482 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -36,40 +36,15 @@
 
 #ifdef CONFIG_SH_KGDB
 #include <asm/kgdb.h>
-#define CHK_REMOTE_DEBUG(regs)                                               \
-{                                                                            \
-  if ((kgdb_debug_hook != (kgdb_debug_hook_t *) NULL) && (!user_mode(regs))) \
-  {                                                                          \
-    (*kgdb_debug_hook)(regs);                                                \
-  }                                                                          \
+#define CHK_REMOTE_DEBUG(regs)                  \
+{                                               \
+        if (kgdb_debug_hook && !user_mode(regs))\
+                (*kgdb_debug_hook)(regs);       \
 }
 #else
 #define CHK_REMOTE_DEBUG(regs)
 #endif
 
-#define DO_ERROR(trapnr, signr, str, name, tsk)                         \
-asmlinkage void do_##name(unsigned long r4, unsigned long r5,           \
-                          unsigned long r6, unsigned long r7,           \
-                          struct pt_regs regs)                          \
-{                                                                       \
-        unsigned long error_code;                                       \
-                                                                        \
-        /* Check if it's a DSP instruction */                           \
-        if (is_dsp_inst(&regs)) {                                       \
-                /* Enable DSP mode, and restart instruction. */         \
-                regs.sr |= SR_DSP;                                      \
-                return;                                                 \
-        }                                                               \
-                                                                        \
-        asm volatile("stc       r2_bank, %0": "=r" (error_code));       \
-        local_irq_enable();                                             \
-        tsk->thread.error_code = error_code;                            \
-        tsk->thread.trap_no = trapnr;                                   \
-        CHK_REMOTE_DEBUG(&regs);                                        \
-        force_sig(signr, tsk);                                          \
-        die_if_no_fixup(str,&regs,error_code);                          \
-}
-
 #ifdef CONFIG_CPU_SH2
 #define TRAP_RESERVED_INST      4
 #define TRAP_ILLEGAL_SLOT_INST  6
@@ -86,7 +61,7 @@ asmlinkage void do_##name(unsigned long r4, unsigned long r5,		\
 #define VMALLOC_OFFSET (8*1024*1024)
 #define MODULE_RANGE (8*1024*1024)
 
-spinlock_t die_lock;
+DEFINE_SPINLOCK(die_lock);
 
 void die(const char * str, struct pt_regs * regs, long err)
 {
@@ -575,8 +550,117 @@ int is_dsp_inst(struct pt_regs *regs)
 #define is_dsp_inst(regs)       (0)
 #endif /* CONFIG_SH_DSP */
 
-DO_ERROR(TRAP_RESERVED_INST, SIGILL, "reserved instruction", reserved_inst, current)
-DO_ERROR(TRAP_ILLEGAL_SLOT_INST, SIGILL, "illegal slot instruction", illegal_slot_inst, current)
+extern int do_fpu_inst(unsigned short, struct pt_regs*);
+
+asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
+                                unsigned long r6, unsigned long r7,
+                                struct pt_regs regs)
+{
+        unsigned long error_code;
+        struct task_struct *tsk = current;
+
+#ifdef CONFIG_SH_FPU_EMU
+        unsigned short inst;
+        int err;
+
+        get_user(inst, (unsigned short*)regs.pc);
+
+        err = do_fpu_inst(inst, &regs);
+        if (!err) {
+                regs.pc += 2;
+                return;
+        }
+        /* not a FPU inst. */
+#endif
+
+#ifdef CONFIG_SH_DSP
+        /* Check if it's a DSP instruction */
+        if (is_dsp_inst(&regs)) {
+                /* Enable DSP mode, and restart instruction. */
+                regs.sr |= SR_DSP;
+                return;
+        }
+#endif
+
+        asm volatile("stc       r2_bank, %0": "=r" (error_code));
+        local_irq_enable();
+        tsk->thread.error_code = error_code;
+        tsk->thread.trap_no = TRAP_RESERVED_INST;
+        CHK_REMOTE_DEBUG(&regs);
+        force_sig(SIGILL, tsk);
+        die_if_no_fixup("reserved instruction", &regs, error_code);
+}
+
+#ifdef CONFIG_SH_FPU_EMU
+static int emulate_branch(unsigned short inst, struct pt_regs* regs)
+{
+        /*
+         * bfs: 8fxx: PC+=d*2+4;
+         * bts: 8dxx: PC+=d*2+4;
+         * bra: axxx: PC+=D*2+4;
+         * bsr: bxxx: PC+=D*2+4  after PR=PC+4;
+         * braf:0x23: PC+=Rn*2+4;
+         * bsrf:0x03: PC+=Rn*2+4 after PR=PC+4;
+         * jmp: 4x2b: PC=Rn;
+         * jsr: 4x0b: PC=Rn      after PR=PC+4;
+         * rts: 000b: PC=PR;
+         */
+        if ((inst & 0xfd00) == 0x8d00) {
+                regs->pc += SH_PC_8BIT_OFFSET(inst);
+                return 0;
+        }
+
+        if ((inst & 0xe000) == 0xa000) {
+                regs->pc += SH_PC_12BIT_OFFSET(inst);
+                return 0;
+        }
+
+        if ((inst & 0xf0df) == 0x0003) {
+                regs->pc += regs->regs[(inst & 0x0f00) >> 8] + 4;
+                return 0;
+        }
+
+        if ((inst & 0xf0df) == 0x400b) {
+                regs->pc = regs->regs[(inst & 0x0f00) >> 8];
+                return 0;
+        }
+
+        if ((inst & 0xffff) == 0x000b) {
+                regs->pc = regs->pr;
+                return 0;
+        }
+
+        return 1;
+}
+#endif
+
+asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
+                                unsigned long r6, unsigned long r7,
+                                struct pt_regs regs)
+{
+        unsigned long error_code;
+        struct task_struct *tsk = current;
+#ifdef CONFIG_SH_FPU_EMU
+        unsigned short inst;
+
+        get_user(inst, (unsigned short *)regs.pc + 1);
+        if (!do_fpu_inst(inst, &regs)) {
+                get_user(inst, (unsigned short *)regs.pc);
+                if (!emulate_branch(inst, &regs))
+                        return;
+                /* fault in branch.*/
+        }
+        /* not a FPU inst. */
+#endif
+
+        asm volatile("stc       r2_bank, %0": "=r" (error_code));
+        local_irq_enable();
+        tsk->thread.error_code = error_code;
+        tsk->thread.trap_no = TRAP_RESERVED_INST;
+        CHK_REMOTE_DEBUG(&regs);
+        force_sig(SIGILL, tsk);
+        die_if_no_fixup("illegal slot instruction", &regs, error_code);
+}
 
 asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
                                    unsigned long r6, unsigned long r7,
@@ -634,14 +718,16 @@ void __init trap_init(void)
         exception_handling_table[TRAP_ILLEGAL_SLOT_INST]
                 = (void *)do_illegal_slot_inst;
 
-#ifdef CONFIG_CPU_SH4
-        if (!(cpu_data->flags & CPU_HAS_FPU)) {
-                /* For SH-4 lacking an FPU, treat floating point instructions
-                   as reserved. */
-                /* entry 64 corresponds to EXPEVT=0x800 */
-                exception_handling_table[64] = (void *)do_reserved_inst;
-                exception_handling_table[65] = (void *)do_illegal_slot_inst;
-        }
+#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_FPU) || \
+    defined(CONFIG_SH_FPU_EMU)
+        /*
+         * For SH-4 lacking an FPU, treat floating point instructions as
+         * reserved. They'll be handled in the math-emu case, or faulted on
+         * otherwise.
+         */
+        /* entry 64 corresponds to EXPEVT=0x800 */
+        exception_handling_table[64] = (void *)do_reserved_inst;
+        exception_handling_table[65] = (void *)do_illegal_slot_inst;
 #endif
                 
         /* Setup VBR for boot cpu */
@@ -655,20 +741,12 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
         unsigned long module_end = VMALLOC_END;
         int i = 1;
 
-        if (tsk && !sp) {
+        if (!tsk)
+                tsk = current;
+        if (tsk == current)
+                sp = (unsigned long *)current_stack_pointer;
+        else
                 sp = (unsigned long *)tsk->thread.sp;
-        }
-
-        if (!sp) {
-                __asm__ __volatile__ (
-                        "mov r15, %0\n\t"
-                        "stc r7_bank, %1\n\t"
-                        : "=r" (module_start),
-                          "=r" (module_end)
-                );
-                
-                sp = (unsigned long *)module_start;
-        }
 
         stack = sp;
 
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 95fdd9135fcf..5eb930918186 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -2,6 +2,7 @@
  * ld script to make SuperH Linux kernel
  * Written by Niibe Yutaka
  */
+#include <asm/thread_info.h>
 #include <asm-generic/vmlinux.lds.h>
 
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
@@ -13,7 +14,7 @@ OUTPUT_ARCH(sh)
 ENTRY(_start)
 SECTIONS
 {
-  . = 0x80000000 + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;
+  . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;
   _text = .;                    /* Text and read-only data */
   text = .;                     /* Text and read-only data */
   .empty_zero_page : {
@@ -40,16 +41,16 @@ SECTIONS
         *(.data)
 
          /* Align the initial ramdisk image (INITRD) on page boundaries. */
-         . = ALIGN(4096);
+         . = ALIGN(PAGE_SIZE);
          __rd_start = .;
          *(.initrd)
-         . = ALIGN(4096);
+         . = ALIGN(PAGE_SIZE);
          __rd_end = .;
 
         CONSTRUCTORS
         }
 
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
   .data.page_aligned : { *(.data.idt) }
 
   . = ALIGN(32);
@@ -60,12 +61,10 @@ SECTIONS
 
   _edata = .;                   /* End of data section */
 
-  . = ALIGN(8192);              /* init_task */
+  . = ALIGN(THREAD_SIZE);               /* init_task */
   .data.init_task : { *(.data.init_task) }
-  /* stack */
-  .stack : { stack = .;  _stack = .; }
 
-  . = ALIGN(4096);              /* Init code and data */
+  . = ALIGN(PAGE_SIZE);         /* Init code and data */
   __init_begin = .;
   _sinittext = .;
   .init.text : { *(.init.text) }
@@ -96,7 +95,7 @@ SECTIONS
   __machvec_start = .;
   .init.machvec : { *(.init.machvec) }
   __machvec_end = .;
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
   __init_end = .;
 
   . = ALIGN(4);
diff --git a/arch/sh/kernel/vsyscall/Makefile b/arch/sh/kernel/vsyscall/Makefile
new file mode 100644
index 000000000000..4bbce1cfa359
--- /dev/null
+++ b/arch/sh/kernel/vsyscall/Makefile
@@ -0,0 +1,36 @@
+obj-y += vsyscall.o vsyscall-syscall.o
+
+$(obj)/vsyscall-syscall.o: \
+        $(foreach F,trapa,$(obj)/vsyscall-$F.so)
+
+# Teach kbuild about targets
+targets += $(foreach F,trapa,vsyscall-$F.o vsyscall-$F.so)
+targets += vsyscall-note.o vsyscall.lds
+
+# The DSO images are built using a special linker script
+quiet_cmd_syscall = SYSCALL $@
+      cmd_syscall = $(CC) -nostdlib $(SYSCFLAGS_$(@F)) \
+                           -Wl,-T,$(filter-out FORCE,$^) -o $@
+
+export CPPFLAGS_vsyscall.lds += -P -C -Ush
+
+vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
+                $(call ld-option, -Wl$(comma)--hash-style=sysv)
+
+SYSCFLAGS_vsyscall-trapa.so     = $(vsyscall-flags)
+
+$(obj)/vsyscall-trapa.so: \
+$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
+        $(call if_changed,syscall)
+
+# We also create a special relocatable object that should mirror the symbol
+# table and layout of the linked DSO.  With ld -R we can then refer to
+# these symbols in the kernel code rather than hand-coded addresses.
+extra-y += vsyscall-syms.o
+$(obj)/built-in.o: $(obj)/vsyscall-syms.o
+$(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
+
+SYSCFLAGS_vsyscall-syms.o = -r
+$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
+                        $(obj)/vsyscall-trapa.o $(obj)/vsyscall-note.o FORCE
+        $(call if_changed,syscall)
diff --git a/arch/sh/kernel/vsyscall/vsyscall-note.S b/arch/sh/kernel/vsyscall/vsyscall-note.S
new file mode 100644
index 000000000000..d4b5be4f3d5f
--- /dev/null
+++ b/arch/sh/kernel/vsyscall/vsyscall-note.S
@@ -0,0 +1,25 @@
+/*
+ * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
+ * Here we can supply some information useful to userland.
+ */
+
+#include <linux/uts.h>
+#include <linux/version.h>
+
+#define ASM_ELF_NOTE_BEGIN(name, flags, vendor, type)                         \
+        .section name, flags;                                                 \
+        .balign 4;                                                            \
+        .long 1f - 0f;          /* name length */                             \
+        .long 3f - 2f;          /* data length */                             \
+        .long type;             /* note type */                               \
+0:      .asciz vendor;          /* vendor name */                             \
+1:      .balign 4;                                                            \
+2:
+
+#define ASM_ELF_NOTE_END                                                      \
+3:      .balign 4;              /* pad out section */                         \
+        .previous
+
+        ASM_ELF_NOTE_BEGIN(".note.kernel-version", "a", UTS_SYSNAME, 0)
+        .long LINUX_VERSION_CODE
+        ASM_ELF_NOTE_END
diff --git a/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S b/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
new file mode 100644
index 000000000000..555a64f124ca
--- /dev/null
+++ b/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
@@ -0,0 +1,39 @@
+#include <asm/unistd.h>
+
+        .text
+        .balign 32
+        .globl __kernel_sigreturn
+        .type __kernel_sigreturn,@function
+__kernel_sigreturn:
+.LSTART_sigreturn:
+        mov.w   1f, r3
+        trapa   #0x10
+        or      r0, r0
+        or      r0, r0
+        or      r0, r0
+        or      r0, r0
+        or      r0, r0
+
+1:      .short  __NR_sigreturn
+.LEND_sigreturn:
+        .size __kernel_sigreturn,.-.LSTART_sigreturn
+
+        .balign 32
+        .globl __kernel_rt_sigreturn
+        .type __kernel_rt_sigreturn,@function
+__kernel_rt_sigreturn:
+.LSTART_rt_sigreturn:
+        mov.w   1f, r3
+        trapa   #0x10
+        or      r0, r0
+        or      r0, r0
+        or      r0, r0
+        or      r0, r0
+        or      r0, r0
+
+1:      .short  __NR_rt_sigreturn
+.LEND_rt_sigreturn:
+        .size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn
+
+        .section .eh_frame,"a",@progbits
+        .previous
diff --git a/arch/sh/kernel/vsyscall/vsyscall-syscall.S b/arch/sh/kernel/vsyscall/vsyscall-syscall.S
new file mode 100644
index 000000000000..c2ac7f0282b3
--- /dev/null
+++ b/arch/sh/kernel/vsyscall/vsyscall-syscall.S
@@ -0,0 +1,10 @@
+#include <linux/init.h>
+
+__INITDATA
+
+        .globl vsyscall_trapa_start, vsyscall_trapa_end
+vsyscall_trapa_start:
+        .incbin "arch/sh/kernel/vsyscall/vsyscall-trapa.so"
+vsyscall_trapa_end:
+
+__FINIT
diff --git a/arch/sh/kernel/vsyscall/vsyscall-trapa.S b/arch/sh/kernel/vsyscall/vsyscall-trapa.S
new file mode 100644
index 000000000000..3b6eb34c43fa
--- /dev/null
+++ b/arch/sh/kernel/vsyscall/vsyscall-trapa.S
@@ -0,0 +1,42 @@
+        .text
+        .globl __kernel_vsyscall
+        .type __kernel_vsyscall,@function
+__kernel_vsyscall:
+.LSTART_vsyscall:
+        /* XXX: We'll have to do something here once we opt to use the vDSO
+         * page for something other than the signal trampoline.. as well as
+         * fill out .eh_frame -- PFM. */
+.LEND_vsyscall:
+        .size __kernel_vsyscall,.-.LSTART_vsyscall
+        .previous
+
+        .section .eh_frame,"a",@progbits
+.LCIE:
+        .ualong .LCIE_end - .LCIE_start
+.LCIE_start:
+        .ualong 0               /* CIE ID */
+        .byte   0x1             /* Version number */
+        .string "zRS"           /* NUL-terminated augmentation string */
+        .uleb128 0x1            /* Code alignment factor */
+        .sleb128 -4             /* Data alignment factor */
+        .byte   0x11            /* Return address register column */
+                                /* Augmentation length and data (none) */
+        .byte   0xc             /* DW_CFA_def_cfa */
+        .uleb128 0xf            /* r15 */
+        .uleb128 0x0            /* offset 0 */
+
+        .align 2
+.LCIE_end:
+
+        .ualong .LFDE_end-.LFDE_start   /* Length FDE */
+.LFDE_start:
+        .ualong .LCIE                   /* CIE pointer */
+        .ualong .LSTART_vsyscall-.      /* start address */
+        .ualong .LEND_vsyscall-.LSTART_vsyscall
+        .uleb128 0
+        .align 2
+.LFDE_end:
+        .previous
+
+/* Get the common code for the sigreturn entry points */
+#include "vsyscall-sigreturn.S"
diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c
new file mode 100644
index 000000000000..075d6cc1a2d7
--- /dev/null
+++ b/arch/sh/kernel/vsyscall/vsyscall.c
@@ -0,0 +1,150 @@
+/*
+ * arch/sh/kernel/vsyscall.c
+ *
+ *  Copyright (C) 2006 Paul Mundt
+ *
+ * vDSO randomization
+ * Copyright(C) 2005-2006, Red Hat, Inc., Ingo Molnar
+ *
+ * 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/mm.h>
+#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/gfp.h>
+#include <linux/module.h>
+#include <linux/elf.h>
+
+/*
+ * Should the kernel map a VDSO page into processes and pass its
+ * address down to glibc upon exec()?
+ */
+unsigned int __read_mostly vdso_enabled = 1;
+EXPORT_SYMBOL_GPL(vdso_enabled);
+
+static int __init vdso_setup(char *s)
+{
+        vdso_enabled = simple_strtoul(s, NULL, 0);
+        return 1;
+}
+__setup("vdso=", vdso_setup);
+
+/*
+ * These symbols are defined by vsyscall.o to mark the bounds
+ * of the ELF DSO images included therein.
+ */
+extern const char vsyscall_trapa_start, vsyscall_trapa_end;
+static void *syscall_page;
+
+int __init vsyscall_init(void)
+{
+        syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
+
+        /*
+         * XXX: Map this page to a fixmap entry if we get around
+         * to adding the page to ELF core dumps
+         */
+
+        memcpy(syscall_page,
+               &vsyscall_trapa_start,
+               &vsyscall_trapa_end - &vsyscall_trapa_start);
+
+        return 0;
+}
+
+static struct page *syscall_vma_nopage(struct vm_area_struct *vma,
+                                       unsigned long address, int *type)
+{
+        unsigned long offset = address - vma->vm_start;
+        struct page *page;
+
+        if (address < vma->vm_start || address > vma->vm_end)
+                return NOPAGE_SIGBUS;
+
+        page = virt_to_page(syscall_page + offset);
+
+        get_page(page);
+
+        return page;
+}
+
+/* Prevent VMA merging */
+static void syscall_vma_close(struct vm_area_struct *vma)
+{
+}
+
+static struct vm_operations_struct syscall_vm_ops = {
+        .nopage = syscall_vma_nopage,
+        .close  = syscall_vma_close,
+};
+
+/* Setup a VMA at program startup for the vsyscall page */
+int arch_setup_additional_pages(struct linux_binprm *bprm,
+                                int executable_stack)
+{
+        struct vm_area_struct *vma;
+        struct mm_struct *mm = current->mm;
+        unsigned long addr;
+        int ret;
+
+        down_write(&mm->mmap_sem);
+        addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
+        if (IS_ERR_VALUE(addr)) {
+                ret = addr;
+                goto up_fail;
+        }
+
+        vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
+        if (!vma) {
+                ret = -ENOMEM;
+                goto up_fail;
+        }
+
+        vma->vm_start = addr;
+        vma->vm_end = addr + PAGE_SIZE;
+        /* MAYWRITE to allow gdb to COW and set breakpoints */
+        vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
+        vma->vm_flags |= mm->def_flags;
+        vma->vm_page_prot = protection_map[vma->vm_flags & 7];
+        vma->vm_ops = &syscall_vm_ops;
+        vma->vm_mm = mm;
+
+        ret = insert_vm_struct(mm, vma);
+        if (unlikely(ret)) {
+                kmem_cache_free(vm_area_cachep, vma);
+                goto up_fail;
+        }
+
+        current->mm->context.vdso = (void *)addr;
+
+        mm->total_vm++;
+up_fail:
+        up_write(&mm->mmap_sem);
+        return ret;
+}
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+        if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
+                return "[vdso]";
+
+        return NULL;
+}
+
+struct vm_area_struct *get_gate_vma(struct task_struct *task)
+{
+        return NULL;
+}
+
+int in_gate_area(struct task_struct *task, unsigned long address)
+{
+        return 0;
+}
+
+int in_gate_area_no_task(unsigned long address)
+{
+        return 0;
+}
diff --git a/arch/sh/kernel/vsyscall/vsyscall.lds.S b/arch/sh/kernel/vsyscall/vsyscall.lds.S
new file mode 100644
index 000000000000..b13c3d439fee
--- /dev/null
+++ b/arch/sh/kernel/vsyscall/vsyscall.lds.S
@@ -0,0 +1,74 @@
+/*
+ * Linker script for vsyscall DSO.  The vsyscall page is an ELF shared
+ * object prelinked to its virtual address, and with only one read-only
+ * segment (that fits in one page).  This script controls its layout.
+ */
+#include <asm/asm-offsets.h>
+
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
+OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
+#else
+OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-shbig-linux")
+#endif
+OUTPUT_ARCH(sh)
+
+/* The ELF entry point can be used to set the AT_SYSINFO value.  */
+ENTRY(__kernel_vsyscall);
+
+SECTIONS
+{
+  . = SIZEOF_HEADERS;
+
+  .hash           : { *(.hash) }                :text
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+
+  /* This linker script is used both with -r and with -shared.
+     For the layouts to match, we need to skip more than enough
+     space for the dynamic symbol table et al.  If this amount
+     is insufficient, ld -shared will barf.  Just increase it here.  */
+  . = 0x400;
+
+  .text           : { *(.text) }                :text =0x90909090
+  .note           : { *(.note.*) }              :text :note
+  .eh_frame_hdr   : { *(.eh_frame_hdr) }        :text :eh_frame_hdr
+  .eh_frame       : { KEEP (*(.eh_frame)) }     :text
+  .dynamic        : { *(.dynamic) }             :text :dynamic
+  .useless        : {
+        *(.got.plt) *(.got)
+        *(.data .data.* .gnu.linkonce.d.*)
+        *(.dynbss)
+        *(.bss .bss.* .gnu.linkonce.b.*)
+  }                                             :text
+}
+
+/*
+ * We must supply the ELF program headers explicitly to get just one
+ * PT_LOAD segment, and set the flags explicitly to make segments read-only.
+ */
+PHDRS
+{
+  text PT_LOAD FILEHDR PHDRS FLAGS(5); /* PF_R|PF_X */
+  dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
+  note PT_NOTE FLAGS(4); /* PF_R */
+  eh_frame_hdr 0x6474e550; /* PT_GNU_EH_FRAME, but ld doesn't match the name */
+}
+
+/*
+ * This controls what symbols we export from the DSO.
+ */
+VERSION
+{
+  LINUX_2.6 {
+    global:
+        __kernel_vsyscall;
+        __kernel_sigreturn;
+        __kernel_rt_sigreturn;
+
+    local: *;
+  };
+}
diff --git a/arch/sh/lib/checksum.S b/arch/sh/lib/checksum.S
index 7c50dfe68c07..cbdd0d40e545 100644
--- a/arch/sh/lib/checksum.S
+++ b/arch/sh/lib/checksum.S
@@ -202,8 +202,9 @@ ENTRY(csum_partial_copy_generic)
         cmp/pz  r6              ! Jump if we had at least two bytes.
         bt/s    1f
          clrt
+        add     #2,r6           ! r6 was < 2.   Deal with it.
         bra     4f
-         add    #2,r6           ! r6 was < 2.   Deal with it.
+         mov    r6,r2
 
 3:      ! Handle different src and dest alignments.
         ! This is not common, so simple byte by byte copy will do.
diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S
index db6b736537ad..560bc17eebdd 100644
--- a/arch/sh/lib/memcpy-sh4.S
+++ b/arch/sh/lib/memcpy-sh4.S
@@ -727,8 +727,8 @@ ENTRY(memcpy)
         mov.l   @(0x04,r5), r11 !  18 LS (latency=2)
         xtrct   r9, r8          !  48 EX
 
-        mov.w   @(0x02,r5), r12 !  18 LS (latency=2)
-        xtrct   r10, r9         !  48 EX
+        mov.l   @(0x00,r5), r12 !  18 LS (latency=2)
+        xtrct   r10, r9         !  48 EX
 
         movca.l r0,@r1          !  40 LS (latency=3-7)
         add     #-0x1c, r1      !  50 EX
diff --git a/arch/sh/lib/memset.S b/arch/sh/lib/memset.S
index 95670090680e..af91fe2b72a6 100644
--- a/arch/sh/lib/memset.S
+++ b/arch/sh/lib/memset.S
@@ -29,6 +29,7 @@ ENTRY(memset)
         bf/s    1b
          mov.b  r5,@-r4
 2:                              ! make VVVV
+        extu.b  r5,r5
         swap.b  r5,r0           !   V0
         or      r0,r5           !   VV
         swap.w  r5,r0           ! VV00
diff --git a/arch/sh/math-emu/Makefile b/arch/sh/math-emu/Makefile
new file mode 100644
index 000000000000..638b342c781a
--- /dev/null
+++ b/arch/sh/math-emu/Makefile
@@ -0,0 +1 @@
+obj-y   := math.o
diff --git a/arch/sh/math-emu/math.c b/arch/sh/math-emu/math.c
new file mode 100644
index 000000000000..26b6046814fd
--- /dev/null
+++ b/arch/sh/math-emu/math.c
@@ -0,0 +1,624 @@
+/*
+ * arch/sh/math-emu/math.c
+ *
+ * Copyright (C) 2006 Takashi YOSHII <takasi-y@ops.dti.ne.jp>
+ *
+ * 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/config.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/signal.h>
+
+#include <asm/system.h>
+#include <asm/uaccess.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+
+#include "sfp-util.h"
+#include <math-emu/soft-fp.h>
+#include <math-emu/single.h>
+#include <math-emu/double.h>
+
+#define FPUL            (fregs->fpul)
+#define FPSCR           (fregs->fpscr)
+#define FPSCR_RM        (FPSCR&3)
+#define FPSCR_DN        ((FPSCR>>18)&1)
+#define FPSCR_PR        ((FPSCR>>19)&1)
+#define FPSCR_SZ        ((FPSCR>>20)&1)
+#define FPSCR_FR        ((FPSCR>>21)&1)
+#define FPSCR_MASK      0x003fffffUL
+
+#define BANK(n) (n^(FPSCR_FR?16:0))
+#define FR      ((unsigned long*)(fregs->fp_regs))
+#define FR0     (FR[BANK(0)])
+#define FRn     (FR[BANK(n)])
+#define FRm     (FR[BANK(m)])
+#define DR      ((unsigned long long*)(fregs->fp_regs))
+#define DRn     (DR[BANK(n)/2])
+#define DRm     (DR[BANK(m)/2])
+
+#define XREG(n) (n^16)
+#define XFn     (FR[BANK(XREG(n))])
+#define XFm     (FR[BANK(XREG(m))])
+#define XDn     (DR[BANK(XREG(n))/2])
+#define XDm     (DR[BANK(XREG(m))/2])
+
+#define R0      (regs->regs[0])
+#define Rn      (regs->regs[n])
+#define Rm      (regs->regs[m])
+
+#define WRITE(d,a)      ({if(put_user(d, (typeof (d)*)a)) return -EFAULT;})
+#define READ(d,a)       ({if(get_user(d, (typeof (d)*)a)) return -EFAULT;})
+
+#define PACK_S(r,f)     FP_PACK_SP(&r,f)
+#define UNPACK_S(f,r)   FP_UNPACK_SP(f,&r)
+#define PACK_D(r,f) \
+        {u32 t[2]; FP_PACK_DP(t,f); ((u32*)&r)[0]=t[1]; ((u32*)&r)[1]=t[0];}
+#define UNPACK_D(f,r) \
+        {u32 t[2]; t[0]=((u32*)&r)[1]; t[1]=((u32*)&r)[0]; FP_UNPACK_DP(f,t);}
+
+// 2 args instructions.
+#define BOTH_PRmn(op,x) \
+        FP_DECL_EX; if(FPSCR_PR) op(D,x,DRm,DRn); else op(S,x,FRm,FRn);
+
+#define CMP_X(SZ,R,M,N) do{ \
+        FP_DECL_##SZ(Fm); FP_DECL_##SZ(Fn); \
+        UNPACK_##SZ(Fm, M); UNPACK_##SZ(Fn, N); \
+        FP_CMP_##SZ(R, Fn, Fm, 2); }while(0)
+#define EQ_X(SZ,R,M,N) do{ \
+        FP_DECL_##SZ(Fm); FP_DECL_##SZ(Fn); \
+        UNPACK_##SZ(Fm, M); UNPACK_##SZ(Fn, N); \
+        FP_CMP_EQ_##SZ(R, Fn, Fm); }while(0)
+#define CMP(OP) ({ int r; BOTH_PRmn(OP##_X,r); r; })
+
+static int
+fcmp_gt(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        if (CMP(CMP) > 0)
+                regs->sr |= 1;
+        else
+                regs->sr &= ~1;
+
+        return 0;
+}
+
+static int
+fcmp_eq(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        if (CMP(CMP /*EQ*/) == 0)
+                regs->sr |= 1;
+        else
+                regs->sr &= ~1;
+        return 0;
+}
+
+#define ARITH_X(SZ,OP,M,N) do{ \
+        FP_DECL_##SZ(Fm); FP_DECL_##SZ(Fn); FP_DECL_##SZ(Fr); \
+        UNPACK_##SZ(Fm, M); UNPACK_##SZ(Fn, N); \
+        FP_##OP##_##SZ(Fr, Fn, Fm); \
+        PACK_##SZ(N, Fr); }while(0)
+
+static int
+fadd(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        BOTH_PRmn(ARITH_X, ADD);
+        return 0;
+}
+
+static int
+fsub(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        BOTH_PRmn(ARITH_X, SUB);
+        return 0;
+}
+
+static int
+fmul(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        BOTH_PRmn(ARITH_X, MUL);
+        return 0;
+}
+
+static int
+fdiv(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        BOTH_PRmn(ARITH_X, DIV);
+        return 0;
+}
+
+static int
+fmac(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        FP_DECL_EX;
+        FP_DECL_S(Fr);
+        FP_DECL_S(Ft);
+        FP_DECL_S(F0);
+        FP_DECL_S(Fm);
+        FP_DECL_S(Fn);
+        UNPACK_S(F0, FR0);
+        UNPACK_S(Fm, FRm);
+        UNPACK_S(Fn, FRn);
+        FP_MUL_S(Ft, Fm, F0);
+        FP_ADD_S(Fr, Fn, Ft);
+        PACK_S(FRn, Fr);
+        return 0;
+}
+
+// to process fmov's extention (odd n for DR access XD).
+#define FMOV_EXT(x) if(x&1) x+=16-1
+
+static int
+fmov_idx_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
+             int n)
+{
+        if (FPSCR_SZ) {
+                FMOV_EXT(n);
+                READ(FRn, Rm + R0 + 4);
+                n++;
+                READ(FRn, Rm + R0);
+        } else {
+                READ(FRn, Rm + R0);
+        }
+
+        return 0;
+}
+
+static int
+fmov_mem_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
+             int n)
+{
+        if (FPSCR_SZ) {
+                FMOV_EXT(n);
+                READ(FRn, Rm + 4);
+                n++;
+                READ(FRn, Rm);
+        } else {
+                READ(FRn, Rm);
+        }
+
+        return 0;
+}
+
+static int
+fmov_inc_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
+             int n)
+{
+        if (FPSCR_SZ) {
+                FMOV_EXT(n);
+                READ(FRn, Rm + 4);
+                n++;
+                READ(FRn, Rm);
+                Rm += 8;
+        } else {
+                READ(FRn, Rm);
+                Rm += 4;
+        }
+
+        return 0;
+}
+
+static int
+fmov_reg_idx(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
+             int n)
+{
+        if (FPSCR_SZ) {
+                FMOV_EXT(m);
+                WRITE(FRm, Rn + R0 + 4);
+                m++;
+                WRITE(FRm, Rn + R0);
+        } else {
+                WRITE(FRm, Rn + R0);
+        }
+
+        return 0;
+}
+
+static int
+fmov_reg_mem(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
+             int n)
+{
+        if (FPSCR_SZ) {
+                FMOV_EXT(m);
+                WRITE(FRm, Rn + 4);
+                m++;
+                WRITE(FRm, Rn);
+        } else {
+                WRITE(FRm, Rn);
+        }
+
+        return 0;
+}
+
+static int
+fmov_reg_dec(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
+             int n)
+{
+        if (FPSCR_SZ) {
+                FMOV_EXT(m);
+                Rn -= 8;
+                WRITE(FRm, Rn + 4);
+                m++;
+                WRITE(FRm, Rn);
+        } else {
+                Rn -= 4;
+                WRITE(FRm, Rn);
+        }
+
+        return 0;
+}
+
+static int
+fmov_reg_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
+             int n)
+{
+        if (FPSCR_SZ) {
+                FMOV_EXT(m);
+                FMOV_EXT(n);
+                DRn = DRm;
+        } else {
+                FRn = FRm;
+        }
+
+        return 0;
+}
+
+static int
+fnop_mn(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
+{
+        return -EINVAL;
+}
+
+// 1 arg instructions.
+#define NOTYETn(i) static int i(struct sh_fpu_soft_struct *fregs, int n) \
+        { printk( #i " not yet done.\n"); return 0; }
+
+NOTYETn(ftrv)
+NOTYETn(fsqrt)
+NOTYETn(fipr)
+NOTYETn(fsca)
+NOTYETn(fsrra)
+
+#define EMU_FLOAT_X(SZ,N) do { \
+        FP_DECL_##SZ(Fn); \
+        FP_FROM_INT_##SZ(Fn, FPUL, 32, int); \
+        PACK_##SZ(N, Fn); }while(0)
+static int ffloat(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FP_DECL_EX;
+
+        if (FPSCR_PR)
+                EMU_FLOAT_X(D, DRn);
+        else
+                EMU_FLOAT_X(S, FRn);
+
+        return 0;
+}
+
+#define EMU_FTRC_X(SZ,N) do { \
+        FP_DECL_##SZ(Fn); \
+        UNPACK_##SZ(Fn, N); \
+        FP_TO_INT_##SZ(FPUL, Fn, 32, 1); }while(0)
+static int ftrc(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FP_DECL_EX;
+
+        if (FPSCR_PR)
+                EMU_FTRC_X(D, DRn);
+        else
+                EMU_FTRC_X(S, FRn);
+
+        return 0;
+}
+
+static int fcnvsd(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FP_DECL_EX;
+        FP_DECL_S(Fn);
+        FP_DECL_D(Fr);
+        UNPACK_S(Fn, FPUL);
+        FP_CONV(D, S, 2, 1, Fr, Fn);
+        PACK_D(DRn, Fr);
+        return 0;
+}
+
+static int fcnvds(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FP_DECL_EX;
+        FP_DECL_D(Fn);
+        FP_DECL_S(Fr);
+        UNPACK_D(Fn, DRn);
+        FP_CONV(S, D, 1, 2, Fr, Fn);
+        PACK_S(FPUL, Fr);
+        return 0;
+}
+
+static int fxchg(struct sh_fpu_soft_struct *fregs, int flag)
+{
+        FPSCR ^= flag;
+        return 0;
+}
+
+static int fsts(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FRn = FPUL;
+        return 0;
+}
+
+static int flds(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FPUL = FRn;
+        return 0;
+}
+
+static int fneg(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FRn ^= (1 << (_FP_W_TYPE_SIZE - 1));
+        return 0;
+}
+
+static int fabs(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FRn &= ~(1 << (_FP_W_TYPE_SIZE - 1));
+        return 0;
+}
+
+static int fld0(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FRn = 0;
+        return 0;
+}
+
+static int fld1(struct sh_fpu_soft_struct *fregs, int n)
+{
+        FRn = (_FP_EXPBIAS_S << (_FP_FRACBITS_S - 1));
+        return 0;
+}
+
+static int fnop_n(struct sh_fpu_soft_struct *fregs, int n)
+{
+        return -EINVAL;
+}
+
+/// Instruction decoders.
+
+static int id_fxfd(struct sh_fpu_soft_struct *, int);
+static int id_fnxd(struct sh_fpu_soft_struct *, struct pt_regs *, int, int);
+
+static int (*fnxd[])(struct sh_fpu_soft_struct *, int) = {
+        fsts, flds, ffloat, ftrc, fneg, fabs, fsqrt, fsrra,
+        fld0, fld1, fcnvsd, fcnvds, fnop_n, fnop_n, fipr, id_fxfd
+};
+
+static int (*fnmx[])(struct sh_fpu_soft_struct *, struct pt_regs *, int, int) = {
+        fadd, fsub, fmul, fdiv, fcmp_eq, fcmp_gt, fmov_idx_reg, fmov_reg_idx,
+        fmov_mem_reg, fmov_inc_reg, fmov_reg_mem, fmov_reg_dec,
+        fmov_reg_reg, id_fnxd, fmac, fnop_mn};
+
+static int id_fxfd(struct sh_fpu_soft_struct *fregs, int x)
+{
+        const int flag[] = { FPSCR_SZ, FPSCR_PR, FPSCR_FR, 0 };
+        switch (x & 3) {
+        case 3:
+                fxchg(fregs, flag[x >> 2]);
+                break;
+        case 1:
+                ftrv(fregs, x - 1);
+                break;
+        default:
+                fsca(fregs, x);
+        }
+        return 0;
+}
+
+static int
+id_fnxd(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int x, int n)
+{
+        return (fnxd[x])(fregs, n);
+}
+
+static int
+id_fnmx(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, u16 code)
+{
+        int n = (code >> 8) & 0xf, m = (code >> 4) & 0xf, x = code & 0xf;
+        return (fnmx[x])(fregs, regs, m, n);
+}
+
+static int
+id_sys(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, u16 code)
+{
+        int n = ((code >> 8) & 0xf);
+        unsigned long *reg = (code & 0x0010) ? &FPUL : &FPSCR;
+
+        switch (code & 0xf0ff) {
+        case 0x005a:
+        case 0x006a:
+                Rn = *reg;
+                break;
+        case 0x405a:
+        case 0x406a:
+                *reg = Rn;
+                break;
+        case 0x4052:
+        case 0x4062:
+                Rn -= 4;
+                WRITE(*reg, Rn);
+                break;
+        case 0x4056:
+        case 0x4066:
+                READ(*reg, Rn);
+                Rn += 4;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int fpu_emulate(u16 code, struct sh_fpu_soft_struct *fregs, struct pt_regs *regs)
+{
+        if ((code & 0xf000) == 0xf000)
+                return id_fnmx(fregs, regs, code);
+        else
+                return id_sys(fregs, regs, code);
+}
+
+/**
+ *      denormal_to_double - Given denormalized float number,
+ *                           store double float
+ *
+ *      @fpu: Pointer to sh_fpu_hard structure
+ *      @n: Index to FP register
+ */
+static void denormal_to_double(struct sh_fpu_hard_struct *fpu, int n)
+{
+        unsigned long du, dl;
+        unsigned long x = fpu->fpul;
+        int exp = 1023 - 126;
+
+        if (x != 0 && (x & 0x7f800000) == 0) {
+                du = (x & 0x80000000);
+                while ((x & 0x00800000) == 0) {
+                        x <<= 1;
+                        exp--;
+                }
+                x &= 0x007fffff;
+                du |= (exp << 20) | (x >> 3);
+                dl = x << 29;
+
+                fpu->fp_regs[n] = du;
+                fpu->fp_regs[n+1] = dl;
+        }
+}
+
+/**
+ *      ieee_fpe_handler - Handle denormalized number exception
+ *
+ *      @regs: Pointer to register structure
+ *
+ *      Returns 1 when it's handled (should not cause exception).
+ */
+static int ieee_fpe_handler(struct pt_regs *regs)
+{
+        unsigned short insn = *(unsigned short *)regs->pc;
+        unsigned short finsn;
+        unsigned long nextpc;
+        int nib[4] = {
+                (insn >> 12) & 0xf,
+                (insn >> 8) & 0xf,
+                (insn >> 4) & 0xf,
+                insn & 0xf};
+
+        if (nib[0] == 0xb ||
+            (nib[0] == 0x4 && nib[2] == 0x0 && nib[3] == 0xb)) /* bsr & jsr */
+                regs->pr = regs->pc + 4;
+
+        if (nib[0] == 0xa || nib[0] == 0xb) { /* bra & bsr */
+                nextpc = regs->pc + 4 + ((short) ((insn & 0xfff) << 4) >> 3);
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x8 && nib[1] == 0xd) { /* bt/s */
+                if (regs->sr & 1)
+                        nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
+                else
+                        nextpc = regs->pc + 4;
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x8 && nib[1] == 0xf) { /* bf/s */
+                if (regs->sr & 1)
+                        nextpc = regs->pc + 4;
+                else
+                        nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x4 && nib[3] == 0xb &&
+                 (nib[2] == 0x0 || nib[2] == 0x2)) { /* jmp & jsr */
+                nextpc = regs->regs[nib[1]];
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x0 && nib[3] == 0x3 &&
+                 (nib[2] == 0x0 || nib[2] == 0x2)) { /* braf & bsrf */
+                nextpc = regs->pc + 4 + regs->regs[nib[1]];
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (insn == 0x000b) { /* rts */
+                nextpc = regs->pr;
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else {
+                nextpc = regs->pc + 2;
+                finsn = insn;
+        }
+
+        if ((finsn & 0xf1ff) == 0xf0ad) { /* fcnvsd */
+                struct task_struct *tsk = current;
+
+                if ((tsk->thread.fpu.hard.fpscr & (1 << 17))) {
+                        /* FPU error */
+                        denormal_to_double (&tsk->thread.fpu.hard,
+                                            (finsn >> 8) & 0xf);
+                        tsk->thread.fpu.hard.fpscr &=
+                                ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
+                        set_tsk_thread_flag(tsk, TIF_USEDFPU);
+                } else {
+                        tsk->thread.trap_no = 11;
+                        tsk->thread.error_code = 0;
+                        force_sig(SIGFPE, tsk);
+                }
+
+                regs->pc = nextpc;
+                return 1;
+        }
+
+        return 0;
+}
+
+asmlinkage void do_fpu_error(unsigned long r4, unsigned long r5,
+                             unsigned long r6, unsigned long r7,
+                             struct pt_regs regs)
+{
+        struct task_struct *tsk = current;
+
+        if (ieee_fpe_handler (&regs))
+                return;
+
+        regs.pc += 2;
+        tsk->thread.trap_no = 11;
+        tsk->thread.error_code = 0;
+        force_sig(SIGFPE, tsk);
+}
+
+/**
+ * fpu_init - Initialize FPU registers
+ * @fpu: Pointer to software emulated FPU registers.
+ */
+static void fpu_init(struct sh_fpu_soft_struct *fpu)
+{
+        int i;
+
+        fpu->fpscr = FPSCR_INIT;
+        fpu->fpul = 0;
+
+        for (i = 0; i < 16; i++) {
+                fpu->fp_regs[i] = 0;
+                fpu->xfp_regs[i]= 0;
+        }
+}
+
+/**
+ * do_fpu_inst - Handle reserved instructions for FPU emulation
+ * @inst: instruction code.
+ * @regs: registers on stack.
+ */
+int do_fpu_inst(unsigned short inst, struct pt_regs *regs)
+{
+        struct task_struct *tsk = current;
+        struct sh_fpu_soft_struct *fpu = &(tsk->thread.fpu.soft);
+
+        if (!test_tsk_thread_flag(tsk, TIF_USEDFPU)) {
+                /* initialize once. */
+                fpu_init(fpu);
+                set_tsk_thread_flag(tsk, TIF_USEDFPU);
+        }
+
+        return fpu_emulate(inst, fpu, regs);
+}
diff --git a/arch/sh/math-emu/sfp-util.h b/arch/sh/math-emu/sfp-util.h
new file mode 100644
index 000000000000..8ae1bd310ad0
--- /dev/null
+++ b/arch/sh/math-emu/sfp-util.h
@@ -0,0 +1,72 @@
+/*
+ * These are copied from glibc/stdlib/longlong.h
+ */
+
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  do {                                                                  \
+    UWtype __x;                                                         \
+    __x = (al) + (bl);                                                  \
+    (sh) = (ah) + (bh) + (__x < (al));                                  \
+    (sl) = __x;                                                         \
+  } while (0)
+
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  do {                                                                  \
+    UWtype __x;                                                         \
+    __x = (al) - (bl);                                                  \
+    (sh) = (ah) - (bh) - (__x > (al));                                  \
+    (sl) = __x;                                                         \
+  } while (0)
+
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("dmulu.l %2,%3\n\tsts    macl,%1\n\tsts  mach,%0"    \
+        : "=r" ((u32)(w1)), "=r" ((u32)(w0))    \
+        :  "r" ((u32)(u)),   "r" ((u32)(v))     \
+        : "macl", "mach")
+
+#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
+#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))
+#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))
+
+#define udiv_qrnnd(q, r, n1, n0, d) \
+  do {                                                                  \
+    UWtype __d1, __d0, __q1, __q0;                                      \
+    UWtype __r1, __r0, __m;                                             \
+    __d1 = __ll_highpart (d);                                           \
+    __d0 = __ll_lowpart (d);                                            \
+                                                                        \
+    __r1 = (n1) % __d1;                                                 \
+    __q1 = (n1) / __d1;                                                 \
+    __m = (UWtype) __q1 * __d0;                                         \
+    __r1 = __r1 * __ll_B | __ll_highpart (n0);                          \
+    if (__r1 < __m)                                                     \
+      {                                                                 \
+        __q1--, __r1 += (d);                                            \
+        if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
+          if (__r1 < __m)                                               \
+            __q1--, __r1 += (d);                                        \
+      }                                                                 \
+    __r1 -= __m;                                                        \
+                                                                        \
+    __r0 = __r1 % __d1;                                                 \
+    __q0 = __r1 / __d1;                                                 \
+    __m = (UWtype) __q0 * __d0;                                         \
+    __r0 = __r0 * __ll_B | __ll_lowpart (n0);                           \
+    if (__r0 < __m)                                                     \
+      {                                                                 \
+        __q0--, __r0 += (d);                                            \
+        if (__r0 >= (d))                                                \
+          if (__r0 < __m)                                               \
+            __q0--, __r0 += (d);                                        \
+      }                                                                 \
+    __r0 -= __m;                                                        \
+                                                                        \
+    (q) = (UWtype) __q1 * __ll_B | __q0;                                \
+    (r) = __r0;                                                         \
+  } while (0)
+
+#define abort() return 0
+
+#define __BYTE_ORDER __LITTLE_ENDIAN
+
+
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index fb586b1cf8bb..9dd606464d23 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -20,7 +20,10 @@ config CPU_SH4
 config CPU_SH4A
         bool
         select CPU_SH4
-        select CPU_HAS_INTC2_IRQ
+
+config CPU_SH4AL_DSP
+        bool
+        select CPU_SH4A
 
 config CPU_SUBTYPE_ST40
         bool
@@ -48,6 +51,12 @@ config CPU_SUBTYPE_SH7705
         select CPU_SH3
         select CPU_HAS_PINT_IRQ
 
+config CPU_SUBTYPE_SH7706
+        bool "Support SH7706 processor"
+        select CPU_SH3
+        help
+          Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
+
 config CPU_SUBTYPE_SH7707
         bool "Support SH7707 processor"
         select CPU_SH3
@@ -69,6 +78,12 @@ config CPU_SUBTYPE_SH7709
         help
           Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
+config CPU_SUBTYPE_SH7710
+        bool "Support SH7710 processor"
+        select CPU_SH3
+        help
+          Select SH7710 if you have a SH3-DSP SH7710 CPU.
+
 comment "SH-4 Processor Support"
 
 config CPU_SUBTYPE_SH7750
@@ -133,10 +148,6 @@ config CPU_SUBTYPE_ST40GX1
 
 comment "SH-4A Processor Support"
 
-config CPU_SUBTYPE_SH73180
-        bool "Support SH73180 processor"
-        select CPU_SH4A
-
 config CPU_SUBTYPE_SH7770
         bool "Support SH7770 processor"
         select CPU_SH4A
@@ -144,6 +155,17 @@ config CPU_SUBTYPE_SH7770
 config CPU_SUBTYPE_SH7780
         bool "Support SH7780 processor"
         select CPU_SH4A
+        select CPU_HAS_INTC2_IRQ
+
+comment "SH4AL-DSP Processor Support"
+
+config CPU_SUBTYPE_SH73180
+        bool "Support SH73180 processor"
+        select CPU_SH4AL_DSP
+
+config CPU_SUBTYPE_SH7343
+        bool "Support SH7343 processor"
+        select CPU_SH4AL_DSP
 
 endmenu
 
@@ -161,15 +183,59 @@ config MMU
           turning this off will boot the kernel on these machines with the
           MMU implicitly switched off.
 
+config PAGE_OFFSET
+        hex
+        default "0x80000000" if MMU
+        default "0x00000000"
+
+config MEMORY_START
+        hex "Physical memory start address"
+        default "0x08000000"
+        ---help---
+          Computers built with Hitachi SuperH processors always
+          map the ROM starting at address zero.  But the processor
+          does not specify the range that RAM takes.
+
+          The physical memory (RAM) start address will be automatically
+          set to 08000000. Other platforms, such as the Solution Engine
+          boards typically map RAM at 0C000000.
+
+          Tweak this only when porting to a new machine which does not
+          already have a defconfig. Changing it from the known correct
+          value on any of the known systems will only lead to disaster.
+
+config MEMORY_SIZE
+        hex "Physical memory size"
+        default "0x00400000"
+        help
+          This sets the default memory size assumed by your SH kernel. It can
+          be overridden as normal by the 'mem=' argument on the kernel command
+          line. If unsure, consult your board specifications or just leave it
+          as 0x00400000 which was the default value before this became
+          configurable.
+
 config 32BIT
         bool "Support 32-bit physical addressing through PMB"
-        depends on CPU_SH4A
+        depends on CPU_SH4A && MMU
         default y
         help
           If you say Y here, physical addressing will be extended to
           32-bits through the SH-4A PMB. If this is not set, legacy
           29-bit physical addressing will be used.
 
+config VSYSCALL
+        bool "Support vsyscall page"
+        depends on MMU
+        default y
+        help
+          This will enable support for the kernel mapping a vDSO page
+          in process space, and subsequently handing down the entry point
+          to the libc through the ELF auxiliary vector.
+
+          From the kernel side this is used for the signal trampoline.
+          For systems with an MMU that can afford to give up a page,
+          (the default value) say Y.
+
 choice
         prompt "HugeTLB page size"
         depends on HUGETLB_PAGE && CPU_SH4 && MMU
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index 9489a1424644..3ffd7f68c0a2 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -6,20 +6,26 @@ obj-y			:= init.o extable.o consistent.o
 
 obj-$(CONFIG_CPU_SH2)   += cache-sh2.o
 obj-$(CONFIG_CPU_SH3)   += cache-sh3.o
-obj-$(CONFIG_CPU_SH4)   += cache-sh4.o pg-sh4.o
+obj-$(CONFIG_CPU_SH4)   += cache-sh4.o
 
 obj-$(CONFIG_DMA_PAGE_OPS)      += pg-dma.o
 obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
 
 mmu-y                   := fault-nommu.o tlb-nommu.o pg-nommu.o
-mmu-$(CONFIG_MMU)       := fault.o clear_page.o copy_page.o
+mmu-$(CONFIG_MMU)       := fault.o clear_page.o copy_page.o tlb-flush.o \
+                           ioremap.o
 
 obj-y                   += $(mmu-y)
 
+ifdef CONFIG_DEBUG_FS
+obj-$(CONFIG_CPU_SH4)           += cache-debugfs.o
+endif
+
 ifdef CONFIG_MMU
-obj-$(CONFIG_CPU_SH3)   += tlb-sh3.o
-obj-$(CONFIG_CPU_SH4)   += tlb-sh4.o ioremap.o
+obj-$(CONFIG_CPU_SH3)           += tlb-sh3.o
+obj-$(CONFIG_CPU_SH4)           += tlb-sh4.o pg-sh4.o
 obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
 endif
 
-obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
+obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
+obj-$(CONFIG_32BIT)             += pmb.o
diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c
new file mode 100644
index 000000000000..a22d914e4d15
--- /dev/null
+++ b/arch/sh/mm/cache-debugfs.c
@@ -0,0 +1,147 @@
+/*
+ * debugfs ops for the L1 cache
+ *
+ *  Copyright (C) 2006  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/module.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+#include <asm/processor.h>
+#include <asm/uaccess.h>
+#include <asm/cache.h>
+#include <asm/io.h>
+
+enum cache_type {
+        CACHE_TYPE_ICACHE,
+        CACHE_TYPE_DCACHE,
+        CACHE_TYPE_UNIFIED,
+};
+
+static int cache_seq_show(struct seq_file *file, void *iter)
+{
+        unsigned int cache_type = (unsigned int)file->private;
+        struct cache_info *cache;
+        unsigned int waysize, way, cache_size;
+        unsigned long ccr, base;
+        static unsigned long addrstart = 0;
+
+        /*
+         * Go uncached immediately so we don't skew the results any
+         * more than we already are..
+         */
+        jump_to_P2();
+
+        ccr = ctrl_inl(CCR);
+        if ((ccr & CCR_CACHE_ENABLE) == 0) {
+                back_to_P1();
+
+                seq_printf(file, "disabled\n");
+                return 0;
+        }
+
+        if (cache_type == CACHE_TYPE_DCACHE) {
+                base = CACHE_OC_ADDRESS_ARRAY;
+                cache = &cpu_data->dcache;
+        } else {
+                base = CACHE_IC_ADDRESS_ARRAY;
+                cache = &cpu_data->icache;
+        }
+
+        /*
+         * Due to the amount of data written out (depending on the cache size),
+         * we may be iterated over multiple times. In this case, keep track of
+         * the entry position in addrstart, and rewind it when we've hit the
+         * end of the cache.
+         *
+         * Likewise, the same code is used for multiple caches, so care must
+         * be taken for bouncing addrstart back and forth so the appropriate
+         * cache is hit.
+         */
+        cache_size = cache->ways * cache->sets * cache->linesz;
+        if (((addrstart & 0xff000000) != base) ||
+             (addrstart & 0x00ffffff) > cache_size)
+                addrstart = base;
+
+        waysize = cache->sets;
+
+        /*
+         * If the OC is already in RAM mode, we only have
+         * half of the entries to consider..
+         */
+        if ((ccr & CCR_CACHE_ORA) && cache_type == CACHE_TYPE_DCACHE)
+                waysize >>= 1;
+
+        waysize <<= cache->entry_shift;
+
+        for (way = 0; way < cache->ways; way++) {
+                unsigned long addr;
+                unsigned int line;
+
+                seq_printf(file, "-----------------------------------------\n");
+                seq_printf(file, "Way %d\n", way);
+                seq_printf(file, "-----------------------------------------\n");
+
+                for (addr = addrstart, line = 0;
+                     addr < addrstart + waysize;
+                     addr += cache->linesz, line++) {
+                        unsigned long data = ctrl_inl(addr);
+
+                        /* Check the V bit, ignore invalid cachelines */
+                        if ((data & 1) == 0)
+                                continue;
+
+                        /* U: Dirty, cache tag is 10 bits up */
+                        seq_printf(file, "%3d: %c 0x%lx\n",
+                                   line, data & 2 ? 'U' : ' ',
+                                   data & 0x1ffffc00);
+                }
+
+                addrstart += cache->way_incr;
+        }
+
+        back_to_P1();
+
+        return 0;
+}
+
+static int cache_debugfs_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, cache_seq_show, inode->u.generic_ip);
+}
+
+static struct file_operations cache_debugfs_fops = {
+        .owner          = THIS_MODULE,
+        .open           = cache_debugfs_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
+static int __init cache_debugfs_init(void)
+{
+        struct dentry *dcache_dentry, *icache_dentry;
+
+        dcache_dentry = debugfs_create_file("dcache", S_IRUSR, NULL,
+                                            (unsigned int *)CACHE_TYPE_DCACHE,
+                                            &cache_debugfs_fops);
+        if (IS_ERR(dcache_dentry))
+                return PTR_ERR(dcache_dentry);
+
+        icache_dentry = debugfs_create_file("icache", S_IRUSR, NULL,
+                                            (unsigned int *)CACHE_TYPE_ICACHE,
+                                            &cache_debugfs_fops);
+        if (IS_ERR(icache_dentry)) {
+                debugfs_remove(dcache_dentry);
+                return PTR_ERR(icache_dentry);
+        }
+
+        return 0;
+}
+module_init(cache_debugfs_init);
+
+MODULE_LICENSE("GPL v2");
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 524cea5b47f9..e48cc22724d9 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -2,49 +2,120 @@
  * arch/sh/mm/cache-sh4.c
  *
  * Copyright (C) 1999, 2000, 2002  Niibe Yutaka
- * Copyright (C) 2001, 2002, 2003, 2004  Paul Mundt
+ * Copyright (C) 2001 - 2006  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
  *
  * 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/mman.h>
 #include <linux/mm.h>
-#include <linux/threads.h>
 #include <asm/addrspace.h>
-#include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
-extern void __flush_cache_4096_all(unsigned long start);
-static void __flush_cache_4096_all_ex(unsigned long start);
-extern void __flush_dcache_all(void);
-static void __flush_dcache_all_ex(void);
+/*
+ * The maximum number of pages we support up to when doing ranged dcache
+ * flushing. Anything exceeding this will simply flush the dcache in its
+ * entirety.
+ */
+#define MAX_DCACHE_PAGES        64      /* XXX: Tune for ways */
+
+static void __flush_dcache_segment_1way(unsigned long start,
+                                        unsigned long extent);
+static void __flush_dcache_segment_2way(unsigned long start,
+                                        unsigned long extent);
+static void __flush_dcache_segment_4way(unsigned long start,
+                                        unsigned long extent);
+
+static void __flush_cache_4096(unsigned long addr, unsigned long phys,
+                               unsigned long exec_offset);
+
+/*
+ * This is initialised here to ensure that it is not placed in the BSS.  If
+ * that were to happen, note that cache_init gets called before the BSS is
+ * cleared, so this would get nulled out which would be hopeless.
+ */
+static void (*__flush_dcache_segment_fn)(unsigned long, unsigned long) =
+        (void (*)(unsigned long, unsigned long))0xdeadbeef;
+
+static void compute_alias(struct cache_info *c)
+{
+        c->alias_mask = ((c->sets - 1) << c->entry_shift) & ~(PAGE_SIZE - 1);
+        c->n_aliases = (c->alias_mask >> PAGE_SHIFT) + 1;
+}
+
+static void __init emit_cache_params(void)
+{
+        printk("PVR=%08x CVR=%08x PRR=%08x\n",
+                ctrl_inl(CCN_PVR),
+                ctrl_inl(CCN_CVR),
+                ctrl_inl(CCN_PRR));
+        printk("I-cache : n_ways=%d n_sets=%d way_incr=%d\n",
+                cpu_data->icache.ways,
+                cpu_data->icache.sets,
+                cpu_data->icache.way_incr);
+        printk("I-cache : entry_mask=0x%08x alias_mask=0x%08x n_aliases=%d\n",
+                cpu_data->icache.entry_mask,
+                cpu_data->icache.alias_mask,
+                cpu_data->icache.n_aliases);
+        printk("D-cache : n_ways=%d n_sets=%d way_incr=%d\n",
+                cpu_data->dcache.ways,
+                cpu_data->dcache.sets,
+                cpu_data->dcache.way_incr);
+        printk("D-cache : entry_mask=0x%08x alias_mask=0x%08x n_aliases=%d\n",
+                cpu_data->dcache.entry_mask,
+                cpu_data->dcache.alias_mask,
+                cpu_data->dcache.n_aliases);
+
+        if (!__flush_dcache_segment_fn)
+                panic("unknown number of cache ways\n");
+}
 
 /*
  * SH-4 has virtually indexed and physically tagged cache.
  */
 
-struct semaphore p3map_sem[4];
+/* Worst case assumed to be 64k cache, direct-mapped i.e. 4 synonym bits. */
+#define MAX_P3_SEMAPHORES 16
+
+struct semaphore p3map_sem[MAX_P3_SEMAPHORES];
 
 void __init p3_cache_init(void)
 {
-        if (remap_area_pages(P3SEG, 0, PAGE_SIZE*4, _PAGE_CACHABLE))
+        int i;
+
+        compute_alias(&cpu_data->icache);
+        compute_alias(&cpu_data->dcache);
+
+        switch (cpu_data->dcache.ways) {
+        case 1:
+                __flush_dcache_segment_fn = __flush_dcache_segment_1way;
+                break;
+        case 2:
+                __flush_dcache_segment_fn = __flush_dcache_segment_2way;
+                break;
+        case 4:
+                __flush_dcache_segment_fn = __flush_dcache_segment_4way;
+                break;
+        default:
+                __flush_dcache_segment_fn = NULL;
+                break;
+        }
+
+        emit_cache_params();
+
+        if (remap_area_pages(P3SEG, 0, PAGE_SIZE * 4, _PAGE_CACHABLE))
                 panic("%s failed.", __FUNCTION__);
 
-        sema_init (&p3map_sem[0], 1);
-        sema_init (&p3map_sem[1], 1);
-        sema_init (&p3map_sem[2], 1);
-        sema_init (&p3map_sem[3], 1);
+        for (i = 0; i < cpu_data->dcache.n_aliases; i++)
+                sema_init(&p3map_sem[i], 1);
 }
 
 /*
@@ -89,7 +160,6 @@ void __flush_purge_region(void *start, int size)
         }
 }
 
-
 /*
  * No write back please
  */
@@ -108,40 +178,6 @@ void __flush_invalidate_region(void *start, int size)
         }
 }
 
-static void __flush_dcache_all_ex(void)
-{
-        unsigned long addr, end_addr, entry_offset;
-
-        end_addr = CACHE_OC_ADDRESS_ARRAY + (cpu_data->dcache.sets << cpu_data->dcache.entry_shift) * cpu_data->dcache.ways;
-        entry_offset = 1 << cpu_data->dcache.entry_shift;
-        for (addr = CACHE_OC_ADDRESS_ARRAY; addr < end_addr; addr += entry_offset) {
-                ctrl_outl(0, addr);
-        }
-}
-
-static void __flush_cache_4096_all_ex(unsigned long start)
-{
-        unsigned long addr, entry_offset;
-        int i;
-
-        entry_offset = 1 << cpu_data->dcache.entry_shift;
-        for (i = 0; i < cpu_data->dcache.ways; i++, start += cpu_data->dcache.way_incr) {
-                for (addr = CACHE_OC_ADDRESS_ARRAY + start;
-                     addr < CACHE_OC_ADDRESS_ARRAY + 4096 + start;
-                     addr += entry_offset) {
-                        ctrl_outl(0, addr);
-                }
-        }
-}
-
-void flush_cache_4096_all(unsigned long start)
-{
-        if (cpu_data->dcache.ways == 1)
-                __flush_cache_4096_all(start);
-        else
-                __flush_cache_4096_all_ex(start);
-}
-
 /*
  * Write back the range of D-cache, and purge the I-cache.
  *
@@ -153,14 +189,14 @@ void flush_icache_range(unsigned long start, unsigned long end)
 }
 
 /*
- * Write back the D-cache and purge the I-cache for signal trampoline. 
+ * Write back the D-cache and purge the I-cache for signal trampoline.
  * .. which happens to be the same behavior as flush_icache_range().
  * So, we simply flush out a line.
  */
 void flush_cache_sigtramp(unsigned long addr)
 {
         unsigned long v, index;
-        unsigned long flags; 
+        unsigned long flags;
         int i;
 
         v = addr & ~(L1_CACHE_BYTES-1);
@@ -172,30 +208,33 @@ void flush_cache_sigtramp(unsigned long addr)
 
         local_irq_save(flags);
         jump_to_P2();
-        for(i = 0; i < cpu_data->icache.ways; i++, index += cpu_data->icache.way_incr)
+
+        for (i = 0; i < cpu_data->icache.ways;
+             i++, index += cpu_data->icache.way_incr)
                 ctrl_outl(0, index);    /* Clear out Valid-bit */
+
         back_to_P1();
+        wmb();
         local_irq_restore(flags);
 }
 
 static inline void flush_cache_4096(unsigned long start,
                                     unsigned long phys)
 {
-        unsigned long flags; 
-        extern void __flush_cache_4096(unsigned long addr, unsigned long phys, unsigned long exec_offset);
+        unsigned long flags, exec_offset = 0;
 
         /*
-         * SH7751, SH7751R, and ST40 have no restriction to handle cache.
-         * (While SH7750 must do that at P2 area.)
+         * All types of SH-4 require PC to be in P2 to operate on the I-cache.
+         * Some types of SH-4 require PC to be in P2 to operate on the D-cache.
          */
-        if ((cpu_data->flags & CPU_HAS_P2_FLUSH_BUG)
-           || start < CACHE_OC_ADDRESS_ARRAY) {
-                local_irq_save(flags);
-                __flush_cache_4096(start | SH_CACHE_ASSOC, P1SEGADDR(phys), 0x20000000);
-                local_irq_restore(flags);
-        } else {
-                __flush_cache_4096(start | SH_CACHE_ASSOC, P1SEGADDR(phys), 0);
-        }
+        if ((cpu_data->flags & CPU_HAS_P2_FLUSH_BUG) ||
+            (start < CACHE_OC_ADDRESS_ARRAY))
+                exec_offset = 0x20000000;
+
+        local_irq_save(flags);
+        __flush_cache_4096(start | SH_CACHE_ASSOC,
+                           P1SEGADDR(phys), exec_offset);
+        local_irq_restore(flags);
 }
 
 /*
@@ -206,15 +245,19 @@ void flush_dcache_page(struct page *page)
 {
         if (test_bit(PG_mapped, &page->flags)) {
                 unsigned long phys = PHYSADDR(page_address(page));
+                unsigned long addr = CACHE_OC_ADDRESS_ARRAY;
+                int i, n;
 
                 /* Loop all the D-cache */
-                flush_cache_4096(CACHE_OC_ADDRESS_ARRAY,          phys);
-                flush_cache_4096(CACHE_OC_ADDRESS_ARRAY | 0x1000, phys);
-                flush_cache_4096(CACHE_OC_ADDRESS_ARRAY | 0x2000, phys);
-                flush_cache_4096(CACHE_OC_ADDRESS_ARRAY | 0x3000, phys);
+                n = cpu_data->dcache.n_aliases;
+                for (i = 0; i < n; i++, addr += PAGE_SIZE)
+                        flush_cache_4096(addr, phys);
         }
+
+        wmb();
 }
 
+/* TODO: Selective icache invalidation through IC address array.. */
 static inline void flush_icache_all(void)
 {
         unsigned long flags, ccr;
@@ -227,34 +270,142 @@ static inline void flush_icache_all(void)
         ccr |= CCR_CACHE_ICI;
         ctrl_outl(ccr, CCR);
 
+        /*
+         * back_to_P1() will take care of the barrier for us, don't add
+         * another one!
+         */
+
         back_to_P1();
         local_irq_restore(flags);
 }
 
+void flush_dcache_all(void)
+{
+        (*__flush_dcache_segment_fn)(0UL, cpu_data->dcache.way_size);
+        wmb();
+}
+
 void flush_cache_all(void)
 {
-        if (cpu_data->dcache.ways == 1)
-                __flush_dcache_all();
-        else
-                __flush_dcache_all_ex();
+        flush_dcache_all();
         flush_icache_all();
 }
 
+static void __flush_cache_mm(struct mm_struct *mm, unsigned long start,
+                             unsigned long end)
+{
+        unsigned long d = 0, p = start & PAGE_MASK;
+        unsigned long alias_mask = cpu_data->dcache.alias_mask;
+        unsigned long n_aliases = cpu_data->dcache.n_aliases;
+        unsigned long select_bit;
+        unsigned long all_aliases_mask;
+        unsigned long addr_offset;
+        pgd_t *dir;
+        pmd_t *pmd;
+        pud_t *pud;
+        pte_t *pte;
+        int i;
+
+        dir = pgd_offset(mm, p);
+        pud = pud_offset(dir, p);
+        pmd = pmd_offset(pud, p);
+        end = PAGE_ALIGN(end);
+
+        all_aliases_mask = (1 << n_aliases) - 1;
+
+        do {
+                if (pmd_none(*pmd) || unlikely(pmd_bad(*pmd))) {
+                        p &= PMD_MASK;
+                        p += PMD_SIZE;
+                        pmd++;
+
+                        continue;
+                }
+
+                pte = pte_offset_kernel(pmd, p);
+
+                do {
+                        unsigned long phys;
+                        pte_t entry = *pte;
+
+                        if (!(pte_val(entry) & _PAGE_PRESENT)) {
+                                pte++;
+                                p += PAGE_SIZE;
+                                continue;
+                        }
+
+                        phys = pte_val(entry) & PTE_PHYS_MASK;
+
+                        if ((p ^ phys) & alias_mask) {
+                                d |= 1 << ((p & alias_mask) >> PAGE_SHIFT);
+                                d |= 1 << ((phys & alias_mask) >> PAGE_SHIFT);
+
+                                if (d == all_aliases_mask)
+                                        goto loop_exit;
+                        }
+
+                        pte++;
+                        p += PAGE_SIZE;
+                } while (p < end && ((unsigned long)pte & ~PAGE_MASK));
+                pmd++;
+        } while (p < end);
+
+loop_exit:
+        addr_offset = 0;
+        select_bit = 1;
+
+        for (i = 0; i < n_aliases; i++) {
+                if (d & select_bit) {
+                        (*__flush_dcache_segment_fn)(addr_offset, PAGE_SIZE);
+                        wmb();
+                }
+
+                select_bit <<= 1;
+                addr_offset += PAGE_SIZE;
+        }
+}
+
+/*
+ * Note : (RPC) since the caches are physically tagged, the only point
+ * of flush_cache_mm for SH-4 is to get rid of aliases from the
+ * D-cache.  The assumption elsewhere, e.g. flush_cache_range, is that
+ * lines can stay resident so long as the virtual address they were
+ * accessed with (hence cache set) is in accord with the physical
+ * address (i.e. tag).  It's no different here.  So I reckon we don't
+ * need to flush the I-cache, since aliases don't matter for that.  We
+ * should try that.
+ *
+ * Caller takes mm->mmap_sem.
+ */
 void flush_cache_mm(struct mm_struct *mm)
 {
-        /* Is there any good way? */
-        /* XXX: possibly call flush_cache_range for each vm area */
-        /* 
-         * FIXME: Really, the optimal solution here would be able to flush out
-         * individual lines created by the specified context, but this isn't
-         * feasible for a number of architectures (such as MIPS, and some
-         * SPARC) .. is this possible for SuperH?
-         *
-         * In the meantime, we'll just flush all of the caches.. this
-         * seems to be the simplest way to avoid at least a few wasted
-         * cache flushes. -Lethal
+        /*
+         * If cache is only 4k-per-way, there are never any 'aliases'.  Since
+         * the cache is physically tagged, the data can just be left in there.
          */
-        flush_cache_all();
+        if (cpu_data->dcache.n_aliases == 0)
+                return;
+
+        /*
+         * Don't bother groveling around the dcache for the VMA ranges
+         * if there are too many PTEs to make it worthwhile.
+         */
+        if (mm->nr_ptes >= MAX_DCACHE_PAGES)
+                flush_dcache_all();
+        else {
+                struct vm_area_struct *vma;
+
+                /*
+                 * In this case there are reasonably sized ranges to flush,
+                 * iterate through the VMA list and take care of any aliases.
+                 */
+                for (vma = mm->mmap; vma; vma = vma->vm_next)
+                        __flush_cache_mm(mm, vma->vm_start, vma->vm_end);
+        }
+
+        /* Only touch the icache if one of the VMAs has VM_EXEC set. */
+        if (mm->exec_vm)
+                flush_icache_all();
 }
 
 /*
@@ -263,27 +414,40 @@ void flush_cache_mm(struct mm_struct *mm)
  * ADDR: Virtual Address (U0 address)
  * PFN: Physical page number
  */
-void flush_cache_page(struct vm_area_struct *vma, unsigned long address, unsigned long pfn)
+void flush_cache_page(struct vm_area_struct *vma, unsigned long address,
+                      unsigned long pfn)
 {
         unsigned long phys = pfn << PAGE_SHIFT;
+        unsigned int alias_mask;
+
+        alias_mask = cpu_data->dcache.alias_mask;
 
         /* We only need to flush D-cache when we have alias */
-        if ((address^phys) & CACHE_ALIAS) {
+        if ((address^phys) & alias_mask) {
                 /* Loop 4K of the D-cache */
                 flush_cache_4096(
-                        CACHE_OC_ADDRESS_ARRAY | (address & CACHE_ALIAS),
+                        CACHE_OC_ADDRESS_ARRAY | (address & alias_mask),
                         phys);
                 /* Loop another 4K of the D-cache */
                 flush_cache_4096(
-                        CACHE_OC_ADDRESS_ARRAY | (phys & CACHE_ALIAS),
+                        CACHE_OC_ADDRESS_ARRAY | (phys & alias_mask),
                         phys);
         }
 
-        if (vma->vm_flags & VM_EXEC)
-                /* Loop 4K (half) of the I-cache */
+        alias_mask = cpu_data->icache.alias_mask;
+        if (vma->vm_flags & VM_EXEC) {
+                /*
+                 * Evict entries from the portion of the cache from which code
+                 * may have been executed at this address (virtual).  There's
+                 * no need to evict from the portion corresponding to the
+                 * physical address as for the D-cache, because we know the
+                 * kernel has never executed the code through its identity
+                 * translation.
+                 */
                 flush_cache_4096(
-                        CACHE_IC_ADDRESS_ARRAY | (address & 0x1000),
+                        CACHE_IC_ADDRESS_ARRAY | (address & alias_mask),
                         phys);
+        }
 }
 
 /*
@@ -298,52 +462,31 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long address, unsigne
 void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
                        unsigned long end)
 {
-        unsigned long p = start & PAGE_MASK;
-        pgd_t *dir;
-        pmd_t *pmd;
-        pte_t *pte;
-        pte_t entry;
-        unsigned long phys;
-        unsigned long d = 0;
-
-        dir = pgd_offset(vma->vm_mm, p);
-        pmd = pmd_offset(dir, p);
+        /*
+         * If cache is only 4k-per-way, there are never any 'aliases'.  Since
+         * the cache is physically tagged, the data can just be left in there.
+         */
+        if (cpu_data->dcache.n_aliases == 0)
+                return;
 
-        do {
-                if (pmd_none(*pmd) || pmd_bad(*pmd)) {
-                        p &= ~((1 << PMD_SHIFT) -1);
-                        p += (1 << PMD_SHIFT);
-                        pmd++;
-                        continue;
-                }
-                pte = pte_offset_kernel(pmd, p);
-                do {
-                        entry = *pte;
-                        if ((pte_val(entry) & _PAGE_PRESENT)) {
-                                phys = pte_val(entry)&PTE_PHYS_MASK;
-                                if ((p^phys) & CACHE_ALIAS) {
-                                        d |= 1 << ((p & CACHE_ALIAS)>>12); 
-                                        d |= 1 << ((phys & CACHE_ALIAS)>>12);
-                                        if (d == 0x0f)
-                                                goto loop_exit;
-                                }
-                        }
-                        pte++;
-                        p += PAGE_SIZE;
-                } while (p < end && ((unsigned long)pte & ~PAGE_MASK));
-                pmd++;
-        } while (p < end);
- loop_exit:
-        if (d & 1)
-                flush_cache_4096_all(0);
-        if (d & 2)
-                flush_cache_4096_all(0x1000);
-        if (d & 4)
-                flush_cache_4096_all(0x2000);
-        if (d & 8)
-                flush_cache_4096_all(0x3000);
-        if (vma->vm_flags & VM_EXEC)
+        /*
+         * Don't bother with the lookup and alias check if we have a
+         * wide range to cover, just blow away the dcache in its
+         * entirety instead. -- PFM.
+         */
+        if (((end - start) >> PAGE_SHIFT) >= MAX_DCACHE_PAGES)
+                flush_dcache_all();
+        else
+                __flush_cache_mm(vma->vm_mm, start, end);
+
+        if (vma->vm_flags & VM_EXEC) {
+                /*
+                 * TODO: Is this required???  Need to look at how I-cache
+                 * coherency is assured when new programs are loaded to see if
+                 * this matters.
+                 */
                 flush_icache_all();
+        }
 }
 
 /*
@@ -357,5 +500,273 @@ void flush_icache_user_range(struct vm_area_struct *vma,
                              struct page *page, unsigned long addr, int len)
 {
         flush_cache_page(vma, addr, page_to_pfn(page));
+        mb();
+}
+
+/**
+ * __flush_cache_4096
+ *
+ * @addr:  address in memory mapped cache array
+ * @phys:  P1 address to flush (has to match tags if addr has 'A' bit
+ *         set i.e. associative write)
+ * @exec_offset: set to 0x20000000 if flush has to be executed from P2
+ *               region else 0x0
+ *
+ * The offset into the cache array implied by 'addr' selects the
+ * 'colour' of the virtual address range that will be flushed.  The
+ * operation (purge/write-back) is selected by the lower 2 bits of
+ * 'phys'.
+ */
+static void __flush_cache_4096(unsigned long addr, unsigned long phys,
+                               unsigned long exec_offset)
+{
+        int way_count;
+        unsigned long base_addr = addr;
+        struct cache_info *dcache;
+        unsigned long way_incr;
+        unsigned long a, ea, p;
+        unsigned long temp_pc;
+
+        dcache = &cpu_data->dcache;
+        /* Write this way for better assembly. */
+        way_count = dcache->ways;
+        way_incr = dcache->way_incr;
+
+        /*
+         * Apply exec_offset (i.e. branch to P2 if required.).
+         *
+         * FIXME:
+         *
+         *      If I write "=r" for the (temp_pc), it puts this in r6 hence
+         *      trashing exec_offset before it's been added on - why?  Hence
+         *      "=&r" as a 'workaround'
+         */
+        asm volatile("mov.l 1f, %0\n\t"
+                     "add   %1, %0\n\t"
+                     "jmp   @%0\n\t"
+                     "nop\n\t"
+                     ".balign 4\n\t"
+                     "1:  .long 2f\n\t"
+                     "2:\n" : "=&r" (temp_pc) : "r" (exec_offset));
+
+        /*
+         * We know there will be >=1 iteration, so write as do-while to avoid
+         * pointless nead-of-loop check for 0 iterations.
+         */
+        do {
+                ea = base_addr + PAGE_SIZE;
+                a = base_addr;
+                p = phys;
+
+                do {
+                        *(volatile unsigned long *)a = p;
+                        /*
+                         * Next line: intentionally not p+32, saves an add, p
+                         * will do since only the cache tag bits need to
+                         * match.
+                         */
+                        *(volatile unsigned long *)(a+32) = p;
+                        a += 64;
+                        p += 64;
+                } while (a < ea);
+
+                base_addr += way_incr;
+        } while (--way_count != 0);
 }
 
+/*
+ * Break the 1, 2 and 4 way variants of this out into separate functions to
+ * avoid nearly all the overhead of having the conditional stuff in the function
+ * bodies (+ the 1 and 2 way cases avoid saving any registers too).
+ */
+static void __flush_dcache_segment_1way(unsigned long start,
+                                        unsigned long extent_per_way)
+{
+        unsigned long orig_sr, sr_with_bl;
+        unsigned long base_addr;
+        unsigned long way_incr, linesz, way_size;
+        struct cache_info *dcache;
+        register unsigned long a0, a0e;
+
+        asm volatile("stc sr, %0" : "=r" (orig_sr));
+        sr_with_bl = orig_sr | (1<<28);
+        base_addr = ((unsigned long)&empty_zero_page[0]);
+
+        /*
+         * The previous code aligned base_addr to 16k, i.e. the way_size of all
+         * existing SH-4 D-caches.  Whilst I don't see a need to have this
+         * aligned to any better than the cache line size (which it will be
+         * anyway by construction), let's align it to at least the way_size of
+         * any existing or conceivable SH-4 D-cache.  -- RPC
+         */
+        base_addr = ((base_addr >> 16) << 16);
+        base_addr |= start;
+
+        dcache = &cpu_data->dcache;
+        linesz = dcache->linesz;
+        way_incr = dcache->way_incr;
+        way_size = dcache->way_size;
+
+        a0 = base_addr;
+        a0e = base_addr + extent_per_way;
+        do {
+                asm volatile("ldc %0, sr" : : "r" (sr_with_bl));
+                asm volatile("movca.l r0, @%0\n\t"
+                             "ocbi @%0" : : "r" (a0));
+                a0 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "ocbi @%0" : : "r" (a0));
+                a0 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "ocbi @%0" : : "r" (a0));
+                a0 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "ocbi @%0" : : "r" (a0));
+                asm volatile("ldc %0, sr" : : "r" (orig_sr));
+                a0 += linesz;
+        } while (a0 < a0e);
+}
+
+static void __flush_dcache_segment_2way(unsigned long start,
+                                        unsigned long extent_per_way)
+{
+        unsigned long orig_sr, sr_with_bl;
+        unsigned long base_addr;
+        unsigned long way_incr, linesz, way_size;
+        struct cache_info *dcache;
+        register unsigned long a0, a1, a0e;
+
+        asm volatile("stc sr, %0" : "=r" (orig_sr));
+        sr_with_bl = orig_sr | (1<<28);
+        base_addr = ((unsigned long)&empty_zero_page[0]);
+
+        /* See comment under 1-way above */
+        base_addr = ((base_addr >> 16) << 16);
+        base_addr |= start;
+
+        dcache = &cpu_data->dcache;
+        linesz = dcache->linesz;
+        way_incr = dcache->way_incr;
+        way_size = dcache->way_size;
+
+        a0 = base_addr;
+        a1 = a0 + way_incr;
+        a0e = base_addr + extent_per_way;
+        do {
+                asm volatile("ldc %0, sr" : : "r" (sr_with_bl));
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1" : :
+                             "r" (a0), "r" (a1));
+                a0 += linesz;
+                a1 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1" : :
+                             "r" (a0), "r" (a1));
+                a0 += linesz;
+                a1 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1" : :
+                             "r" (a0), "r" (a1));
+                a0 += linesz;
+                a1 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1" : :
+                             "r" (a0), "r" (a1));
+                asm volatile("ldc %0, sr" : : "r" (orig_sr));
+                a0 += linesz;
+                a1 += linesz;
+        } while (a0 < a0e);
+}
+
+static void __flush_dcache_segment_4way(unsigned long start,
+                                        unsigned long extent_per_way)
+{
+        unsigned long orig_sr, sr_with_bl;
+        unsigned long base_addr;
+        unsigned long way_incr, linesz, way_size;
+        struct cache_info *dcache;
+        register unsigned long a0, a1, a2, a3, a0e;
+
+        asm volatile("stc sr, %0" : "=r" (orig_sr));
+        sr_with_bl = orig_sr | (1<<28);
+        base_addr = ((unsigned long)&empty_zero_page[0]);
+
+        /* See comment under 1-way above */
+        base_addr = ((base_addr >> 16) << 16);
+        base_addr |= start;
+
+        dcache = &cpu_data->dcache;
+        linesz = dcache->linesz;
+        way_incr = dcache->way_incr;
+        way_size = dcache->way_size;
+
+        a0 = base_addr;
+        a1 = a0 + way_incr;
+        a2 = a1 + way_incr;
+        a3 = a2 + way_incr;
+        a0e = base_addr + extent_per_way;
+        do {
+                asm volatile("ldc %0, sr" : : "r" (sr_with_bl));
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "movca.l r0, @%2\n\t"
+                             "movca.l r0, @%3\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1\n\t"
+                             "ocbi @%2\n\t"
+                             "ocbi @%3\n\t" : :
+                             "r" (a0), "r" (a1), "r" (a2), "r" (a3));
+                a0 += linesz;
+                a1 += linesz;
+                a2 += linesz;
+                a3 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "movca.l r0, @%2\n\t"
+                             "movca.l r0, @%3\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1\n\t"
+                             "ocbi @%2\n\t"
+                             "ocbi @%3\n\t" : :
+                             "r" (a0), "r" (a1), "r" (a2), "r" (a3));
+                a0 += linesz;
+                a1 += linesz;
+                a2 += linesz;
+                a3 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "movca.l r0, @%2\n\t"
+                             "movca.l r0, @%3\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1\n\t"
+                             "ocbi @%2\n\t"
+                             "ocbi @%3\n\t" : :
+                             "r" (a0), "r" (a1), "r" (a2), "r" (a3));
+                a0 += linesz;
+                a1 += linesz;
+                a2 += linesz;
+                a3 += linesz;
+                asm volatile("movca.l r0, @%0\n\t"
+                             "movca.l r0, @%1\n\t"
+                             "movca.l r0, @%2\n\t"
+                             "movca.l r0, @%3\n\t"
+                             "ocbi @%0\n\t"
+                             "ocbi @%1\n\t"
+                             "ocbi @%2\n\t"
+                             "ocbi @%3\n\t" : :
+                             "r" (a0), "r" (a1), "r" (a2), "r" (a3));
+                asm volatile("ldc %0, sr" : : "r" (orig_sr));
+                a0 += linesz;
+                a1 += linesz;
+                a2 += linesz;
+                a3 += linesz;
+        } while (a0 < a0e);
+}
diff --git a/arch/sh/mm/cache-sh7705.c b/arch/sh/mm/cache-sh7705.c
index ad8ed7d41e16..045abdf078f5 100644
--- a/arch/sh/mm/cache-sh7705.c
+++ b/arch/sh/mm/cache-sh7705.c
@@ -9,7 +9,6 @@
  * for more details.
  *
  */
-
 #include <linux/init.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
@@ -25,14 +24,10 @@
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
-/* The 32KB cache on the SH7705 suffers from the same synonym problem
- * as SH4 CPUs */
-
-#define __pte_offset(address) \
-                ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \
-                __pte_offset(address))
-
+/*
+ * The 32KB cache on the SH7705 suffers from the same synonym problem
+ * as SH4 CPUs
+ */
 static inline void cache_wback_all(void)
 {
         unsigned long ways, waysize, addrstart;
@@ -73,7 +68,6 @@ void flush_icache_range(unsigned long start, unsigned long end)
         __flush_wback_region((void *)start, end - start);
 }
 
-
 /*
  * Writeback&Invalidate the D-cache of the page
  */
@@ -128,7 +122,6 @@ static void __flush_dcache_page(unsigned long phys)
         local_irq_restore(flags);
 }
 
-
 /*
  * Write back & invalidate the D-cache of the page.
  * (To avoid "alias" issues)
@@ -186,7 +179,8 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
  *
  * ADDRESS: Virtual Address (U0 address)
  */
-void flush_cache_page(struct vm_area_struct *vma, unsigned long address, unsigned long pfn)
+void flush_cache_page(struct vm_area_struct *vma, unsigned long address,
+                      unsigned long pfn)
 {
         __flush_dcache_page(pfn << PAGE_SHIFT);
 }
@@ -203,4 +197,3 @@ void flush_icache_page(struct vm_area_struct *vma, struct page *page)
 {
         __flush_purge_region(page_address(page), PAGE_SIZE);
 }
-
diff --git a/arch/sh/mm/clear_page.S b/arch/sh/mm/clear_page.S
index 08acead7b2a1..7b96425ae270 100644
--- a/arch/sh/mm/clear_page.S
+++ b/arch/sh/mm/clear_page.S
@@ -193,102 +193,5 @@ ENTRY(__clear_user_page)
          nop
 .L4096: .word   4096
 
-ENTRY(__flush_cache_4096)
-        mov.l   1f,r3
-        add     r6,r3
-        mov     r4,r0
-        mov     #64,r2
-        shll    r2
-        mov     #64,r6
-        jmp     @r3
-         mov    #96,r7
-        .align  2
-1:      .long   2f
-2:
-        .rept   32
-        mov.l   r5,@r0
-        mov.l   r5,@(32,r0)
-        mov.l   r5,@(r0,r6)
-        mov.l   r5,@(r0,r7)
-        add     r2,r5
-        add     r2,r0
-        .endr
-        nop
-        nop
-        nop
-        nop
-        nop
-        nop
-        nop
-        rts
-         nop
-
-ENTRY(__flush_dcache_all)
-        mov.l   2f,r0
-        mov.l   3f,r4
-        and     r0,r4           ! r4 = (unsigned long)&empty_zero_page[0] & ~0xffffc000
-        stc     sr,r1           ! save SR
-        mov.l   4f,r2
-        or      r1,r2
-        mov     #32,r3
-        shll2   r3
-1:
-        ldc     r2,sr           ! set BL bit
-        movca.l r0,@r4
-        ocbi    @r4
-        add     #32,r4
-        movca.l r0,@r4
-        ocbi    @r4
-        add     #32,r4
-        movca.l r0,@r4
-        ocbi    @r4
-        add     #32,r4
-        movca.l r0,@r4
-        ocbi    @r4
-        ldc     r1,sr           ! restore SR
-        dt      r3
-        bf/s    1b
-         add    #32,r4
-
-        rts
-         nop
-        .align  2
-2:      .long   0xffffc000
-3:      .long   empty_zero_page
-4:      .long   0x10000000      ! BL bit
-
-/* __flush_cache_4096_all(unsigned long addr) */
-ENTRY(__flush_cache_4096_all)
-        mov.l   2f,r0
-        mov.l   3f,r2
-        and     r0,r2
-        or      r2,r4           ! r4 = addr | (unsigned long)&empty_zero_page[0] & ~0x3fff
-        stc     sr,r1           ! save SR
-        mov.l   4f,r2
-        or      r1,r2
-        mov     #32,r3
-1:
-        ldc     r2,sr           ! set BL bit
-        movca.l r0,@r4
-        ocbi    @r4
-        add     #32,r4
-        movca.l r0,@r4
-        ocbi    @r4
-        add     #32,r4
-        movca.l r0,@r4
-        ocbi    @r4
-        add     #32,r4
-        movca.l r0,@r4
-        ocbi    @r4
-        ldc     r1,sr           ! restore SR
-        dt      r3
-        bf/s    1b
-         add    #32,r4
-
-        rts
-         nop
-        .align  2
-2:      .long   0xffffc000
-3:      .long   empty_zero_page
-4:      .long   0x10000000      ! BL bit
 #endif
+
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index ee73e30263af..c81e6b67ad30 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -9,6 +9,8 @@
  */
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
+#include <asm/cacheflush.h>
+#include <asm/addrspace.h>
 #include <asm/io.h>
 
 void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 775f86cd3fe8..c69fd603226a 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -1,33 +1,22 @@
-/* $Id: fault.c,v 1.14 2004/01/13 05:52:11 kkojima Exp $
+/*
+ * Page fault handler for SH with an MMU.
  *
- *  linux/arch/sh/mm/fault.c
  *  Copyright (C) 1999  Niibe Yutaka
  *  Copyright (C) 2003  Paul Mundt
  *
  *  Based on linux/arch/i386/mm/fault.c:
  *   Copyright (C) 1995  Linus Torvalds
+ *
+ * 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/signal.h>
-#include <linux/sched.h>
 #include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/mman.h>
 #include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-
+#include <linux/hardirq.h>
+#include <linux/kprobes.h>
 #include <asm/system.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
-#include <asm/cacheflush.h>
 #include <asm/kgdb.h>
 
 extern void die(const char *,struct pt_regs *,long);
@@ -187,18 +176,30 @@ do_sigbus:
                 goto no_context;
 }
 
+#ifdef CONFIG_SH_STORE_QUEUES
 /*
- * Called with interrupt disabled.
+ * This is a special case for the SH-4 store queues, as pages for this
+ * space still need to be faulted in before it's possible to flush the
+ * store queue cache for writeout to the remapped region.
  */
-asmlinkage int __do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
-                               unsigned long address)
+#define P3_ADDR_MAX             (P4SEG_STORE_QUE + 0x04000000)
+#else
+#define P3_ADDR_MAX             P4SEG
+#endif
+
+/*
+ * Called with interrupts disabled.
+ */
+asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
+                                         unsigned long writeaccess,
+                                         unsigned long address)
 {
-        unsigned long addrmax = P4SEG;
         pgd_t *pgd;
+        pud_t *pud;
         pmd_t *pmd;
         pte_t *pte;
         pte_t entry;
-        struct mm_struct *mm;
+        struct mm_struct *mm = current->mm;
         spinlock_t *ptl;
         int ret = 1;
 
@@ -207,31 +208,37 @@ asmlinkage int __do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
                 kgdb_bus_err_hook();
 #endif
 
-#ifdef CONFIG_SH_STORE_QUEUES
-        addrmax = P4SEG_STORE_QUE + 0x04000000;
-#endif
-
-        if (address >= P3SEG && address < addrmax) {
+        /*
+         * We don't take page faults for P1, P2, and parts of P4, these
+         * are always mapped, whether it be due to legacy behaviour in
+         * 29-bit mode, or due to PMB configuration in 32-bit mode.
+         */
+        if (address >= P3SEG && address < P3_ADDR_MAX) {
                 pgd = pgd_offset_k(address);
                 mm = NULL;
-        } else if (address >= TASK_SIZE)
-                return 1;
-        else if (!(mm = current->mm))
-                return 1;
-        else
+        } else {
+                if (unlikely(address >= TASK_SIZE || !mm))
+                        return 1;
+
                 pgd = pgd_offset(mm, address);
+        }
 
-        pmd = pmd_offset(pgd, address);
+        pud = pud_offset(pgd, address);
+        if (pud_none_or_clear_bad(pud))
+                return 1;
+        pmd = pmd_offset(pud, address);
         if (pmd_none_or_clear_bad(pmd))
                 return 1;
+
         if (mm)
                 pte = pte_offset_map_lock(mm, pmd, address, &ptl);
         else
                 pte = pte_offset_kernel(pmd, address);
 
         entry = *pte;
-        if (pte_none(entry) || pte_not_present(entry)
-            || (writeaccess && !pte_write(entry)))
+        if (unlikely(pte_none(entry) || pte_not_present(entry)))
+                goto unlock;
+        if (unlikely(writeaccess && !pte_write(entry)))
                 goto unlock;
 
         if (writeaccess)
@@ -243,13 +250,7 @@ asmlinkage int __do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
          * ITLB is not affected by "ldtlb" instruction.
          * So, we need to flush the entry by ourselves.
          */
-
-        {
-                unsigned long flags;
-                local_irq_save(flags);
-                __flush_tlb_page(get_asid(), address&PAGE_MASK);
-                local_irq_restore(flags);
-        }
+        __flush_tlb_page(get_asid(), address & PAGE_MASK);
 #endif
 
         set_pte(pte, entry);
@@ -260,121 +261,3 @@ unlock:
                 pte_unmap_unlock(pte, ptl);
         return ret;
 }
-
-void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
-{
-        if (vma->vm_mm && vma->vm_mm->context != NO_CONTEXT) {
-                unsigned long flags;
-                unsigned long asid;
-                unsigned long saved_asid = MMU_NO_ASID;
-
-                asid = vma->vm_mm->context & MMU_CONTEXT_ASID_MASK;
-                page &= PAGE_MASK;
-
-                local_irq_save(flags);
-                if (vma->vm_mm != current->mm) {
-                        saved_asid = get_asid();
-                        set_asid(asid);
-                }
-                __flush_tlb_page(asid, page);
-                if (saved_asid != MMU_NO_ASID)
-                        set_asid(saved_asid);
-                local_irq_restore(flags);
-        }
-}
-
-void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
-                     unsigned long end)
-{
-        struct mm_struct *mm = vma->vm_mm;
-
-        if (mm->context != NO_CONTEXT) {
-                unsigned long flags;
-                int size;
-
-                local_irq_save(flags);
-                size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
-                if (size > (MMU_NTLB_ENTRIES/4)) { /* Too many TLB to flush */
-                        mm->context = NO_CONTEXT;
-                        if (mm == current->mm)
-                                activate_context(mm);
-                } else {
-                        unsigned long asid = mm->context&MMU_CONTEXT_ASID_MASK;
-                        unsigned long saved_asid = MMU_NO_ASID;
-
-                        start &= PAGE_MASK;
-                        end += (PAGE_SIZE - 1);
-                        end &= PAGE_MASK;
-                        if (mm != current->mm) {
-                                saved_asid = get_asid();
-                                set_asid(asid);
-                        }
-                        while (start < end) {
-                                __flush_tlb_page(asid, start);
-                                start += PAGE_SIZE;
-                        }
-                        if (saved_asid != MMU_NO_ASID)
-                                set_asid(saved_asid);
-                }
-                local_irq_restore(flags);
-        }
-}
-
-void flush_tlb_kernel_range(unsigned long start, unsigned long end)
-{
-        unsigned long flags;
-        int size;
-
-        local_irq_save(flags);
-        size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
-        if (size > (MMU_NTLB_ENTRIES/4)) { /* Too many TLB to flush */
-                flush_tlb_all();
-        } else {
-                unsigned long asid = init_mm.context&MMU_CONTEXT_ASID_MASK;
-                unsigned long saved_asid = get_asid();
-
-                start &= PAGE_MASK;
-                end += (PAGE_SIZE - 1);
-                end &= PAGE_MASK;
-                set_asid(asid);
-                while (start < end) {
-                        __flush_tlb_page(asid, start);
-                        start += PAGE_SIZE;
-                }
-                set_asid(saved_asid);
-        }
-        local_irq_restore(flags);
-}
-
-void flush_tlb_mm(struct mm_struct *mm)
-{
-        /* Invalidate all TLB of this process. */
-        /* Instead of invalidating each TLB, we get new MMU context. */
-        if (mm->context != NO_CONTEXT) {
-                unsigned long flags;
-
-                local_irq_save(flags);
-                mm->context = NO_CONTEXT;
-                if (mm == current->mm)
-                        activate_context(mm);
-                local_irq_restore(flags);
-        }
-}
-
-void flush_tlb_all(void)
-{
-        unsigned long flags, status;
-
-        /*
-         * Flush all the TLB.
-         *
-         * Write to the MMU control register's bit:
-         *      TF-bit for SH-3, TI-bit for SH-4.
-         *      It's same position, bit #2.
-         */
-        local_irq_save(flags);
-        status = ctrl_inl(MMUCR);
-        status |= 0x04;         
-        ctrl_outl(status, MMUCR);
-        local_irq_restore(flags);
-}
diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c
index 2a85bc15a412..329059d6b54a 100644
--- a/arch/sh/mm/hugetlbpage.c
+++ b/arch/sh/mm/hugetlbpage.c
@@ -26,61 +26,41 @@
 pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
 {
         pgd_t *pgd;
+        pud_t *pud;
         pmd_t *pmd;
         pte_t *pte = NULL;
 
         pgd = pgd_offset(mm, addr);
         if (pgd) {
-                pmd = pmd_alloc(mm, pgd, addr);
-                if (pmd)
-                        pte = pte_alloc_map(mm, pmd, addr);
+                pud = pud_alloc(mm, pgd, addr);
+                if (pud) {
+                        pmd = pmd_alloc(mm, pud, addr);
+                        if (pmd)
+                                pte = pte_alloc_map(mm, pmd, addr);
+                }
         }
+
         return pte;
 }
 
 pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
 {
         pgd_t *pgd;
+        pud_t *pud;
         pmd_t *pmd;
         pte_t *pte = NULL;
 
         pgd = pgd_offset(mm, addr);
         if (pgd) {
-                pmd = pmd_offset(pgd, addr);
-                if (pmd)
-                        pte = pte_offset_map(pmd, addr);
-        }
-        return pte;
-}
-
-void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
-                     pte_t *ptep, pte_t entry)
-{
-        int i;
-
-        for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
-                set_pte_at(mm, addr, ptep, entry);
-                ptep++;
-                addr += PAGE_SIZE;
-                pte_val(entry) += PAGE_SIZE;
+                pud = pud_offset(pgd, addr);
+                if (pud) {
+                        pmd = pmd_offset(pud, addr);
+                        if (pmd)
+                                pte = pte_offset_map(pmd, addr);
+                }
         }
-}
-
-pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
-                              pte_t *ptep)
-{
-        pte_t entry;
-        int i;
-
-        entry = *ptep;
 
-        for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
-                pte_clear(mm, addr, ptep);
-                addr += PAGE_SIZE;
-                ptep++;
-        }
-
-        return entry;
+        return pte;
 }
 
 struct page *follow_huge_addr(struct mm_struct *mm,
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 8ea27ca4b700..7154d1ce9785 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -24,7 +24,7 @@
 #include <linux/highmem.h>
 #include <linux/bootmem.h>
 #include <linux/pagemap.h>
-
+#include <linux/proc_fs.h>
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -80,6 +80,7 @@ void show_mem(void)
 static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot)
 {
         pgd_t *pgd;
+        pud_t *pud;
         pmd_t *pmd;
         pte_t *pte;
 
@@ -89,7 +90,17 @@ static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot)
                 return;
         }
 
-        pmd = pmd_offset(pgd, addr);
+        pud = pud_offset(pgd, addr);
+        if (pud_none(*pud)) {
+                pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC);
+                set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE | _PAGE_USER));
+                if (pmd != pmd_offset(pud, 0)) {
+                        pud_ERROR(*pud);
+                        return;
+                }
+        }
+
+        pmd = pmd_offset(pud, addr);
         if (pmd_none(*pmd)) {
                 pte = (pte_t *)get_zeroed_page(GFP_ATOMIC);
                 set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE | _PAGE_USER));
@@ -212,6 +223,8 @@ void __init paging_init(void)
         free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
 }
 
+static struct kcore_list kcore_mem, kcore_vmalloc;
+
 void __init mem_init(void)
 {
         extern unsigned long empty_zero_page[1024];
@@ -237,8 +250,13 @@ void __init mem_init(void)
          * Setup wrappers for copy/clear_page(), these will get overridden
          * later in the boot process if a better method is available.
          */
+#ifdef CONFIG_MMU
         copy_page = copy_page_slow;
         clear_page = clear_page_slow;
+#else
+        copy_page = copy_page_nommu;
+        clear_page = clear_page_nommu;
+#endif
 
         /* this will put all low memory onto the freelists */
         totalram_pages += free_all_bootmem_node(NODE_DATA(0));
@@ -254,7 +272,12 @@ void __init mem_init(void)
         datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
         initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
 
-        printk("Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
+        kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);
+        kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
+                   VMALLOC_END - VMALLOC_START);
+
+        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
+               "%dk reserved, %dk data, %dk init)\n",
                 (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
                 max_mapnr << (PAGE_SHIFT-10),
                 codesize >> 10,
@@ -263,6 +286,9 @@ void __init mem_init(void)
                 initsize >> 10);
 
         p3_cache_init();
+
+        /* Initialize the vDSO */
+        vsyscall_init();
 }
 
 void free_initmem(void)
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index 96fa4a999e2a..a9fe80cfc233 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
@@ -15,6 +15,7 @@
 #include <linux/vmalloc.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
@@ -135,6 +136,20 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
                 return (void __iomem *)phys_to_virt(phys_addr);
 
         /*
+         * If we're on an SH7751 or SH7780 PCI controller, PCI memory is
+         * mapped at the end of the address space (typically 0xfd000000)
+         * in a non-translatable area, so mapping through page tables for
+         * this area is not only pointless, but also fundamentally
+         * broken. Just return the physical address instead.
+         *
+         * For boards that map a small PCI memory aperture somewhere in
+         * P1/P2 space, ioremap() will already do the right thing,
+         * and we'll never get this far.
+         */
+        if (is_pci_memaddr(phys_addr) && is_pci_memaddr(last_addr))
+                return (void __iomem *)phys_addr;
+
+        /*
          * Don't allow anybody to remap normal RAM that we're using..
          */
         if (phys_addr < virt_to_phys(high_memory))
@@ -192,7 +207,7 @@ void __iounmap(void __iomem *addr)
         unsigned long vaddr = (unsigned long __force)addr;
         struct vm_struct *p;
 
-        if (PXSEG(vaddr) < P3SEG)
+        if (PXSEG(vaddr) < P3SEG || is_pci_memaddr(vaddr))
                 return;
 
 #ifdef CONFIG_32BIT
diff --git a/arch/sh/mm/pg-nommu.c b/arch/sh/mm/pg-nommu.c
index 8f9165a4e333..d15221beaa16 100644
--- a/arch/sh/mm/pg-nommu.c
+++ b/arch/sh/mm/pg-nommu.c
@@ -14,23 +14,24 @@
 #include <linux/string.h>
 #include <asm/page.h>
 
-static void copy_page_nommu(void *to, void *from)
+void copy_page_nommu(void *to, void *from)
 {
         memcpy(to, from, PAGE_SIZE);
 }
 
-static void clear_page_nommu(void *to)
+void clear_page_nommu(void *to)
 {
         memset(to, 0, PAGE_SIZE);
 }
 
-static int __init pg_nommu_init(void)
+__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n)
 {
-        copy_page = copy_page_nommu;
-        clear_page = clear_page_nommu;
-
+        memcpy(to, from, n);
         return 0;
 }
 
-subsys_initcall(pg_nommu_init);
-
+__kernel_size_t __clear_user(void *to, __kernel_size_t n)
+{
+        memset(to, 0, n);
+        return 0;
+}
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c
index c776b60fc250..07371ed7a313 100644
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
@@ -2,7 +2,7 @@
  * arch/sh/mm/pg-sh4.c
  *
  * Copyright (C) 1999, 2000, 2002  Niibe Yutaka
- * Copyright (C) 2002  Paul Mundt
+ * Copyright (C) 2002 - 2005  Paul Mundt
  *
  * Released under the terms of the GNU GPL v2.0.
  */
@@ -23,6 +23,8 @@
 
 extern struct semaphore p3map_sem[];
 
+#define CACHE_ALIAS (cpu_data->dcache.alias_mask)
+
 /*
  * clear_user_page
  * @to: P1 address
@@ -35,14 +37,15 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 clear_page(to);
         else {
-                pgprot_t pgprot = __pgprot(_PAGE_PRESENT | 
+                pgprot_t pgprot = __pgprot(_PAGE_PRESENT |
                                            _PAGE_RW | _PAGE_CACHABLE |
-                                           _PAGE_DIRTY | _PAGE_ACCESSED | 
+                                           _PAGE_DIRTY | _PAGE_ACCESSED |
                                            _PAGE_HW_SHARED | _PAGE_FLAGS_HARD);
                 unsigned long phys_addr = PHYSADDR(to);
                 unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
-                pgd_t *dir = pgd_offset_k(p3_addr);
-                pmd_t *pmd = pmd_offset(dir, p3_addr);
+                pgd_t *pgd = pgd_offset_k(p3_addr);
+                pud_t *pud = pud_offset(pgd, p3_addr);
+                pmd_t *pmd = pmd_offset(pud, p3_addr);
                 pte_t *pte = pte_offset_kernel(pmd, p3_addr);
                 pte_t entry;
                 unsigned long flags;
@@ -67,21 +70,22 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
  * @address: U0 address to be mapped
  * @page: page (virt_to_page(to))
  */
-void copy_user_page(void *to, void *from, unsigned long address, 
+void copy_user_page(void *to, void *from, unsigned long address,
                     struct page *page)
 {
         __set_bit(PG_mapped, &page->flags);
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 copy_page(to, from);
         else {
-                pgprot_t pgprot = __pgprot(_PAGE_PRESENT | 
+                pgprot_t pgprot = __pgprot(_PAGE_PRESENT |
                                            _PAGE_RW | _PAGE_CACHABLE |
-                                           _PAGE_DIRTY | _PAGE_ACCESSED | 
+                                           _PAGE_DIRTY | _PAGE_ACCESSED |
                                            _PAGE_HW_SHARED | _PAGE_FLAGS_HARD);
                 unsigned long phys_addr = PHYSADDR(to);
                 unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
-                pgd_t *dir = pgd_offset_k(p3_addr);
-                pmd_t *pmd = pmd_offset(dir, p3_addr);
+                pgd_t *pgd = pgd_offset_k(p3_addr);
+                pud_t *pud = pud_offset(pgd, p3_addr);
+                pmd_t *pmd = pmd_offset(pud, p3_addr);
                 pte_t *pte = pte_offset_kernel(pmd, p3_addr);
                 pte_t entry;
                 unsigned long flags;
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
new file mode 100644
index 000000000000..92e745341e4d
--- /dev/null
+++ b/arch/sh/mm/pmb.c
@@ -0,0 +1,400 @@
+/*
+ * arch/sh/mm/pmb.c
+ *
+ * Privileged Space Mapping Buffer (PMB) Support.
+ *
+ * Copyright (C) 2005, 2006 Paul Mundt
+ *
+ * P1/P2 Section mapping definitions from map32.h, which was:
+ *
+ *      Copyright 2003 (c) Lineo Solutions,Inc.
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/bitops.h>
+#include <linux/debugfs.h>
+#include <linux/fs.h>
+#include <linux/seq_file.h>
+#include <linux/err.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
+#include <asm/pgtable.h>
+#include <asm/mmu.h>
+#include <asm/io.h>
+
+#define NR_PMB_ENTRIES  16
+
+static kmem_cache_t *pmb_cache;
+static unsigned long pmb_map;
+
+static struct pmb_entry pmb_init_map[] = {
+        /* vpn         ppn         flags (ub/sz/c/wt) */
+
+        /* P1 Section Mappings */
+        { 0x80000000, 0x00000000, PMB_SZ_64M  | PMB_C, },
+        { 0x84000000, 0x04000000, PMB_SZ_64M  | PMB_C, },
+        { 0x88000000, 0x08000000, PMB_SZ_128M | PMB_C, },
+        { 0x90000000, 0x10000000, PMB_SZ_64M  | PMB_C, },
+        { 0x94000000, 0x14000000, PMB_SZ_64M  | PMB_C, },
+        { 0x98000000, 0x18000000, PMB_SZ_64M  | PMB_C, },
+
+        /* P2 Section Mappings */
+        { 0xa0000000, 0x00000000, PMB_UB | PMB_SZ_64M  | PMB_WT, },
+        { 0xa4000000, 0x04000000, PMB_UB | PMB_SZ_64M  | PMB_WT, },
+        { 0xa8000000, 0x08000000, PMB_UB | PMB_SZ_128M | PMB_WT, },
+        { 0xb0000000, 0x10000000, PMB_UB | PMB_SZ_64M  | PMB_WT, },
+        { 0xb4000000, 0x14000000, PMB_UB | PMB_SZ_64M  | PMB_WT, },
+        { 0xb8000000, 0x18000000, PMB_UB | PMB_SZ_64M  | PMB_WT, },
+};
+
+static inline unsigned long mk_pmb_entry(unsigned int entry)
+{
+        return (entry & PMB_E_MASK) << PMB_E_SHIFT;
+}
+
+static inline unsigned long mk_pmb_addr(unsigned int entry)
+{
+        return mk_pmb_entry(entry) | PMB_ADDR;
+}
+
+static inline unsigned long mk_pmb_data(unsigned int entry)
+{
+        return mk_pmb_entry(entry) | PMB_DATA;
+}
+
+struct pmb_entry *pmb_alloc(unsigned long vpn, unsigned long ppn,
+                            unsigned long flags)
+{
+        struct pmb_entry *pmbe;
+
+        pmbe = kmem_cache_alloc(pmb_cache, GFP_KERNEL);
+        if (!pmbe)
+                return ERR_PTR(-ENOMEM);
+
+        pmbe->vpn       = vpn;
+        pmbe->ppn       = ppn;
+        pmbe->flags     = flags;
+
+        return pmbe;
+}
+
+void pmb_free(struct pmb_entry *pmbe)
+{
+        kmem_cache_free(pmb_cache, pmbe);
+}
+
+/*
+ * Must be in P2 for __set_pmb_entry()
+ */
+int __set_pmb_entry(unsigned long vpn, unsigned long ppn,
+                    unsigned long flags, int *entry)
+{
+        unsigned int pos = *entry;
+
+        if (unlikely(pos == PMB_NO_ENTRY))
+                pos = find_first_zero_bit(&pmb_map, NR_PMB_ENTRIES);
+
+repeat:
+        if (unlikely(pos > NR_PMB_ENTRIES))
+                return -ENOSPC;
+
+        if (test_and_set_bit(pos, &pmb_map)) {
+                pos = find_first_zero_bit(&pmb_map, NR_PMB_ENTRIES);
+                goto repeat;
+        }
+
+        ctrl_outl(vpn | PMB_V, mk_pmb_addr(pos));
+
+#ifdef CONFIG_SH_WRITETHROUGH
+        /*
+         * When we are in 32-bit address extended mode, CCR.CB becomes
+         * invalid, so care must be taken to manually adjust cacheable
+         * translations.
+         */
+        if (likely(flags & PMB_C))
+                flags |= PMB_WT;
+#endif
+
+        ctrl_outl(ppn | flags | PMB_V, mk_pmb_data(pos));
+
+        *entry = pos;
+
+        return 0;
+}
+
+int set_pmb_entry(struct pmb_entry *pmbe)
+{
+        int ret;
+
+        jump_to_P2();
+        ret = __set_pmb_entry(pmbe->vpn, pmbe->ppn, pmbe->flags, &pmbe->entry);
+        back_to_P1();
+
+        return ret;
+}
+
+void clear_pmb_entry(struct pmb_entry *pmbe)
+{
+        unsigned int entry = pmbe->entry;
+        unsigned long addr;
+
+        /*
+         * Don't allow clearing of wired init entries, P1 or P2 access
+         * without a corresponding mapping in the PMB will lead to reset
+         * by the TLB.
+         */
+        if (unlikely(entry < ARRAY_SIZE(pmb_init_map) ||
+                     entry >= NR_PMB_ENTRIES))
+                return;
+
+        jump_to_P2();
+
+        /* Clear V-bit */
+        addr = mk_pmb_addr(entry);
+        ctrl_outl(ctrl_inl(addr) & ~PMB_V, addr);
+
+        addr = mk_pmb_data(entry);
+        ctrl_outl(ctrl_inl(addr) & ~PMB_V, addr);
+
+        back_to_P1();
+
+        clear_bit(entry, &pmb_map);
+}
+
+static DEFINE_SPINLOCK(pmb_list_lock);
+static struct pmb_entry *pmb_list;
+
+static inline void pmb_list_add(struct pmb_entry *pmbe)
+{
+        struct pmb_entry **p, *tmp;
+
+        p = &pmb_list;
+        while ((tmp = *p) != NULL)
+                p = &tmp->next;
+
+        pmbe->next = tmp;
+        *p = pmbe;
+}
+
+static inline void pmb_list_del(struct pmb_entry *pmbe)
+{
+        struct pmb_entry **p, *tmp;
+
+        for (p = &pmb_list; (tmp = *p); p = &tmp->next)
+                if (tmp == pmbe) {
+                        *p = tmp->next;
+                        return;
+                }
+}
+
+static struct {
+        unsigned long size;
+        int flag;
+} pmb_sizes[] = {
+        { .size = 0x20000000, .flag = PMB_SZ_512M, },
+        { .size = 0x08000000, .flag = PMB_SZ_128M, },
+        { .size = 0x04000000, .flag = PMB_SZ_64M,  },
+        { .size = 0x01000000, .flag = PMB_SZ_16M,  },
+};
+
+long pmb_remap(unsigned long vaddr, unsigned long phys,
+               unsigned long size, unsigned long flags)
+{
+        struct pmb_entry *pmbp;
+        unsigned long wanted;
+        int pmb_flags, i;
+
+        /* Convert typical pgprot value to the PMB equivalent */
+        if (flags & _PAGE_CACHABLE) {
+                if (flags & _PAGE_WT)
+                        pmb_flags = PMB_WT;
+                else
+                        pmb_flags = PMB_C;
+        } else
+                pmb_flags = PMB_WT | PMB_UB;
+
+        pmbp = NULL;
+        wanted = size;
+
+again:
+        for (i = 0; i < ARRAY_SIZE(pmb_sizes); i++) {
+                struct pmb_entry *pmbe;
+                int ret;
+
+                if (size < pmb_sizes[i].size)
+                        continue;
+
+                pmbe = pmb_alloc(vaddr, phys, pmb_flags | pmb_sizes[i].flag);
+                if (IS_ERR(pmbe))
+                        return PTR_ERR(pmbe);
+
+                ret = set_pmb_entry(pmbe);
+                if (ret != 0) {
+                        pmb_free(pmbe);
+                        return -EBUSY;
+                }
+
+                phys    += pmb_sizes[i].size;
+                vaddr   += pmb_sizes[i].size;
+                size    -= pmb_sizes[i].size;
+
+                /*
+                 * Link adjacent entries that span multiple PMB entries
+                 * for easier tear-down.
+                 */
+                if (likely(pmbp))
+                        pmbp->link = pmbe;
+
+                pmbp = pmbe;
+        }
+
+        if (size >= 0x1000000)
+                goto again;
+
+        return wanted - size;
+}
+
+void pmb_unmap(unsigned long addr)
+{
+        struct pmb_entry **p, *pmbe;
+
+        for (p = &pmb_list; (pmbe = *p); p = &pmbe->next)
+                if (pmbe->vpn == addr)
+                        break;
+
+        if (unlikely(!pmbe))
+                return;
+
+        WARN_ON(!test_bit(pmbe->entry, &pmb_map));
+
+        do {
+                struct pmb_entry *pmblink = pmbe;
+
+                clear_pmb_entry(pmbe);
+                pmbe = pmblink->link;
+
+                pmb_free(pmblink);
+        } while (pmbe);
+}
+
+static void pmb_cache_ctor(void *pmb, kmem_cache_t *cachep, unsigned long flags)
+{
+        struct pmb_entry *pmbe = pmb;
+
+        memset(pmb, 0, sizeof(struct pmb_entry));
+
+        spin_lock_irq(&pmb_list_lock);
+
+        pmbe->entry = PMB_NO_ENTRY;
+        pmb_list_add(pmbe);
+
+        spin_unlock_irq(&pmb_list_lock);
+}
+
+static void pmb_cache_dtor(void *pmb, kmem_cache_t *cachep, unsigned long flags)
+{
+        spin_lock_irq(&pmb_list_lock);
+        pmb_list_del(pmb);
+        spin_unlock_irq(&pmb_list_lock);
+}
+
+static int __init pmb_init(void)
+{
+        unsigned int nr_entries = ARRAY_SIZE(pmb_init_map);
+        unsigned int entry;
+
+        BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
+
+        pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry),
+                                      0, 0, pmb_cache_ctor, pmb_cache_dtor);
+        BUG_ON(!pmb_cache);
+
+        jump_to_P2();
+
+        /*
+         * Ordering is important, P2 must be mapped in the PMB before we
+         * can set PMB.SE, and P1 must be mapped before we jump back to
+         * P1 space.
+         */
+        for (entry = 0; entry < nr_entries; entry++) {
+                struct pmb_entry *pmbe = pmb_init_map + entry;
+
+                __set_pmb_entry(pmbe->vpn, pmbe->ppn, pmbe->flags, &entry);
+        }
+
+        ctrl_outl(0, PMB_IRMCR);
+
+        /* PMB.SE and UB[7] */
+        ctrl_outl((1 << 31) | (1 << 7), PMB_PASCR);
+
+        back_to_P1();
+
+        return 0;
+}
+arch_initcall(pmb_init);
+
+static int pmb_seq_show(struct seq_file *file, void *iter)
+{
+        int i;
+
+        seq_printf(file, "V: Valid, C: Cacheable, WT: Write-Through\n"
+                         "CB: Copy-Back, B: Buffered, UB: Unbuffered\n");
+        seq_printf(file, "ety   vpn  ppn  size   flags\n");
+
+        for (i = 0; i < NR_PMB_ENTRIES; i++) {
+                unsigned long addr, data;
+                unsigned int size;
+                char *sz_str = NULL;
+
+                addr = ctrl_inl(mk_pmb_addr(i));
+                data = ctrl_inl(mk_pmb_data(i));
+
+                size = data & PMB_SZ_MASK;
+                sz_str = (size == PMB_SZ_16M)  ? " 16MB":
+                         (size == PMB_SZ_64M)  ? " 64MB":
+                         (size == PMB_SZ_128M) ? "128MB":
+                                                 "512MB";
+
+                /* 02: V 0x88 0x08 128MB C CB  B */
+                seq_printf(file, "%02d: %c 0x%02lx 0x%02lx %s %c %s %s\n",
+                           i, ((addr & PMB_V) && (data & PMB_V)) ? 'V' : ' ',
+                           (addr >> 24) & 0xff, (data >> 24) & 0xff,
+                           sz_str, (data & PMB_C) ? 'C' : ' ',
+                           (data & PMB_WT) ? "WT" : "CB",
+                           (data & PMB_UB) ? "UB" : " B");
+        }
+
+        return 0;
+}
+
+static int pmb_debugfs_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, pmb_seq_show, NULL);
+}
+
+static struct file_operations pmb_debugfs_fops = {
+        .owner          = THIS_MODULE,
+        .open           = pmb_debugfs_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
+static int __init pmb_debugfs_init(void)
+{
+        struct dentry *dentry;
+
+        dentry = debugfs_create_file("pmb", S_IFREG | S_IRUGO,
+                                     NULL, NULL, &pmb_debugfs_fops);
+        if (IS_ERR(dentry))
+                return PTR_ERR(dentry);
+
+        return 0;
+}
+postcore_initcall(pmb_debugfs_init);
diff --git a/arch/sh/mm/tlb-flush.c b/arch/sh/mm/tlb-flush.c
new file mode 100644
index 000000000000..73ec7f6084fa
--- /dev/null
+++ b/arch/sh/mm/tlb-flush.c
@@ -0,0 +1,134 @@
+/*
+ * TLB flushing operations for SH with an MMU.
+ *
+ *  Copyright (C) 1999  Niibe Yutaka
+ *  Copyright (C) 2003  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/mm.h>
+#include <asm/mmu_context.h>
+#include <asm/tlbflush.h>
+
+void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
+{
+        if (vma->vm_mm && vma->vm_mm->context.id != NO_CONTEXT) {
+                unsigned long flags;
+                unsigned long asid;
+                unsigned long saved_asid = MMU_NO_ASID;
+
+                asid = vma->vm_mm->context.id & MMU_CONTEXT_ASID_MASK;
+                page &= PAGE_MASK;
+
+                local_irq_save(flags);
+                if (vma->vm_mm != current->mm) {
+                        saved_asid = get_asid();
+                        set_asid(asid);
+                }
+                __flush_tlb_page(asid, page);
+                if (saved_asid != MMU_NO_ASID)
+                        set_asid(saved_asid);
+                local_irq_restore(flags);
+        }
+}
+
+void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
+                     unsigned long end)
+{
+        struct mm_struct *mm = vma->vm_mm;
+
+        if (mm->context.id != NO_CONTEXT) {
+                unsigned long flags;
+                int size;
+
+                local_irq_save(flags);
+                size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
+                if (size > (MMU_NTLB_ENTRIES/4)) { /* Too many TLB to flush */
+                        mm->context.id = NO_CONTEXT;
+                        if (mm == current->mm)
+                                activate_context(mm);
+                } else {
+                        unsigned long asid;
+                        unsigned long saved_asid = MMU_NO_ASID;
+
+                        asid = mm->context.id & MMU_CONTEXT_ASID_MASK;
+                        start &= PAGE_MASK;
+                        end += (PAGE_SIZE - 1);
+                        end &= PAGE_MASK;
+                        if (mm != current->mm) {
+                                saved_asid = get_asid();
+                                set_asid(asid);
+                        }
+                        while (start < end) {
+                                __flush_tlb_page(asid, start);
+                                start += PAGE_SIZE;
+                        }
+                        if (saved_asid != MMU_NO_ASID)
+                                set_asid(saved_asid);
+                }
+                local_irq_restore(flags);
+        }
+}
+
+void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        unsigned long flags;
+        int size;
+
+        local_irq_save(flags);
+        size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
+        if (size > (MMU_NTLB_ENTRIES/4)) { /* Too many TLB to flush */
+                flush_tlb_all();
+        } else {
+                unsigned long asid;
+                unsigned long saved_asid = get_asid();
+
+                asid = init_mm.context.id & MMU_CONTEXT_ASID_MASK;
+                start &= PAGE_MASK;
+                end += (PAGE_SIZE - 1);
+                end &= PAGE_MASK;
+                set_asid(asid);
+                while (start < end) {
+                        __flush_tlb_page(asid, start);
+                        start += PAGE_SIZE;
+                }
+                set_asid(saved_asid);
+        }
+        local_irq_restore(flags);
+}
+
+void flush_tlb_mm(struct mm_struct *mm)
+{
+        /* Invalidate all TLB of this process. */
+        /* Instead of invalidating each TLB, we get new MMU context. */
+        if (mm->context.id != NO_CONTEXT) {
+                unsigned long flags;
+
+                local_irq_save(flags);
+                mm->context.id = NO_CONTEXT;
+                if (mm == current->mm)
+                        activate_context(mm);
+                local_irq_restore(flags);
+        }
+}
+
+void flush_tlb_all(void)
+{
+        unsigned long flags, status;
+
+        /*
+         * Flush all the TLB.
+         *
+         * Write to the MMU control register's bit:
+         *      TF-bit for SH-3, TI-bit for SH-4.
+         *      It's same position, bit #2.
+         */
+        local_irq_save(flags);
+        status = ctrl_inl(MMUCR);
+        status |= 0x04;
+        ctrl_outl(status, MMUCR);
+        ctrl_barrier();
+        local_irq_restore(flags);
+}
diff --git a/arch/sh/mm/tlb-sh4.c b/arch/sh/mm/tlb-sh4.c
index 115b1b6be40b..812b2d567de2 100644
--- a/arch/sh/mm/tlb-sh4.c
+++ b/arch/sh/mm/tlb-sh4.c
@@ -36,7 +36,6 @@ void update_mmu_cache(struct vm_area_struct * vma,
         unsigned long vpn;
         struct page *page;
         unsigned long pfn;
-        unsigned long ptea;
 
         /* Ptrace may call this routine. */
         if (vma && current->active_mm != vma->vm_mm)
@@ -59,10 +58,11 @@ void update_mmu_cache(struct vm_area_struct * vma,
         ctrl_outl(vpn, MMU_PTEH);
 
         pteval = pte_val(pte);
+
         /* Set PTEA register */
-        /* TODO: make this look less hacky */
-        ptea = ((pteval >> 28) & 0xe) | (pteval & 0x1);
-        ctrl_outl(ptea, MMU_PTEA);
+        if (cpu_data->flags & CPU_HAS_PTEA)
+                /* TODO: make this look less hacky */
+                ctrl_outl(((pteval >> 28) & 0xe) | (pteval & 0x1), MMU_PTEA);
 
         /* Set PTEL register */
         pteval &= _PAGE_FLAGS_HARDWARE_MASK; /* drop software flags */
diff --git a/arch/sh/oprofile/Makefile b/arch/sh/oprofile/Makefile
index 686738d4aa3c..1f25d9bb7538 100644
--- a/arch/sh/oprofile/Makefile
+++ b/arch/sh/oprofile/Makefile
@@ -7,7 +7,11 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
                 timer_int.o )
 
 profdrvr-y                              := op_model_null.o
+
+# SH7750-style performance counters exist across 7750/7750S and 7091.
+profdrvr-$(CONFIG_CPU_SUBTYPE_SH7750S)  := op_model_sh7750.o
 profdrvr-$(CONFIG_CPU_SUBTYPE_SH7750)   := op_model_sh7750.o
+profdrvr-$(CONFIG_CPU_SUBTYPE_SH7091)   := op_model_sh7750.o
 
 oprofile-y                              := $(DRIVER_OBJS) $(profdrvr-y)
 
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index 182fe9092577..ac57638977ee 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -8,16 +8,15 @@
 SE                      SH_SOLUTION_ENGINE
 7751SE                  SH_7751_SOLUTION_ENGINE         
 7300SE                  SH_7300_SOLUTION_ENGINE
+7343SE                  SH_7343_SOLUTION_ENGINE
 73180SE                 SH_73180_SOLUTION_ENGINE
 7751SYSTEMH             SH_7751_SYSTEMH
 HP6XX                   SH_HP6XX
 HD64461                 HD64461
 HD64465                 HD64465
-SH2000                  SH_SH2000
 SATURN                  SH_SATURN
 DREAMCAST               SH_DREAMCAST
 BIGSUR                  SH_BIGSUR
-ADX                     SH_ADX
 MPC1211                 SH_MPC1211
 SNAPGEAR                SH_SECUREEDGE5410
 HS7751RVOIP             SH_HS7751RVOIP
@@ -25,4 +24,9 @@ RTS7751R2D		SH_RTS7751R2D
 EDOSK7705               SH_EDOSK7705
 SH4202_MICRODEV         SH_SH4202_MICRODEV
 SH03                    SH_SH03
-
+LANDISK                 SH_LANDISK
+R7780RP                 SH_R7780RP
+R7780MP                 SH_R7780MP
+TITAN                   SH_TITAN
+SHMIN                   SH_SHMIN
+7710VOIPGW              SH_7710VOIPGW