diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-18 13:22:18 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-18 13:22:18 -0400 |
commit | 76c1b8386b31aeda911afaf11f032006d403addf (patch) | |
tree | cfb073c14faa8e2f232334979437018dd1050ab8 /arch/arm/plat-samsung | |
parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) |
ARM: SAMSUNG: Consolidate uncompress subroutine
For mach-exynos, uart_base is a pointer and the value is calculated
in the machine folder. For other machines, uart_base is defined as
a macro in platform directory. For symmetry, the uart_base macro
definition is removed and the uart_base calculation is moved to
specific machine folders.
This would help us consolidating uncompress subroutine for s5p64x0.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/uncompress.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h index 02b66d723d1a..2ace0d561446 100644 --- a/arch/arm/plat-samsung/include/plat/uncompress.h +++ b/arch/arm/plat-samsung/include/plat/uncompress.h | |||
@@ -21,6 +21,8 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */ | |||
21 | unsigned int fifo_mask; | 21 | unsigned int fifo_mask; |
22 | unsigned int fifo_max; | 22 | unsigned int fifo_max; |
23 | 23 | ||
24 | volatile u8 *uart_base; | ||
25 | |||
24 | /* forward declerations */ | 26 | /* forward declerations */ |
25 | 27 | ||
26 | static void arch_detect_cpu(void); | 28 | static void arch_detect_cpu(void); |
@@ -37,10 +39,6 @@ static void arch_detect_cpu(void); | |||
37 | /* how many bytes we allow into the FIFO at a time in FIFO mode */ | 39 | /* how many bytes we allow into the FIFO at a time in FIFO mode */ |
38 | #define FIFO_MAX (14) | 40 | #define FIFO_MAX (14) |
39 | 41 | ||
40 | #ifdef S3C_PA_UART | ||
41 | #define uart_base S3C_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT) | ||
42 | #endif | ||
43 | |||
44 | static __inline__ void | 42 | static __inline__ void |
45 | uart_wr(unsigned int reg, unsigned int val) | 43 | uart_wr(unsigned int reg, unsigned int val) |
46 | { | 44 | { |