ARM: exynos: move SoC sources to mach-exynos

Move arch/arm/cpu/armv7/exynos/* to arch/arm/mach-exynos/* to allow
reuse of existing code for ARMv8 based Exynos platforms.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

56 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ee9a1b3e65a..735d971f4e1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -838,7 +838,7 @@ source "arch/arm/mach-bcm283x/Kconfig"
 
 source "arch/arm/mach-davinci/Kconfig"
 
-source "arch/arm/cpu/armv7/exynos/Kconfig"
+source "arch/arm/mach-exynos/Kconfig"
 
 source "arch/arm/mach-highbank/Kconfig"
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index ab0e9ce6736..e84d6d366e1 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -44,6 +44,7 @@ PLATFORM_CPPFLAGS += $(arch-y) $(tune-y)
 machine-$(CONFIG_ARCH_AT91)		+= at91
 machine-$(CONFIG_ARCH_BCM283X)		+= bcm283x
 machine-$(CONFIG_ARCH_DAVINCI)		+= davinci
+machine-$(CONFIG_ARCH_EXYNOS)		+= exynos
 machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
 # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index 5a761004069..6769d8fbfe4 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -41,7 +41,6 @@ obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
 obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
 obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
 obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
-obj-$(CONFIG_ARCH_EXYNOS) += exynos/
 obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/
 obj-$(if $(filter mx5,$(SOC)),y) += mx5/
 obj-$(CONFIG_MX6) += mx6/
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 37b89b00131..37b89b00131 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 8542f896cfc..8542f896cfc 100644
--- a/arch/arm/cpu/armv7/exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 1c6baa14b21..1c6baa14b21 100644
--- a/arch/arm/cpu/armv7/exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
diff --git a/arch/arm/cpu/armv7/exynos/clock_init.h b/arch/arm/mach-exynos/clock_init.h
index fce502f45a3..fce502f45a3 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init.h
+++ b/arch/arm/mach-exynos/clock_init.h
diff --git a/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c b/arch/arm/mach-exynos/clock_init_exynos4.c
index 584e4bac09f..584e4bac09f 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c
+++ b/arch/arm/mach-exynos/clock_init_exynos4.c
diff --git a/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c
index 0200fd154f9..0200fd154f9 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
diff --git a/arch/arm/cpu/armv7/exynos/common_setup.h b/arch/arm/mach-exynos/common_setup.h
index 5235abb808a..5235abb808a 100644
--- a/arch/arm/cpu/armv7/exynos/common_setup.h
+++ b/arch/arm/mach-exynos/common_setup.h
diff --git a/arch/arm/cpu/armv7/exynos/config.mk b/arch/arm/mach-exynos/config.mk
index ee0d2dab7b8..ee0d2dab7b8 100644
--- a/arch/arm/cpu/armv7/exynos/config.mk
+++ b/arch/arm/mach-exynos/config.mk
diff --git a/arch/arm/cpu/armv7/exynos/dmc_common.c b/arch/arm/mach-exynos/dmc_common.c
index 9b6ee69f467..9b6ee69f467 100644
--- a/arch/arm/cpu/armv7/exynos/dmc_common.c
+++ b/arch/arm/mach-exynos/dmc_common.c
diff --git a/arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index 7c0b12ae51a..7c0b12ae51a 100644
--- a/arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
diff --git a/arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c b/arch/arm/mach-exynos/dmc_init_exynos4.c
index ecddc726849..ecddc726849 100644
--- a/arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c
+++ b/arch/arm/mach-exynos/dmc_init_exynos4.c
diff --git a/arch/arm/cpu/armv7/exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h
index 9f29d94c10f..9f29d94c10f 100644
--- a/arch/arm/cpu/armv7/exynos/exynos4_setup.h
+++ b/arch/arm/mach-exynos/exynos4_setup.h
diff --git a/arch/arm/cpu/armv7/exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h
index 9073f50f6b3..9073f50f6b3 100644
--- a/arch/arm/cpu/armv7/exynos/exynos5_setup.h
+++ b/arch/arm/mach-exynos/exynos5_setup.h
diff --git a/arch/arm/include/asm/arch-exynos/adc.h b/arch/arm/mach-exynos/include/mach/adc.h
index a0e26d7052c..a0e26d7052c 100644
--- a/arch/arm/include/asm/arch-exynos/adc.h
+++ b/arch/arm/mach-exynos/include/mach/adc.h
diff --git a/arch/arm/include/asm/arch-exynos/board.h b/arch/arm/mach-exynos/include/mach/board.h
index 1b1cd0dd9ed..1b1cd0dd9ed 100644
--- a/arch/arm/include/asm/arch-exynos/board.h
+++ b/arch/arm/mach-exynos/include/mach/board.h
diff --git a/arch/arm/include/asm/arch-exynos/clk.h b/arch/arm/mach-exynos/include/mach/clk.h
index d20b7d2ae30..d20b7d2ae30 100644
--- a/arch/arm/include/asm/arch-exynos/clk.h
+++ b/arch/arm/mach-exynos/include/mach/clk.h
diff --git a/arch/arm/include/asm/arch-exynos/clock.h b/arch/arm/mach-exynos/include/mach/clock.h
index 8259b92b8ea..8259b92b8ea 100644
--- a/arch/arm/include/asm/arch-exynos/clock.h
+++ b/arch/arm/mach-exynos/include/mach/clock.h
diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/mach-exynos/include/mach/cpu.h
index cb3d2cc06fc..cb3d2cc06fc 100644
--- a/arch/arm/include/asm/arch-exynos/cpu.h
+++ b/arch/arm/mach-exynos/include/mach/cpu.h
diff --git a/arch/arm/include/asm/arch-exynos/dmc.h b/arch/arm/mach-exynos/include/mach/dmc.h
index 4990a1af39c..4990a1af39c 100644
--- a/arch/arm/include/asm/arch-exynos/dmc.h
+++ b/arch/arm/mach-exynos/include/mach/dmc.h
diff --git a/arch/arm/include/asm/arch-exynos/dp.h b/arch/arm/mach-exynos/include/mach/dp.h
index 0ec58e94cea..0ec58e94cea 100644
--- a/arch/arm/include/asm/arch-exynos/dp.h
+++ b/arch/arm/mach-exynos/include/mach/dp.h
diff --git a/arch/arm/include/asm/arch-exynos/dp_info.h b/arch/arm/mach-exynos/include/mach/dp_info.h
index 17e8f56d904..17e8f56d904 100644
--- a/arch/arm/include/asm/arch-exynos/dp_info.h
+++ b/arch/arm/mach-exynos/include/mach/dp_info.h
diff --git a/arch/arm/include/asm/arch-exynos/dsim.h b/arch/arm/mach-exynos/include/mach/dsim.h
index 86ff4da4d8e..86ff4da4d8e 100644
--- a/arch/arm/include/asm/arch-exynos/dsim.h
+++ b/arch/arm/mach-exynos/include/mach/dsim.h
diff --git a/arch/arm/include/asm/arch-exynos/dwmmc.h b/arch/arm/mach-exynos/include/mach/dwmmc.h
index a7ca12c477e..a7ca12c477e 100644
--- a/arch/arm/include/asm/arch-exynos/dwmmc.h
+++ b/arch/arm/mach-exynos/include/mach/dwmmc.h
diff --git a/arch/arm/include/asm/arch-exynos/ehci.h b/arch/arm/mach-exynos/include/mach/ehci.h
index 3800fa90443..3800fa90443 100644
--- a/arch/arm/include/asm/arch-exynos/ehci.h
+++ b/arch/arm/mach-exynos/include/mach/ehci.h
diff --git a/arch/arm/include/asm/arch-exynos/fb.h b/arch/arm/mach-exynos/include/mach/fb.h
index f0d69b730e4..f0d69b730e4 100644
--- a/arch/arm/include/asm/arch-exynos/fb.h
+++ b/arch/arm/mach-exynos/include/mach/fb.h
diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/mach-exynos/include/mach/gpio.h
index 9699954a7d4..9699954a7d4 100644
--- a/arch/arm/include/asm/arch-exynos/gpio.h
+++ b/arch/arm/mach-exynos/include/mach/gpio.h
diff --git a/arch/arm/include/asm/arch-exynos/i2s-regs.h b/arch/arm/mach-exynos/include/mach/i2s-regs.h
index 4a4a7a00b7a..4a4a7a00b7a 100644
--- a/arch/arm/include/asm/arch-exynos/i2s-regs.h
+++ b/arch/arm/mach-exynos/include/mach/i2s-regs.h
diff --git a/arch/arm/include/asm/arch-exynos/mipi_dsim.h b/arch/arm/mach-exynos/include/mach/mipi_dsim.h
index 50e5c258a93..50e5c258a93 100644
--- a/arch/arm/include/asm/arch-exynos/mipi_dsim.h
+++ b/arch/arm/mach-exynos/include/mach/mipi_dsim.h
diff --git a/arch/arm/include/asm/arch-exynos/mmc.h b/arch/arm/mach-exynos/include/mach/mmc.h
index 0fb6461c08b..0fb6461c08b 100644
--- a/arch/arm/include/asm/arch-exynos/mmc.h
+++ b/arch/arm/mach-exynos/include/mach/mmc.h
diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/mach-exynos/include/mach/periph.h
index fdc9e87c691..fdc9e87c691 100644
--- a/arch/arm/include/asm/arch-exynos/periph.h
+++ b/arch/arm/mach-exynos/include/mach/periph.h
diff --git a/arch/arm/include/asm/arch-exynos/pinmux.h b/arch/arm/mach-exynos/include/mach/pinmux.h
index d0ae7575dae..d0ae7575dae 100644
--- a/arch/arm/include/asm/arch-exynos/pinmux.h
+++ b/arch/arm/mach-exynos/include/mach/pinmux.h
diff --git a/arch/arm/include/asm/arch-exynos/power.h b/arch/arm/mach-exynos/include/mach/power.h
index 3f97b31aead..3f97b31aead 100644
--- a/arch/arm/include/asm/arch-exynos/power.h
+++ b/arch/arm/mach-exynos/include/mach/power.h
diff --git a/arch/arm/include/asm/arch-exynos/pwm.h b/arch/arm/mach-exynos/include/mach/pwm.h
index 43474c34b0c..43474c34b0c 100644
--- a/arch/arm/include/asm/arch-exynos/pwm.h
+++ b/arch/arm/mach-exynos/include/mach/pwm.h
diff --git a/arch/arm/include/asm/arch-exynos/pwm_backlight.h b/arch/arm/mach-exynos/include/mach/pwm_backlight.h
index 4f54fa737d0..4f54fa737d0 100644
--- a/arch/arm/include/asm/arch-exynos/pwm_backlight.h
+++ b/arch/arm/mach-exynos/include/mach/pwm_backlight.h
diff --git a/arch/arm/include/asm/arch-exynos/sound.h b/arch/arm/mach-exynos/include/mach/sound.h
index bff57c6919a..bff57c6919a 100644
--- a/arch/arm/include/asm/arch-exynos/sound.h
+++ b/arch/arm/mach-exynos/include/mach/sound.h
diff --git a/arch/arm/include/asm/arch-exynos/spi.h b/arch/arm/mach-exynos/include/mach/spi.h
index 0ba931b7e37..0ba931b7e37 100644
--- a/arch/arm/include/asm/arch-exynos/spi.h
+++ b/arch/arm/mach-exynos/include/mach/spi.h
diff --git a/arch/arm/include/asm/arch-exynos/spl.h b/arch/arm/mach-exynos/include/mach/spl.h
index cdcb2bc7ada..0c480acb1a2 100644
--- a/arch/arm/include/asm/arch-exynos/spl.h
+++ b/arch/arm/mach-exynos/include/mach/spl.h
@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_EXYNOS_SPL_H__
 #define __ASM_ARCH_EXYNOS_SPL_H__
 
-#include <asm/arch-exynos/dmc.h>
+#include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
 
 #ifndef __ASSEMBLY__
diff --git a/arch/arm/include/asm/arch-exynos/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h
index 7f584033bd2..7f584033bd2 100644
--- a/arch/arm/include/asm/arch-exynos/sromc.h
+++ b/arch/arm/mach-exynos/include/mach/sromc.h
diff --git a/arch/arm/include/asm/arch-exynos/sys_proto.h b/arch/arm/mach-exynos/include/mach/sys_proto.h
index 83ae42a743f..83ae42a743f 100644
--- a/arch/arm/include/asm/arch-exynos/sys_proto.h
+++ b/arch/arm/mach-exynos/include/mach/sys_proto.h
diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/mach-exynos/include/mach/system.h
index 3ffb296a57f..3ffb296a57f 100644
--- a/arch/arm/include/asm/arch-exynos/system.h
+++ b/arch/arm/mach-exynos/include/mach/system.h
diff --git a/arch/arm/include/asm/arch-exynos/tmu.h b/arch/arm/mach-exynos/include/mach/tmu.h
index cad35694f64..cad35694f64 100644
--- a/arch/arm/include/asm/arch-exynos/tmu.h
+++ b/arch/arm/mach-exynos/include/mach/tmu.h
diff --git a/arch/arm/include/asm/arch-exynos/tzpc.h b/arch/arm/mach-exynos/include/mach/tzpc.h
index 0a4be239110..0a4be239110 100644
--- a/arch/arm/include/asm/arch-exynos/tzpc.h
+++ b/arch/arm/mach-exynos/include/mach/tzpc.h
diff --git a/arch/arm/include/asm/arch-exynos/uart.h b/arch/arm/mach-exynos/include/mach/uart.h
index 33d6ba3b64b..33d6ba3b64b 100644
--- a/arch/arm/include/asm/arch-exynos/uart.h
+++ b/arch/arm/mach-exynos/include/mach/uart.h
diff --git a/arch/arm/include/asm/arch-exynos/watchdog.h b/arch/arm/mach-exynos/include/mach/watchdog.h
index eb641090600..eb641090600 100644
--- a/arch/arm/include/asm/arch-exynos/watchdog.h
+++ b/arch/arm/mach-exynos/include/mach/watchdog.h
diff --git a/arch/arm/include/asm/arch-exynos/xhci-exynos.h b/arch/arm/mach-exynos/include/mach/xhci-exynos.h
index 92b90a462c9..92b90a462c9 100644
--- a/arch/arm/include/asm/arch-exynos/xhci-exynos.h
+++ b/arch/arm/mach-exynos/include/mach/xhci-exynos.h
diff --git a/arch/arm/cpu/armv7/exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 37746078487..37746078487 100644
--- a/arch/arm/cpu/armv7/exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index e97cb376ffc..e97cb376ffc 100644
--- a/arch/arm/cpu/armv7/exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
diff --git a/arch/arm/cpu/armv7/exynos/power.c b/arch/arm/mach-exynos/power.c
index 1b12051656e..1b12051656e 100644
--- a/arch/arm/cpu/armv7/exynos/power.c
+++ b/arch/arm/mach-exynos/power.c
diff --git a/arch/arm/cpu/armv7/exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S
index dfc3455929e..dfc3455929e 100644
--- a/arch/arm/cpu/armv7/exynos/sec_boot.S
+++ b/arch/arm/mach-exynos/sec_boot.S
diff --git a/arch/arm/cpu/armv7/exynos/soc.c b/arch/arm/mach-exynos/soc.c
index 0f116b141a3..0f116b141a3 100644
--- a/arch/arm/cpu/armv7/exynos/soc.c
+++ b/arch/arm/mach-exynos/soc.c
diff --git a/arch/arm/cpu/armv7/exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index c7f943eb6a9..c7f943eb6a9 100644
--- a/arch/arm/cpu/armv7/exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
diff --git a/arch/arm/cpu/armv7/exynos/system.c b/arch/arm/mach-exynos/system.c
index ad12445832c..ad12445832c 100644
--- a/arch/arm/cpu/armv7/exynos/system.c
+++ b/arch/arm/mach-exynos/system.c
diff --git a/arch/arm/cpu/armv7/exynos/tzpc.c b/arch/arm/mach-exynos/tzpc.c
index 395077cf256..395077cf256 100644
--- a/arch/arm/cpu/armv7/exynos/tzpc.c
+++ b/arch/arm/mach-exynos/tzpc.c