diff options
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos4-dt.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index b2b5d5faa748..76b32b75eeb0 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Samsung's Exynos4210 flattened device tree enabled machine | 2 | * Samsung's EXYNOS4 flattened device tree enabled machine |
3 | * | 3 | * |
4 | * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. | 4 | * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. |
5 | * http://www.samsung.com | 5 | * http://www.samsung.com |
@@ -36,7 +36,7 @@ | |||
36 | * at some point, the drivers should be capable of parsing all the platform | 36 | * at some point, the drivers should be capable of parsing all the platform |
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 exynos4_auxdata_lookup[] __initconst = { |
40 | OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_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", EXYNOS4_PA_UART1, | 42 | OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART1, |
@@ -66,19 +66,19 @@ static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = { | |||
66 | {}, | 66 | {}, |
67 | }; | 67 | }; |
68 | 68 | ||
69 | static void __init exynos4210_dt_map_io(void) | 69 | static void __init exynos4_dt_map_io(void) |
70 | { | 70 | { |
71 | exynos_init_io(NULL, 0); | 71 | exynos_init_io(NULL, 0); |
72 | s3c24xx_init_clocks(24000000); | 72 | s3c24xx_init_clocks(24000000); |
73 | } | 73 | } |
74 | 74 | ||
75 | static void __init exynos4210_dt_machine_init(void) | 75 | static void __init exynos4_dt_machine_init(void) |
76 | { | 76 | { |
77 | of_platform_populate(NULL, of_default_bus_match_table, | 77 | of_platform_populate(NULL, of_default_bus_match_table, |
78 | exynos4210_auxdata_lookup, NULL); | 78 | exynos4_auxdata_lookup, NULL); |
79 | } | 79 | } |
80 | 80 | ||
81 | static char const *exynos4210_dt_compat[] __initdata = { | 81 | static char const *exynos4_dt_compat[] __initdata = { |
82 | "samsung,exynos4210", | 82 | "samsung,exynos4210", |
83 | NULL | 83 | NULL |
84 | }; | 84 | }; |
@@ -86,11 +86,11 @@ static char const *exynos4210_dt_compat[] __initdata = { | |||
86 | DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") | 86 | DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") |
87 | /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ | 87 | /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ |
88 | .init_irq = exynos4_init_irq, | 88 | .init_irq = exynos4_init_irq, |
89 | .map_io = exynos4210_dt_map_io, | 89 | .map_io = exynos4_dt_map_io, |
90 | .handle_irq = gic_handle_irq, | 90 | .handle_irq = gic_handle_irq, |
91 | .init_machine = exynos4210_dt_machine_init, | 91 | .init_machine = exynos4_dt_machine_init, |
92 | .init_late = exynos_init_late, | 92 | .init_late = exynos_init_late, |
93 | .timer = &exynos4_timer, | 93 | .timer = &exynos4_timer, |
94 | .dt_compat = exynos4210_dt_compat, | 94 | .dt_compat = exynos4_dt_compat, |
95 | .restart = exynos4_restart, | 95 | .restart = exynos4_restart, |
96 | MACHINE_END | 96 | MACHINE_END |