diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2010-01-26 16:31:32 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-01 17:55:31 +0000 |
| commit | 916ee9249a7f19d8eb18cc9ee16ca495a517ab34 (patch) | |
| tree | 43e77e20a48d32586ec44a46fab1c32782aa55d5 | |
| parent | ARM: S3C2440: Fix SMDK2440 SoC selection (diff) | |
| download | linux-dev-916ee9249a7f19d8eb18cc9ee16ca495a517ab34.tar.xz linux-dev-916ee9249a7f19d8eb18cc9ee16ca495a517ab34.zip | |
ARM: S3C244X: Move S3C2442 code into S3C2440
Move the remaining S3C2442 code into mach-s3c2440 as there is only one
file currently in there and these two SoCs are very similar.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 12 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c2442.c (renamed from arch/arm/mach-s3c2442/s3c2442.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 11 |
4 files changed, 14 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 45cab7af5cde..f496385e1c75 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -15,6 +15,18 @@ config CPU_S3C2440 help Support for S3C2440 Samsung Mobile CPU based systems. +config CPU_S3C2442 + bool + depends on ARCH_S3C2410 + select CPU_ARM920T + select S3C2410_CLOCK + select S3C2410_GPIO + select S3C2410_PM if PM + select CPU_S3C244X + select CPU_LLSERIAL_S3C2440 + help + Support for S3C2442 Samsung Mobile CPU based systems. + config S3C2440_DMA bool depends on ARCH_S3C2410 && CPU_S3C24405B diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile index e51497ca12ea..e8412b35dcb0 100644 --- a/arch/arm/mach-s3c2440/Makefile +++ b/arch/arm/mach-s3c2440/Makefile @@ -10,6 +10,8 @@ obj-n := obj- := obj-$(CONFIG_CPU_S3C2440) += s3c2440.o dsc.o +obj-$(CONFIG_CPU_S3C2442) += s3c2442.o + obj-$(CONFIG_CPU_S3C2440) += irq.o obj-$(CONFIG_CPU_S3C2440) += clock.o obj-$(CONFIG_S3C2440_DMA) += dma.o diff --git a/arch/arm/mach-s3c2442/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c index 188ad1e57dc0..188ad1e57dc0 100644 --- a/arch/arm/mach-s3c2442/s3c2442.c +++ b/arch/arm/mach-s3c2440/s3c2442.c diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 4832cd6ccfbc..29ef0669e959 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig @@ -2,14 +2,3 @@ # # Licensed under GPLv2 -config CPU_S3C2442 - bool - depends on ARCH_S3C2410 - select CPU_ARM920T - select S3C2410_CLOCK - select S3C2410_GPIO - select S3C2410_PM if PM - select CPU_S3C244X - select CPU_LLSERIAL_S3C2440 - help - Support for S3C2442 Samsung Mobile CPU based systems. |