diff options
author | Jon Loeliger <jdl@freescale.com> | 2008-11-10 10:04:51 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2008-11-10 10:04:51 -0600 |
commit | 33211469f7d7e2afacf103cc55790f734572f7a6 (patch) | |
tree | 7c374cde48fba08b52b4f83bdf00aae89d7f85a3 /board/atmel/at91sam9rlek/at91sam9rlek.c | |
parent | 1266df887781c779deaf6d05eea2ef90a470cb34 (diff) | |
parent | 1378174a1351c0285736863a665ab758fe8d5f71 (diff) | |
download | u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.zip u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.gz u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.bz2 |
Merge commit 'wd/master'
Diffstat (limited to 'board/atmel/at91sam9rlek/at91sam9rlek.c')
-rw-r--r-- | board/atmel/at91sam9rlek/at91sam9rlek.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index 37e371f..992dd4c 100644 --- 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 */ |