ARM: mx28: Remove CONFIG_ARCH_CPU_INIT

[oweals/u-boot.git] / arch / arm / cpu / arm926ejs / at91 / at91sam9260_devices.c

diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
index 6bdc75c702b550b369afa19c3269998034705682..62f76fa8e328441605d5e69a6ce10dcf2f5a4c6c 100644 (file)
--- a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2007-2008
- * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Stelian Pop <stelian@popies.net>
  * Lead Tech Design <www.leadtechdesign.com>
  *
  * See file CREDITS for list of people who contributed to this
@@ -138,7 +138,7 @@ void at91_spi1_hw_init(unsigned long cs_mask)
                at91_set_b_periph(AT91_PIO_PORTC, 4, 1);
        }
        if (cs_mask & (1 << 3)) {
-               at91_set_pio_output(AT91_PIO_PORTC, 3, 1);
+               at91_set_b_periph(AT91_PIO_PORTC, 3, 1);
        }
        if (cs_mask & (1 << 4)) {
                at91_set_pio_output(AT91_PIO_PORTB, 3, 1);
@@ -196,7 +196,7 @@ void at91_macb_hw_init(void)
 }
 #endif
 
-#if defined(CONFIG_ATMEL_MCI) || defined(CONFIG_GENERIC_ATMEL_MCI)
+#if defined(CONFIG_GENERIC_ATMEL_MCI)
 void at91_mci_hw_init(void)
 {
        at91_set_a_periph(AT91_PIO_PORTA, 8, 1);        /* MCCK */