AT91SAM9/CAP9: cleanup common code
cover AT91SAM9/CAP9: cleanup common code
Hi,
The following patchset will cleanup the current at91sam9 and at91cap9 code to unify common code
Jean-Christophe PLAGNIOL-VILLARD (7):
at91sam9/at91cap: move common serial initialisation to cpu at91sam9/at91cap: move common spi initialisation to cpu at91sam9/at91cap: move common led management to cpu at91sam9/at91cap: move common usb host initialisation to cpu at91sam9/at91cap: move common macb initialisation to cpu atmel/at91/boards: compile dataflash partition only when dataflash is at91sam9/at91cap: move nand drivers to drivers/mtd/nand
board/afeb9260/Makefile | 1 - board/afeb9260/afeb9260.c | 72 ++--------------- board/atmel/at91cap9adk/Makefile | 3 +- board/atmel/at91cap9adk/at91cap9adk.c | 71 ++--------------- board/atmel/at91cap9adk/led.c | 46 ++--------- board/atmel/at91cap9adk/nand.c | 72 ----------------- board/atmel/at91sam9260ek/Makefile | 3 +- board/atmel/at91sam9260ek/at91sam9260ek.c | 83 ++------------------ board/atmel/at91sam9260ek/led.c | 31 +------ board/atmel/at91sam9260ek/nand.c | 78 ------------------ board/atmel/at91sam9261ek/Makefile | 3 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 50 +---------- board/atmel/at91sam9261ek/led.c | 47 ++---------- board/atmel/at91sam9261ek/nand.c | 78 ------------------ board/atmel/at91sam9263ek/Makefile | 3 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 85 ++------------------ board/atmel/at91sam9263ek/led.c | 46 ++--------- board/atmel/at91sam9263ek/nand.c | 78 ------------------ board/atmel/at91sam9rlek/Makefile | 3 +- board/atmel/at91sam9rlek/at91sam9rlek.c | 50 +---------- board/atmel/at91sam9rlek/led.c | 46 ++--------- board/atmel/at91sam9rlek/nand.c | 78 ------------------ cpu/arm926ejs/at91/Makefile | 27 ++++++- cpu/arm926ejs/at91/at91cap9_macb.c | 54 ++++++++++++ cpu/arm926ejs/at91/at91cap9_serial.c | 76 +++++++++++++++++ cpu/arm926ejs/at91/at91cap9_spi.c | 75 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9260_macb.c | 63 +++++++++++++++ cpu/arm926ejs/at91/at91sam9260_serial.c | 76 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9260_spi.c | 75 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9261_serial.c | 76 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9261_spi.c | 75 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9263_macb.c | 54 ++++++++++++ cpu/arm926ejs/at91/at91sam9263_serial.c | 76 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9263_spi.c | 75 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9263_usb.c | 35 ++++++++ cpu/arm926ejs/at91/at91sam9rl_serial.c | 76 +++++++++++++++++ cpu/arm926ejs/at91/at91sam9rl_spi.c | 52 ++++++++++++ cpu/arm926ejs/at91/led.c | 64 +++++++++++++++ drivers/mtd/nand/Makefile | 1 + .../nand.c => drivers/mtd/nand/atmel_nand.c | 32 ++++---- include/asm-arm/arch-at91/at91_common.h | 38 +++++++++ include/configs/afeb9260.h | 9 ++ include/configs/at91cap9adk.h | 14 +++ include/configs/at91sam9260ek.h | 14 +++ include/configs/at91sam9261ek.h | 15 ++++ include/configs/at91sam9263ek.h | 15 ++++ include/configs/at91sam9rlek.h | 15 ++++ 47 files changed, 1234 insertions(+), 975 deletions(-) delete mode 100644 board/atmel/at91cap9adk/nand.c delete mode 100644 board/atmel/at91sam9260ek/nand.c delete mode 100644 board/atmel/at91sam9261ek/nand.c delete mode 100644 board/atmel/at91sam9263ek/nand.c delete mode 100644 board/atmel/at91sam9rlek/nand.c create mode 100644 cpu/arm926ejs/at91/at91cap9_macb.c create mode 100644 cpu/arm926ejs/at91/at91cap9_serial.c create mode 100644 cpu/arm926ejs/at91/at91cap9_spi.c create mode 100644 cpu/arm926ejs/at91/at91sam9260_macb.c create mode 100644 cpu/arm926ejs/at91/at91sam9260_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9260_spi.c create mode 100644 cpu/arm926ejs/at91/at91sam9261_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9261_spi.c create mode 100644 cpu/arm926ejs/at91/at91sam9263_macb.c create mode 100644 cpu/arm926ejs/at91/at91sam9263_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9263_spi.c create mode 100644 cpu/arm926ejs/at91/at91sam9263_usb.c create mode 100644 cpu/arm926ejs/at91/at91sam9rl_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9rl_spi.c create mode 100644 cpu/arm926ejs/at91/led.c rename board/afeb9260/nand.c => drivers/mtd/nand/atmel_nand.c (72%) create mode 100644 include/asm-arm/arch-at91/at91_common.h
Best Regards,
J.
PATCH 1/7 at91sam9/at91cap: move common serial initialisation to cpu
--- board/afeb9260/afeb9260.c | 30 +----------- board/atmel/at91cap9adk/at91cap9adk.c | 30 +----------- board/atmel/at91sam9260ek/at91sam9260ek.c | 30 +----------- board/atmel/at91sam9261ek/at91sam9261ek.c | 30 +----------- board/atmel/at91sam9263ek/at91sam9263ek.c | 30 +----------- board/atmel/at91sam9rlek/at91sam9rlek.c | 30 +----------- cpu/arm926ejs/at91/Makefile | 7 ++- cpu/arm926ejs/at91/at91cap9_serial.c | 76 +++++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9260_serial.c | 76 +++++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9261_serial.c | 76 +++++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9263_serial.c | 76 +++++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9rl_serial.c | 76 +++++++++++++++++++++++++++++ include/asm-arm/arch-at91/at91_common.h | 34 +++++++++++++ 13 files changed, 432 insertions(+), 169 deletions(-) create mode 100644 cpu/arm926ejs/at91/at91cap9_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9260_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9261_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9263_serial.c create mode 100644 cpu/arm926ejs/at91/at91sam9rl_serial.c create mode 100644 include/asm-arm/arch-at91/at91_common.h
board/afeb9260/afeb9260.c +2 -28
@@ -27,6 +27,7 @@#include <asm/arch/at91sam9260.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h>
@@ -44,33 +45,6 @@ DECLARE_GLOBAL_DATA_PTR;* Miscelaneous platform dependent initialisations */ -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 <<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 <<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 <<AT91SAM9260_ID_US2 ); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ -at91_set_A_periph (AT91_PIN_PB14 ,0 );/* DRXD */ -at91_set_A_periph (AT91_PIN_PB15 ,1 );/* DTXD */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91_ID_SYS ); -#endif -} -static void afeb9260_nand_hw_init (void ) {unsigned long csa;
@@ -201,7 +175,7 @@ int board_init(void)/* adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; -afeb9260_serial_hw_init (); +at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND afeb9260_nand_hw_init ();#endif
board/atmel/at91cap9adk/at91cap9adk.c +2 -28
@@ -26,6 +26,7 @@#include <asm/arch/at91cap9.h> #include <asm/arch/at91cap9_matrix.h> #include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h>
@@ -47,33 +48,6 @@ DECLARE_GLOBAL_DATA_PTR;* Miscelaneous platform dependent initialisations */ -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 <<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 <<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 <<AT91CAP9_ID_US2 ); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ -at91_set_A_periph (AT91_PIN_PC30 ,0 );/* DRXD */ -at91_set_A_periph (AT91_PIN_PC31 ,1 );/* DTXD */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91_ID_SYS ); -#endif -} -static void at91cap9_slowclock_hw_init (void ) {/*
@@ -367,7 +341,7 @@ int board_init(void)/* adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; -at91cap9_serial_hw_init (); +at91_serial_hw_init ();at91cap9_slowclock_hw_init ();at91cap9_nor_hw_init ();#ifdef CONFIG_CMD_NAND
board/atmel/at91sam9260ek/at91sam9260ek.c +2 -28
@@ -26,6 +26,7 @@#include <asm/arch/at91sam9260.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h>
@@ -43,33 +44,6 @@ DECLARE_GLOBAL_DATA_PTR;* Miscelaneous platform dependent initialisations */ -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 <<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 <<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 <<AT91SAM9260_ID_US2 ); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ -at91_set_A_periph (AT91_PIN_PB14 ,0 );/* DRXD */ -at91_set_A_periph (AT91_PIN_PB15 ,1 );/* DTXD */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91_ID_SYS ); -#endif -} -#ifdef CONFIG_CMD_NAND static void at91sam9260ek_nand_hw_init (void ) {
@@ -217,7 +191,7 @@ int board_init(void)/* adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; -at91sam9260ek_serial_hw_init (); +at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND at91sam9260ek_nand_hw_init ();#endif
board/atmel/at91sam9261ek/at91sam9261ek.c +2 -28
@@ -26,6 +26,7 @@#include <asm/arch/at91sam9261.h> #include <asm/arch/at91sam9261_matrix.h> #include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h>
@@ -43,33 +44,6 @@ DECLARE_GLOBAL_DATA_PTR;* Miscelaneous platform dependent initialisations */ -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 <<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 <<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 <<AT91SAM9261_ID_US2 ); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ -at91_set_A_periph (AT91_PIN_PA9 ,0 );/* DRXD */ -at91_set_A_periph (AT91_PIN_PA10 ,1 );/* DTXD */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91_ID_SYS ); -#endif -} -#ifdef CONFIG_CMD_NAND static void at91sam9261ek_nand_hw_init (void ) {
@@ -250,7 +224,7 @@ int board_init(void)/* adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; -at91sam9261ek_serial_hw_init (); +at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND at91sam9261ek_nand_hw_init ();#endif
board/atmel/at91sam9263ek/at91sam9263ek.c +2 -28
@@ -27,6 +27,7 @@#include <asm/arch/at91sam9263.h> #include <asm/arch/at91sam9263_matrix.h> #include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h>
@@ -46,33 +47,6 @@ DECLARE_GLOBAL_DATA_PTR;* Miscelaneous platform dependent initialisations */ -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 <<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 <<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 <<AT91SAM9263_ID_US2 ); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ -at91_set_A_periph (AT91_PIN_PC30 ,0 );/* DRXD */ -at91_set_A_periph (AT91_PIN_PC31 ,1 );/* DTXD */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91_ID_SYS ); -#endif -} -#ifdef CONFIG_CMD_NAND static void at91sam9263ek_nand_hw_init (void ) {
@@ -301,7 +275,7 @@ int board_init(void)/* adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; -at91sam9263ek_serial_hw_init (); +at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND at91sam9263ek_nand_hw_init ();#endif
board/atmel/at91sam9rlek/at91sam9rlek.c +2 -28
@@ -26,6 +26,7 @@#include <asm/arch/at91sam9rl.h> #include <asm/arch/at91sam9rl_matrix.h> #include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h>
@@ -43,33 +44,6 @@ DECLARE_GLOBAL_DATA_PTR;* Miscelaneous platform dependent initialisations */ -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 <<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 <<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 <<AT91SAM9RL_ID_US2 ); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ -at91_set_A_periph (AT91_PIN_PA21 ,0 );/* DRXD */ -at91_set_A_periph (AT91_PIN_PA22 ,1 );/* DTXD */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91_ID_SYS ); -#endif -} -#ifdef CONFIG_CMD_NAND static void at91sam9rlek_nand_hw_init (void ) {
@@ -223,7 +197,7 @@ int board_init(void)/* adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; -at91sam9rlek_serial_hw_init (); +at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND at91sam9rlek_nand_hw_init ();#endif
cpu/arm926ejs/at91/Makefile +6 -1
@@ -25,8 +25,13 @@ 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 +COBJS-$(CONFIG_HAS_DATAFLASH) += spi.o COBJS-y += timer.o -COBJS-$(CONFIG_HAS_DATAFLASH) +=spi.o COBJS-y += usb.o SOBJS = lowlevel_init.o
cpu/arm926ejs/at91/at91cap9_serial.c new file +76 -0
76 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9260_serial.c new file +76 -0
76 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9261_serial.c new file +76 -0
76 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9263_serial.c new file +76 -0
76 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9rl_serial.c new file +76 -0
76 lines not on this page · raw message
include/asm-arm/arch-at91/at91_common.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* (C) Copyright 2007-2008 +* Stelian Pop <[email protected]> +* 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 +*/ + +#ifndef AT91_COMMON_H +#define AT91_COMMON_H + +void at91_serial_hw_init (void ); +void at91_serial0_hw_init (void ); +void at91_serial1_hw_init (void ); +void at91_serial2_hw_init (void ); +void at91_serial3_hw_init (void ); + +#endif /* AT91_COMMON_H */
Signature · 1 line
1.5.6.5
PATCH 2/7 at91sam9/at91cap: move common spi initialisation to cpu
--- board/afeb9260/afeb9260.c | 15 +---- board/atmel/at91cap9adk/at91cap9adk.c | 16 +---- board/atmel/at91sam9260ek/at91sam9260ek.c | 17 +---- board/atmel/at91sam9261ek/at91sam9261ek.c | 16 +---- board/atmel/at91sam9263ek/at91sam9263ek.c | 17 +---- board/atmel/at91sam9rlek/at91sam9rlek.c | 16 +---- cpu/arm926ejs/at91/Makefile | 25 +++++-- cpu/arm926ejs/at91/at91cap9_spi.c | 75 ++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9260_spi.c | 75 ++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9261_spi.c | 75 ++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9263_spi.c | 75 ++++++++++++++++++++ .../arm926ejs/at91/at91sam9rl_spi.c | 34 +++++++-- include/asm-arm/arch-at91/at91_common.h | 2 + 13 files changed, 355 insertions(+), 103 deletions(-) create mode 100644 cpu/arm926ejs/at91/at91cap9_spi.c create mode 100644 cpu/arm926ejs/at91/at91sam9260_spi.c create mode 100644 cpu/arm926ejs/at91/at91sam9261_spi.c create mode 100644 cpu/arm926ejs/at91/at91sam9263_spi.c copy include/asm-arm/arch-at91/at91_common.h => cpu/arm926ejs/at91/at91sam9rl_spi.c (56%)
board/afeb9260/afeb9260.c +1 -14
@@ -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
board/atmel/at91cap9adk/at91cap9adk.c +1 -15
@@ -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 ();
board/atmel/at91sam9260ek/at91sam9260ek.c +1 -16
@@ -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 ();
board/atmel/at91sam9261ek/at91sam9261ek.c +1 -15
@@ -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 ();
board/atmel/at91sam9263ek/at91sam9263ek.c +2 -15
@@ -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 ();
board/atmel/at91sam9rlek/at91sam9rlek.c +1 -15
@@ -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 ();
cpu/arm926ejs/at91/Makefile +20 -5
@@ -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
cpu/arm926ejs/at91/at91cap9_spi.c new file +75 -0
75 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9260_spi.c new file +75 -0
75 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9261_spi.c new file +75 -0
75 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9263_spi.c new file +75 -0
75 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9rl_spi.c renamed from include/asm-arm/arch-at91/at91_common.h +26 -8
@@ -22,13 +22,31 @@* MA 02111-1307 USA */ -#ifndef AT91_COMMON_H -#define AT91_COMMON_H +#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_serial_hw_init (void ); -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) +{ +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 */ -#endif /* AT91_COMMON_H */ +/* 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 ); + } +}
include/asm-arm/arch-at91/at91_common.h +2 -0
@@ -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 */
Signature · 1 line
1.5.6.5
PATCH 3/7 at91sam9/at91cap: move common led management to cpu
---
board/atmel/at91cap9adk/led.c | 46 +++-----------------
board/atmel/at91sam9260ek/led.c | 31 ++-----------
board/atmel/at91sam9261ek/led.c | 47 +++-----------------
board/atmel/at91sam9263ek/led.c | 46 +++-----------------
board/atmel/at91sam9rlek/led.c | 46 +++-----------------
cpu/arm926ejs/at91/Makefile | 1 +
.../at91sam9260ek => cpu/arm926ejs/at91}/led.c | 32 +++++++-------
include/configs/at91cap9adk.h | 6 +++
include/configs/at91sam9260ek.h | 5 ++
include/configs/at91sam9261ek.h | 6 +++
include/configs/at91sam9263ek.h | 6 +++
include/configs/at91sam9rlek.h | 6 +++
12 files changed, 74 insertions(+), 204 deletions(-)
copy {board/atmel/at91sam9260ek => cpu/arm926ejs/at91}/led.c (67%)board/atmel/at91cap9adk/led.c +6 -40
@@ -28,50 +28,16 @@#include <asm/arch/gpio.h> #include <asm/arch/io.h> -#define RED_LED AT91_PIN_PC29/* this is the power led */ -#define GREEN_LED AT91_PIN_PA10/* this is the user1 led */ -#define YELLOW_LED AT91_PIN_PA11/* this is the user1 led */ - -void red_LED_on (void ) -{ -at91_set_gpio_value (RED_LED ,1 ); -} - -void red_LED_off (void ) -{ -at91_set_gpio_value (RED_LED ,0 ); -} - -void green_LED_on (void ) -{ -at91_set_gpio_value (GREEN_LED ,0 ); -} - -void green_LED_off (void ) -{ -at91_set_gpio_value (GREEN_LED ,1 ); -} - -void yellow_LED_on (void ) -{ -at91_set_gpio_value (YELLOW_LED ,0 ); -} - -void yellow_LED_off (void ) -{ -at91_set_gpio_value (YELLOW_LED ,1 ); -} -void coloured_LED_init (void ) {/* Enable clock */ at91_sys_write (AT91_PMC_PCER ,1 <<AT91CAP9_ID_PIOABCD ); -at91_set_gpio_output (RED_LED ,1 ); -at91_set_gpio_output (GREEN_LED ,1 ); -at91_set_gpio_output (YELLOW_LED ,1 ); +at91_set_gpio_output (CONFIG_RED_LED ,1 ); +at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); +at91_set_gpio_output (CONFIG_YELLOW_LED ,1 ); -at91_set_gpio_output (RED_LED ,0 ); -at91_set_gpio_output (GREEN_LED ,1 ); -at91_set_gpio_output (YELLOW_LED ,1 ); +at91_set_gpio_output (CONFIG_RED_LED ,0 ); +at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); +at91_set_gpio_output (CONFIG_YELLOW_LED ,1 ); }
board/atmel/at91sam9260ek/led.c +4 -27
@@ -28,37 +28,14 @@#include <asm/arch/gpio.h> #include <asm/arch/io.h> -#define RED_LED AT91_PIN_PA9/* this is the power led */ -#define GREEN_LED AT91_PIN_PA6/* this is the user led */ - -void red_LED_on (void ) -{ -at91_set_gpio_value (RED_LED ,1 ); -} - -void red_LED_off (void ) -{ -at91_set_gpio_value (RED_LED ,0 ); -} - -void green_LED_on (void ) -{ -at91_set_gpio_value (GREEN_LED ,0 ); -} - -void green_LED_off (void ) -{ -at91_set_gpio_value (GREEN_LED ,1 ); -} -void coloured_LED_init (void ) {/* Enable clock */ at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_PIOA ); -at91_set_gpio_output (RED_LED ,1 ); -at91_set_gpio_output (GREEN_LED ,1 ); +at91_set_gpio_output (CONFIG_RED_LED ,1 ); +at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_value (RED_LED ,0 ); -at91_set_gpio_value (GREEN_LED ,1 ); +at91_set_gpio_value (CONFIG_RED_LED ,0 ); +at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); }
board/atmel/at91sam9261ek/led.c +6 -41
57 lines not on this page · raw message
board/atmel/at91sam9263ek/led.c +6 -40
57 lines not on this page · raw message
board/atmel/at91sam9rlek/led.c +6 -40
56 lines not on this page · raw message
cpu/arm926ejs/at91/Makefile +1 -0
@@ -45,6 +45,7 @@ ifdef CONFIG_AT91SAM9RL COBJS-y += at91sam9rl_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9rl_spi.o endif +COBJS-$(CONFIG_AT91_LED) += led.o COBJS-$(CONFIG_HAS_DATAFLASH) += spi.o COBJS-y += timer.o COBJS-y += usb.o
cpu/arm926ejs/at91/led.c renamed from board/atmel/at91sam9260ek/led.c +16 -16
@@ -23,42 +23,42 @@*/ #include <common.h> -#include <asm/arch/at91sam9260.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/gpio.h> #include <asm/arch/io.h> -#define RED_LED AT91_PIN_PA9/* this is the power led */ -#define GREEN_LED AT91_PIN_PA6/* this is the user led */ - +#ifdef CONFIG_RED_LED void red_LED_on (void ) { -at91_set_gpio_value (RED_LED ,1 ); +at91_set_gpio_value (CONFIG_RED_LED ,1 ); }void red_LED_off (void ) { -at91_set_gpio_value (RED_LED ,0 ); +at91_set_gpio_value (CONFIG_RED_LED ,0 ); } +#endif +#ifdef CONFIG_GREEN_LED void green_LED_on (void ) { -at91_set_gpio_value (GREEN_LED ,0 ); +at91_set_gpio_value (CONFIG_GREEN_LED ,0 ); }void green_LED_off (void ) { -at91_set_gpio_value (GREEN_LED ,1 ); +at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); } +#endif -void coloured_LED_init (void ) +#ifdef CONFIG_YELLOW_LED +void yellow_LED_on (void ) { -/* Enable clock */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_PIOA ); - -at91_set_gpio_output (RED_LED ,1 ); -at91_set_gpio_output (GREEN_LED ,1 ); +at91_set_gpio_value (CONFIG_YELLOW_LED ,0 ); +} -at91_set_gpio_value (RED_LED ,0 ); -at91_set_gpio_value (GREEN_LED ,1 ); +void yellow_LED_off (void ) +{ +at91_set_gpio_value (CONFIG_YELLOW_LED ,1 ); } +#endif
include/configs/at91cap9adk.h +6 -0
@@ -70,6 +70,12 @@#define CONFIG_ATMEL_LCD_BGR555 1#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 +/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PC29/* this is the power led */ +#define CONFIG_GREEN_LED AT91_PIN_PA10/* this is the user1 led */ +#define CONFIG_YELLOW_LED AT91_PIN_PA11/* this is the user1 led */ +#define CONFIG_BOOTDELAY 3/*
include/configs/at91sam9260ek.h +5 -0
@@ -58,6 +58,11 @@#undef CONFIG_USART2#define CONFIG_USART3 1/* USART 3 is DBGU */ +/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PA9/* this is the power led */ +#define CONFIG_GREEN_LED AT91_PIN_PA6/* this is the user led */ +#define CONFIG_BOOTDELAY 3/*
include/configs/at91sam9261ek.h +6 -0
@@ -69,6 +69,12 @@#define CONFIG_ATMEL_LCD_BGR555 1#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 +/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PA23/* this is the power led */ +#define CONFIG_GREEN_LED AT91_PIN_PA13/* this is the user1 led */ +#define CONFIG_YELLOW_LED AT91_PIN_PA14/* this is the user2 led */ +#define CONFIG_BOOTDELAY 3/*
include/configs/at91sam9263ek.h +6 -0
@@ -70,6 +70,12 @@#define CONFIG_ATMEL_LCD_BGR555 1#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 +/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PB7/* this is the power led */ +#define CONFIG_GREEN_LED AT91_PIN_PB8/* this is the user1 led */ +#define CONFIG_YELLOW_LED AT91_PIN_PC29/* this is the user2 led */ +#define CONFIG_BOOTDELAY 3/*
include/configs/at91sam9rlek.h +6 -0
@@ -69,6 +69,12 @@#define CONFIG_ATMEL_LCD_RGB565 1#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 +/* LED */ +#define CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PD14/* this is the power led */ +#define CONFIG_GREEN_LED AT91_PIN_PD15/* this is the user1 led */ +#define CONFIG_YELLOW_LED AT91_PIN_PD16/* this is the user2 led */ +#define CONFIG_BOOTDELAY 3/*
Signature · 1 line
1.5.6.5
PATCH 4/7 at91sam9/at91cap: move common usb host initialisation to cpu
--- board/atmel/at91sam9263ek/at91sam9263ek.c | 11 +--------- cpu/arm926ejs/at91/Makefile | 1 + .../arm926ejs/at91/at91sam9263_usb.c | 21 +++++++++---------- include/asm-arm/arch-at91/at91_common.h | 1 + 4 files changed, 13 insertions(+), 21 deletions(-) copy include/asm-arm/arch-at91/at91_common.h => cpu/arm926ejs/at91/at91sam9263_usb.c (73%)
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -10
@@ -154,15 +154,6 @@ static void at91sam9263ek_macb_hw_init(void) }#endif -#ifdef CONFIG_USB_OHCI_NEW -static void at91sam9263ek_uhp_hw_init (void ) -{ -/* Enable VBus on UHP ports */ -at91_set_gpio_output (AT91_PIN_PA21 ,0 ); -at91_set_gpio_output (AT91_PIN_PA24 ,0 ); -} -#endif -#ifdef CONFIG_LCD vidinfo_t panel_info = { vl_col: 240,
@@ -273,7 +264,7 @@ int board_init(void)at91sam9263ek_macb_hw_init ();#endif #ifdef CONFIG_USB_OHCI_NEW -at91sam9263ek_uhp_hw_init (); +at91_uhp_hw_init ();#endif #ifdef CONFIG_LCD at91sam9263ek_lcd_hw_init ();
cpu/arm926ejs/at91/Makefile +1 -0
@@ -40,6 +40,7 @@ endif ifdef CONFIG_AT91SAM9263 COBJS-y += at91sam9263_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9263_spi.o +COBJS-$(CONFIG_USB_OHCI_NEW) += at91sam9263_usb.o endif ifdef CONFIG_AT91SAM9RL COBJS-y += at91sam9rl_serial.o
cpu/arm926ejs/at91/at91sam9263_usb.c renamed from include/asm-arm/arch-at91/at91_common.h +10 -11
@@ -22,15 +22,14 @@* MA 02111-1307 USA */ -#ifndef AT91_COMMON_H -#define AT91_COMMON_H +#include <common.h> +#include <asm/arch/at91_common.h> +#include <asm/arch/gpio.h> +#include <asm/arch/io.h> -void at91_serial_hw_init (void ); -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 */ +void at91_uhp_hw_init (void ) +{ +/* Enable VBus on UHP ports */ +at91_set_gpio_output (AT91_PIN_PA21 ,0 ); +at91_set_gpio_output (AT91_PIN_PA24 ,0 ); +}
include/asm-arm/arch-at91/at91_common.h +1 -0
@@ -32,5 +32,6 @@ 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); +void at91_uhp_hw_init (void );#endif /* AT91_COMMON_H */
Signature · 1 line
1.5.6.5
PATCH 5/7 at91sam9/at91cap: move common macb initialisation to cpu
--- board/afeb9260/afeb9260.c | 23 +---------- board/atmel/at91cap9adk/at91cap9adk.c | 23 +---------- board/atmel/at91sam9260ek/at91sam9260ek.c | 32 +-------------- board/atmel/at91sam9263ek/at91sam9263ek.c | 23 +---------- cpu/arm926ejs/at91/Makefile | 3 + cpu/arm926ejs/at91/at91cap9_macb.c | 54 ++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9260_macb.c | 63 +++++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9263_macb.c | 54 ++++++++++++++++++++++++ include/asm-arm/arch-at91/at91_common.h | 1 + 9 files changed, 180 insertions(+), 96 deletions(-) create mode 100644 cpu/arm926ejs/at91/at91cap9_macb.c create mode 100644 cpu/arm926ejs/at91/at91sam9260_macb.c create mode 100644 cpu/arm926ejs/at91/at91sam9263_macb.c
board/afeb9260/afeb9260.c +1 -22
@@ -127,28 +127,7 @@ static void afeb9260_macb_hw_init(void)pin_to_mask (AT91_PIN_PA28 ), pin_to_controller(AT91_PIN_PA0) + PIO_PUER); -at91_set_A_periph (AT91_PIN_PA19 ,0 );/* ETXCK_EREFCK */ -at91_set_A_periph (AT91_PIN_PA17 ,0 );/* ERXDV */ -at91_set_A_periph (AT91_PIN_PA14 ,0 );/* ERX0 */ -at91_set_A_periph (AT91_PIN_PA15 ,0 );/* ERX1 */ -at91_set_A_periph (AT91_PIN_PA18 ,0 );/* ERXER */ -at91_set_A_periph (AT91_PIN_PA16 ,0 );/* ETXEN */ -at91_set_A_periph (AT91_PIN_PA12 ,0 );/* ETX0 */ -at91_set_A_periph (AT91_PIN_PA13 ,0 );/* ETX1 */ -at91_set_A_periph (AT91_PIN_PA21 ,0 );/* EMDIO */ -at91_set_A_periph (AT91_PIN_PA20 ,0 );/* EMDC */ - -#ifndef CONFIG_RMII -at91_set_B_periph (AT91_PIN_PA28 ,0 );/* ECRS */ -at91_set_B_periph (AT91_PIN_PA29 ,0 );/* ECOL */ -at91_set_B_periph (AT91_PIN_PA25 ,0 );/* ERX2 */ -at91_set_B_periph (AT91_PIN_PA26 ,0 );/* ERX3 */ -at91_set_B_periph (AT91_PIN_PA27 ,0 );/* ERXCK */ -at91_set_B_periph (AT91_PIN_PA10 ,0 );/* ETX2 */ -at91_set_B_periph (AT91_PIN_PA11 ,0 );/* ETX3 */ -at91_set_B_periph (AT91_PIN_PA22 ,0 );/* ETXER */ -#endif - + at91_macb_hw_init(); }#endif
board/atmel/at91cap9adk/at91cap9adk.c +2 -21
@@ -177,27 +177,8 @@ static void at91cap9_macb_hw_init(void)pin_to_mask (AT91_PIN_PB26 ), pin_to_controller(AT91_PIN_PA0) + PIO_PUER); -at91_set_A_periph (AT91_PIN_PB21 ,0 );/* ETXCK_EREFCK */ -at91_set_A_periph (AT91_PIN_PB22 ,0 );/* ERXDV */ -at91_set_A_periph (AT91_PIN_PB25 ,0 );/* ERX0 */ -at91_set_A_periph (AT91_PIN_PB26 ,0 );/* ERX1 */ -at91_set_A_periph (AT91_PIN_PB27 ,0 );/* ERXER */ -at91_set_A_periph (AT91_PIN_PB28 ,0 );/* ETXEN */ -at91_set_A_periph (AT91_PIN_PB23 ,0 );/* ETX0 */ -at91_set_A_periph (AT91_PIN_PB24 ,0 );/* ETX1 */ -at91_set_A_periph (AT91_PIN_PB30 ,0 );/* EMDIO */ -at91_set_A_periph (AT91_PIN_PB29 ,0 );/* EMDC */ - -#ifndef CONFIG_RMII -at91_set_B_periph (AT91_PIN_PC25 ,0 );/* ECRS */ -at91_set_B_periph (AT91_PIN_PC26 ,0 );/* ECOL */ -at91_set_B_periph (AT91_PIN_PC22 ,0 );/* ERX2 */ -at91_set_B_periph (AT91_PIN_PC23 ,0 );/* ERX3 */ -at91_set_B_periph (AT91_PIN_PC27 ,0 );/* ERXCK */ -at91_set_B_periph (AT91_PIN_PC20 ,0 );/* ETX2 */ -at91_set_B_periph (AT91_PIN_PC21 ,0 );/* ETX3 */ -at91_set_B_periph (AT91_PIN_PC24 ,0 );/* ETXER */ -#endif +at91_macb_hw_init (); +/* Unlock EMAC, 3 0 2 1 sequence */ #define MP_MAC_KEY0 0x5969cb2a#define MP_MAC_KEY1 0xb4a1872e
board/atmel/at91sam9260ek/at91sam9260ek.c +1 -31
@@ -132,37 +132,7 @@ static void at91sam9260ek_macb_hw_init(void)pin_to_mask (AT91_PIN_PA28 ), pin_to_controller(AT91_PIN_PA0) + PIO_PUER); -at91_set_A_periph (AT91_PIN_PA19 ,0 );/* ETXCK_EREFCK */ -at91_set_A_periph (AT91_PIN_PA17 ,0 );/* ERXDV */ -at91_set_A_periph (AT91_PIN_PA14 ,0 );/* ERX0 */ -at91_set_A_periph (AT91_PIN_PA15 ,0 );/* ERX1 */ -at91_set_A_periph (AT91_PIN_PA18 ,0 );/* ERXER */ -at91_set_A_periph (AT91_PIN_PA16 ,0 );/* ETXEN */ -at91_set_A_periph (AT91_PIN_PA12 ,0 );/* ETX0 */ -at91_set_A_periph (AT91_PIN_PA13 ,0 );/* ETX1 */ -at91_set_A_periph (AT91_PIN_PA21 ,0 );/* EMDIO */ -at91_set_A_periph (AT91_PIN_PA20 ,0 );/* EMDC */ - -#ifndef CONFIG_RMII -at91_set_B_periph (AT91_PIN_PA28 ,0 );/* ECRS */ -at91_set_B_periph (AT91_PIN_PA29 ,0 );/* ECOL */ -at91_set_B_periph (AT91_PIN_PA25 ,0 );/* ERX2 */ -at91_set_B_periph (AT91_PIN_PA26 ,0 );/* ERX3 */ -at91_set_B_periph (AT91_PIN_PA27 ,0 );/* ERXCK */ -#if defined(CONFIG_AT91SAM9260EK ) -/* -* use PA10, PA11 for ETX2, ETX3. -* PA23 and PA24 are for TWI EEPROM -*/ -at91_set_B_periph (AT91_PIN_PA10 ,0 );/* ETX2 */ -at91_set_B_periph (AT91_PIN_PA11 ,0 );/* ETX3 */ -#else -at91_set_B_periph (AT91_PIN_PA23 ,0 );/* ETX2 */ -at91_set_B_periph (AT91_PIN_PA24 ,0 );/* ETX3 */ -#endif -at91_set_B_periph (AT91_PIN_PA22 ,0 );/* ETXER */ -#endif - + at91_macb_hw_init(); }#endif
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -22
@@ -129,28 +129,7 @@ static void at91sam9263ek_macb_hw_init(void)pin_to_mask (AT91_PIN_PE26 ), pin_to_controller(AT91_PIN_PE0) + PIO_PUER); -at91_set_A_periph (AT91_PIN_PE21 ,0 );/* ETXCK_EREFCK */ -at91_set_B_periph (AT91_PIN_PC25 ,0 );/* ERXDV */ -at91_set_A_periph (AT91_PIN_PE25 ,0 );/* ERX0 */ -at91_set_A_periph (AT91_PIN_PE26 ,0 );/* ERX1 */ -at91_set_A_periph (AT91_PIN_PE27 ,0 );/* ERXER */ -at91_set_A_periph (AT91_PIN_PE28 ,0 );/* ETXEN */ -at91_set_A_periph (AT91_PIN_PE23 ,0 );/* ETX0 */ -at91_set_A_periph (AT91_PIN_PE24 ,0 );/* ETX1 */ -at91_set_A_periph (AT91_PIN_PE30 ,0 );/* EMDIO */ -at91_set_A_periph (AT91_PIN_PE29 ,0 );/* EMDC */ - -#ifndef CONFIG_RMII -at91_set_A_periph (AT91_PIN_PE22 ,0 );/* ECRS */ -at91_set_B_periph (AT91_PIN_PC26 ,0 );/* ECOL */ -at91_set_B_periph (AT91_PIN_PC22 ,0 );/* ERX2 */ -at91_set_B_periph (AT91_PIN_PC23 ,0 );/* ERX3 */ -at91_set_B_periph (AT91_PIN_PC27 ,0 );/* ERXCK */ -at91_set_B_periph (AT91_PIN_PC20 ,0 );/* ETX2 */ -at91_set_B_periph (AT91_PIN_PC21 ,0 );/* ETX3 */ -at91_set_B_periph (AT91_PIN_PC24 ,0 );/* ETXER */ -#endif - + at91_macb_hw_init(); }#endif
cpu/arm926ejs/at91/Makefile +3 -0
@@ -26,10 +26,12 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a ifdef CONFIG_AT91CAP9 +COBJS-$(CONFIG_MACB) += at91cap9_macb.o COBJS-y += at91cap9_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91cap9_spi.o endif ifdef CONFIG_AT91SAM9260 +COBJS-$(CONFIG_MACB) += at91sam9260_macb.o COBJS-y += at91sam9260_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9260_spi.o endif
@@ -38,6 +40,7 @@ COBJS-y += at91sam9261_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9261_spi.o endif ifdef CONFIG_AT91SAM9263 +COBJS-$(CONFIG_MACB) += at91sam9263_macb.o COBJS-y += at91sam9263_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9263_spi.o COBJS-$(CONFIG_USB_OHCI_NEW) += at91sam9263_usb.o
cpu/arm926ejs/at91/at91cap9_macb.c new file +54 -0
54 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9260_macb.c new file +63 -0
63 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9263_macb.c new file +54 -0
54 lines not on this page · raw message
include/asm-arm/arch-at91/at91_common.h +1 -0
@@ -25,6 +25,7 @@#ifndef AT91_COMMON_H #define AT91_COMMON_H +void at91_macb_hw_init (void );void at91_serial_hw_init (void );void at91_serial0_hw_init (void );void at91_serial1_hw_init (void );
Signature · 1 line
1.5.6.5
PATCH 6/7 atmel/at91/boards: compile dataflash partition only when dataflash is
--- board/atmel/at91cap9adk/Makefile | 2 +- board/atmel/at91sam9260ek/Makefile | 2 +- board/atmel/at91sam9261ek/Makefile | 2 +- board/atmel/at91sam9263ek/Makefile | 2 +- board/atmel/at91sam9rlek/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
board/atmel/at91cap9adk/Makefile +1 -1
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91cap9adk.o COBJS-y += led.o -COBJS-y += partition.o +COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
board/atmel/at91sam9260ek/Makefile +1 -1
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9260ek.o COBJS-y += led.o -COBJS-y += partition.o +COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
board/atmel/at91sam9261ek/Makefile +1 -1
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9261ek.o COBJS-y += led.o -COBJS-y += partition.o +COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
board/atmel/at91sam9263ek/Makefile +1 -1
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9263ek.o COBJS-y += led.o -COBJS-y += partition.o +COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
board/atmel/at91sam9rlek/Makefile +1 -1
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9rlek.o COBJS-y += led.o -COBJS-y += partition.o +COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
Signature · 1 line
1.5.6.5
PATCH 7/7 at91sam9/at91cap: move nand drivers to drivers/mtd/nand
--- board/afeb9260/Makefile | 1 - board/afeb9260/afeb9260.c | 4 +- board/afeb9260/nand.c | 78 -------------------- board/atmel/at91cap9adk/Makefile | 1 - board/atmel/at91cap9adk/at91cap9adk.c | 2 +- board/atmel/at91cap9adk/nand.c | 72 ------------------ board/atmel/at91sam9260ek/Makefile | 1 - board/atmel/at91sam9260ek/at91sam9260ek.c | 4 +- board/atmel/at91sam9261ek/Makefile | 1 - board/atmel/at91sam9261ek/at91sam9261ek.c | 4 +- board/atmel/at91sam9261ek/nand.c | 78 -------------------- board/atmel/at91sam9263ek/Makefile | 1 - board/atmel/at91sam9263ek/at91sam9263ek.c | 4 +- board/atmel/at91sam9263ek/nand.c | 78 -------------------- board/atmel/at91sam9rlek/Makefile | 1 - board/atmel/at91sam9rlek/at91sam9rlek.c | 4 +- board/atmel/at91sam9rlek/nand.c | 78 -------------------- drivers/mtd/nand/Makefile | 1 + .../nand.c => drivers/mtd/nand/atmel_nand.c | 32 ++++---- include/configs/afeb9260.h | 9 ++ include/configs/at91cap9adk.h | 8 ++ include/configs/at91sam9260ek.h | 9 ++ include/configs/at91sam9261ek.h | 9 ++ include/configs/at91sam9263ek.h | 9 ++ include/configs/at91sam9rlek.h | 9 ++ 25 files changed, 81 insertions(+), 417 deletions(-) delete mode 100644 board/afeb9260/nand.c delete mode 100644 board/atmel/at91cap9adk/nand.c delete mode 100644 board/atmel/at91sam9261ek/nand.c delete mode 100644 board/atmel/at91sam9263ek/nand.c delete mode 100644 board/atmel/at91sam9rlek/nand.c rename board/atmel/at91sam9260ek/nand.c => drivers/mtd/nand/atmel_nand.c (72%)
board/afeb9260/Makefile +0 -1
@@ -31,7 +31,6 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += afeb9260.o COBJS-y += partition.o -COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/afeb9260/afeb9260.c +2 -2
@@ -72,10 +72,10 @@ static void afeb9260_nand_hw_init(void)at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_PIOC );/* Configure RDY/BSY */ -at91_set_gpio_input (AT91_PIN_PC13 ,1 ); +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 );/* Enable NandFlash */ -at91_set_gpio_output (AT91_PIN_PC14 ,1 ); +at91_set_gpio_output (CONFIG_SYS_NAND_ENABLE_PIN ,1 ); }#ifdef CONFIG_MACB
board/afeb9260/nand.c deleted +0 -78
78 lines not on this page · raw message
board/atmel/at91cap9adk/Makefile +0 -1
@@ -32,7 +32,6 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91cap9adk.o COBJS-y += led.o COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o -COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/atmel/at91cap9adk/at91cap9adk.c +1 -1
@@ -133,7 +133,7 @@ static void at91cap9_nand_hw_init(void)/* RDY/BSY is not connected */ /* Enable NandFlash */ - at91_set_gpio_output(AT91_PIN_PD15, 1); + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); }#endif
board/atmel/at91cap9adk/nand.c deleted +0 -72
72 lines not on this page · raw message
board/atmel/at91sam9260ek/Makefile +0 -1
@@ -32,7 +32,6 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9260ek.o COBJS-y += led.o COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o -COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/atmel/at91sam9260ek/at91sam9260ek.c +2 -2
@@ -76,10 +76,10 @@ static void at91sam9260ek_nand_hw_init(void)at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_PIOC );/* Configure RDY/BSY */ -at91_set_gpio_input (AT91_PIN_PC13 ,1 ); +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 );/* Enable NandFlash */ - at91_set_gpio_output(AT91_PIN_PC14, 1); + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); }#endif
board/atmel/at91sam9261ek/Makefile +0 -1
@@ -32,7 +32,6 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9261ek.o COBJS-y += led.o COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o -COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/atmel/at91sam9261ek/at91sam9261ek.c +2 -2
@@ -76,10 +76,10 @@ static void at91sam9261ek_nand_hw_init(void)at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9261_ID_PIOC );/* Configure RDY/BSY */ -at91_set_gpio_input (AT91_PIN_PC15 ,1 ); +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 );/* Enable NandFlash */ -at91_set_gpio_output (AT91_PIN_PC14 ,1 ); +at91_set_gpio_output (CONFIG_SYS_NAND_ENABLE_PIN ,1 );at91_set_A_periph (AT91_PIN_PC0 ,0 );/* NANDOE */ at91_set_A_periph (AT91_PIN_PC1 ,0 );/* NANDWE */
board/atmel/at91sam9261ek/nand.c deleted +0 -78
78 lines not on this page · raw message
board/atmel/at91sam9263ek/Makefile +0 -1
@@ -32,7 +32,6 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9263ek.o COBJS-y += led.o COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o -COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/atmel/at91sam9263ek/at91sam9263ek.c +2 -2
@@ -80,10 +80,10 @@ static void at91sam9263ek_nand_hw_init(void) 1 << AT91SAM9263_ID_PIOCDE);/* Configure RDY/BSY */ -at91_set_gpio_input (AT91_PIN_PA22 ,1 ); +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 );/* Enable NandFlash */ - at91_set_gpio_output(AT91_PIN_PD15, 1); + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); }#endif
board/atmel/at91sam9263ek/nand.c deleted +0 -78
78 lines not on this page · raw message
board/atmel/at91sam9rlek/Makefile +0 -1
@@ -32,7 +32,6 @@ LIB = $(obj)lib$(BOARD).a COBJS-y += at91sam9rlek.o COBJS-y += led.o COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o -COBJS-$(CONFIG_CMD_NAND) += nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/atmel/at91sam9rlek/at91sam9rlek.c +2 -2
@@ -76,10 +76,10 @@ static void at91sam9rlek_nand_hw_init(void)at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9RL_ID_PIOD );/* Configure RDY/BSY */ -at91_set_gpio_input (AT91_PIN_PD17 ,1 ); +at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 );/* Enable NandFlash */ -at91_set_gpio_output (AT91_PIN_PB6 ,1 ); +at91_set_gpio_output (CONFIG_SYS_NAND_ENABLE_PIN ,1 );at91_set_A_periph (AT91_PIN_PB4 ,0 );/* NANDOE */ at91_set_A_periph (AT91_PIN_PB5 ,0 );/* NANDWE */
board/atmel/at91sam9rlek/nand.c deleted +0 -78
78 lines not on this page · raw message
drivers/mtd/nand/Makefile +1 -0
@@ -35,6 +35,7 @@ COBJS-y += nand_ids.o COBJS-y += nand_util.o endif +COBJS-$(CONFIG_NAND_ATMEL) += atmel_nand.o COBJS-$(CONFIG_DRIVER_NAND_BFIN) += bfin_nand.o COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
drivers/mtd/nand/atmel_nand.c renamed from board/atmel/at91sam9260ek/nand.c +16 -16
@@ -25,33 +25,29 @@*/ #include <common.h> -#include <asm/arch/at91sam9260.h> +#include <asm/arch/hardware.h> #include <asm/arch/gpio.h> #include <asm/arch/at91_pio.h> #include <nand.h> -/* -* hardware specific access to control-lines -*/ -#define MASK_ALE (1 << 21)/* our ALE is AD21 */ -#define MASK_CLE (1 << 22)/* our CLE is AD22 */ - -static void at91sam9260ek_nand_hwcontrol (struct mtd_info *mtd, +static void at91_nand_hwcontrol (struct mtd_info *mtd,int cmd,unsigned int ctrl) {struct nand_chip *this = mtd->priv;if (ctrl &NAND_CTRL_CHANGE ) {ulong IO_ADDR_W = (ulong ) this->IO_ADDR_W; -IO_ADDR_W &= ~(MASK_ALE |MASK_CLE ); +IO_ADDR_W &= ~(CONFIG_SYS_NAND_MASK_ALE + |CONFIG_SYS_NAND_MASK_CLE );if (ctrl &NAND_CLE ) -IO_ADDR_W |=MASK_CLE ; +IO_ADDR_W |=CONFIG_SYS_NAND_MASK_CLE ;if (ctrl &NAND_ALE ) -IO_ADDR_W |=MASK_ALE ; +IO_ADDR_W |=CONFIG_SYS_NAND_MASK_ALE ; -at91_set_gpio_value (AT91_PIN_PC14 , !(ctrl &NAND_NCE )); +at91_set_gpio_value (CONFIG_SYS_NAND_ENABLE_PIN , + !(ctrl &NAND_NCE )); this->IO_ADDR_W = (void *)IO_ADDR_W ; }
@@ -59,10 +55,12 @@ static void at91sam9260ek_nand_hwcontrol(struct mtd_info *mtd,writeb (cmd, this->IO_ADDR_W); } -static int at91sam9260ek_nand_ready (struct mtd_info *mtd) +#ifdef CONFIG_SYS_NAND_READY_PIN +static int at91_nand_ready (struct mtd_info *mtd) { -return at91_get_gpio_value (AT91_PIN_PC13 ); +return at91_get_gpio_value (CONFIG_SYS_NAND_READY_PIN ); } +#endif int board_nand_init (struct nand_chip *nand) {
@@ -70,8 +68,10 @@ int board_nand_init(struct nand_chip *nand)#ifdef CONFIG_SYS_NAND_DBW_16 nand->options =NAND_BUSWIDTH_16 ;#endif - nand->cmd_ctrl = at91sam9260ek_nand_hwcontrol; - nand->dev_ready = at91sam9260ek_nand_ready; + nand->cmd_ctrl = at91_nand_hwcontrol; +#ifdef CONFIG_SYS_NAND_READY_PIN + nand->dev_ready = at91_nand_ready; +#endif nand->chip_delay =20 ;return 0 ;
include/configs/afeb9260.h +9 -0
@@ -97,9 +97,18 @@#define DATAFLASH_TCHS (0x1 << 24)/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_DBW_8 1 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#endif /* NOR flash - no real flash on this board */ #define CONFIG_SYS_NO_FLASH 1
include/configs/at91cap9adk.h +8 -0
@@ -122,8 +122,16 @@#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1#define CONFIG_SYS_MAX_FLASH_SECT 256#define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15 +#endif /* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_DBW_8 1
include/configs/at91sam9260ek.h +9 -0
@@ -105,9 +105,18 @@#define DATAFLASH_TCHS (0x1 << 24)/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_DBW_8 1 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#endif /* NOR flash - no real flash on this board */ #define CONFIG_SYS_NO_FLASH 1
include/configs/at91sam9261ek.h +9 -0
@@ -117,9 +117,18 @@#define DATAFLASH_TCHS (0x1 << 24)/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_DBW_8 1 +/* our ALE is AD22 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 22) +/* our CLE is AD21 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 21) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC15 +#endif /* NOR flash - no real flash on this board */ #define CONFIG_SYS_NO_FLASH 1
include/configs/at91sam9263ek.h +9 -0
@@ -129,9 +129,18 @@#endif /* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_DBW_8 1 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22 +#endif /* Ethernet */ #define CONFIG_MACB 1
include/configs/at91sam9rlek.h +9 -0
@@ -110,9 +110,18 @@#define CONFIG_SYS_NO_FLASH 1/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_DBW_8 1 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PB6 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD17 +#endif /* Ethernet - not present */
Signature · 1 line
1.5.6.5