1 files changed, 5 insertions, 7 deletions

diff --git a/arch/arm/mach-orion/kurobox_pro-setup.c b/arch/arm/mach-orion/kurobox_pro-setup.c
index feae4839830b..bf7034df8a62 100644
--- a/arch/arm/mach-orion/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion/kurobox_pro-setup.c
@@ -193,16 +193,14 @@ static void __init kurobox_pro_init(void)
         /*
          * Setup the CPU address decode windows for our devices
          */
-        orion_setup_cpu_win(ORION_DEV_BOOT, KUROBOX_PRO_NOR_BOOT_BASE,
-                                KUROBOX_PRO_NOR_BOOT_SIZE, -1);
-        orion_setup_cpu_win(ORION_DEV0, KUROBOX_PRO_NAND_BASE,
-                                KUROBOX_PRO_NAND_SIZE, -1);
+        orion_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE,
+                                KUROBOX_PRO_NOR_BOOT_SIZE);
+        orion_setup_dev0_win(KUROBOX_PRO_NAND_BASE, KUROBOX_PRO_NAND_SIZE);
+
         /*
          * Open a special address decode windows for the PCIE WA.
          */
-        orion_write(ORION_REGS_VIRT_BASE | 0x20074, ORION_PCIE_WA_PHYS_BASE);
-        orion_write(ORION_REGS_VIRT_BASE | 0x20070, (0x7941 |
-                (((ORION_PCIE_WA_SIZE >> 16) - 1)) << 16));
+        orion_setup_pcie_wa_win(ORION_PCIE_WA_PHYS_BASE, ORION_PCIE_WA_SIZE);
 
         /*
          * Setup Multiplexing Pins --