| Message ID | 1331097626-5369-1-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On 03/06/12 21:20, Tushar Behera wrote: > Commit 84499abd19d4 ("ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5") > renames S5P_PA_UARTn to EXYNOS4_PA_UARTn. Hence we need to do > similar modification in mach-exynos4-dt.c to fix compilation error. > > arch/arm/mach-exynos/mach-exynos4-dt.c:40:2: error: ‘S5P_PA_UART0’ > undeclared here (not in a function) > > Signed-off-by: Tushar Behera<tushar.behera@linaro.org> > --- > arch/arm/mach-exynos/mach-exynos4-dt.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c > index e6b02fd..8245f1c 100644 > --- a/arch/arm/mach-exynos/mach-exynos4-dt.c > +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c > @@ -37,13 +37,13 @@ > * data from the device tree. > */ > static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = { > - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART0, > + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART0, > "exynos4210-uart.0", NULL), > - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART1, > + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART1, > "exynos4210-uart.1", NULL), > - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART2, > + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART2, > "exynos4210-uart.2", NULL), > - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART3, > + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART3, > "exynos4210-uart.3", NULL), > OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0), > "exynos4-sdhci.0", NULL), Applied, thanks. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index e6b02fd..8245f1c 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -37,13 +37,13 @@ * data from the device tree. */ static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = { - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART0, + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART0, "exynos4210-uart.0", NULL), - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART1, + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART1, "exynos4210-uart.1", NULL), - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART2, + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART2, "exynos4210-uart.2", NULL), - OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART3, + OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART3, "exynos4210-uart.3", NULL), OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0), "exynos4-sdhci.0", NULL),
Commit 84499abd19d4 ("ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5") renames S5P_PA_UARTn to EXYNOS4_PA_UARTn. Hence we need to do similar modification in mach-exynos4-dt.c to fix compilation error. arch/arm/mach-exynos/mach-exynos4-dt.c:40:2: error: ‘S5P_PA_UART0’ undeclared here (not in a function) Signed-off-by: Tushar Behera <tushar.behera@linaro.org> --- arch/arm/mach-exynos/mach-exynos4-dt.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)