AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: ux500: List DT compatibility using platform names rather than by board

Browse Source 
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 <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Lee Jones 2012-10-15 10:07:55 +01:00
parent 46c1bf8133
commit 79b40753a3
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/ccu9540.dts
View File

@ -14,7 +14,7 @@
/ { / {
model = "ST-Ericsson CCU9540 platform with Device Tree"; model = "ST-Ericsson CCU9540 platform with Device Tree";
compatible = "st-ericsson,ccu9540"; compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";
memory { memory {
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;

2
arch/arm/boot/dts/hrefprev60.dts
View File

@ -16,7 +16,7 @@
/ { / {
model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
compatible = "st-ericsson,mop500"; compatible = "st-ericsson,mop500", "st-ericsson,u8500";
gpio_keys { gpio_keys {
button@1 { button@1 {

2
arch/arm/boot/dts/hrefv60plus.dts
View File

@ -16,7 +16,7 @@
/ { / {
model = "ST-Ericsson HREF (v60+) platform with Device Tree"; model = "ST-Ericsson HREF (v60+) platform with Device Tree";
compatible = "st-ericsson,hrefv60+"; compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
gpio_keys { gpio_keys {
button@1 { button@1 {

2
arch/arm/boot/dts/snowball.dts
View File

@ -14,7 +14,7 @@
/ { / {
model = "Calao Systems Snowball platform with device tree"; model = "Calao Systems Snowball platform with device tree";
compatible = "calaosystems,snowball-a9500"; compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
memory { memory {
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;

12
arch/arm/mach-ux500/cpu-db8500.c
View File

@ -330,11 +330,11 @@ static void __init u8500_init_machine(void)
of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
} }
static const char * u8500_dt_board_compat[] = { static const char * stericsson_dt_platform_compat[] = {
"calaosystems,snowball-a9500", "st-ericsson,u8500",
"st-ericsson,hrefv60+", "st-ericsson,u8540",
"st-ericsson,mop500", "st-ericsson,u9500",
"st-ericsson,ccu9540", "st-ericsson,u9540",
NULL, NULL,
}; };
@ -346,7 +346,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
.handle_irq = gic_handle_irq, .handle_irq = gic_handle_irq,
.init_machine = u8500_init_machine, .init_machine = u8500_init_machine,
.init_late = NULL, .init_late = NULL,
.dt_compat = u8500_dt_board_compat, .dt_compat = stericsson_dt_platform_compat,
MACHINE_END MACHINE_END
#endif #endif