Merge tag 'pm+acpi-fixes-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / arm / mach-orion5x / edmini_v2-setup.c

diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c
index 7d316ede10aeeb78996abdc0eb32f704da366c52..f66c1b2ee8c1fe8b0f3b6e6eb2c026975bd27bbc 100644 (file)
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@ -145,8 +145,10 @@ void __init edmini_v2_init(void)
         */
        orion5x_ehci0_init();
 
-       mvebu_mbus_add_window("devbus-boot", EDMINI_V2_NOR_BOOT_BASE,
-                             EDMINI_V2_NOR_BOOT_SIZE);
+       mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                   ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                   EDMINI_V2_NOR_BOOT_BASE,
+                                   EDMINI_V2_NOR_BOOT_SIZE);
        platform_device_register(&edmini_v2_nor_flash);
 
        pr_notice("edmini_v2: USB device port, flash write and power-off "