diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 02:47:41 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-01 12:56:04 -0500 |
commit | 58bac7b8ded70c39bcd5f7037091051c277618aa (patch) | |
tree | 68fab2208ee756748a116ec39de1655923532d95 | |
parent | 70556b143ae4cf404a73c2461a6bf7fef3fefbf7 (diff) |
ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440
Remove the old common S3C2440 and S3C2442 SoC support from plat-s3c24xx
into mach-s3c2440 now this directory is serving both SoCs.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 42 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/Makefile | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/s3c244x-clock.c (renamed from arch/arm/plat-s3c24xx/s3c244x-clock.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/s3c244x-irq.c (renamed from arch/arm/plat-s3c24xx/s3c244x-irq.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/s3c244x.c (renamed from arch/arm/plat-s3c24xx/s3c244x.c) | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/Kconfig | 41 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/Makefile | 7 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/s3c244x.h (renamed from arch/arm/plat-s3c24xx/s3c244x.h) | 2 |
9 files changed, 53 insertions, 51 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index f496385e1c75..7f465265cf04 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
@@ -27,6 +27,48 @@ config CPU_S3C2442 | |||
27 | help | 27 | help |
28 | Support for S3C2442 Samsung Mobile CPU based systems. | 28 | Support for S3C2442 Samsung Mobile CPU based systems. |
29 | 29 | ||
30 | config CPU_S3C244X | ||
31 | bool | ||
32 | depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) | ||
33 | help | ||
34 | Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. | ||
35 | |||
36 | |||
37 | |||
38 | config S3C2440_CPUFREQ | ||
39 | bool "S3C2440/S3C2442 CPU Frequency scaling support" | ||
40 | depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) | ||
41 | select S3C2410_CPUFREQ_UTILS | ||
42 | default y | ||
43 | help | ||
44 | CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. | ||
45 | |||
46 | config S3C2440_XTAL_12000000 | ||
47 | bool | ||
48 | help | ||
49 | Indicate that the build needs to support 12MHz system | ||
50 | crystal. | ||
51 | |||
52 | config S3C2440_XTAL_16934400 | ||
53 | bool | ||
54 | help | ||
55 | Indicate that the build needs to support 16.9344MHz system | ||
56 | crystal. | ||
57 | |||
58 | config S3C2440_PLL_12000000 | ||
59 | bool | ||
60 | depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000 | ||
61 | default y if CPU_FREQ_S3C24XX_PLL | ||
62 | help | ||
63 | PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals. | ||
64 | |||
65 | config S3C2440_PLL_16934400 | ||
66 | bool | ||
67 | depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400 | ||
68 | default y if CPU_FREQ_S3C24XX_PLL | ||
69 | help | ||
70 | PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals. | ||
71 | |||
30 | config S3C2440_DMA | 72 | config S3C2440_DMA |
31 | bool | 73 | bool |
32 | depends on ARCH_S3C2410 && CPU_S3C24405B | 74 | depends on ARCH_S3C2410 && CPU_S3C24405B |
diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile index e8412b35dcb0..c85ba32d8956 100644 --- a/arch/arm/mach-s3c2440/Makefile +++ b/arch/arm/mach-s3c2440/Makefile | |||
@@ -16,6 +16,14 @@ obj-$(CONFIG_CPU_S3C2440) += irq.o | |||
16 | obj-$(CONFIG_CPU_S3C2440) += clock.o | 16 | obj-$(CONFIG_CPU_S3C2440) += clock.o |
17 | obj-$(CONFIG_S3C2440_DMA) += dma.o | 17 | obj-$(CONFIG_S3C2440_DMA) += dma.o |
18 | 18 | ||
19 | obj-$(CONFIG_CPU_S3C244X) += s3c244x.o | ||
20 | obj-$(CONFIG_CPU_S3C244X) += s3c244x-irq.o | ||
21 | obj-$(CONFIG_CPU_S3C244X) += s3c244x-clock.o | ||
22 | obj-$(CONFIG_S3C2440_CPUFREQ) += s3c2440-cpufreq.o | ||
23 | |||
24 | obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o | ||
25 | obj-$(CONFIG_S3C2440_PLL_16934400) += s3c2440-pll-16934400.o | ||
26 | |||
19 | # Machine support | 27 | # Machine support |
20 | 28 | ||
21 | obj-$(CONFIG_MACH_ANUBIS) += mach-anubis.o | 29 | obj-$(CONFIG_MACH_ANUBIS) += mach-anubis.o |
diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/mach-s3c2440/s3c244x-clock.c index f8d96130d1d1..f8d96130d1d1 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-clock.c +++ b/arch/arm/mach-s3c2440/s3c244x-clock.c | |||
diff --git a/arch/arm/plat-s3c24xx/s3c244x-irq.c b/arch/arm/mach-s3c2440/s3c244x-irq.c index a75c0c2431ea..a75c0c2431ea 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-irq.c +++ b/arch/arm/mach-s3c2440/s3c244x-irq.c | |||
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c index 12623a474b54..46e13db03e79 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/mach-s3c2440/s3c244x.c | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | #include <plat/s3c2410.h> | 40 | #include <plat/s3c2410.h> |
41 | #include <plat/s3c2440.h> | 41 | #include <plat/s3c2440.h> |
42 | #include "s3c244x.h" | 42 | #include <plat/s3c244x.h> |
43 | #include <plat/clock.h> | 43 | #include <plat/clock.h> |
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index a806f359ceb6..0cc5760b668a 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig | |||
@@ -27,46 +27,6 @@ config S3C24XX_DCLK | |||
27 | help | 27 | help |
28 | Clock code for supporting DCLK/CLKOUT on S3C24XX architectures | 28 | Clock code for supporting DCLK/CLKOUT on S3C24XX architectures |
29 | 29 | ||
30 | config CPU_S3C244X | ||
31 | bool | ||
32 | depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) | ||
33 | help | ||
34 | Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. | ||
35 | |||
36 | config S3C2440_CPUFREQ | ||
37 | bool "S3C2440/S3C2442 CPU Frequency scaling support" | ||
38 | depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) | ||
39 | select S3C2410_CPUFREQ_UTILS | ||
40 | default y | ||
41 | help | ||
42 | CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. | ||
43 | |||
44 | config S3C2440_XTAL_12000000 | ||
45 | bool | ||
46 | help | ||
47 | Indicate that the build needs to support 12MHz system | ||
48 | crystal. | ||
49 | |||
50 | config S3C2440_XTAL_16934400 | ||
51 | bool | ||
52 | help | ||
53 | Indicate that the build needs to support 16.9344MHz system | ||
54 | crystal. | ||
55 | |||
56 | config S3C2440_PLL_12000000 | ||
57 | bool | ||
58 | depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000 | ||
59 | default y if CPU_FREQ_S3C24XX_PLL | ||
60 | help | ||
61 | PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals. | ||
62 | |||
63 | config S3C2440_PLL_16934400 | ||
64 | bool | ||
65 | depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400 | ||
66 | default y if CPU_FREQ_S3C24XX_PLL | ||
67 | help | ||
68 | PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals. | ||
69 | |||
70 | config S3C24XX_PWM | 30 | config S3C24XX_PWM |
71 | bool "PWM device support" | 31 | bool "PWM device support" |
72 | select HAVE_PWM | 32 | select HAVE_PWM |
@@ -74,7 +34,6 @@ config S3C24XX_PWM | |||
74 | Support for exporting the PWM timer blocks via the pwm device | 34 | Support for exporting the PWM timer blocks via the pwm device |
75 | system. | 35 | system. |
76 | 36 | ||
77 | |||
78 | # gpio configurations | 37 | # gpio configurations |
79 | 38 | ||
80 | config S3C24XX_GPIO_EXTRA | 39 | config S3C24XX_GPIO_EXTRA |
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile index e0100266d039..c2237c41141f 100644 --- a/arch/arm/plat-s3c24xx/Makefile +++ b/arch/arm/plat-s3c24xx/Makefile | |||
@@ -25,13 +25,6 @@ obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpu-freq-debugfs.o | |||
25 | 25 | ||
26 | # Architecture dependant builds | 26 | # Architecture dependant builds |
27 | 27 | ||
28 | obj-$(CONFIG_CPU_S3C244X) += s3c244x.o | ||
29 | obj-$(CONFIG_CPU_S3C244X) += s3c244x-irq.o | ||
30 | obj-$(CONFIG_CPU_S3C244X) += s3c244x-clock.o | ||
31 | obj-$(CONFIG_S3C2440_CPUFREQ) += s3c2440-cpufreq.o | ||
32 | obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o | ||
33 | obj-$(CONFIG_S3C2440_PLL_16934400) += s3c2440-pll-16934400.o | ||
34 | |||
35 | obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o | 28 | obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o |
36 | obj-$(CONFIG_PM) += pm.o | 29 | obj-$(CONFIG_PM) += pm.o |
37 | obj-$(CONFIG_PM) += irq-pm.o | 30 | obj-$(CONFIG_PM) += irq-pm.o |
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index 4af9dd948793..6ecf87af9602 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c | |||
@@ -49,7 +49,7 @@ | |||
49 | #include <plat/s3c2400.h> | 49 | #include <plat/s3c2400.h> |
50 | #include <plat/s3c2410.h> | 50 | #include <plat/s3c2410.h> |
51 | #include <plat/s3c2412.h> | 51 | #include <plat/s3c2412.h> |
52 | #include "s3c244x.h" | 52 | #include <plat/s3c244x.h> |
53 | #include <plat/s3c2440.h> | 53 | #include <plat/s3c2440.h> |
54 | #include <plat/s3c2442.h> | 54 | #include <plat/s3c2442.h> |
55 | #include <plat/s3c2443.h> | 55 | #include <plat/s3c2443.h> |
diff --git a/arch/arm/plat-s3c24xx/s3c244x.h b/arch/arm/plat-s3c24xx/include/plat/s3c244x.h index 6aab5eaae2b4..8da0904c41ab 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.h +++ b/arch/arm/plat-s3c24xx/include/plat/s3c244x.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/s3c244x.h | 1 | /* linux/arch/arm/plat-s3c24xx/include/plat/s3c244x.h |
2 | * | 2 | * |
3 | * Copyright (c) 2004-2005 Simtec Electronics | 3 | * Copyright (c) 2004-2005 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |