ARM: rmobile: Move SoC sources to mach-rmobile

Move from arch/arm/cpu/armv7/rmobile/ to arch/arm/mach-rmobile/.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3237a74f722358bdb76207fa0244eeb1fb3a403f..e6940e6206372dcf9ab8f6f8381abe907ec36d37 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -879,7 +879,7 @@ source "arch/arm/cpu/armv7/omap-common/Kconfig"
 
 source "arch/arm/mach-orion5x/Kconfig"
 
-source "arch/arm/cpu/armv7/rmobile/Kconfig"
+source "arch/arm/mach-rmobile/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"
 

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6a07cd178e64109480a93cfe388e7d15ca320248..43ae79a6efb464547cc6898125f5286769dff3b0 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -59,6 +59,7 @@ machine-$(CONFIG_ARCH_S5PC1XX)                += s5pc1xx
 machine-$(CONFIG_ARCH_SUNXI)           += sunxi
 machine-$(CONFIG_ARCH_SNAPDRAGON)      += snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)         += socfpga
+machine-$(CONFIG_RMOBILE)              += rmobile
 machine-$(CONFIG_ARCH_ROCKCHIP)                += rockchip
 machine-$(CONFIG_STM32)                        += stm32
 machine-$(CONFIG_TEGRA)                        += tegra

diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/Kconfig
rename to arch/arm/mach-rmobile/Kconfig

diff --git a/arch/arm/cpu/armv7/rmobile/Makefile b/arch/arm/mach-rmobile/Makefile
similarity index 92%
rename from arch/arm/cpu/armv7/rmobile/Makefile
rename to arch/arm/mach-rmobile/Makefile
index 647e426d0b5172571f5b5d5c607d76d0114f529a..d793616b010423086cece1666ab829f43306d7a2 100644 (file)
--- a/arch/arm/cpu/armv7/rmobile/Makefile
+++ b/arch/arm/mach-rmobile/Makefile
@@ -16,4 +16,4 @@ obj-$(CONFIG_R8A7791) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7791.o
 obj-$(CONFIG_R8A7793) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7793.o
 obj-$(CONFIG_R8A7794) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7794.o
 obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o
-obj-$(CONFIG_TMU_TIMER) += ../../../../sh/lib/time.o
+obj-$(CONFIG_TMU_TIMER) += ../../sh/lib/time.o

diff --git a/arch/arm/cpu/armv7/rmobile/board.c b/arch/arm/mach-rmobile/board.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/board.c
rename to arch/arm/mach-rmobile/board.c

diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info-r8a7740.c b/arch/arm/mach-rmobile/cpu_info-r8a7740.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/cpu_info-r8a7740.c
rename to arch/arm/mach-rmobile/cpu_info-r8a7740.c

diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/cpu_info-rcar.c
rename to arch/arm/mach-rmobile/cpu_info-rcar.c

diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c b/arch/arm/mach-rmobile/cpu_info-sh73a0.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c
rename to arch/arm/mach-rmobile/cpu_info-sh73a0.c

diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/cpu_info.c
rename to arch/arm/mach-rmobile/cpu_info.c

diff --git a/arch/arm/cpu/armv7/rmobile/emac.c b/arch/arm/mach-rmobile/emac.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/emac.c
rename to arch/arm/mach-rmobile/emac.c

diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S b/arch/arm/mach-rmobile/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/lowlevel_init.S
rename to arch/arm/mach-rmobile/lowlevel_init.S

diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S b/arch/arm/mach-rmobile/lowlevel_init_ca15.S
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S
rename to arch/arm/mach-rmobile/lowlevel_init_ca15.S

diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7740.c b/arch/arm/mach-rmobile/pfc-r8a7740.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/pfc-r8a7740.c
rename to arch/arm/mach-rmobile/pfc-r8a7740.c

diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c b/arch/arm/mach-rmobile/pfc-r8a7790.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c
rename to arch/arm/mach-rmobile/pfc-r8a7790.c

diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h b/arch/arm/mach-rmobile/pfc-r8a7790.h
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h
rename to arch/arm/mach-rmobile/pfc-r8a7790.h

diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c b/arch/arm/mach-rmobile/pfc-r8a7791.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c
rename to arch/arm/mach-rmobile/pfc-r8a7791.c

diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7793.c b/arch/arm/mach-rmobile/pfc-r8a7793.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/pfc-r8a7793.c
rename to arch/arm/mach-rmobile/pfc-r8a7793.c

diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c b/arch/arm/mach-rmobile/pfc-r8a7794.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c
rename to arch/arm/mach-rmobile/pfc-r8a7794.c

diff --git a/arch/arm/cpu/armv7/rmobile/pfc-sh73a0.c b/arch/arm/mach-rmobile/pfc-sh73a0.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/pfc-sh73a0.c
rename to arch/arm/mach-rmobile/pfc-sh73a0.c

diff --git a/arch/arm/cpu/armv7/rmobile/timer.c b/arch/arm/mach-rmobile/timer.c
similarity index 100%
rename from arch/arm/cpu/armv7/rmobile/timer.c
rename to arch/arm/mach-rmobile/timer.c