From 79b40753a318adb3254c6d534b834c10f99cba05 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 15 Oct 2012 10:07:55 +0100 Subject: ARM: ux500: List DT compatibility using platform names rather than by board So far, each ST-Ericsson board supported by Device Tree has been similar enough to run though a single DT_MACHINE_INIT call. On the back of that it has been suggested that we should reduce the number of compatible strings in our dt_compat structure. After subsequent discussion with Arnd Bergmann the conclusion was to list entries by platform as opposed to by board. The other suggestion was to use a single string which would cover all supported platforms, but any wildcard entries would include unsupported chipsets, such as the u5500 and potential new chips which no not yet have DT functionality. Hence, the best solution which encompasses all supported platforms, but no unsupported ones was to list the currently enabled four chipsets; u8500, u8540, u9500 and u9540 instead. Acked-by: Arnd Bergmann Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/arm/mach-ux500/cpu-db8500.c') diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 472b49f90317..c65e7e3ce439 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -330,11 +330,11 @@ static void __init u8500_init_machine(void) of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); } -static const char * u8500_dt_board_compat[] = { - "calaosystems,snowball-a9500", - "st-ericsson,hrefv60+", - "st-ericsson,mop500", - "st-ericsson,ccu9540", +static const char * stericsson_dt_platform_compat[] = { + "st-ericsson,u8500", + "st-ericsson,u8540", + "st-ericsson,u9500", + "st-ericsson,u9540", NULL, }; @@ -346,7 +346,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") .handle_irq = gic_handle_irq, .init_machine = u8500_init_machine, .init_late = NULL, - .dt_compat = u8500_dt_board_compat, + .dt_compat = stericsson_dt_platform_compat, MACHINE_END #endif -- cgit v1.2.3