AT91: Replace (undefined) AT91_ID_US* by the board specific values.

AT91_ID_US0 / AT91_ID_US1 / AT91_ID_US2 were used but never defined.
Since they are never used outside the board specific files, they can
be replaced by the board specific AT91xxx_ID_US0 / AT91xxx_ID_US1 /
AT91xxx_ID_US2.

Bug spotted by Jesus Alvarez <jalvarez@micromint.com>.

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c
index d1e01653144f40ac343f185b84a0a62202993baf..e6140ff6f3a456a1187f208817501ed144967dd5 100644 (file)
--- a/board/afeb9260/afeb9260.c
+++ b/board/afeb9260/afeb9260.c
@@ -49,19 +49,19 @@ static void afeb9260_serial_hw_init(void)
 #ifdef CONFIG_USART0
        at91_set_A_periph(AT91_PIN_PB4, 1);             /* TXD0 */
        at91_set_A_periph(AT91_PIN_PB5, 0);             /* RXD0 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US0);
 #endif
 
 #ifdef CONFIG_USART1
        at91_set_A_periph(AT91_PIN_PB6, 1);             /* TXD1 */
        at91_set_A_periph(AT91_PIN_PB7, 0);             /* RXD1 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US1);
 #endif
 
 #ifdef CONFIG_USART2
        at91_set_A_periph(AT91_PIN_PB8, 1);             /* TXD2 */
        at91_set_A_periph(AT91_PIN_PB9, 0);             /* RXD2 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US2);
 #endif
 
 #ifdef CONFIG_USART3   /* DBGU */

diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c
index a1a9238f6ec2aa1c5cbb18d39754ee2f5483d7bf..88cc4f91c17e74d9fb165917af6e970117599bcd 100644 (file)
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -52,19 +52,19 @@ static void at91cap9_serial_hw_init(void)
 #ifdef CONFIG_USART0
        at91_set_A_periph(AT91_PIN_PA22, 1);            /* TXD0 */
        at91_set_A_periph(AT91_PIN_PA23, 0);            /* RXD0 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US0);
 #endif
 
 #ifdef CONFIG_USART1
        at91_set_A_periph(AT91_PIN_PD0, 1);             /* TXD1 */
        at91_set_A_periph(AT91_PIN_PD1, 0);             /* RXD1 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US1);
 #endif
 
 #ifdef CONFIG_USART2
        at91_set_A_periph(AT91_PIN_PD2, 1);             /* TXD2 */
        at91_set_A_periph(AT91_PIN_PD3, 0);             /* RXD2 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US2);
 #endif
 
 #ifdef CONFIG_USART3   /* DBGU */

diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 372cfb22f380e2f12bdb15ad16e2d48e982489fb..0904827cb220f0ffd728a8fb314a17675940062d 100644 (file)
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -48,19 +48,19 @@ static void at91sam9260ek_serial_hw_init(void)
 #ifdef CONFIG_USART0
        at91_set_A_periph(AT91_PIN_PB4, 1);             /* TXD0 */
        at91_set_A_periph(AT91_PIN_PB5, 0);             /* RXD0 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US0);
 #endif
 
 #ifdef CONFIG_USART1
        at91_set_A_periph(AT91_PIN_PB6, 1);             /* TXD1 */
        at91_set_A_periph(AT91_PIN_PB7, 0);             /* RXD1 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US1);
 #endif
 
 #ifdef CONFIG_USART2
        at91_set_A_periph(AT91_PIN_PB8, 1);             /* TXD2 */
        at91_set_A_periph(AT91_PIN_PB9, 0);             /* RXD2 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US2);
 #endif
 
 #ifdef CONFIG_USART3   /* DBGU */

diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 70f1db93f6f162506d49bdc7a0e5004a045e76ca..185d6e1307d025ffd11b267752de3a61799b7b20 100644 (file)
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -48,19 +48,19 @@ static void at91sam9261ek_serial_hw_init(void)
 #ifdef CONFIG_USART0
        at91_set_A_periph(AT91_PIN_PC8, 1);             /* TXD0 */
        at91_set_A_periph(AT91_PIN_PC9, 0);             /* RXD0 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US0);
 #endif
 
 #ifdef CONFIG_USART1
        at91_set_A_periph(AT91_PIN_PC12, 1);            /* TXD1 */
        at91_set_A_periph(AT91_PIN_PC13, 0);            /* RXD1 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US1);
 #endif
 
 #ifdef CONFIG_USART2
        at91_set_A_periph(AT91_PIN_PC14, 1);            /* TXD2 */
        at91_set_A_periph(AT91_PIN_PC15, 0);            /* RXD2 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US2);
 #endif
 
 #ifdef CONFIG_USART3   /* DBGU */

diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 63f95e718fec3a9c20edc867a8c3eaa61bef342e..a1f39294e2c2d8d1f6efc5fce591a078bcbaac95 100644 (file)
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -51,19 +51,19 @@ static void at91sam9263ek_serial_hw_init(void)
 #ifdef CONFIG_USART0
        at91_set_A_periph(AT91_PIN_PA26, 1);            /* TXD0 */
        at91_set_A_periph(AT91_PIN_PA27, 0);            /* RXD0 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US0);
 #endif
 
 #ifdef CONFIG_USART1
        at91_set_A_periph(AT91_PIN_PD0, 1);             /* TXD1 */
        at91_set_A_periph(AT91_PIN_PD1, 0);             /* RXD1 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US1);
 #endif
 
 #ifdef CONFIG_USART2
        at91_set_A_periph(AT91_PIN_PD2, 1);             /* TXD2 */
        at91_set_A_periph(AT91_PIN_PD3, 0);             /* RXD2 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US2);
 #endif
 
 #ifdef CONFIG_USART3   /* DBGU */

diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 37e371ff2df8467175a4edf8b2f778038aa14e66..992dd4cd2c9597ce46dcd759cf39bb36c4b31986 100644 (file)
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -48,19 +48,19 @@ static void at91sam9rlek_serial_hw_init(void)
 #ifdef CONFIG_USART0
        at91_set_A_periph(AT91_PIN_PA6, 1);             /* TXD0 */
        at91_set_A_periph(AT91_PIN_PA7, 0);             /* RXD0 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US0);
 #endif
 
 #ifdef CONFIG_USART1
        at91_set_A_periph(AT91_PIN_PA11, 1);            /* TXD1 */
        at91_set_A_periph(AT91_PIN_PA12, 0);            /* RXD1 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US1);
 #endif
 
 #ifdef CONFIG_USART2
        at91_set_A_periph(AT91_PIN_PA13, 1);            /* TXD2 */
        at91_set_A_periph(AT91_PIN_PA14, 0);            /* RXD2 */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US2);
 #endif
 
 #ifdef CONFIG_USART3   /* DBGU */