diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-02-08 13:18:48 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-04 20:42:47 -0500 |
commit | 4d512a908ed00269204f67303becf279898c5674 (patch) | |
tree | cfd90278c88c7d75eac36aef330f234b785be40d /arch | |
parent | 24fae0fe2cf02eef941fd17a1e44b747483f4bef (diff) |
ARM: S3C24XX: plat/common-smdk.h local
The header file plat/common-smdk.h is used only in mach-s3c24xx/,
so this patch moves it into mach-s3c24xx directory.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c24xx/common-smdk.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/common-smdk.h (renamed from arch/arm/plat-samsung/include/plat/common-smdk.h) | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-qt2410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2410.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2413.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2440.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 |
8 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c index 3b2cf6db3634..404444dd3840 100644 --- a/arch/arm/mach-s3c24xx/common-smdk.c +++ b/arch/arm/mach-s3c24xx/common-smdk.c | |||
@@ -41,11 +41,12 @@ | |||
41 | 41 | ||
42 | #include <linux/platform_data/mtd-nand-s3c2410.h> | 42 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
43 | 43 | ||
44 | #include <plat/common-smdk.h> | ||
45 | #include <plat/gpio-cfg.h> | 44 | #include <plat/gpio-cfg.h> |
46 | #include <plat/devs.h> | 45 | #include <plat/devs.h> |
47 | #include <plat/pm.h> | 46 | #include <plat/pm.h> |
48 | 47 | ||
48 | #include "common-smdk.h" | ||
49 | |||
49 | /* LED devices */ | 50 | /* LED devices */ |
50 | 51 | ||
51 | static struct s3c24xx_led_platdata smdk_pdata_led4 = { | 52 | static struct s3c24xx_led_platdata smdk_pdata_led4 = { |
diff --git a/arch/arm/plat-samsung/include/plat/common-smdk.h b/arch/arm/mach-s3c24xx/common-smdk.h index ba028f1ed30b..98f733e1cb42 100644 --- a/arch/arm/plat-samsung/include/plat/common-smdk.h +++ b/arch/arm/mach-s3c24xx/common-smdk.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/plat-samsung/include/plat/common-smdk.h | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2006 Simtec Electronics | 2 | * Copyright (c) 2006 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 3 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 4 | * |
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c index 56175f0941b1..84c541602661 100644 --- a/arch/arm/mach-s3c24xx/mach-qt2410.c +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c | |||
@@ -55,13 +55,13 @@ | |||
55 | #include <linux/platform_data/usb-s3c2410_udc.h> | 55 | #include <linux/platform_data/usb-s3c2410_udc.h> |
56 | #include <linux/platform_data/i2c-s3c2410.h> | 56 | #include <linux/platform_data/i2c-s3c2410.h> |
57 | 57 | ||
58 | #include <plat/common-smdk.h> | ||
59 | #include <plat/gpio-cfg.h> | 58 | #include <plat/gpio-cfg.h> |
60 | #include <plat/devs.h> | 59 | #include <plat/devs.h> |
61 | #include <plat/cpu.h> | 60 | #include <plat/cpu.h> |
62 | #include <plat/pm.h> | 61 | #include <plat/pm.h> |
63 | 62 | ||
64 | #include "common.h" | 63 | #include "common.h" |
64 | #include "common-smdk.h" | ||
65 | 65 | ||
66 | static struct map_desc qt2410_iodesc[] __initdata = { | 66 | static struct map_desc qt2410_iodesc[] __initdata = { |
67 | { 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE } | 67 | { 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE } |
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2410.c b/arch/arm/mach-s3c24xx/mach-smdk2410.c index e184bfa9613a..cd0b1635c47e 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2410.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2410.c | |||
@@ -52,9 +52,8 @@ | |||
52 | #include <plat/devs.h> | 52 | #include <plat/devs.h> |
53 | #include <plat/cpu.h> | 53 | #include <plat/cpu.h> |
54 | 54 | ||
55 | #include <plat/common-smdk.h> | ||
56 | |||
57 | #include "common.h" | 55 | #include "common.h" |
56 | #include "common-smdk.h" | ||
58 | 57 | ||
59 | static struct map_desc smdk2410_iodesc[] __initdata = { | 58 | static struct map_desc smdk2410_iodesc[] __initdata = { |
60 | /* nothing here yet */ | 59 | /* nothing here yet */ |
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c b/arch/arm/mach-s3c24xx/mach-smdk2413.c index 86d7847c9d45..bab2e923b516 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2413.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <plat/devs.h> | 47 | #include <plat/devs.h> |
48 | #include <plat/cpu.h> | 48 | #include <plat/cpu.h> |
49 | 49 | ||
50 | #include <plat/common-smdk.h> | 50 | #include "common-smdk.h" |
51 | 51 | ||
52 | static struct map_desc smdk2413_iodesc[] __initdata = { | 52 | static struct map_desc smdk2413_iodesc[] __initdata = { |
53 | }; | 53 | }; |
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c index ebb2e61f3d07..41bd68c6d3ef 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2416.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c | |||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | #include <plat/fb.h> | 55 | #include <plat/fb.h> |
56 | 56 | ||
57 | #include <plat/common-smdk.h> | 57 | #include "common-smdk.h" |
58 | 58 | ||
59 | static struct map_desc smdk2416_iodesc[] __initdata = { | 59 | static struct map_desc smdk2416_iodesc[] __initdata = { |
60 | /* ISA IO Space map (memory space selected by A24) */ | 60 | /* ISA IO Space map (memory space selected by A24) */ |
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2440.c b/arch/arm/mach-s3c24xx/mach-smdk2440.c index 08cc38c8a4ae..5025576d3abf 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2440.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2440.c | |||
@@ -44,9 +44,8 @@ | |||
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
47 | #include <plat/common-smdk.h> | ||
48 | |||
49 | #include "common.h" | 47 | #include "common.h" |
48 | #include "common-smdk.h" | ||
50 | 49 | ||
51 | static struct map_desc smdk2440_iodesc[] __initdata = { | 50 | static struct map_desc smdk2440_iodesc[] __initdata = { |
52 | /* ISA IO Space map (memory space selected by A24) */ | 51 | /* ISA IO Space map (memory space selected by A24) */ |
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2443.c b/arch/arm/mach-s3c24xx/mach-smdk2443.c index fc65d74d3c73..53ef12acdb93 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2443.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
47 | #include <plat/common-smdk.h> | 47 | #include "common-smdk.h" |
48 | 48 | ||
49 | static struct map_desc smdk2443_iodesc[] __initdata = { | 49 | static struct map_desc smdk2443_iodesc[] __initdata = { |
50 | /* ISA IO Space map (memory space selected by A24) */ | 50 | /* ISA IO Space map (memory space selected by A24) */ |