diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-10-15 08:49:33 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-11-01 13:02:23 +0100 |
| commit | 58e5b9e3d0b5e1319fd24124e79b4d4e6188bf1b (patch) | |
| tree | 8825060303cda85bfe4a5cdaa967c8beb7da320a /arch | |
| parent | a37e84ca31f4354373fe9a930d80566d6833a877 (diff) | |
| download | blackbird-op-linux-58e5b9e3d0b5e1319fd24124e79b4d4e6188bf1b.tar.gz blackbird-op-linux-58e5b9e3d0b5e1319fd24124e79b4d4e6188bf1b.zip | |
ARM: ux500: Rename references to the ccu9540 dev board accordingly
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/ccu9540.dts (renamed from arch/arm/boot/dts/u9540.dts) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/ccu9540.dts index 95892ec6c342..26dfe83178be 100644 --- a/arch/arm/boot/dts/u9540.dts +++ b/arch/arm/boot/dts/ccu9540.dts @@ -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>; diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 0b15591a087d..6e9a06d693a6 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -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(); @@ -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, }; |
