[ARM] 3114/1: use ixp2000_reg_wrb in ixp2000 uengine loader

Patch from Lennert Buytenhek

Make the uengine loader use ixp2000_reg_wrb in the right places.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-ixp2000/uengine.c b/arch/arm/mach-ixp2000/uengine.c
index 43e234349d4a66fd642e050b90d8825ee793a3c5..ec4e007a22efed732c87c72d99e62e0b6c6895f9 100644 (file)
--- a/arch/arm/mach-ixp2000/uengine.c
+++ b/arch/arm/mach-ixp2000/uengine.c
@@ -91,8 +91,8 @@ EXPORT_SYMBOL(ixp2000_uengine_csr_write);
 
 void ixp2000_uengine_reset(u32 uengine_mask)
 {
-       ixp2000_reg_write(IXP2000_RESET1, uengine_mask & ixp2000_uengine_mask);
-       ixp2000_reg_write(IXP2000_RESET1, 0);
+       ixp2000_reg_wrb(IXP2000_RESET1, uengine_mask & ixp2000_uengine_mask);
+       ixp2000_reg_wrb(IXP2000_RESET1, 0);
 }
 EXPORT_SYMBOL(ixp2000_uengine_reset);
 
@@ -452,21 +452,20 @@ static int __init ixp2000_uengine_init(void)
        /*
         * Reset microengines.
         */
-       ixp2000_reg_write(IXP2000_RESET1, ixp2000_uengine_mask);
-       ixp2000_reg_write(IXP2000_RESET1, 0);
+       ixp2000_uengine_reset(ixp2000_uengine_mask);
 
        /*
         * Synchronise timestamp counters across all microengines.
         */
        value = ixp2000_reg_read(IXP2000_MISC_CONTROL);
-       ixp2000_reg_write(IXP2000_MISC_CONTROL, value & ~0x80);
+       ixp2000_reg_wrb(IXP2000_MISC_CONTROL, value & ~0x80);
        for (uengine = 0; uengine < 32; uengine++) {
                if (ixp2000_uengine_mask & (1 << uengine)) {
                        ixp2000_uengine_csr_write(uengine, TIMESTAMP_LOW, 0);
                        ixp2000_uengine_csr_write(uengine, TIMESTAMP_HIGH, 0);
                }
        }
-       ixp2000_reg_write(IXP2000_MISC_CONTROL, value | 0x80);
+       ixp2000_reg_wrb(IXP2000_MISC_CONTROL, value | 0x80);
 
        return 0;
 }