From f7be9abaa5f4a64fdcca6808bb7eacb3547e574e Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Tue, 26 Jan 2010 13:41:30 +0900 Subject: [PATCH] ARM: S3C64XX: Move core support to mach-s3c64xx Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used outside of this directory. Also move the SoC header files in with it. This includes the clock, cpu, cpufreq, dma, gpiolib and pll support. Signed-off-by: Ben Dooks --- arch/arm/mach-s3c64xx/Kconfig | 4 ++++ arch/arm/mach-s3c64xx/Makefile | 15 +++++++++++++++ arch/arm/{plat-s3c64xx => mach-s3c64xx}/clock.c | 2 ++ arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c | 4 ++-- .../arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c | 0 arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c | 0 .../arm/{plat-s3c64xx => mach-s3c64xx}/gpiolib.c | 0 .../plat => mach-s3c64xx/include/mach}/pll.h | 0 .../plat => mach-s3c64xx/include/mach}/s3c6400.h | 3 +-- .../plat => mach-s3c64xx/include/mach}/s3c6410.h | 2 +- arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- arch/arm/mach-s3c64xx/mach-ncp.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c | 0 arch/arm/mach-s3c64xx/s3c6400.c | 2 +- arch/arm/mach-s3c64xx/s3c6410.c | 4 ++-- arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S | 0 arch/arm/plat-s3c64xx/Kconfig | 4 ---- arch/arm/plat-s3c64xx/Makefile | 16 ---------------- arch/arm/plat-s3c64xx/s3c6400-init.c | 4 ++-- 22 files changed, 35 insertions(+), 35 deletions(-) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/clock.c (99%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c (98%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c (100%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c (100%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/gpiolib.c (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pll.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6400.h (95%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6410.h (93%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c (100%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S (100%) diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 15e065ef19a5..7c9cd9a9901a 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -19,6 +19,10 @@ config CPU_S3C6410 help Enable S3C6410 CPU support +config S3C64XX_DMA + bool "S3C64XX DMA" + select S3C_DMA + config S3C64XX_SETUP_SDHCI select S3C64XX_SETUP_SDHCI_GPIO bool diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index 49b71d5f2e59..4417f1ad99b6 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile @@ -10,6 +10,11 @@ obj-m := obj-n := obj- := +# Core files +obj-y += cpu.o +obj-y += clock.o +obj-y += gpiolib.o + # Core support for S3C6400 system obj-$(CONFIG_CPU_S3C6400) += s3c6400.o @@ -18,6 +23,14 @@ obj-$(CONFIG_CPU_S3C6410) += s3c6410.o obj-y += irq.o obj-y += irq-eint.o +# CPU frequency scaling + +obj-$(CONFIG_CPU_FREQ_S3C64XX) += cpufreq.o + +# DMA support + +obj-$(CONFIG_S3C64XX_DMA) += dma.o + # Device setup obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o @@ -28,6 +41,8 @@ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o # PM +obj-$(CONFIG_PM) += pm.o +obj-$(CONFIG_PM) += sleep.o obj-$(CONFIG_PM) += irq-pm.o # Machine support diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c similarity index 99% rename from arch/arm/plat-s3c64xx/clock.c rename to arch/arm/mach-s3c64xx/clock.c index 64439de206cb..229bb3bcc54f 100644 --- a/arch/arm/plat-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -23,6 +23,8 @@ #include #include +#include + #include #include #include diff --git a/arch/arm/plat-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c similarity index 98% rename from arch/arm/plat-s3c64xx/cpu.c rename to arch/arm/mach-s3c64xx/cpu.c index bc7ca1812e32..410d688a6910 100644 --- a/arch/arm/plat-s3c64xx/cpu.c +++ b/arch/arm/mach-s3c64xx/cpu.c @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include /* table of supported CPUs */ diff --git a/arch/arm/plat-s3c64xx/cpufreq.c b/arch/arm/mach-s3c64xx/cpufreq.c similarity index 100% rename from arch/arm/plat-s3c64xx/cpufreq.c rename to arch/arm/mach-s3c64xx/cpufreq.c diff --git a/arch/arm/plat-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c similarity index 100% rename from arch/arm/plat-s3c64xx/dma.c rename to arch/arm/mach-s3c64xx/dma.c diff --git a/arch/arm/plat-s3c64xx/gpiolib.c b/arch/arm/mach-s3c64xx/gpiolib.c similarity index 100% rename from arch/arm/plat-s3c64xx/gpiolib.c rename to arch/arm/mach-s3c64xx/gpiolib.c diff --git a/arch/arm/plat-s3c64xx/include/plat/pll.h b/arch/arm/mach-s3c64xx/include/mach/pll.h similarity index 100% rename from arch/arm/plat-s3c64xx/include/plat/pll.h rename to arch/arm/mach-s3c64xx/include/mach/pll.h diff --git a/arch/arm/plat-s3c64xx/include/plat/s3c6400.h b/arch/arm/mach-s3c64xx/include/mach/s3c6400.h similarity index 95% rename from arch/arm/plat-s3c64xx/include/plat/s3c6400.h rename to arch/arm/mach-s3c64xx/include/mach/s3c6400.h index 11f2e1e119b0..2bc7c07a928f 100644 --- a/arch/arm/plat-s3c64xx/include/plat/s3c6400.h +++ b/arch/arm/mach-s3c64xx/include/mach/s3c6400.h @@ -1,4 +1,4 @@ -/* arch/arm/plat-s3c64xx/include/plat/s3c6400.h +/* arch/arm/mach-s3c64xx/include/macht/s3c6400.h * * Copyright 2008 Openmoko, Inc. * Copyright 2008 Simtec Electronics @@ -33,4 +33,3 @@ extern void s3c6400_init_clocks(int xtal); #define s3c6400_map_io NULL #define s3c6400_init NULL #endif - diff --git a/arch/arm/plat-s3c64xx/include/plat/s3c6410.h b/arch/arm/mach-s3c64xx/include/mach/s3c6410.h similarity index 93% rename from arch/arm/plat-s3c64xx/include/plat/s3c6410.h rename to arch/arm/mach-s3c64xx/include/mach/s3c6410.h index 50dcdd6f6800..24f1141ffcb7 100644 --- a/arch/arm/plat-s3c64xx/include/plat/s3c6410.h +++ b/arch/arm/mach-s3c64xx/include/mach/s3c6410.h @@ -1,4 +1,4 @@ -/* arch/arm/plat-s3c64xx/include/plat/s3c6410.h +/* arch/arm/mach-s3c64xx/include/mach/s3c6410.h * * Copyright 2008 Openmoko, Inc. * Copyright 2008 Simtec Electronics diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index 06d8fe579e10..4a0bb243d14a 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 284886c26a28..a6d91c39f22e 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c index 9be92ddd2176..bf65747ea68e 100644 --- a/arch/arm/mach-s3c64xx/mach-ncp.c +++ b/arch/arm/mach-s3c64xx/mach-ncp.c @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c index ba8a052a6142..f7b18983950c 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c @@ -31,7 +31,7 @@ #include -#include +#include #include #include #include diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index 021670e39d3e..fdf8f7539a12 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/plat-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c similarity index 100% rename from arch/arm/plat-s3c64xx/pm.c rename to arch/arm/mach-s3c64xx/pm.c diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c index 2fba1b263fed..720d0d1f3bfc 100644 --- a/arch/arm/mach-s3c64xx/s3c6400.c +++ b/arch/arm/mach-s3c64xx/s3c6400.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include void __init s3c6400_map_io(void) { diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c index b881d6a50b11..fd457cc3ab87 100644 --- a/arch/arm/mach-s3c64xx/s3c6410.c +++ b/arch/arm/mach-s3c64xx/s3c6410.c @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include void __init s3c6410_map_io(void) { diff --git a/arch/arm/plat-s3c64xx/sleep.S b/arch/arm/mach-s3c64xx/sleep.S similarity index 100% rename from arch/arm/plat-s3c64xx/sleep.S rename to arch/arm/mach-s3c64xx/sleep.S diff --git a/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig index 4edb580a02b7..fb7e25f710e0 100644 --- a/arch/arm/plat-s3c64xx/Kconfig +++ b/arch/arm/plat-s3c64xx/Kconfig @@ -42,8 +42,4 @@ config CPU_S3C6400_CLOCK Common clock support code for the S3C6400 that is shared by other CPUs in the series, such as the S3C6410. -config S3C64XX_DMA - bool "S3C64XX DMA" - select S3C_DMA - endif diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile index 187b779a2bdc..bd4fe3b48eaa 100644 --- a/arch/arm/plat-s3c64xx/Makefile +++ b/arch/arm/plat-s3c64xx/Makefile @@ -10,23 +10,7 @@ obj-m := obj-n := dummy.o obj- := -# Core files -obj-y += cpu.o -obj-y += clock.o -obj-y += gpiolib.o - # CPU support obj-$(CONFIG_CPU_S3C6400_INIT) += s3c6400-init.o obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o -obj-$(CONFIG_CPU_FREQ_S3C64XX) += cpufreq.o - -# PM support - -obj-$(CONFIG_PM) += pm.o -obj-$(CONFIG_PM) += sleep.o - -# DMA support - -obj-$(CONFIG_S3C64XX_DMA) += dma.o - diff --git a/arch/arm/plat-s3c64xx/s3c6400-init.c b/arch/arm/plat-s3c64xx/s3c6400-init.c index 6c28f39df097..e64caa4d02d9 100644 --- a/arch/arm/plat-s3c64xx/s3c6400-init.c +++ b/arch/arm/plat-s3c64xx/s3c6400-init.c @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include /* uart registration process */ -- 2.39.2