summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/cpu-db8500.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-10-15 09:55:17 +0200
committerLee Jones <lee.jones@linaro.org>2012-11-01 13:02:24 +0100
commit46c1bf813376654f6b75120b9c2cf3de0f67af7d (patch)
tree10ed95bad55554ded044d570a25fb6d3f90d7875 /arch/arm/mach-ux500/cpu-db8500.c
parentARM: ux500: Rename references to the ccu9540 dev board accordingly (diff)
downloadlinux-46c1bf813376654f6b75120b9c2cf3de0f67af7d.tar.xz
linux-46c1bf813376654f6b75120b9c2cf3de0f67af7d.zip
ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
The u8500 and u9540 DT_MACHINE_START calls are almost identical at the moment, referencing exactly the same function pointers. Until this changes we may as well convert the original one to be more generic and use that instead. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 6e9a06d693a6..472b49f90317 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -338,7 +338,7 @@ static const char * u8500_dt_board_compat[] = {
NULL,
};
-DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
+DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
.map_io = u8500_map_io,
.init_irq = ux500_init_irq,
/* we re-use nomadik timer here */
@@ -349,14 +349,4 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
.dt_compat = u8500_dt_board_compat,
MACHINE_END
-DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
- .map_io = u8500_map_io,
- .init_irq = ux500_init_irq,
- .timer = &ux500_timer,
- .handle_irq = gic_handle_irq,
- .init_machine = u8500_init_machine,
- .init_late = NULL,
- .dt_compat = u8500_dt_board_compat,
-MACHINE_END
-
#endif