| commit | 56b820a39ec138807f634512c78bbb64e659b2f0 | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Fri Nov 20 15:24:57 2015 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Mon Nov 30 17:17:01 2015 +0900 |
| tree | f1348e316a9c4b871d3cadbab9d9cdbe7ce5852a | |
| parent | 89de706c9725ba86e65da0d54003bc5419f38211 [diff] |
arm: s5pc1xx: move SoC to mach-s5pc1xx move arm/arm/cpu/armv7/s5pc1xx to arch/arm/mach-s5pc1xx Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6542c38..9705685 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -721,7 +721,7 @@ source "arch/arm/mach-rockchip/Kconfig" -source "arch/arm/cpu/armv7/s5pc1xx/Kconfig" +source "arch/arm/mach-s5pc1xx/Kconfig" source "arch/arm/mach-socfpga/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 58f9bbb..18283d1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile
@@ -53,6 +53,7 @@ # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x +machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_TEGRA) += tegra
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index c8d1422..45f346c 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_OMAP44XX) += omap4/ obj-$(CONFIG_OMAP54XX) += omap5/ obj-$(CONFIG_RMOBILE) += rmobile/ -obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_VF610) += vf610/
diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/mach-s5pc1xx/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/s5pc1xx/Kconfig rename to arch/arm/mach-s5pc1xx/Kconfig
diff --git a/arch/arm/cpu/armv7/s5pc1xx/Makefile b/arch/arm/mach-s5pc1xx/Makefile similarity index 100% rename from arch/arm/cpu/armv7/s5pc1xx/Makefile rename to arch/arm/mach-s5pc1xx/Makefile
diff --git a/arch/arm/cpu/armv7/s5pc1xx/cache.c b/arch/arm/mach-s5pc1xx/cache.c similarity index 100% rename from arch/arm/cpu/armv7/s5pc1xx/cache.c rename to arch/arm/mach-s5pc1xx/cache.c
diff --git a/arch/arm/cpu/armv7/s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c similarity index 100% rename from arch/arm/cpu/armv7/s5pc1xx/clock.c rename to arch/arm/mach-s5pc1xx/clock.c
diff --git a/arch/arm/include/asm/arch-s5pc1xx/clk.h b/arch/arm/mach-s5pc1xx/include/mach/clk.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/clk.h rename to arch/arm/mach-s5pc1xx/include/mach/clk.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/clock.h b/arch/arm/mach-s5pc1xx/include/mach/clock.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/clock.h rename to arch/arm/mach-s5pc1xx/include/mach/clock.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h b/arch/arm/mach-s5pc1xx/include/mach/cpu.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/cpu.h rename to arch/arm/mach-s5pc1xx/include/mach/cpu.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/gpio.h b/arch/arm/mach-s5pc1xx/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/gpio.h rename to arch/arm/mach-s5pc1xx/include/mach/gpio.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/mach-s5pc1xx/include/mach/mmc.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/mmc.h rename to arch/arm/mach-s5pc1xx/include/mach/mmc.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/periph.h b/arch/arm/mach-s5pc1xx/include/mach/periph.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/periph.h rename to arch/arm/mach-s5pc1xx/include/mach/periph.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/pinmux.h b/arch/arm/mach-s5pc1xx/include/mach/pinmux.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/pinmux.h rename to arch/arm/mach-s5pc1xx/include/mach/pinmux.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/power.h b/arch/arm/mach-s5pc1xx/include/mach/power.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/power.h rename to arch/arm/mach-s5pc1xx/include/mach/power.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/pwm.h b/arch/arm/mach-s5pc1xx/include/mach/pwm.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/pwm.h rename to arch/arm/mach-s5pc1xx/include/mach/pwm.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/sromc.h b/arch/arm/mach-s5pc1xx/include/mach/sromc.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/sromc.h rename to arch/arm/mach-s5pc1xx/include/mach/sromc.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/sys_proto.h b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/sys_proto.h rename to arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/uart.h b/arch/arm/mach-s5pc1xx/include/mach/uart.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/uart.h rename to arch/arm/mach-s5pc1xx/include/mach/uart.h
diff --git a/arch/arm/include/asm/arch-s5pc1xx/watchdog.h b/arch/arm/mach-s5pc1xx/include/mach/watchdog.h similarity index 100% rename from arch/arm/include/asm/arch-s5pc1xx/watchdog.h rename to arch/arm/mach-s5pc1xx/include/mach/watchdog.h
diff --git a/arch/arm/cpu/armv7/s5pc1xx/reset.S b/arch/arm/mach-s5pc1xx/reset.S similarity index 100% rename from arch/arm/cpu/armv7/s5pc1xx/reset.S rename to arch/arm/mach-s5pc1xx/reset.S