summaryrefslogtreecommitdiff
path: root/board/atmel/at91sam9n12ek
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-04-13 17:31:06 -0400
committerTom Rini <trini@konsulko.com>2017-04-13 17:31:06 -0400
commitb7b24a7a3cd74bb165d28a2959ed9143e3648fbf (patch)
tree062fd13092cee10dc8746a1339ecea18f08d21d6 /board/atmel/at91sam9n12ek
parent1622559066d890f1b7622be0ede8a5d64de66ef3 (diff)
parent22e10be456014400788f80d45fc5f5c0b9d4a81d (diff)
Merge git://git.denx.de/u-boot-dm
Here with some DM changes as well as the long-standing AT91 DM/DT conversion patches which I have picked up via dm.
Diffstat (limited to 'board/atmel/at91sam9n12ek')
-rw-r--r--board/atmel/at91sam9n12ek/at91sam9n12ek.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index fc4f50d219..58da2d27f8 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -71,10 +71,10 @@ static void at91sam9n12ek_nand_hw_init(void)
/* Configure ENABLE pin for NandFlash */
at91_set_pio_output(AT91_PIO_PORTD, 4, 1);
- at91_set_a_periph(AT91_PIO_PORTD, 0, 1); /* NAND OE */
- at91_set_a_periph(AT91_PIO_PORTD, 1, 1); /* NAND WE */
- at91_set_a_periph(AT91_PIO_PORTD, 2, 1); /* ALE */
- at91_set_a_periph(AT91_PIO_PORTD, 3, 1); /* CLE */
+ at91_pio3_set_a_periph(AT91_PIO_PORTD, 0, 1); /* NAND OE */
+ at91_pio3_set_a_periph(AT91_PIO_PORTD, 1, 1); /* NAND WE */
+ at91_pio3_set_a_periph(AT91_PIO_PORTD, 2, 1); /* ALE */
+ at91_pio3_set_a_periph(AT91_PIO_PORTD, 3, 1); /* CLE */
}
#endif
@@ -194,7 +194,7 @@ void at91sam9n12ek_ks8851_hw_init(void)
&smc->cs[2].mode);
/* Configure NCS2 PIN */
- at91_set_b_periph(AT91_PIO_PORTD, 19, 0);
+ at91_pio3_set_b_periph(AT91_PIO_PORTD, 19, 0);
}
#endif