]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
at91sam9/at91cap: move common spi initialisation to cpu
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sat, 21 Mar 2009 20:07:59 +0000 (21:07 +0100)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sun, 22 Mar 2009 12:22:06 +0000 (13:22 +0100)
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
13 files changed:
board/afeb9260/afeb9260.c
board/atmel/at91cap9adk/at91cap9adk.c
board/atmel/at91sam9260ek/at91sam9260ek.c
board/atmel/at91sam9261ek/at91sam9261ek.c
board/atmel/at91sam9263ek/at91sam9263ek.c
board/atmel/at91sam9rlek/at91sam9rlek.c
cpu/arm926ejs/at91/Makefile
cpu/arm926ejs/at91/at91cap9_spi.c [new file with mode: 0644]
cpu/arm926ejs/at91/at91sam9260_spi.c [new file with mode: 0644]
cpu/arm926ejs/at91/at91sam9261_spi.c [new file with mode: 0644]
cpu/arm926ejs/at91/at91sam9263_spi.c [new file with mode: 0644]
cpu/arm926ejs/at91/at91sam9rl_spi.c [new file with mode: 0644]
include/asm-arm/arch-at91/at91_common.h

index dd29d91631f05d57a7f326271f953d27e12c6e65..0f9c50486a953cb7c5b9745c333c54718714ad2b 100644 (file)
@@ -78,19 +78,6 @@ static void afeb9260_nand_hw_init(void)
        at91_set_gpio_output(AT91_PIN_PC14, 1);
 }
 
-static void afeb9260_spi_hw_init(void)
-{
-       at91_set_A_periph(AT91_PIN_PA3, 0);     /* SPI0_NPCS0 */
-       at91_set_B_periph(AT91_PIN_PC11, 0);    /* SPI0_NPCS1 */
-
-       at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
-       at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
-       at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
-
-       /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0);
-}
-
 #ifdef CONFIG_MACB
 static void afeb9260_macb_hw_init(void)
 {
@@ -179,7 +166,7 @@ int board_init(void)
 #ifdef CONFIG_CMD_NAND
        afeb9260_nand_hw_init();
 #endif
-       afeb9260_spi_hw_init();
+       at91_spi0_hw_init((1 << 0) || (1 << 1));
 #ifdef CONFIG_MACB
        afeb9260_macb_hw_init();
 #endif
index 18a0e9d6f49de0a521686972c54b66d1dfc2ecd3..b1e9c62b29afcfabe372eb9ef64dfc928d180d32 100644 (file)
@@ -137,20 +137,6 @@ static void at91cap9_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_HAS_DATAFLASH
-static void at91cap9_spi_hw_init(void)
-{
-       at91_set_B_periph(AT91_PIN_PA5, 0);     /* SPI0_NPCS0 */
-
-       at91_set_B_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
-       at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
-       at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
-
-       /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_SPI0);
-}
-#endif
-
 #ifdef CONFIG_MACB
 static void at91cap9_macb_hw_init(void)
 {
@@ -348,7 +334,7 @@ int board_init(void)
        at91cap9_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
-       at91cap9_spi_hw_init();
+       at91_spi0_hw_init(1 << 0);
 #endif
 #ifdef CONFIG_MACB
        at91cap9_macb_hw_init();
index 985daf7fb52936eb322cf11d0438335866edfa6a..ad9dfeb288da775b8a5945856ffcd84bba9523bf 100644 (file)
@@ -83,21 +83,6 @@ static void at91sam9260ek_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_HAS_DATAFLASH
-static void at91sam9260ek_spi_hw_init(void)
-{
-       at91_set_A_periph(AT91_PIN_PA3, 0);     /* SPI0_NPCS0 */
-       at91_set_B_periph(AT91_PIN_PC11, 0);    /* SPI0_NPCS1 */
-
-       at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
-       at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
-       at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
-
-       /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0);
-}
-#endif
-
 #ifdef CONFIG_MACB
 static void at91sam9260ek_macb_hw_init(void)
 {
@@ -196,7 +181,7 @@ int board_init(void)
        at91sam9260ek_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
-       at91sam9260ek_spi_hw_init();
+       at91_spi0_hw_init((1 << 0) || (1 << 1));
 #endif
 #ifdef CONFIG_MACB
        at91sam9260ek_macb_hw_init();
index 5fe3d3f16dae13daf2f20d5f6662f36e91e9c166..d8f006c54a9e8ed5065ba5d60993eeda75999e40 100644 (file)
@@ -86,20 +86,6 @@ static void at91sam9261ek_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_HAS_DATAFLASH
-static void at91sam9261ek_spi_hw_init(void)
-{
-       at91_set_A_periph(AT91_PIN_PA3, 0);     /* SPI0_NPCS0 */
-
-       at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
-       at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
-       at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
-
-       /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_SPI0);
-}
-#endif
-
 #ifdef CONFIG_DRIVER_DM9000
 static void at91sam9261ek_dm9000_hw_init(void)
 {
@@ -229,7 +215,7 @@ int board_init(void)
        at91sam9261ek_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
-       at91sam9261ek_spi_hw_init();
+       at91_spi0_hw_init(1 << 0);
 #endif
 #ifdef CONFIG_DRIVER_DM9000
        at91sam9261ek_dm9000_hw_init();
index 37634a8f26726c33d0dbb80616715c228c694038..1a3e39cf319c5f3ce4f19a3aba8d9832f42f8518 100644 (file)
@@ -87,20 +87,6 @@ static void at91sam9263ek_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_HAS_DATAFLASH
-static void at91sam9263ek_spi_hw_init(void)
-{
-       at91_set_B_periph(AT91_PIN_PA5, 0);     /* SPI0_NPCS0 */
-
-       at91_set_B_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
-       at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
-       at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
-
-       /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_SPI0);
-}
-#endif
-
 #ifdef CONFIG_MACB
 static void at91sam9263ek_macb_hw_init(void)
 {
@@ -280,7 +266,8 @@ int board_init(void)
        at91sam9263ek_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
-       at91sam9263ek_spi_hw_init();
+       at91_set_gpio_output(AT91_PIN_PE20, 1); /* select spi0 clock */
+       at91_spi0_hw_init(1 << 0);
 #endif
 #ifdef CONFIG_MACB
        at91sam9263ek_macb_hw_init();
index 26395a251b917e5cd5b70ffa53642b54c0620bd6..ce10cdf0746955b13b3964d29ef798c759f0a19b 100644 (file)
@@ -86,20 +86,6 @@ static void at91sam9rlek_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_HAS_DATAFLASH
-static void at91sam9rlek_spi_hw_init(void)
-{
-       at91_set_A_periph(AT91_PIN_PA28, 0);    /* SPI0_NPCS0 */
-
-       at91_set_A_periph(AT91_PIN_PA25, 0);    /* SPI0_MISO */
-       at91_set_A_periph(AT91_PIN_PA26, 0);    /* SPI0_MOSI */
-       at91_set_A_periph(AT91_PIN_PA27, 0);    /* SPI0_SPCK */
-
-       /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_SPI);
-}
-#endif
-
 #ifdef CONFIG_LCD
 vidinfo_t panel_info = {
        vl_col:         240,
@@ -202,7 +188,7 @@ int board_init(void)
        at91sam9rlek_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
-       at91sam9rlek_spi_hw_init();
+       at91_spi0_hw_init(1 << 0);
 #endif
 #ifdef CONFIG_LCD
        at91sam9rlek_lcd_hw_init();
index 66d4d6d617d0d58785ea430835e71d38cbcfa9dd..e547ab58c3bd8be657b6114c11a62c4d5adcd1a4 100644 (file)
@@ -25,11 +25,26 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(SOC).a
 
-COBJS-$(CONFIG_AT91CAP9)       += at91cap9_serial.o
-COBJS-$(CONFIG_AT91SAM9260)    += at91sam9260_serial.o
-COBJS-$(CONFIG_AT91SAM9261)    += at91sam9261_serial.o
-COBJS-$(CONFIG_AT91SAM9263)    += at91sam9263_serial.o
-COBJS-$(CONFIG_AT91SAM9RL)     += at91sam9rl_serial.o
+ifdef CONFIG_AT91CAP9
+COBJS-y                                += at91cap9_serial.o
+COBJS-$(CONFIG_HAS_DATAFLASH)  += at91cap9_spi.o
+endif
+ifdef CONFIG_AT91SAM9260
+COBJS-y                                += at91sam9260_serial.o
+COBJS-$(CONFIG_HAS_DATAFLASH)  += at91sam9260_spi.o
+endif
+ifdef CONFIG_AT91SAM9261
+COBJS-y                                += at91sam9261_serial.o
+COBJS-$(CONFIG_HAS_DATAFLASH)  += at91sam9261_spi.o
+endif
+ifdef CONFIG_AT91SAM9263
+COBJS-y                                += at91sam9263_serial.o
+COBJS-$(CONFIG_HAS_DATAFLASH)  += at91sam9263_spi.o
+endif
+ifdef CONFIG_AT91SAM9RL
+COBJS-y                                += at91sam9rl_serial.o
+COBJS-$(CONFIG_HAS_DATAFLASH)  += at91sam9rl_spi.o
+endif
 COBJS-$(CONFIG_HAS_DATAFLASH)  += spi.o
 COBJS-y        += timer.o
 COBJS-y        += usb.o
diff --git a/cpu/arm926ejs/at91/at91cap9_spi.c b/cpu/arm926ejs/at91/at91cap9_spi.c
new file mode 100644 (file)
index 0000000..356a804
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/arch/at91_common.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/io.h>
+
+void at91_spi0_hw_init(unsigned long cs_mask)
+{
+       at91_set_B_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
+       at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
+       at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_SPI0);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PA5, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PA3, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PD0, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PD1, 1);
+       }
+}
+
+void at91_spi1_hw_init(unsigned long cs_mask)
+{
+       at91_set_A_periph(AT91_PIN_PB12, 0);    /* SPI1_MISO */
+       at91_set_A_periph(AT91_PIN_PB13, 0);    /* SPI1_MOSI */
+       at91_set_A_periph(AT91_PIN_PB14, 0);    /* SPI1_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_SPI1);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PB15, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PB16, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PB17, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PB18, 1);
+       }
+}
diff --git a/cpu/arm926ejs/at91/at91sam9260_spi.c b/cpu/arm926ejs/at91/at91sam9260_spi.c
new file mode 100644 (file)
index 0000000..0105072
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/arch/at91_common.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/io.h>
+
+void at91_spi0_hw_init(unsigned long cs_mask)
+{
+       at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
+       at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
+       at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PA3, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PC11, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PC16, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PC17, 1);
+       }
+}
+
+void at91_spi1_hw_init(unsigned long cs_mask)
+{
+       at91_set_A_periph(AT91_PIN_PB0, 0);     /* SPI1_MISO */
+       at91_set_A_periph(AT91_PIN_PB1, 0);     /* SPI1_MOSI */
+       at91_set_A_periph(AT91_PIN_PB2, 0);     /* SPI1_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI1);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PB3, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PC5, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PC4, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PC3, 1);
+       }
+}
diff --git a/cpu/arm926ejs/at91/at91sam9261_spi.c b/cpu/arm926ejs/at91/at91sam9261_spi.c
new file mode 100644 (file)
index 0000000..f70320d
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/arch/at91_common.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/io.h>
+
+void at91_spi0_hw_init(unsigned long cs_mask)
+{
+       at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
+       at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
+       at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_SPI0);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PA3, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PA4, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PA5, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PA6, 1);
+       }
+}
+
+void at91_spi1_hw_init(unsigned long cs_mask)
+{
+       at91_set_A_periph(AT91_PIN_PB30, 0);    /* SPI1_MISO */
+       at91_set_A_periph(AT91_PIN_PB31, 0);    /* SPI1_MOSI */
+       at91_set_A_periph(AT91_PIN_PB29, 0);    /* SPI1_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_SPI1);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PB28, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PA24, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PA25, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PA26, 1);
+       }
+}
diff --git a/cpu/arm926ejs/at91/at91sam9263_spi.c b/cpu/arm926ejs/at91/at91sam9263_spi.c
new file mode 100644 (file)
index 0000000..1dda04c
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/arch/at91_common.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/io.h>
+
+void at91_spi0_hw_init(unsigned long cs_mask)
+{
+       at91_set_B_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
+       at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
+       at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_SPI0);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PA5, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PA3, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PA4, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PB11, 1);
+       }
+}
+
+void at91_spi1_hw_init(unsigned long cs_mask)
+{
+       at91_set_A_periph(AT91_PIN_PB12, 0);    /* SPI1_MISO */
+       at91_set_A_periph(AT91_PIN_PB13, 0);    /* SPI1_MOSI */
+       at91_set_A_periph(AT91_PIN_PB14, 0);    /* SPI1_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_SPI1);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PB15, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PB16, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PB17, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PB18, 1);
+       }
+}
diff --git a/cpu/arm926ejs/at91/at91sam9rl_spi.c b/cpu/arm926ejs/at91/at91sam9rl_spi.c
new file mode 100644 (file)
index 0000000..aa9c183
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/arch/at91_common.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/io.h>
+
+void at91_spi0_hw_init(unsigned long cs_mask)
+{
+       at91_set_A_periph(AT91_PIN_PA25, 0);    /* SPI0_MISO */
+       at91_set_A_periph(AT91_PIN_PA26, 0);    /* SPI0_MOSI */
+       at91_set_A_periph(AT91_PIN_PA27, 0);    /* SPI0_SPCK */
+
+       /* Enable clock */
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_SPI);
+
+       if (cs_mask & (1 << 0)) {
+               at91_set_gpio_output(AT91_PIN_PA28, 1);
+       }
+       if (cs_mask & (1 << 1)) {
+               at91_set_gpio_output(AT91_PIN_PB7, 1);
+       }
+       if (cs_mask & (1 << 2)) {
+               at91_set_gpio_output(AT91_PIN_PD8, 1);
+       }
+       if (cs_mask & (1 << 3)) {
+               at91_set_gpio_output(AT91_PIN_PD9, 1);
+       }
+}
index 2ac241fd5b9c414fea165fa0b7c777de1c46af56..1432f949daefa07b9136d5194f4b8a8e6fbb480d 100644 (file)
@@ -30,5 +30,7 @@ void at91_serial0_hw_init(void);
 void at91_serial1_hw_init(void);
 void at91_serial2_hw_init(void);
 void at91_serial3_hw_init(void);
+void at91_spi0_hw_init(unsigned long cs_mask);
+void at91_spi1_hw_init(unsigned long cs_mask);
 
 #endif /* AT91_COMMON_H */