mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
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>
This commit is contained in:
parent
317ddd256b
commit
76c1b8386b
6 changed files with 12 additions and 7 deletions
|
@ -15,9 +15,6 @@
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
|
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
|
|
||||||
volatile u8 *uart_base;
|
|
||||||
|
|
||||||
#include <plat/uncompress.h>
|
#include <plat/uncompress.h>
|
||||||
|
|
||||||
static unsigned int __raw_readl(unsigned int ptr)
|
static unsigned int __raw_readl(unsigned int ptr)
|
||||||
|
|
|
@ -49,6 +49,9 @@ static void arch_detect_cpu(void)
|
||||||
fifo_mask = S3C2410_UFSTAT_TXMASK;
|
fifo_mask = S3C2410_UFSTAT_TXMASK;
|
||||||
fifo_max = 15 << S3C2410_UFSTAT_TXSHIFT;
|
fifo_max = 15 << S3C2410_UFSTAT_TXSHIFT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uart_base = (volatile u8 *) S3C_PA_UART +
|
||||||
|
(S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
||||||
|
|
|
@ -23,6 +23,9 @@ static void arch_detect_cpu(void)
|
||||||
/* we do not need to do any cpu detection here at the moment. */
|
/* we do not need to do any cpu detection here at the moment. */
|
||||||
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
||||||
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
||||||
|
|
||||||
|
uart_base = (volatile u8 *)S3C_PA_UART +
|
||||||
|
(S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
||||||
|
|
|
@ -23,6 +23,8 @@ static void arch_detect_cpu(void)
|
||||||
/* we do not need to do any cpu detection here at the moment. */
|
/* we do not need to do any cpu detection here at the moment. */
|
||||||
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
||||||
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
||||||
|
|
||||||
|
uart_base = (volatile u8 *)S5P_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
||||||
|
|
|
@ -21,6 +21,8 @@ static void arch_detect_cpu(void)
|
||||||
/* we do not need to do any cpu detection here at the moment. */
|
/* we do not need to do any cpu detection here at the moment. */
|
||||||
fifo_mask = S5PV210_UFSTAT_TXMASK;
|
fifo_mask = S5PV210_UFSTAT_TXMASK;
|
||||||
fifo_max = 63 << S5PV210_UFSTAT_TXSHIFT;
|
fifo_max = 63 << S5PV210_UFSTAT_TXSHIFT;
|
||||||
|
|
||||||
|
uart_base = (volatile u8 *)S5P_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
||||||
|
|
|
@ -21,6 +21,8 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
|
||||||
unsigned int fifo_mask;
|
unsigned int fifo_mask;
|
||||||
unsigned int fifo_max;
|
unsigned int fifo_max;
|
||||||
|
|
||||||
|
volatile u8 *uart_base;
|
||||||
|
|
||||||
/* forward declerations */
|
/* forward declerations */
|
||||||
|
|
||||||
static void arch_detect_cpu(void);
|
static void arch_detect_cpu(void);
|
||||||
|
@ -37,10 +39,6 @@ static void arch_detect_cpu(void);
|
||||||
/* how many bytes we allow into the FIFO at a time in FIFO mode */
|
/* how many bytes we allow into the FIFO at a time in FIFO mode */
|
||||||
#define FIFO_MAX (14)
|
#define FIFO_MAX (14)
|
||||||
|
|
||||||
#ifdef S3C_PA_UART
|
|
||||||
#define uart_base S3C_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static __inline__ void
|
static __inline__ void
|
||||||
uart_wr(unsigned int reg, unsigned int val)
|
uart_wr(unsigned int reg, unsigned int val)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue