diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-02-05 20:59:47 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-02 18:55:12 -0500 |
commit | 26febf8ef14a3682eb99af3805c1f8149ed8eb6c (patch) | |
tree | f6206e4ac98c76f04dc7cc290e99056bfbfe3264 /arch/arm | |
parent | 85e2a26f3d17b349a921b93e02b778fa8a09027b (diff) |
ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/
This patch moves S3C2416 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.
Cc: Ben Dooks <ben-linux@fluff.org>
Tested-by: Heiko Stuebner <heiko@sntech.de>
[kgene.kim@samsung.com: removed compiling s3c2416 as per Heiko's suggestion]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2416/Kconfig | 46 | ||||
-rw-r--r-- | arch/arm/mach-s3c2416/Makefile | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 47 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/Makefile | 9 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2416.c (renamed from arch/arm/mach-s3c2416/clock.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/irq-s3c2416.c (renamed from arch/arm/mach-s3c2416/irq.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2416.c (renamed from arch/arm/mach-s3c2416/mach-smdk2416.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2416.c (renamed from arch/arm/mach-s3c2416/pm.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/s3c2416.c (renamed from arch/arm/mach-s3c2416/s3c2416.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/setup-sdhci-gpio.c (renamed from arch/arm/mach-s3c2416/setup-sdhci-gpio.c) | 0 |
11 files changed, 57 insertions, 57 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 59d9df40ca10..29f11649a96f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -175,7 +175,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 | |||
175 | machine-$(CONFIG_ARCH_PXA) := pxa | 175 | machine-$(CONFIG_ARCH_PXA) := pxa |
176 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 176 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
177 | machine-$(CONFIG_ARCH_RPC) := rpc | 177 | machine-$(CONFIG_ARCH_RPC) := rpc |
178 | machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2416 s3c2440 s3c2443 | 178 | machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 s3c2443 |
179 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx | 179 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
180 | machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 | 180 | machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 |
181 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 | 181 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 |
diff --git a/arch/arm/mach-s3c2416/Kconfig b/arch/arm/mach-s3c2416/Kconfig index 53d5c2bf5437..faaa289a486c 100644 --- a/arch/arm/mach-s3c2416/Kconfig +++ b/arch/arm/mach-s3c2416/Kconfig | |||
@@ -7,54 +7,8 @@ | |||
7 | # note, this also supports the S3C2450 which is so similar it has the same | 7 | # note, this also supports the S3C2450 which is so similar it has the same |
8 | # ID code as the S3C2416. | 8 | # ID code as the S3C2416. |
9 | 9 | ||
10 | config CPU_S3C2416 | ||
11 | bool | ||
12 | depends on ARCH_S3C24XX | ||
13 | select CPU_ARM926T | ||
14 | select S3C2416_DMA if S3C2410_DMA | ||
15 | select CPU_LLSERIAL_S3C2440 | ||
16 | select SAMSUNG_CLKSRC | ||
17 | select S3C2443_CLOCK | ||
18 | help | ||
19 | Support for the S3C2416 SoC from the S3C24XX line | ||
20 | |||
21 | config S3C2416_DMA | 10 | config S3C2416_DMA |
22 | bool | 11 | bool |
23 | depends on CPU_S3C2416 | 12 | depends on CPU_S3C2416 |
24 | help | 13 | help |
25 | Internal config node for S3C2416 DMA support | 14 | Internal config node for S3C2416 DMA support |
26 | |||
27 | config S3C2416_PM | ||
28 | bool | ||
29 | select S3C2412_PM_SLEEP | ||
30 | help | ||
31 | Internal config node to apply S3C2416 power management | ||
32 | |||
33 | config S3C2416_SETUP_SDHCI | ||
34 | bool | ||
35 | select S3C2416_SETUP_SDHCI_GPIO | ||
36 | help | ||
37 | Internal helper functions for S3C2416 based SDHCI systems | ||
38 | |||
39 | config S3C2416_SETUP_SDHCI_GPIO | ||
40 | bool | ||
41 | help | ||
42 | Common setup code for SDHCI gpio. | ||
43 | |||
44 | menu "S3C2416 Machines" | ||
45 | |||
46 | config MACH_SMDK2416 | ||
47 | bool "SMDK2416" | ||
48 | select CPU_S3C2416 | ||
49 | select MACH_SMDK | ||
50 | select S3C_DEV_FB | ||
51 | select S3C_DEV_HSMMC | ||
52 | select S3C_DEV_HSMMC1 | ||
53 | select S3C_DEV_NAND | ||
54 | select S3C_DEV_USB_HOST | ||
55 | select S3C2416_SETUP_SDHCI | ||
56 | select S3C2416_PM if PM | ||
57 | help | ||
58 | Say Y here if you are using an SMDK2416 | ||
59 | |||
60 | endmenu | ||
diff --git a/arch/arm/mach-s3c2416/Makefile b/arch/arm/mach-s3c2416/Makefile index ca0cd227f873..3299f192c879 100644 --- a/arch/arm/mach-s3c2416/Makefile +++ b/arch/arm/mach-s3c2416/Makefile | |||
@@ -9,14 +9,4 @@ obj-m := | |||
9 | obj-n := | 9 | obj-n := |
10 | obj- := | 10 | obj- := |
11 | 11 | ||
12 | obj-$(CONFIG_CPU_S3C2416) += s3c2416.o clock.o | ||
13 | obj-$(CONFIG_CPU_S3C2416) += irq.o | ||
14 | obj-$(CONFIG_S3C2416_PM) += pm.o | ||
15 | #obj-$(CONFIG_S3C2416_DMA) += dma.o | 12 | #obj-$(CONFIG_S3C2416_DMA) += dma.o |
16 | |||
17 | # Device setup | ||
18 | obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | ||
19 | |||
20 | # Machine support | ||
21 | |||
22 | obj-$(CONFIG_MACH_SMDK2416) += mach-smdk2416.o | ||
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 1c646ff07b92..9dda29e82bbe 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
@@ -35,6 +35,18 @@ config CPU_S3C2412 | |||
35 | help | 35 | help |
36 | Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line | 36 | Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line |
37 | 37 | ||
38 | config CPU_S3C2416 | ||
39 | bool "SAMSUNG S3C2416/S3C2450" | ||
40 | depends on ARCH_S3C24XX | ||
41 | select CPU_ARM926T | ||
42 | select CPU_LLSERIAL_S3C2440 | ||
43 | select SAMSUNG_CLKSRC | ||
44 | select S3C2443_CLOCK | ||
45 | select S3C2416_DMA if S3C24XX_DMA | ||
46 | select S3C2416_PM if PM | ||
47 | help | ||
48 | Support for the S3C2416 SoC from the S3C24XX line | ||
49 | |||
38 | if CPU_S3C2410 | 50 | if CPU_S3C2410 |
39 | 51 | ||
40 | config S3C2410_DMA | 52 | config S3C2410_DMA |
@@ -248,6 +260,41 @@ config MACH_VSTMS | |||
248 | 260 | ||
249 | endif # CPU_S3C2412 | 261 | endif # CPU_S3C2412 |
250 | 262 | ||
263 | if CPU_S3C2416 | ||
264 | |||
265 | config S3C2416_PM | ||
266 | bool | ||
267 | select S3C2412_PM_SLEEP | ||
268 | help | ||
269 | Internal config node to apply S3C2416 power management | ||
270 | |||
271 | config S3C2416_SETUP_SDHCI | ||
272 | bool | ||
273 | select S3C2416_SETUP_SDHCI_GPIO | ||
274 | help | ||
275 | Internal helper functions for S3C2416 based SDHCI systems | ||
276 | |||
277 | config S3C2416_SETUP_SDHCI_GPIO | ||
278 | bool | ||
279 | help | ||
280 | Common setup code for SDHCI gpio. | ||
281 | |||
282 | comment "S3C2416 Boards" | ||
283 | |||
284 | config MACH_SMDK2416 | ||
285 | bool "SMDK2416" | ||
286 | select MACH_SMDK | ||
287 | select S3C_DEV_FB | ||
288 | select S3C_DEV_HSMMC | ||
289 | select S3C_DEV_HSMMC1 | ||
290 | select S3C_DEV_NAND | ||
291 | select S3C_DEV_USB_HOST | ||
292 | select S3C2416_SETUP_SDHCI | ||
293 | help | ||
294 | Say Y here if you are using an SMDK2416 | ||
295 | |||
296 | endif # CPU_S3C2416 | ||
297 | |||
251 | endmenu # SAMSUNG S3C24XX SoCs Support | 298 | endmenu # SAMSUNG S3C24XX SoCs Support |
252 | 299 | ||
253 | endif # ARCH_S3C24XX | 300 | endif # ARCH_S3C24XX |
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index f5af4af41753..789aa5ca4e01 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile | |||
@@ -23,6 +23,9 @@ obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o | |||
23 | obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o | 23 | obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o |
24 | obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o | 24 | obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o |
25 | 25 | ||
26 | obj-$(CONFIG_CPU_S3C2416) += s3c2416.o irq-s3c2416.o clock-s3c2416.o | ||
27 | obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o | ||
28 | |||
26 | # | 29 | # |
27 | # machine support | 30 | # machine support |
28 | # following is ordered alphabetically by option text. | 31 | # following is ordered alphabetically by option text. |
@@ -45,6 +48,8 @@ obj-$(CONFIG_MACH_JIVE) += mach-jive.o | |||
45 | obj-$(CONFIG_MACH_SMDK2413) += mach-smdk2413.o | 48 | obj-$(CONFIG_MACH_SMDK2413) += mach-smdk2413.o |
46 | obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o | 49 | obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o |
47 | 50 | ||
51 | obj-$(CONFIG_MACH_SMDK2416) += mach-smdk2416.o | ||
52 | |||
48 | # common bits of machine support | 53 | # common bits of machine support |
49 | 54 | ||
50 | obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o | 55 | obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o |
@@ -52,3 +57,7 @@ obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o | |||
52 | # machine additions | 57 | # machine additions |
53 | 58 | ||
54 | obj-$(CONFIG_MACH_BAST_IDE) += bast-ide.o | 59 | obj-$(CONFIG_MACH_BAST_IDE) += bast-ide.o |
60 | |||
61 | # device setup | ||
62 | |||
63 | obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | ||
diff --git a/arch/arm/mach-s3c2416/clock.c b/arch/arm/mach-s3c24xx/clock-s3c2416.c index 5e36905eb7fc..5e36905eb7fc 100644 --- a/arch/arm/mach-s3c2416/clock.c +++ b/arch/arm/mach-s3c24xx/clock-s3c2416.c | |||
diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c24xx/irq-s3c2416.c index 36df761061de..36df761061de 100644 --- a/arch/arm/mach-s3c2416/irq.c +++ b/arch/arm/mach-s3c24xx/irq-s3c2416.c | |||
diff --git a/arch/arm/mach-s3c2416/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c index eebe1e72b93e..eebe1e72b93e 100644 --- a/arch/arm/mach-s3c2416/mach-smdk2416.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c | |||
diff --git a/arch/arm/mach-s3c2416/pm.c b/arch/arm/mach-s3c24xx/pm-s3c2416.c index 3bdb15a0d419..3bdb15a0d419 100644 --- a/arch/arm/mach-s3c2416/pm.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2416.c | |||
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c index 5287d2808d3e..5287d2808d3e 100644 --- a/arch/arm/mach-s3c2416/s3c2416.c +++ b/arch/arm/mach-s3c24xx/s3c2416.c | |||
diff --git a/arch/arm/mach-s3c2416/setup-sdhci-gpio.c b/arch/arm/mach-s3c24xx/setup-sdhci-gpio.c index f65cb3ef16ce..f65cb3ef16ce 100644 --- a/arch/arm/mach-s3c2416/setup-sdhci-gpio.c +++ b/arch/arm/mach-s3c24xx/setup-sdhci-gpio.c | |||