From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: S3C64XX: Move CPUfreq and DMA support to the mach-s3c64xx directory
Date: Tue, 26 Jan 2010 07:03:02 +0000 [thread overview]
Message-ID: <1264489385-13345-12-git-send-email-ben-linux@fluff.org> (raw)
In-Reply-To: <1264489385-13345-1-git-send-email-ben-linux@fluff.org>
Move CPUfreq and DMA support to mach-s3c64xx as it is unlikely to be
used outside of this directory
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/mach-s3c64xx/Kconfig | 4 ++++
arch/arm/mach-s3c64xx/Makefile | 8 ++++++++
arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c | 0
arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c | 0
arch/arm/plat-s3c64xx/Kconfig | 4 ----
arch/arm/plat-s3c64xx/Makefile | 6 ------
6 files changed, 12 insertions(+), 10 deletions(-)
rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c (100%)
rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c (100%)
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 495b6e3..33d82b1 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -17,6 +17,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 ef8bec8..4417f1a 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -23,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
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/Kconfig b/arch/arm/plat-s3c64xx/Kconfig
index 6998f85..cc30089 100644
--- a/arch/arm/plat-s3c64xx/Kconfig
+++ b/arch/arm/plat-s3c64xx/Kconfig
@@ -36,8 +36,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 1d9513c..62fc253 100644
--- a/arch/arm/plat-s3c64xx/Makefile
+++ b/arch/arm/plat-s3c64xx/Makefile
@@ -13,9 +13,3 @@ obj- :=
# CPU support
obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o
-obj-$(CONFIG_CPU_FREQ_S3C64XX) += cpufreq.o
-
-# DMA support
-
-obj-$(CONFIG_S3C64XX_DMA) += dma.o
-
--
1.6.0.4
next prev parent reply other threads:[~2010-01-26 7:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-26 7:02 S3C6410/S3C6400 platform squash Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410 Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Remove useless IO descriptor from S3C6410 Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Squash SDHCI setup into one file Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Move GPIO bank number includes into machine include directory Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Move register definition headers to " Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Move IRQ support into mach-s3c64xx Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Move device files " Ben Dooks
2010-01-26 7:02 ` [PATCH] ARM: S3C64XX: Move device setup support to mach-s3c64xx Ben Dooks
2010-01-26 7:03 ` [PATCH] ARM: S3C64XX: Move cpu, clock and gpiolib and PM " Ben Dooks
2010-01-26 7:03 ` [PATCH] ARM: S3C64XX: Merge s3c6400-init.c into cpu.c Ben Dooks
2010-01-26 7:03 ` Ben Dooks [this message]
2010-01-26 7:03 ` [PATCH] ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xx Ben Dooks
2010-01-26 7:03 ` [PATCH] ARM: S3C64XX: Combine the clock init code Ben Dooks
2010-01-26 7:03 ` [PATCH] ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XX 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=1264489385-13345-12-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).