Merge remote-tracking branch 'mips/mips-for-linux-next'

[karo-tx-linux.git] / arch / arm / mach-orion5x / ls-chl-setup.c

diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c
index 6234977b5aea0d325ba96f4e5bc332cfa79bf76d..028ea038d404d3800c349daead01ad42c092c0cb 100644 (file)
--- a/arch/arm/mach-orion5x/ls-chl-setup.c
+++ b/arch/arm/mach-orion5x/ls-chl-setup.c
@@ -294,8 +294,10 @@ static void __init lschl_init(void)
        orion5x_uart0_init();
        orion5x_xor_init();
 
-       mvebu_mbus_add_window("devbus-boot", LSCHL_NOR_BOOT_BASE,
-                             LSCHL_NOR_BOOT_SIZE);
+       mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                   ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                   LSCHL_NOR_BOOT_BASE,
+                                   LSCHL_NOR_BOOT_SIZE);
        platform_device_register(&lschl_nor_flash);
 
        platform_device_register(&lschl_leds);