nios2: Fix outx/writex parameter order in io.h

The outx/writex macros were using writex(addr, val) rather than
   the standard writex(val, addr), resulting in incompatibilty with
   architecture independent components. This change set uses standard
   parameter order.

Signed-off-by: Scott McNutt <smcnutt@psyent.com>

diff --git a/board/altera/common/AMDLV065D.c b/board/altera/common/AMDLV065D.c
index 0fcf354cdc4289cab4a7f1515066937416c9a226..72b0a9f8074d332da076eb161c0dce78bffbc998 100644 (file)
--- a/board/altera/common/AMDLV065D.c
+++ b/board/altera/common/AMDLV065D.c
@@ -122,12 +122,12 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
        for (sect = s_first; sect <= s_last; sect++) {
                if (info->protect[sect] == 0) { /* not protected */
                        addr2 = (unsigned char *) info->start[sect];
-                       writeb (addr, 0xaa);
-                       writeb (addr,  0x55);
-                       writeb (addr,  0x80);
-                       writeb (addr,  0xaa);
-                       writeb (addr,  0x55);
-                       writeb (addr2, 0x30);
+                       writeb (0xaa, addr);
+                       writeb (0x55, addr);
+                       writeb (0x80, addr);
+                       writeb (0xaa, addr);
+                       writeb (0x55, addr);
+                       writeb (0x30, addr2);
                        /* Now just wait for 0xff & provide some user
                         * feedback while we wait.
                         */
@@ -169,9 +169,9 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
                        return (2);
                }
 
-               writeb (cmd,  0xaa);
-               writeb (cmd,  0x55);
-               writeb (cmd,  0xa0);
+               writeb (0xaa, cmd);
+               writeb (0x55, cmd);
+               writeb (0xa0, cmd);
                writeb (dst, b);
 
                /* Verify write */

diff --git a/board/altera/common/epled.c b/board/altera/common/epled.c
index e5e770576129a49e9165f2d0b659ed9fa7d8d207..d0197358f45d33c4fc8a30cfbefb0a444d441280 100644 (file)
--- a/board/altera/common/epled.c
+++ b/board/altera/common/epled.c
@@ -39,7 +39,7 @@ void __led_init (led_id_t mask, int state)
                val &= ~mask;
        else
                val |= mask;
-       writel (&pio->data, val);
+       writel (val, &pio->data);
 }
 
 void __led_set (led_id_t mask, int state)
@@ -50,7 +50,7 @@ void __led_set (led_id_t mask, int state)
                val &= ~mask;
        else
                val |= mask;
-       writel (&pio->data, val);
+       writel (val, &pio->data);
 }
 
 void __led_toggle (led_id_t mask)
@@ -58,5 +58,5 @@ void __led_toggle (led_id_t mask)
        nios_pio_t *pio = (nios_pio_t *)CONFIG_SYS_LEDPIO_ADDR;
 
        val ^= mask;
-       writel (&pio->data, val);
+       writel (val, &pio->data);
 }

diff --git a/board/psyent/common/AMDLV065D.c b/board/psyent/common/AMDLV065D.c
index 0fcf354cdc4289cab4a7f1515066937416c9a226..72b0a9f8074d332da076eb161c0dce78bffbc998 100644 (file)
--- a/board/psyent/common/AMDLV065D.c
+++ b/board/psyent/common/AMDLV065D.c
@@ -122,12 +122,12 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
        for (sect = s_first; sect <= s_last; sect++) {
                if (info->protect[sect] == 0) { /* not protected */
                        addr2 = (unsigned char *) info->start[sect];
-                       writeb (addr, 0xaa);
-                       writeb (addr,  0x55);
-                       writeb (addr,  0x80);
-                       writeb (addr,  0xaa);
-                       writeb (addr,  0x55);
-                       writeb (addr2, 0x30);
+                       writeb (0xaa, addr);
+                       writeb (0x55, addr);
+                       writeb (0x80, addr);
+                       writeb (0xaa, addr);
+                       writeb (0x55, addr);
+                       writeb (0x30, addr2);
                        /* Now just wait for 0xff & provide some user
                         * feedback while we wait.
                         */
@@ -169,9 +169,9 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
                        return (2);
                }
 
-               writeb (cmd,  0xaa);
-               writeb (cmd,  0x55);
-               writeb (cmd,  0xa0);
+               writeb (0xaa, cmd);
+               writeb (0x55, cmd);
+               writeb (0xa0, cmd);
                writeb (dst, b);
 
                /* Verify write */

diff --git a/board/psyent/pk1c20/led.c b/board/psyent/pk1c20/led.c
index e5e770576129a49e9165f2d0b659ed9fa7d8d207..d0197358f45d33c4fc8a30cfbefb0a444d441280 100644 (file)
--- a/board/psyent/pk1c20/led.c
+++ b/board/psyent/pk1c20/led.c
@@ -39,7 +39,7 @@ void __led_init (led_id_t mask, int state)
                val &= ~mask;
        else
                val |= mask;
-       writel (&pio->data, val);
+       writel (val, &pio->data);
 }
 
 void __led_set (led_id_t mask, int state)
@@ -50,7 +50,7 @@ void __led_set (led_id_t mask, int state)
                val &= ~mask;
        else
                val |= mask;
-       writel (&pio->data, val);
+       writel (val, &pio->data);
 }
 
 void __led_toggle (led_id_t mask)
@@ -58,5 +58,5 @@ void __led_toggle (led_id_t mask)
        nios_pio_t *pio = (nios_pio_t *)CONFIG_SYS_LEDPIO_ADDR;
 
        val ^= mask;
-       writel (&pio->data, val);
+       writel (val, &pio->data);
 }

diff --git a/cpu/nios2/epcs.c b/cpu/nios2/epcs.c
index a2e3fe3d16f5c7393caa153be5c78066c6cfee73..ab7d746b5fb4357f73237ed587a64f4a4d30dc38 100644 (file)
--- a/cpu/nios2/epcs.c
+++ b/cpu/nios2/epcs.c
@@ -85,7 +85,7 @@ static int epcs_cs (int assert)
 
        if (assert) {
                tmp = readl (&epcs->control);
-               writel (&epcs->control, tmp | NIOS_SPI_SSO);
+               writel (tmp | NIOS_SPI_SSO, &epcs->control);
        } else {
                /* Let all bits shift out */
                start = get_timer (0);
@@ -93,7 +93,7 @@ static int epcs_cs (int assert)
                        if (get_timer (start) > EPCS_TIMEOUT)
                                return (-1);
                tmp = readl (&epcs->control);
-               writel (&epcs->control, tmp & ~NIOS_SPI_SSO);
+               writel (tmp & ~NIOS_SPI_SSO, &epcs->control);
        }
        return (0);
 }
@@ -106,7 +106,7 @@ static int epcs_tx (unsigned char c)
        while ((readl (&epcs->status) & NIOS_SPI_TRDY) == 0)
                if (get_timer (start) > EPCS_TIMEOUT)
                        return (-1);
-       writel (&epcs->txdata, c);
+       writel (c, &epcs->txdata);
        return (0);
 }
 

diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c
index 1c3566ebf95610e2e171d02775a9b2cb0c59f183..5c3b5e6146ac7c8e63c037ffbd58d60a0059e5ff 100644 (file)
--- a/cpu/nios2/interrupts.c
+++ b/cpu/nios2/interrupts.c
@@ -81,7 +81,7 @@ void tmr_isr (void *arg)
        /* Interrupt is cleared by writing anything to the
         * status register.
         */
-       writel (&tmr->status, 0);
+       writel (0, &tmr->status);
        timestamp += CONFIG_SYS_NIOS_TMRMS;
 #ifdef CONFIG_STATUS_LED
        status_led_tick(timestamp);
@@ -92,16 +92,16 @@ static void tmr_init (void)
 {
        nios_timer_t *tmr =(nios_timer_t *)CONFIG_SYS_NIOS_TMRBASE;
 
-       writel (&tmr->status, 0);
-       writel (&tmr->control, 0);
-       writel (&tmr->control, NIOS_TIMER_STOP);
+       writel (0, &tmr->status);
+       writel (0, &tmr->control);
+       writel (NIOS_TIMER_STOP, &tmr->control);
 
 #if defined(CONFIG_SYS_NIOS_TMRCNT)
-       writel (&tmr->periodl, CONFIG_SYS_NIOS_TMRCNT & 0xffff);
-       writel (&tmr->periodh, (CONFIG_SYS_NIOS_TMRCNT >> 16) & 0xffff);
+       writel (CONFIG_SYS_NIOS_TMRCNT & 0xffff, &tmr->periodl);
+       writel ((CONFIG_SYS_NIOS_TMRCNT >> 16) & 0xffff, &tmr->periodh);
 #endif
-       writel (&tmr->control, NIOS_TIMER_ITO | NIOS_TIMER_CONT |
-                         NIOS_TIMER_START );
+       writel (NIOS_TIMER_ITO | NIOS_TIMER_CONT | NIOS_TIMER_START,
+                       &tmr->control);
        irq_install_handler (CONFIG_SYS_NIOS_TMRIRQ, tmr_isr, (void *)tmr);
 }
 

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 9eccaa0c2ae312db3a43839fa7d2121d756d6fc4..fb28aa9eb94bbc3d1ffe52958f63c3c381b58c24 100644 (file)
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -40,7 +40,7 @@ void serial_putc (char c)
 {
        while (NIOS_JTAG_WSPACE ( readl (&jtag->control)) == 0)
                WATCHDOG_RESET ();
-       writel (&jtag->data, (unsigned char)c);
+       writel ((unsigned char)c, &jtag->data);
 }
 
 void serial_puts (const char *s)

diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 995e37468cd3a798486a13055fbc3122db66527a..045f1197a344476c4a80bb1bef29d3c43b6cdc29 100644 (file)
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -50,7 +50,7 @@ void serial_setbrg (void)
        unsigned div;
 
        div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1;
-       writel (&uart->divisor,div);
+       writel (div, &uart->divisor);
        return;
 }
 
@@ -71,7 +71,7 @@ void serial_putc (char c)
                serial_putc ('\r');
        while ((readl (&uart->status) & NIOS_UART_TRDY) == 0)
                WATCHDOG_RESET ();
-       writel (&uart->txdata,(unsigned char)c);
+       writel ((unsigned char)c, &uart->txdata);
 }
 
 void serial_puts (const char *s)

diff --git a/drivers/serial/opencores_yanu.c b/drivers/serial/opencores_yanu.c
index dacda5341e46432dd1e4ec1c2fc6ba6aa616421b..f18f7f444e119b5692759ce06c9e7ed1b38f581f 100644 (file)
--- a/drivers/serial/opencores_yanu.c
+++ b/drivers/serial/opencores_yanu.c
@@ -61,7 +61,7 @@ void serial_setbrg (void)
            ((unsigned)CONFIG_SYS_CLK_FREQ >> k);
 
        baud = best_m + best_n * YANU_BAUDE;
-       writel(&uart->baud, baud);
+       writel(baud, &uart->baud);
 
        return;
 }
@@ -92,7 +92,7 @@ void serial_setbrg (void)
            ((unsigned)CONFIG_SYS_CLK_FREQ >> k);
 
        baud = best_m + best_n * YANU_BAUDE;
-       writel(&uart->baud, baud);
+       writel(baud, &uart->baud);
 
        return;
 }
@@ -113,7 +113,7 @@ int serial_init (void)
                YANU_ACTION_RPE         |
            YANU_ACTION_RFE | YANU_ACTION_RFIFO_CLEAR | YANU_ACTION_TFIFO_CLEAR;
 
-       writel(&uart->action, action);
+       writel(action, &uart->action);
        
        /*  control register cleanup */
        /* no interrupts enabled */
@@ -127,7 +127,7 @@ int serial_init (void)
        control |= YANU_CONTROL_RDYDLY * YANU_RXFIFO_DLY;
        control |= YANU_CONTROL_TXTHR *  YANU_TXFIFO_THR;
 
-       writel(&uart->control, control);
+       writel(control, &uart->control);
 
        /* to set baud rate */
        serial_setbrg();
@@ -156,7 +156,7 @@ void serial_putc (char c)
                WATCHDOG_RESET ();
        }
 
-       writel(&uart->data, (unsigned char)c);
+       writel((unsigned char)c, &uart->data);
 }
 
 void serial_puts (const char *s)
@@ -182,7 +182,7 @@ int serial_getc (void)
                WATCHDOG_RESET ();
        
        /* first we pull the char */
-       writel(&uart->action, YANU_ACTION_RFIFO_PULL);
+       writel(YANU_ACTION_RFIFO_PULL, &uart->action);
 
        return(readl(&uart->data) & YANU_DATA_CHAR_MASK);
 }

diff --git a/include/asm-nios2/io.h b/include/asm-nios2/io.h
index 01d11efeceab03a4d0e36a1590922002da5ae70f..121405cd605528247a4c7bc9b6d9f2315e6046f4 100644 (file)
--- a/include/asm-nios2/io.h
+++ b/include/asm-nios2/io.h
@@ -80,19 +80,19 @@ extern unsigned inl (unsigned port);
        ({unsigned long val;\
         asm volatile( "ldwio %0, 0(%1)" :"=r"(val) : "r" (addr)); val;})
 
-#define writeb(addr,val)\
-       asm volatile ("stbio %1, 0(%0)" : : "r" (addr), "r" (val))
-#define writew(addr,val)\
-       asm volatile ("sthio %1, 0(%0)" : : "r" (addr), "r" (val))
-#define writel(addr,val)\
-       asm volatile ("stwio %1, 0(%0)" : : "r" (addr), "r" (val))
+#define writeb(val,addr)\
+       asm volatile ("stbio %0, 0(%1)" : : "r" (val), "r" (addr))
+#define writew(val,addr)\
+       asm volatile ("sthio %0, 0(%1)" : : "r" (val), "r" (addr))
+#define writel(val,addr)\
+       asm volatile ("stwio %0, 0(%1)" : : "r" (val), "r" (addr))
 
 #define inb(addr)      readb(addr)
 #define inw(addr)      readw(addr)
 #define inl(addr)      readl(addr)
-#define outb(addr,val) writeb(addr,val)
-#define outw(addr,val) writew(addr,val)
-#define outl(addr,val) writel(addr,val)
+#define outb(val, addr)        writeb(val,addr)
+#define outw(val, addr)        writew(val,addr)
+#define outl(val, addr)        writel(val,addr)
 
 static inline void insb (unsigned long port, void *dst, unsigned long count)
 {