From 3264f976d3188bea80819793c13a3220b8a4867c Mon Sep 17 00:00:00 2001 From: Hirokazu Takata Date: Wed, 1 Aug 2007 21:09:31 +0900 Subject: [PATCH] m32r: Rearrange platform-dependent codes Rearrange platform-dependent codes from arch/m32r/kernel/*.c to arch/m32r/platforms/{platform}/. Signed-off-by: Hirokazu Takata --- arch/m32r/Makefile | 3 ++- arch/m32r/kernel/Makefile | 8 -------- arch/m32r/platforms/Makefile | 9 +++++++++ arch/m32r/platforms/m32104ut/Makefile | 1 + .../{kernel/io_m32104ut.c => platforms/m32104ut/io.c} | 2 +- .../setup_m32104ut.c => platforms/m32104ut/setup.c} | 2 +- arch/m32r/platforms/m32700ut/Makefile | 1 + .../{kernel/io_m32700ut.c => platforms/m32700ut/io.c} | 2 +- .../setup_m32700ut.c => platforms/m32700ut/setup.c} | 2 +- arch/m32r/platforms/mappi/Makefile | 1 + arch/m32r/{kernel/io_mappi.c => platforms/mappi/io.c} | 2 +- .../{kernel/setup_mappi.c => platforms/mappi/setup.c} | 2 +- arch/m32r/platforms/mappi2/Makefile | 1 + arch/m32r/{kernel/io_mappi2.c => platforms/mappi2/io.c} | 2 +- .../{kernel/setup_mappi2.c => platforms/mappi2/setup.c} | 2 +- arch/m32r/platforms/mappi3/Makefile | 1 + arch/m32r/{kernel/io_mappi3.c => platforms/mappi3/io.c} | 2 +- .../{kernel/setup_mappi3.c => platforms/mappi3/setup.c} | 2 +- arch/m32r/platforms/oaks32r/Makefile | 1 + .../m32r/{kernel/io_oaks32r.c => platforms/oaks32r/io.c} | 2 +- .../setup_oaks32r.c => platforms/oaks32r/setup.c} | 2 +- arch/m32r/platforms/opsput/Makefile | 1 + arch/m32r/{kernel/io_opsput.c => platforms/opsput/io.c} | 2 +- .../{kernel/setup_opsput.c => platforms/opsput/setup.c} | 2 +- arch/m32r/platforms/usrv/Makefile | 1 + arch/m32r/{kernel/io_usrv.c => platforms/usrv/io.c} | 4 ++-- .../m32r/{kernel/setup_usrv.c => platforms/usrv/setup.c} | 5 ++--- 27 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 arch/m32r/platforms/Makefile create mode 100644 arch/m32r/platforms/m32104ut/Makefile rename arch/m32r/{kernel/io_m32104ut.c => platforms/m32104ut/io.c} (99%) rename arch/m32r/{kernel/setup_m32104ut.c => platforms/m32104ut/setup.c} (98%) create mode 100644 arch/m32r/platforms/m32700ut/Makefile rename arch/m32r/{kernel/io_m32700ut.c => platforms/m32700ut/io.c} (99%) rename arch/m32r/{kernel/setup_m32700ut.c => platforms/m32700ut/setup.c} (99%) create mode 100644 arch/m32r/platforms/mappi/Makefile rename arch/m32r/{kernel/io_mappi.c => platforms/mappi/io.c} (99%) rename arch/m32r/{kernel/setup_mappi.c => platforms/mappi/setup.c} (99%) create mode 100644 arch/m32r/platforms/mappi2/Makefile rename arch/m32r/{kernel/io_mappi2.c => platforms/mappi2/io.c} (99%) rename arch/m32r/{kernel/setup_mappi2.c => platforms/mappi2/setup.c} (99%) create mode 100644 arch/m32r/platforms/mappi3/Makefile rename arch/m32r/{kernel/io_mappi3.c => platforms/mappi3/io.c} (99%) rename arch/m32r/{kernel/setup_mappi3.c => platforms/mappi3/setup.c} (99%) create mode 100644 arch/m32r/platforms/oaks32r/Makefile rename arch/m32r/{kernel/io_oaks32r.c => platforms/oaks32r/io.c} (99%) rename arch/m32r/{kernel/setup_oaks32r.c => platforms/oaks32r/setup.c} (98%) create mode 100644 arch/m32r/platforms/opsput/Makefile rename arch/m32r/{kernel/io_opsput.c => platforms/opsput/io.c} (99%) rename arch/m32r/{kernel/setup_opsput.c => platforms/opsput/setup.c} (99%) create mode 100644 arch/m32r/platforms/usrv/Makefile rename arch/m32r/{kernel/io_usrv.c => platforms/usrv/io.c} (98%) rename arch/m32r/{kernel/setup_usrv.c => platforms/usrv/setup.c} (98%) diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile index cdf63b210c..60e12f3126 100644 --- a/arch/m32r/Makefile +++ b/arch/m32r/Makefile @@ -36,7 +36,8 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) libs-y += arch/m32r/lib/ $(LIBGCC) core-y += arch/m32r/kernel/ \ arch/m32r/mm/ \ - arch/m32r/boot/ + arch/m32r/boot/ \ + arch/m32r/platforms/ drivers-$(CONFIG_OPROFILE) += arch/m32r/oprofile/ diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile index 5a2fa88690..e97e26e87c 100644 --- a/arch/m32r/kernel/Makefile +++ b/arch/m32r/kernel/Makefile @@ -8,14 +8,6 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \ m32r_ksyms.o sys_m32r.o semaphore.o signal.o ptrace.o obj-$(CONFIG_SMP) += smp.o smpboot.o -obj-$(CONFIG_PLAT_MAPPI) += setup_mappi.o io_mappi.o -obj-$(CONFIG_PLAT_MAPPI2) += setup_mappi2.o io_mappi2.o -obj-$(CONFIG_PLAT_MAPPI3) += setup_mappi3.o io_mappi3.o -obj-$(CONFIG_PLAT_USRV) += setup_usrv.o io_usrv.o -obj-$(CONFIG_PLAT_M32700UT) += setup_m32700ut.o io_m32700ut.o -obj-$(CONFIG_PLAT_OPSPUT) += setup_opsput.o io_opsput.o obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_PLAT_OAKS32R) += setup_oaks32r.o io_oaks32r.o -obj-$(CONFIG_PLAT_M32104UT) += setup_m32104ut.o io_m32104ut.o EXTRA_AFLAGS := -traditional diff --git a/arch/m32r/platforms/Makefile b/arch/m32r/platforms/Makefile new file mode 100644 index 0000000000..da03e1a8fe --- /dev/null +++ b/arch/m32r/platforms/Makefile @@ -0,0 +1,9 @@ +# arch/m32r/platforms/Makefile +obj-$(CONFIG_PLAT_M32104UT) += m32104ut/ +obj-$(CONFIG_PLAT_M32700UT) += m32700ut/ +obj-$(CONFIG_PLAT_MAPPI) += mappi/ +obj-$(CONFIG_PLAT_MAPPI2) += mappi2/ +obj-$(CONFIG_PLAT_MAPPI3) += mappi3/ +obj-$(CONFIG_PLAT_OAKS32R) += oaks32r/ +obj-$(CONFIG_PLAT_OPSPUT) += opsput/ +obj-$(CONFIG_PLAT_USRV) += usrv/ diff --git a/arch/m32r/platforms/m32104ut/Makefile b/arch/m32r/platforms/m32104ut/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/m32104ut/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_m32104ut.c b/arch/m32r/platforms/m32104ut/io.c similarity index 99% rename from arch/m32r/kernel/io_m32104ut.c rename to arch/m32r/platforms/m32104ut/io.c index 2189eca30b..e5d8be6fbb 100644 --- a/arch/m32r/kernel/io_m32104ut.c +++ b/arch/m32r/platforms/m32104ut/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_m32104ut.c + * linux/arch/m32r/platforms/m32104ut/io.c * * Typical I/O routines for M32104UT board. * diff --git a/arch/m32r/kernel/setup_m32104ut.c b/arch/m32r/platforms/m32104ut/setup.c similarity index 98% rename from arch/m32r/kernel/setup_m32104ut.c rename to arch/m32r/platforms/m32104ut/setup.c index 1692b321f4..98138b4e92 100644 --- a/arch/m32r/kernel/setup_m32104ut.c +++ b/arch/m32r/platforms/m32104ut/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_m32104ut.c + * linux/arch/m32r/platforms/m32104ut/setup.c * * Setup routines for M32104UT Board * diff --git a/arch/m32r/platforms/m32700ut/Makefile b/arch/m32r/platforms/m32700ut/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/m32700ut/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/platforms/m32700ut/io.c similarity index 99% rename from arch/m32r/kernel/io_m32700ut.c rename to arch/m32r/platforms/m32700ut/io.c index 5898f4031a..6862586e58 100644 --- a/arch/m32r/kernel/io_m32700ut.c +++ b/arch/m32r/platforms/m32700ut/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_m32700ut.c + * linux/arch/m32r/platforms/m32700ut/io.c * * Typical I/O routines for M32700UT board. * diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/platforms/m32700ut/setup.c similarity index 99% rename from arch/m32r/kernel/setup_m32700ut.c rename to arch/m32r/platforms/m32700ut/setup.c index 7efc145c74..77b0ae9379 100644 --- a/arch/m32r/kernel/setup_m32700ut.c +++ b/arch/m32r/platforms/m32700ut/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_m32700ut.c + * linux/arch/m32r/platforms/m32700ut/setup.c * * Setup routines for Renesas M32700UT Board * diff --git a/arch/m32r/platforms/mappi/Makefile b/arch/m32r/platforms/mappi/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/mappi/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/platforms/mappi/io.c similarity index 99% rename from arch/m32r/kernel/io_mappi.c rename to arch/m32r/platforms/mappi/io.c index 31396789ab..ac1c396d47 100644 --- a/arch/m32r/kernel/io_mappi.c +++ b/arch/m32r/platforms/mappi/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_mappi.c + * linux/arch/m32r/platforms/mappi/io.c * * Typical I/O routines for Mappi board. * diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/platforms/mappi/setup.c similarity index 99% rename from arch/m32r/kernel/setup_mappi.c rename to arch/m32r/platforms/mappi/setup.c index fe73c9ec61..3ec087ff22 100644 --- a/arch/m32r/kernel/setup_mappi.c +++ b/arch/m32r/platforms/mappi/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_mappi.c + * linux/arch/m32r/platforms/mappi/setup.c * * Setup routines for Renesas MAPPI Board * diff --git a/arch/m32r/platforms/mappi2/Makefile b/arch/m32r/platforms/mappi2/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/mappi2/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/platforms/mappi2/io.c similarity index 99% rename from arch/m32r/kernel/io_mappi2.c rename to arch/m32r/platforms/mappi2/io.c index ecc6aa88f9..da58960b3f 100644 --- a/arch/m32r/kernel/io_mappi2.c +++ b/arch/m32r/platforms/mappi2/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_mappi2.c + * linux/arch/m32r/platforms/mappi2/io.c * * Typical I/O routines for Mappi2 board. * diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/platforms/mappi2/setup.c similarity index 99% rename from arch/m32r/kernel/setup_mappi2.c rename to arch/m32r/platforms/mappi2/setup.c index 55abb21027..d87969c635 100644 --- a/arch/m32r/kernel/setup_mappi2.c +++ b/arch/m32r/platforms/mappi2/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_mappi2.c + * linux/arch/m32r/platforms/mappi2/setup.c * * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board * diff --git a/arch/m32r/platforms/mappi3/Makefile b/arch/m32r/platforms/mappi3/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/mappi3/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/platforms/mappi3/io.c similarity index 99% rename from arch/m32r/kernel/io_mappi3.c rename to arch/m32r/platforms/mappi3/io.c index a13b5f6b07..1bc3f90fdc 100644 --- a/arch/m32r/kernel/io_mappi3.c +++ b/arch/m32r/platforms/mappi3/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_mappi3.c + * linux/arch/m32r/platforms/mappi3/io.c * * Typical I/O routines for Mappi3 board. * diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/platforms/mappi3/setup.c similarity index 99% rename from arch/m32r/kernel/setup_mappi3.c rename to arch/m32r/platforms/mappi3/setup.c index 93dc010c7f..785b4bd6d9 100644 --- a/arch/m32r/kernel/setup_mappi3.c +++ b/arch/m32r/platforms/mappi3/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_mappi3.c + * linux/arch/m32r/platforms/mappi3/setup.c * * Setup routines for Renesas MAPPI-III(M3A-2170) Board * diff --git a/arch/m32r/platforms/oaks32r/Makefile b/arch/m32r/platforms/oaks32r/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/oaks32r/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/platforms/oaks32r/io.c similarity index 99% rename from arch/m32r/kernel/io_oaks32r.c rename to arch/m32r/platforms/oaks32r/io.c index 068bf47060..364a3b2e89 100644 --- a/arch/m32r/kernel/io_oaks32r.c +++ b/arch/m32r/platforms/oaks32r/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_oaks32r.c + * linux/arch/m32r/platforms/oaks32r/io.c * * Typical I/O routines for OAKS32R board. * diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/platforms/oaks32r/setup.c similarity index 98% rename from arch/m32r/kernel/setup_oaks32r.c rename to arch/m32r/platforms/oaks32r/setup.c index cd62598e3c..6faa5db68e 100644 --- a/arch/m32r/kernel/setup_oaks32r.c +++ b/arch/m32r/platforms/oaks32r/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_oaks32r.c + * linux/arch/m32r/platforms/oaks32r/setup.c * * Setup routines for OAKS32R Board * diff --git a/arch/m32r/platforms/opsput/Makefile b/arch/m32r/platforms/opsput/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/opsput/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/platforms/opsput/io.c similarity index 99% rename from arch/m32r/kernel/io_opsput.c rename to arch/m32r/platforms/opsput/io.c index 3cbb1f717e..379efb7712 100644 --- a/arch/m32r/kernel/io_opsput.c +++ b/arch/m32r/platforms/opsput/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_opsput.c + * linux/arch/m32r/platforms/opsput/io.c * * Typical I/O routines for OPSPUT board. * diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/platforms/opsput/setup.c similarity index 99% rename from arch/m32r/kernel/setup_opsput.c rename to arch/m32r/platforms/opsput/setup.c index 62d6b71de4..fab13fd854 100644 --- a/arch/m32r/kernel/setup_opsput.c +++ b/arch/m32r/platforms/opsput/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_opsput.c + * linux/arch/m32r/platforms/opsput/setup.c * * Setup routines for Renesas OPSPUT Board * diff --git a/arch/m32r/platforms/usrv/Makefile b/arch/m32r/platforms/usrv/Makefile new file mode 100644 index 0000000000..0de59084f2 --- /dev/null +++ b/arch/m32r/platforms/usrv/Makefile @@ -0,0 +1 @@ +obj-y := setup.o io.o diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/platforms/usrv/io.c similarity index 98% rename from arch/m32r/kernel/io_usrv.c rename to arch/m32r/platforms/usrv/io.c index a8c0e2eceb..f5e50d37ba 100644 --- a/arch/m32r/kernel/io_usrv.c +++ b/arch/m32r/platforms/usrv/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/io_usrv.c + * linux/arch/m32r/platforms/usrv/io.c * * Typical I/O routines for uServer board. * @@ -17,7 +17,7 @@ #include #include -#include "../drivers/m32r_cfc.h" +#include "../../../../drivers/pcmcia/m32r_cfc.h" extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int); extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int); diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/platforms/usrv/setup.c similarity index 98% rename from arch/m32r/kernel/setup_usrv.c rename to arch/m32r/platforms/usrv/setup.c index f5b4b5ac31..89588d649e 100644 --- a/arch/m32r/kernel/setup_usrv.c +++ b/arch/m32r/platforms/usrv/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/m32r/kernel/setup_usrv.c + * linux/arch/m32r/platforms/usrv/setup.c * * Setup routines for MITSUBISHI uServer * @@ -198,7 +198,7 @@ void __init init_IRQ(void) #endif /* CONFIG_SERIAL_M32R_SIO */ /* INT#67-#71: CFC#0 IREQ on PLD */ - for (i = 0 ; i < CONFIG_CFC_NUM ; i++ ) { + for (i = 0 ; i < CONFIG_M32R_CFC_NUM ; i++ ) { irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED; irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_CF0 + i].action = 0; @@ -246,4 +246,3 @@ void __init init_IRQ(void) icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD11; enable_mappi_irq(M32R_IRQ_INT1); } - -- 2.39.5