Skip to content

Commit

Permalink
ARM: ux500: Rename references to the ccu9540 dev board accordingly
Browse files Browse the repository at this point in the history
When enabling ST-Ericsson's ccu9540 development board the board's
full name has not been used. This patch adapts all references of
the board's short name to how it should be referenced.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Lee Jones committed Nov 1, 2012
1 parent a37e84c commit 58e5b9e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/u9540.dts → arch/arm/boot/dts/ccu9540.dts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/include/ "dbx5x0.dtsi"

/ {
model = "ST-Ericsson U9540 platform with Device Tree";
compatible = "st-ericsson,u9540";
model = "ST-Ericsson CCU9540 platform with Device Tree";
compatible = "st-ericsson,ccu9540";

memory {
reg = <0x00000000 0x20000000>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-ux500/cpu-db8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ static void __init u8500_init_machine(void)
snowball_pinmaps_init();
else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
hrefv60_pinmaps_init();
else if (of_machine_is_compatible("st-ericsson,u9540")) {}
/* TODO: Add u9540 pinmaps. */
else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
/* TODO: Add pinmaps for ccu9540 board. */

/* TODO: Export SoC, USB, cpu-freq and DMA40 */
parent = u8500_of_init_devices();
Expand All @@ -334,7 +334,7 @@ static const char * u8500_dt_board_compat[] = {
"calaosystems,snowball-a9500",
"st-ericsson,hrefv60+",
"st-ericsson,mop500",
"st-ericsson,u9540",
"st-ericsson,ccu9540",
NULL,
};

Expand Down

0 comments on commit 58e5b9e

Please sign in to comment.