diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:02:26 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:02:26 -0400 |
| commit | 5da30bb6d902a36265e74f7141a904b19ec25bd4 (patch) | |
| tree | c95931233f78ec58d0840e3fedbf557a9db5e43a /arch/arm/mach-exynos/mach-exynos4-dt.c | |
| parent | efd9960b0e1bdfe48490504a8166ffdbcc466dba (diff) | |
| parent | efd5af0dc988bd3498065c91f6332545de7ea999 (diff) | |
Merge branch 'next/soc-exynos5250-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/exynos5
* 'next/soc-exynos5250-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix compilation error with mach-exynos4-dt board
ARM: dts: add initial dts file for EXYNOS5250, SMDK5250
ARM: EXYNOS: add support device tree enabled board file for EXYNOS5
ARM: EXYNOS: add support ARCH_EXYNOS5 for EXYNOS5 SoCs
ARM: EXYNOS: add support get_core_count() for EXYNOS5250
ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5
ARM: EXYNOS: add interrupt definitions for EXYNOS5250
ARM: EXYNOS: add support for EXYNOS5250 SoC
ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5
ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5
ARM: EXYNOS: add clock part for EXYNOS5250 SoC
ARM: EXYNOS: use exynos_init_uarts() instead of exynos4_init_uarts()
ARM: EXYNOS: to declare static for mach-exynos/common.c
ARM: EXYNOS: Add clkdev lookup entry for lcd clock
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), |