sh: Move out the solution engine headers to arch/sh/include/mach-se/
authorPaul Mundt <lethal@linux-sh.org>
Tue, 29 Jul 2008 12:41:37 +0000 (21:41 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 29 Jul 2008 12:41:37 +0000 (21:41 +0900)
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
30 files changed:
arch/sh/Kconfig
arch/sh/Makefile
arch/sh/boards/Kconfig [new file with mode: 0644]
arch/sh/boards/mach-se/7206/io.c
arch/sh/boards/mach-se/7206/irq.c
arch/sh/boards/mach-se/7206/setup.c
arch/sh/boards/mach-se/7343/irq.c
arch/sh/boards/mach-se/7343/setup.c
arch/sh/boards/mach-se/770x/io.c
arch/sh/boards/mach-se/770x/irq.c
arch/sh/boards/mach-se/770x/setup.c
arch/sh/boards/mach-se/7721/irq.c
arch/sh/boards/mach-se/7721/setup.c
arch/sh/boards/mach-se/7722/irq.c
arch/sh/boards/mach-se/7722/setup.c
arch/sh/boards/mach-se/7751/io.c
arch/sh/boards/mach-se/7751/irq.c
arch/sh/boards/mach-se/7751/setup.c
arch/sh/boards/mach-se/7780/irq.c
arch/sh/boards/mach-se/7780/setup.c
arch/sh/boards/mach-se/Makefile [new file with mode: 0644]
arch/sh/drivers/pci/ops-se7780.c
arch/sh/include/mach-se/mach/se.h [moved from arch/sh/include/asm/se.h with 100% similarity]
arch/sh/include/mach-se/mach/se7206.h [moved from arch/sh/include/asm/se7206.h with 100% similarity]
arch/sh/include/mach-se/mach/se7343.h [moved from arch/sh/include/asm/se7343.h with 100% similarity]
arch/sh/include/mach-se/mach/se7721.h [moved from arch/sh/include/asm/se7721.h with 100% similarity]
arch/sh/include/mach-se/mach/se7722.h [moved from arch/sh/include/asm/se7722.h with 100% similarity]
arch/sh/include/mach-se/mach/se7751.h [moved from arch/sh/include/asm/se7751.h with 100% similarity]
arch/sh/include/mach-se/mach/se7780.h [moved from arch/sh/include/asm/se7780.h with 100% similarity]
arch/sh/kernel/cf-enabler.c

index 83d170c..2b74220 100644 (file)
@@ -352,253 +352,10 @@ config CPU_SUBTYPE_SH5_103
 endchoice
 
 source "arch/sh/mm/Kconfig"
 source "arch/sh/Kconfig.cpu"
 
-menu "Board support"
-
-config SOLUTION_ENGINE
-       bool
-
-config SH_SOLUTION_ENGINE
-       bool "SolutionEngine"
-       select SOLUTION_ENGINE
-       select CPU_HAS_IPR_IRQ
-       depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \
-         CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \
-         CPU_SUBTYPE_SH7750R 
-       help
-         Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,
-         SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.
-
-config SH_7206_SOLUTION_ENGINE
-       bool "SolutionEngine7206"
-       select SOLUTION_ENGINE
-       depends on CPU_SUBTYPE_SH7206
-       help
-         Select 7206 SolutionEngine if configuring for a Hitachi SH7206
-         evaluation board.
-
-config SH_7619_SOLUTION_ENGINE
-       bool "SolutionEngine7619"
-       select SOLUTION_ENGINE
-       depends on CPU_SUBTYPE_SH7619
-       help
-         Select 7619 SolutionEngine if configuring for a Hitachi SH7619
-         evaluation board.
-       
-config SH_7721_SOLUTION_ENGINE
-       bool "SolutionEngine7721"
-       select SOLUTION_ENGINE
-       depends on CPU_SUBTYPE_SH7721
-       help
-         Select 7721 SolutionEngine if configuring for a Hitachi SH7721
-         evaluation board.
-
-config SH_7722_SOLUTION_ENGINE
-       bool "SolutionEngine7722"
-       select SOLUTION_ENGINE
-       depends on CPU_SUBTYPE_SH7722
-       help
-         Select 7722 SolutionEngine if configuring for a Hitachi SH772
-         evaluation board.
-
-config SH_7751_SOLUTION_ENGINE
-       bool "SolutionEngine7751"
-       select SOLUTION_ENGINE
-       select CPU_HAS_IPR_IRQ
-       depends on CPU_SUBTYPE_SH7751
-       help
-         Select 7751 SolutionEngine if configuring for a Hitachi SH7751
-         evaluation board.
-         
-config SH_7780_SOLUTION_ENGINE
-       bool "SolutionEngine7780"
-       select SOLUTION_ENGINE
-       select SYS_SUPPORTS_PCI
-       depends on CPU_SUBTYPE_SH7780
-       help
-         Select 7780 SolutionEngine if configuring for a Renesas SH7780
-         evaluation board.
-
-config SH_7343_SOLUTION_ENGINE
-       bool "SolutionEngine7343"
-       select SOLUTION_ENGINE
-       depends on CPU_SUBTYPE_SH7343
-       help
-         Select 7343 SolutionEngine if configuring for a Hitachi
-         SH7343 (SH-Mobile 3AS) evaluation board.
-
-config SH_7751_SYSTEMH
-       bool "SystemH7751R"
-       depends on CPU_SUBTYPE_SH7751R
-       help
-         Select SystemH if you are configuring for a Renesas SystemH
-         7751R evaluation board.
-
-config SH_HP6XX
-       bool "HP6XX"
-       select SYS_SUPPORTS_APM_EMULATION
-       select HD6446X_SERIES
-       depends on CPU_SUBTYPE_SH7709
-       help
-         Select HP6XX if configuring for a HP jornada HP6xx.
-         More information (hardware only) at
-         <http://www.hp.com/jornada/>.
-
-config SH_DREAMCAST
-       bool "Dreamcast"
-       select SYS_SUPPORTS_PCI
-       depends on CPU_SUBTYPE_SH7091
-       help
-         Select Dreamcast if configuring for a SEGA Dreamcast.
-         More information at <http://www.linux-sh.org>
-
-config SH_SH03
-       bool "Interface CTP/PCI-SH03"
-       depends on CPU_SUBTYPE_SH7751
-       select CPU_HAS_IPR_IRQ
-       select SYS_SUPPORTS_PCI
-       help
-         CTP/PCI-SH03 is a CPU module computer that is produced
-         by Interface Corporation.
-         More information at <http://www.interface.co.jp>
-
-config SH_SECUREEDGE5410
-       bool "SecureEdge5410"
-       depends on CPU_SUBTYPE_SH7751R
-       select CPU_HAS_IPR_IRQ
-       select SYS_SUPPORTS_PCI
-       help
-         Select SecureEdge5410 if configuring for a SnapGear SH board.
-         This includes both the OEM SecureEdge products as well as the
-         SME product line.
-
-config SH_RTS7751R2D
-       bool "RTS7751R2D"
-       depends on CPU_SUBTYPE_SH7751R
-       select SYS_SUPPORTS_PCI
-       select IO_TRAPPED
-       help
-         Select RTS7751R2D if configuring for a Renesas Technology
-         Sales SH-Graphics board.
-
-config SH_RSK7203
-       bool "RSK7203"
-       depends on CPU_SUBTYPE_SH7203
-
-config SH_SDK7780
-       bool "SDK7780R3"
-       depends on CPU_SUBTYPE_SH7780
-       select SYS_SUPPORTS_PCI
-       help
-         Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3
-         evaluation board.
-
-config SH_HIGHLANDER
-       bool "Highlander"
-       depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
-       select SYS_SUPPORTS_PCI
-       select IO_TRAPPED
-
-config SH_SH7785LCR
-       bool "SH7785LCR"
-       depends on CPU_SUBTYPE_SH7785
-       select SYS_SUPPORTS_PCI
-       select IO_TRAPPED
-
-config SH_SH7785LCR_29BIT_PHYSMAPS
-       bool "SH7785LCR 29bit physmaps"
-       depends on SH_SH7785LCR
-       default y
-       help
-         This board has 2 physical memory maps. It can be changed with
-         DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,
-         you can access all on-board device in 29bit address mode.
-
-config SH_MIGOR
-       bool "Migo-R"
-       depends on CPU_SUBTYPE_SH7722
-       help
-         Select Migo-R if configuring for the SH7722 Migo-R platform
-          by Renesas System Solutions Asia Pte. Ltd.
-
-config SH_AP325RXA
-       bool "AP-325RXA"
-       depends on CPU_SUBTYPE_SH7723
-       help
-         Renesas "AP-325RXA" support.
-         Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
-
-config SH_SH7763RDP
-       bool "SH7763RDP"
-       depends on CPU_SUBTYPE_SH7763
-       help
-         Select SH7763RDP if configuring for a Renesas SH7763
-         evaluation board.
-
-config SH_EDOSK7705
-       bool "EDOSK7705"
-       depends on CPU_SUBTYPE_SH7705
-
-config SH_SH4202_MICRODEV
-       bool "SH4-202 MicroDev"
-       depends on CPU_SUBTYPE_SH4_202
-       help
-         Select SH4-202 MicroDev if configuring for a SuperH MicroDev board
-         with an SH4-202 CPU.
-
-config SH_LANDISK
-       bool "LANDISK"
-       depends on CPU_SUBTYPE_SH7751R
-       select SYS_SUPPORTS_PCI
-       help
-         I-O DATA DEVICE, INC. "LANDISK Series" support.
-
-config SH_TITAN
-       bool "TITAN"
-       depends on CPU_SUBTYPE_SH7751R
-       select CPU_HAS_IPR_IRQ
-       select SYS_SUPPORTS_PCI
-       help
-         Select Titan if you are configuring for a Nimble Microsystems
-         NetEngine NP51R.
-
-config SH_SHMIN
-       bool "SHMIN"
-       depends on CPU_SUBTYPE_SH7706
-       select CPU_HAS_IPR_IRQ
-       help
-         Select SHMIN if configuring for the SHMIN board.
-
-config SH_LBOX_RE2
-       bool "L-BOX RE2"
-       depends on CPU_SUBTYPE_SH7751R
-       select SYS_SUPPORTS_PCI
-       help
-         Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
-
-config SH_X3PROTO
-       bool "SH-X3 Prototype board"
-       depends on CPU_SUBTYPE_SHX3
-
-config SH_MAGIC_PANEL_R2
-       bool "Magic Panel R2"
-       depends on CPU_SUBTYPE_SH7720
-       help
-         Select Magic Panel R2 if configuring for Magic Panel R2.
-
-config SH_CAYMAN
-       bool "Hitachi Cayman"
-       depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
-       select SYS_SUPPORTS_PCI
-
-endmenu
-
-source "arch/sh/boards/mach-r2d/Kconfig"
-source "arch/sh/boards/mach-highlander/Kconfig"
-source "arch/sh/boards/mach-sdk7780/Kconfig"
-source "arch/sh/boards/mach-migor/Kconfig"
-source "arch/sh/boards/mach-magicpanelr2/Kconfig"
+source "arch/sh/boards/Kconfig"
 
 menu "Timer and clock configuration"
 
index 47bbfd8..fb3b65e 100644 (file)
@@ -101,15 +101,8 @@ LIBGCC := $(shell $(CC) $(KBUILD_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)           += mach-se/770x
-machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)      += mach-se/7206
-machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)      += mach-se/7619
-machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)      += mach-se/7722
-machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)      += mach-se/7751
-machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)      += mach-se/7780
-machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)      += mach-se/7343
-machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE)      += mach-se/7721
+# Boards and Mach groups
+machdir-$(CONFIG_SOLUTION_ENGINE)              += mach-se
 machdir-$(CONFIG_SH_HP6XX)                     += mach-hp6xx
 machdir-$(CONFIG_SH_DREAMCAST)                 += mach-dreamcast
 machdir-$(CONFIG_SH_SH03)                      += mach-sh03
@@ -133,8 +126,6 @@ machdir-$(CONFIG_SH_LBOX_RE2)                       += mach-lboxre2
 machdir-$(CONFIG_SH_MAGIC_PANEL_R2)            += mach-magicpanelr2
 machdir-$(CONFIG_SH_CAYMAN)                    += mach-cayman
 
-incdir-y       := $(notdir $(machdir-y))
-
 ifneq ($(machdir-y),)
 core-y += $(addprefix arch/sh/boards/, \
             $(filter-out ., $(patsubst %,%/,$(machdir-y))))
@@ -159,7 +150,7 @@ drivers-$(CONFIG_OPROFILE)  += arch/sh/oprofile/
 boot := arch/sh/boot
 
 cflags-y       += -Iarch/sh/include/$(cpuincdir-y)
-cflags-y       += $(foreach d, $(incdir-y), -Iarch/sh/include/mach-$(d))
+cflags-y       += $(foreach d, $(machdir-y), -Iarch/sh/include/$(d))
 
 KBUILD_CFLAGS          += -pipe $(cflags-y)
 KBUILD_CPPFLAGS                += $(cflags-y)
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
new file mode 100644 (file)
index 0000000..324c25a
--- /dev/null
@@ -0,0 +1,245 @@
+menu "Board support"
+
+config SOLUTION_ENGINE
+       bool
+
+config SH_SOLUTION_ENGINE
+       bool "SolutionEngine"
+       select SOLUTION_ENGINE
+       select CPU_HAS_IPR_IRQ
+       depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \
+         CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \
+         CPU_SUBTYPE_SH7750R 
+       help
+         Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,
+         SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.
+
+config SH_7206_SOLUTION_ENGINE
+       bool "SolutionEngine7206"
+       select SOLUTION_ENGINE
+       depends on CPU_SUBTYPE_SH7206
+       help
+         Select 7206 SolutionEngine if configuring for a Hitachi SH7206
+         evaluation board.
+
+config SH_7619_SOLUTION_ENGINE
+       bool "SolutionEngine7619"
+       select SOLUTION_ENGINE
+       depends on CPU_SUBTYPE_SH7619
+       help
+         Select 7619 SolutionEngine if configuring for a Hitachi SH7619
+         evaluation board.
+       
+config SH_7721_SOLUTION_ENGINE
+       bool "SolutionEngine7721"
+       select SOLUTION_ENGINE
+       depends on CPU_SUBTYPE_SH7721
+       help
+         Select 7721 SolutionEngine if configuring for a Hitachi SH7721
+         evaluation board.
+
+config SH_7722_SOLUTION_ENGINE
+       bool "SolutionEngine7722"
+       select SOLUTION_ENGINE
+       depends on CPU_SUBTYPE_SH7722
+       help
+         Select 7722 SolutionEngine if configuring for a Hitachi SH772
+         evaluation board.
+
+config SH_7751_SOLUTION_ENGINE
+       bool "SolutionEngine7751"
+       select SOLUTION_ENGINE
+       select CPU_HAS_IPR_IRQ
+       depends on CPU_SUBTYPE_SH7751
+       help
+         Select 7751 SolutionEngine if configuring for a Hitachi SH7751
+         evaluation board.
+         
+config SH_7780_SOLUTION_ENGINE
+       bool "SolutionEngine7780"
+       select SOLUTION_ENGINE
+       select SYS_SUPPORTS_PCI
+       depends on CPU_SUBTYPE_SH7780
+       help
+         Select 7780 SolutionEngine if configuring for a Renesas SH7780
+         evaluation board.
+
+config SH_7343_SOLUTION_ENGINE
+       bool "SolutionEngine7343"
+       select SOLUTION_ENGINE
+       depends on CPU_SUBTYPE_SH7343
+       help
+         Select 7343 SolutionEngine if configuring for a Hitachi
+         SH7343 (SH-Mobile 3AS) evaluation board.
+
+config SH_7751_SYSTEMH
+       bool "SystemH7751R"
+       depends on CPU_SUBTYPE_SH7751R
+       help
+         Select SystemH if you are configuring for a Renesas SystemH
+         7751R evaluation board.
+
+config SH_HP6XX
+       bool "HP6XX"
+       select SYS_SUPPORTS_APM_EMULATION
+       select HD6446X_SERIES
+       depends on CPU_SUBTYPE_SH7709
+       help
+         Select HP6XX if configuring for a HP jornada HP6xx.
+         More information (hardware only) at
+         <http://www.hp.com/jornada/>.
+
+config SH_DREAMCAST
+       bool "Dreamcast"
+       select SYS_SUPPORTS_PCI
+       depends on CPU_SUBTYPE_SH7091
+       help
+         Select Dreamcast if configuring for a SEGA Dreamcast.
+         More information at <http://www.linux-sh.org>
+
+config SH_SH03
+       bool "Interface CTP/PCI-SH03"
+       depends on CPU_SUBTYPE_SH7751
+       select CPU_HAS_IPR_IRQ
+       select SYS_SUPPORTS_PCI
+       help
+         CTP/PCI-SH03 is a CPU module computer that is produced
+         by Interface Corporation.
+         More information at <http://www.interface.co.jp>
+
+config SH_SECUREEDGE5410
+       bool "SecureEdge5410"
+       depends on CPU_SUBTYPE_SH7751R
+       select CPU_HAS_IPR_IRQ
+       select SYS_SUPPORTS_PCI
+       help
+         Select SecureEdge5410 if configuring for a SnapGear SH board.
+         This includes both the OEM SecureEdge products as well as the
+         SME product line.
+
+config SH_RTS7751R2D
+       bool "RTS7751R2D"
+       depends on CPU_SUBTYPE_SH7751R
+       select SYS_SUPPORTS_PCI
+       select IO_TRAPPED
+       help
+         Select RTS7751R2D if configuring for a Renesas Technology
+         Sales SH-Graphics board.
+
+config SH_RSK7203
+       bool "RSK7203"
+       depends on CPU_SUBTYPE_SH7203
+
+config SH_SDK7780
+       bool "SDK7780R3"
+       depends on CPU_SUBTYPE_SH7780
+       select SYS_SUPPORTS_PCI
+       help
+         Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3
+         evaluation board.
+
+config SH_HIGHLANDER
+       bool "Highlander"
+       depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
+       select SYS_SUPPORTS_PCI
+       select IO_TRAPPED
+
+config SH_SH7785LCR
+       bool "SH7785LCR"
+       depends on CPU_SUBTYPE_SH7785
+       select SYS_SUPPORTS_PCI
+       select IO_TRAPPED
+
+config SH_SH7785LCR_29BIT_PHYSMAPS
+       bool "SH7785LCR 29bit physmaps"
+       depends on SH_SH7785LCR
+       default y
+       help
+         This board has 2 physical memory maps. It can be changed with
+         DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,
+         you can access all on-board device in 29bit address mode.
+
+config SH_MIGOR
+       bool "Migo-R"
+       depends on CPU_SUBTYPE_SH7722
+       help
+         Select Migo-R if configuring for the SH7722 Migo-R platform
+          by Renesas System Solutions Asia Pte. Ltd.
+
+config SH_AP325RXA
+       bool "AP-325RXA"
+       depends on CPU_SUBTYPE_SH7723
+       help
+         Renesas "AP-325RXA" support.
+         Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
+
+config SH_SH7763RDP
+       bool "SH7763RDP"
+       depends on CPU_SUBTYPE_SH7763
+       help
+         Select SH7763RDP if configuring for a Renesas SH7763
+         evaluation board.
+
+config SH_EDOSK7705
+       bool "EDOSK7705"
+       depends on CPU_SUBTYPE_SH7705
+
+config SH_SH4202_MICRODEV
+       bool "SH4-202 MicroDev"
+       depends on CPU_SUBTYPE_SH4_202
+       help
+         Select SH4-202 MicroDev if configuring for a SuperH MicroDev board
+         with an SH4-202 CPU.
+
+config SH_LANDISK
+       bool "LANDISK"
+       depends on CPU_SUBTYPE_SH7751R
+       select SYS_SUPPORTS_PCI
+       help
+         I-O DATA DEVICE, INC. "LANDISK Series" support.
+
+config SH_TITAN
+       bool "TITAN"
+       depends on CPU_SUBTYPE_SH7751R
+       select CPU_HAS_IPR_IRQ
+       select SYS_SUPPORTS_PCI
+       help
+         Select Titan if you are configuring for a Nimble Microsystems
+         NetEngine NP51R.
+
+config SH_SHMIN
+       bool "SHMIN"
+       depends on CPU_SUBTYPE_SH7706
+       select CPU_HAS_IPR_IRQ
+       help
+         Select SHMIN if configuring for the SHMIN board.
+
+config SH_LBOX_RE2
+       bool "L-BOX RE2"
+       depends on CPU_SUBTYPE_SH7751R
+       select SYS_SUPPORTS_PCI
+       help
+         Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
+
+config SH_X3PROTO
+       bool "SH-X3 Prototype board"
+       depends on CPU_SUBTYPE_SHX3
+
+config SH_MAGIC_PANEL_R2
+       bool "Magic Panel R2"
+       depends on CPU_SUBTYPE_SH7720
+       help
+         Select Magic Panel R2 if configuring for Magic Panel R2.
+
+config SH_CAYMAN
+       bool "Hitachi Cayman"
+       depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
+       select SYS_SUPPORTS_PCI
+
+endmenu
+
+source "arch/sh/boards/mach-r2d/Kconfig"
+source "arch/sh/boards/mach-highlander/Kconfig"
+source "arch/sh/boards/mach-sdk7780/Kconfig"
+source "arch/sh/boards/mach-migor/Kconfig"
+source "arch/sh/boards/mach-magicpanelr2/Kconfig"
index 1308e61..9c3a332 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/io.h>
-#include <asm/se7206.h>
+#include <mach-se/mach/se7206.h>
 
 
 static inline void delay(void)
index 9d5bfc7..aef7f05 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
-#include <asm/se7206.h>
+#include <mach-se/mach/se7206.h>
 
 #define INTSTS0 0x31800000
 #define INTSTS1 0x31800002
index 4fe84cc..f546638 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/smc91x.h>
-#include <asm/se7206.h>
+#include <mach-se/mach/se7206.h>
 #include <asm/io.h>
 #include <asm/machvec.h>
 #include <asm/heartbeat.h>
index 1112e86..5d96e2e 100644 (file)
@@ -13,9 +13,9 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/se7343.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <mach-se/mach/se7343.h>
 
 static void disable_se7343_irq(unsigned int irq)
 {
index 59dc92e..486f40b 100644 (file)
@@ -1,8 +1,8 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
-#include <machvec.h>
-#include <mach/se7343.h>
+#include <asm/machvec.h>
+#include <mach-se/mach/se7343.h>
 #include <asm/heartbeat.h>
 #include <asm/irq.h>
 #include <asm/io.h>
index b1ec085..28833c8 100644 (file)
@@ -6,7 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/io.h>
-#include <asm/se.h>
+#include <mach-se/mach/se.h>
 
 /* MS7750 requires special versions of in*, out* routines, since
    PC-like io ports are located at upper half byte of 16-bit word which
index cdb0807..ec1fea5 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/irq.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/se.h>
+#include <mach-se/mach/se.h>
 
 static struct ipr_data ipr_irq_table[] = {
        /*
index 6c64d77..9123d96 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <asm/machvec.h>
-#include <asm/se.h>
+#include <mach-se/mach/se.h>
 #include <asm/io.h>
 #include <asm/smc37c93x.h>
 #include <asm/heartbeat.h>
index c4fdd62..b417acc 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <asm/se7721.h>
+#include <mach-se/mach/se7721.h>
 
 enum {
        UNUSED = 0,
index 1be3e92..d3fc80f 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <asm/machvec.h>
-#include <asm/se7721.h>
+#include <mach-se/mach/se7721.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
 
index 0b03f3f..02d21a3 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/se7722.h>
+#include <mach-se/mach/se7722.h>
 
 static void disable_se7722_irq(unsigned int irq)
 {
index 6e228ea..fe6f965 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/smc91x.h>
 #include <asm/machvec.h>
 #include <asm/clock.h>
-#include <asm/se7722.h>
+#include <mach-se/mach/se7722.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
 #include <asm/sh_keysc.h>
index e8d846c..6287ae5 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#include <asm/se7751.h>
+#include <mach-se/mach/se7751.h>
 #include <asm/addrspace.h>
 
 static inline volatile u16 *port2adr(unsigned int port)
index c3d1259..5c9847e 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/irq.h>
-#include <asm/se7751.h>
+#include <mach-se/mach/se7751.h>
 
 static struct ipr_data ipr_irq_table[] = {
        { 13, 3, 3, 2 },
index deefbfd..5057251 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <asm/machvec.h>
-#include <asm/se7751.h>
+#include <mach-se/mach/se7751.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
 
index 6bd70da..66ad292 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/se7780.h>
+#include <mach-se/mach/se7780.h>
 
 /*
  * Initialize IRQ setting
index 0f08ab3..1d3a867 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <asm/machvec.h>
-#include <asm/se7780.h>
+#include <mach-se/mach/se7780.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
 
diff --git a/arch/sh/boards/mach-se/Makefile b/arch/sh/boards/mach-se/Makefile
new file mode 100644 (file)
index 0000000..ad2b38e
--- /dev/null
@@ -0,0 +1,8 @@
+obj-$(CONFIG_SH_SOLUTION_ENGINE)       += 770x/
+obj-$(CONFIG_SH_7206_SOLUTION_ENGINE)  += 7206/
+obj-$(CONFIG_SH_7619_SOLUTION_ENGINE)  += 7619/
+obj-$(CONFIG_SH_7722_SOLUTION_ENGINE)  += 7722/
+obj-$(CONFIG_SH_7751_SOLUTION_ENGINE)  += 7751/
+obj-$(CONFIG_SH_7780_SOLUTION_ENGINE)  += 7780/
+obj-$(CONFIG_SH_7343_SOLUTION_ENGINE)  += 7343/
+obj-$(CONFIG_SH_7721_SOLUTION_ENGINE)  += 7721/
index bbdb48c..3145c62 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <asm/se7780.h>
+#include <mach-se/mach/se7780.h>
 #include <asm/io.h>
 #include "pci-sh4.h"
 
index d3d9f32..bea4033 100644 (file)
@@ -80,11 +80,11 @@ static int __init cf_init_default(void)
 }
 
 #if defined(CONFIG_SH_SOLUTION_ENGINE)
-#include <asm/se.h>
+#include <mach-se/mach/se.h>
 #elif defined(CONFIG_SH_7722_SOLUTION_ENGINE)
-#include <asm/se7722.h>
+#include <mach-se/mach/se7722.h>
 #elif defined(CONFIG_SH_7721_SOLUTION_ENGINE)
-#include <asm/se7721.h>
+#include <mach-se/mach/se7721.h>
 #endif
 
 /*