diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-02 16:26:25 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-10 13:45:39 -0500 |
commit | 8eba8ea21f7a289ec78df979b3b5a8affde1e68d (patch) | |
tree | deb0dc6e441ad72bd7c7f2e10017292c23aa02e7 /arch/arm/mach-s3c64xx | |
parent | a81c19700d605a2a07b9a502f0306a9efd3e079d (diff) |
ARM: S3C64XX: make regs-srom.h local
The header file can be local in mach-s3c64xx/.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-mini6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-real6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/regs-srom.h (renamed from arch/arm/mach-s3c64xx/include/mach/regs-srom.h) | 11 |
4 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 67881e6dae77..7cec86c454e3 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c | |||
@@ -31,7 +31,6 @@ | |||
31 | 31 | ||
32 | #include <mach/map.h> | 32 | #include <mach/map.h> |
33 | #include <mach/regs-gpio.h> | 33 | #include <mach/regs-gpio.h> |
34 | #include <mach/regs-srom.h> | ||
35 | 34 | ||
36 | #include <plat/adc.h> | 35 | #include <plat/adc.h> |
37 | #include <plat/cpu.h> | 36 | #include <plat/cpu.h> |
@@ -46,6 +45,7 @@ | |||
46 | 45 | ||
47 | #include "common.h" | 46 | #include "common.h" |
48 | #include "regs-modem.h" | 47 | #include "regs-modem.h" |
48 | #include "regs-srom.h" | ||
49 | 49 | ||
50 | #define UCON S3C2410_UCON_DEFAULT | 50 | #define UCON S3C2410_UCON_DEFAULT |
51 | #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) | 51 | #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) |
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index f620b898fe23..215693cc1dd6 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -32,7 +32,6 @@ | |||
32 | 32 | ||
33 | #include <mach/map.h> | 33 | #include <mach/map.h> |
34 | #include <mach/regs-gpio.h> | 34 | #include <mach/regs-gpio.h> |
35 | #include <mach/regs-srom.h> | ||
36 | 35 | ||
37 | #include <plat/adc.h> | 36 | #include <plat/adc.h> |
38 | #include <plat/cpu.h> | 37 | #include <plat/cpu.h> |
@@ -47,6 +46,7 @@ | |||
47 | 46 | ||
48 | #include "common.h" | 47 | #include "common.h" |
49 | #include "regs-modem.h" | 48 | #include "regs-modem.h" |
49 | #include "regs-srom.h" | ||
50 | 50 | ||
51 | #define UCON S3C2410_UCON_DEFAULT | 51 | #define UCON S3C2410_UCON_DEFAULT |
52 | #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) | 52 | #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index f49ecae27fcf..dcf41bd515e7 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #include <plat/regs-serial.h> | 59 | #include <plat/regs-serial.h> |
60 | #include <mach/regs-gpio.h> | 60 | #include <mach/regs-gpio.h> |
61 | #include <mach/regs-sys.h> | 61 | #include <mach/regs-sys.h> |
62 | #include <mach/regs-srom.h> | ||
63 | #include <linux/platform_data/ata-samsung_cf.h> | 62 | #include <linux/platform_data/ata-samsung_cf.h> |
64 | #include <linux/platform_data/i2c-s3c2410.h> | 63 | #include <linux/platform_data/i2c-s3c2410.h> |
65 | #include <plat/fb.h> | 64 | #include <plat/fb.h> |
@@ -75,6 +74,7 @@ | |||
75 | 74 | ||
76 | #include "common.h" | 75 | #include "common.h" |
77 | #include "regs-modem.h" | 76 | #include "regs-modem.h" |
77 | #include "regs-srom.h" | ||
78 | 78 | ||
79 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK | 79 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK |
80 | #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB | 80 | #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB |
diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h b/arch/arm/mach-s3c64xx/regs-srom.h index 756731b36297..d56f3386eb00 100644 --- a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h +++ b/arch/arm/mach-s3c64xx/regs-srom.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* arch/arm/plat-s3c64xx/include/plat/regs-srom.h | 1 | /* |
2 | * | ||
3 | * Copyright 2009 Andy Green <andy@warmcat.com> | 2 | * Copyright 2009 Andy Green <andy@warmcat.com> |
4 | * | 3 | * |
5 | * S3C64XX SROM definitions | 4 | * S3C64XX SROM definitions |
@@ -9,8 +8,8 @@ | |||
9 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
10 | */ | 9 | */ |
11 | 10 | ||
12 | #ifndef __PLAT_REGS_SROM_H | 11 | #ifndef __MACH_S3C64XX_REGS_SROM_H |
13 | #define __PLAT_REGS_SROM_H __FILE__ | 12 | #define __MACH_S3C64XX_REGS_SROM_H __FILE__ |
14 | 13 | ||
15 | #define S3C64XX_SROMREG(x) (S3C_VA_MEM + (x)) | 14 | #define S3C64XX_SROMREG(x) (S3C_VA_MEM + (x)) |
16 | 15 | ||
@@ -29,7 +28,7 @@ | |||
29 | #define S3C64XX_SROM_BW__DATAWIDTH__SHIFT 0 | 28 | #define S3C64XX_SROM_BW__DATAWIDTH__SHIFT 0 |
30 | #define S3C64XX_SROM_BW__WAITENABLE__SHIFT 2 | 29 | #define S3C64XX_SROM_BW__WAITENABLE__SHIFT 2 |
31 | #define S3C64XX_SROM_BW__BYTEENABLE__SHIFT 3 | 30 | #define S3C64XX_SROM_BW__BYTEENABLE__SHIFT 3 |
32 | #define S3C64XX_SROM_BW__CS_MASK 0xf | 31 | #define S3C64XX_SROM_BW__CS_MASK 0xf |
33 | 32 | ||
34 | #define S3C64XX_SROM_BW__NCS0__SHIFT 0 | 33 | #define S3C64XX_SROM_BW__NCS0__SHIFT 0 |
35 | #define S3C64XX_SROM_BW__NCS1__SHIFT 4 | 34 | #define S3C64XX_SROM_BW__NCS1__SHIFT 4 |
@@ -56,4 +55,4 @@ | |||
56 | #define S3C64XX_SROM_BCX__TACS__SHIFT 28 | 55 | #define S3C64XX_SROM_BCX__TACS__SHIFT 28 |
57 | #define S3C64XX_SROM_BCX__TACS__MASK 0xf | 56 | #define S3C64XX_SROM_BCX__TACS__MASK 0xf |
58 | 57 | ||
59 | #endif /* _PLAT_REGS_SROM_H */ | 58 | #endif /* __MACH_S3C64XX_REGS_SROM_H */ |