From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: S3C244X: Move S3C2442 code into S3C2440
Date: Tue, 26 Jan 2010 07:58:03 +0000 [thread overview]
Message-ID: <1264492686-16901-5-git-send-email-ben-linux@fluff.org> (raw)
In-Reply-To: <1264492686-16901-1-git-send-email-ben-linux@fluff.org>
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>
---
arch/arm/mach-s3c2440/Kconfig | 12 ++++++++++++
arch/arm/mach-s3c2440/Makefile | 2 ++
arch/arm/{mach-s3c2442 => mach-s3c2440}/s3c2442.c | 0
arch/arm/mach-s3c2442/Kconfig | 11 -----------
4 files changed, 14 insertions(+), 11 deletions(-)
rename arch/arm/{mach-s3c2442 => mach-s3c2440}/s3c2442.c (100%)
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 45cab7a..f496385 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 e51497c..e8412b3 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
similarity index 100%
rename from arch/arm/mach-s3c2442/s3c2442.c
rename to arch/arm/mach-s3c2440/s3c2442.c
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
index 4832cd6..29ef066 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.
--
1.6.0.4
next prev parent reply other threads:[~2010-01-26 7:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-26 7:57 S3C2440/S3C2442 merge Ben Dooks
2010-01-26 7:58 ` [PATCH] ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440 Ben Dooks
2010-01-26 7:58 ` [PATCH] ARM: S3C2442: Merge s3c2442.c and clock.c Ben Dooks
2010-01-26 7:58 ` [PATCH] ARM: S3C2440: Fix SMDK2440 SoC selection Ben Dooks
2010-01-26 7:58 ` Ben Dooks [this message]
2010-01-26 7:58 ` [PATCH] ARM: S3C24XX: Remove old mach-s3c2442 Ben Dooks
2010-01-26 7:58 ` [PATCH] ARM: S3C24XX: Move S3C2440/S3C2442 support from plat-s3c24xx to mach-s3c2440 Ben Dooks
2010-01-26 7:58 ` [PATCH] ARM: S3C244X: Merge <plat/s3c2440.h> and <plat/s3c2442.h> into <plat/s3c244x.h> Ben Dooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1264492686-16901-5-git-send-email-ben-linux@fluff.org \
--to=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).