diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:07:57 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:07:57 -0400 |
commit | e7051e9dab77ddeaddbe12364939ae239d92ca73 (patch) | |
tree | b1855cb663f64a374277df1a909cbac1ecf15fbf /arch/arm/mach-exynos/mach-exynos4-dt.c | |
parent | 38abdcd0d0689aaca94e740ac67a952c7918caef (diff) | |
parent | 5da30bb6d902a36265e74f7141a904b19ec25bd4 (diff) |
Merge branch 'samsung/exynos5' into next/soc2
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos4-dt.c')
-rw-r--r-- | 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 e6b02fdf1b0..8245f1c761d 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c | |||
@@ -37,13 +37,13 @@ | |||
37 | * data from the device tree. | 37 | * data from the device tree. |
38 | */ | 38 | */ |
39 | static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = { | 39 | static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = { |
40 | OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART0, | 40 | OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART0, |
41 | "exynos4210-uart.0", NULL), | 41 | "exynos4210-uart.0", NULL), |
42 | OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART1, | 42 | OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART1, |
43 | "exynos4210-uart.1", NULL), | 43 | "exynos4210-uart.1", NULL), |
44 | OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART2, | 44 | OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART2, |
45 | "exynos4210-uart.2", NULL), | 45 | "exynos4210-uart.2", NULL), |
46 | OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART3, | 46 | OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART3, |
47 | "exynos4210-uart.3", NULL), | 47 | "exynos4210-uart.3", NULL), |
48 | OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0), | 48 | OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0), |
49 | "exynos4-sdhci.0", NULL), | 49 | "exynos4-sdhci.0", NULL), |