Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c
index ca4dbe973dafa9e9e5a302cb149c8cd91c2fc627..a6493e76f96ddda14dc59271ecae7e123692fb37 100644 (file)
--- a/arch/arm/mach-orion5x/lsmini-setup.c
+++ b/arch/arm/mach-orion5x/lsmini-setup.c
@@ -244,8 +244,10 @@ static void __init lsmini_init(void)
        orion5x_uart0_init();
        orion5x_xor_init();
 
-       mvebu_mbus_add_window("devbus-boot", LSMINI_NOR_BOOT_BASE,
-                             LSMINI_NOR_BOOT_SIZE);
+       mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                   ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                   LSMINI_NOR_BOOT_BASE,
+                                   LSMINI_NOR_BOOT_SIZE);
        platform_device_register(&lsmini_nor_flash);
 
        platform_device_register(&lsmini_button_device);