ARM: orion5x: Move to ID based window creation

[linux.git] / arch / arm / mach-orion5x / rd88f5182-setup.c

diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 66e77ec91532ba1e42189af393772c7a2248dc81..b1cf68493ffc35666b357d61242fafd01097b97d 100644 (file)
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -264,11 +264,14 @@ static void __init rd88f5182_init(void)
        orion5x_uart0_init();
        orion5x_xor_init();
 
-       mvebu_mbus_add_window("devbus-boot", RD88F5182_NOR_BOOT_BASE,
-                             RD88F5182_NOR_BOOT_SIZE);
-
-       mvebu_mbus_add_window("devbus-cs1", RD88F5182_NOR_BASE,
-                             RD88F5182_NOR_SIZE);
+       mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                   ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                   RD88F5182_NOR_BOOT_BASE,
+                                   RD88F5182_NOR_BOOT_SIZE);
+       mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(1),
+                                   ORION_MBUS_DEVBUS_ATTR(1),
+                                   RD88F5182_NOR_BASE,
+                                   RD88F5182_NOR_SIZE);
        platform_device_register(&rd88f5182_nor_flash);
        platform_device_register(&rd88f5182_gpio_leds);