Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[mirror_ubuntu-jammy-kernel.git] / arch / arm / mach-orion / dns323-setup.c

diff --git a/arch/arm/mach-orion/dns323-setup.c b/arch/arm/mach-orion/dns323-setup.c
index c8a806f249c6add1dcf7f43c21f038d2a6ffc166..02b280c2482064d465fd23a489e046a2d36b3aa3 100644 (file)
--- a/arch/arm/mach-orion/dns323-setup.c
+++ b/arch/arm/mach-orion/dns323-setup.c
@@ -259,8 +259,8 @@ static void __init dns323_init(void)
         *
         * Open a special address decode windows for the PCIE WA.
         */
-       orion_write(ORION_REGS_BASE | 0x20074, ORION_PCIE_WA_BASE);
-       orion_write(ORION_REGS_BASE | 0x20070,
+       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));
 
        /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */
@@ -312,8 +312,8 @@ static void __init dns323_init(void)
 /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */
 MACHINE_START(DNS323, "D-Link DNS-323")
        /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */
-       .phys_io        = ORION_REGS_BASE,
-       .io_pg_offst    = ((ORION_REGS_BASE) >> 18) & 0xFFFC,
+       .phys_io        = ORION_REGS_PHYS_BASE,
+       .io_pg_offst    = ((ORION_REGS_VIRT_BASE) >> 18) & 0xFFFC,
        .boot_params    = 0x00000100,
        .init_machine   = dns323_init,
        .map_io         = orion_map_io,