From 86edb5af82ccb57e489a18376781698926b4f069 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Sat, 31 Mar 2012 14:02:22 +0800 Subject: SAMA5: Add SAMA5 support Signed-off-by: Bo Shen [fix conflicts, not use 9X5's mach type code.] Signed-off-by: Josh Wu --- board/atmel/at91sama5ek/Makefile | 49 ++++++ board/atmel/at91sama5ek/at91sama5ek.c | 323 ++++++++++++++++++++++++++++++++++ board/atmel/at91sama5ek/config.mk | 1 + 3 files changed, 373 insertions(+) create mode 100644 board/atmel/at91sama5ek/Makefile create mode 100644 board/atmel/at91sama5ek/at91sama5ek.c create mode 100644 board/atmel/at91sama5ek/config.mk (limited to 'board') diff --git a/board/atmel/at91sama5ek/Makefile b/board/atmel/at91sama5ek/Makefile new file mode 100644 index 00000000000..c9b6185eef9 --- /dev/null +++ b/board/atmel/at91sama5ek/Makefile @@ -0,0 +1,49 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# (C) Copyright 2008 +# Stelian Pop +# Lead Tech Design +# +# 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 $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += at91sama5ek.o +COBJS-$(CONFIG_AT91_LED) += led.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c new file mode 100644 index 00000000000..c35a7cd6d55 --- /dev/null +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -0,0 +1,323 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop + * Lead Tech Design + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) +#include +#endif +#include + +DECLARE_GLOBAL_DATA_PTR; + +/* ------------------------------------------------------------------------- */ +/* + * Miscelaneous platform dependent initialisations + */ + +#ifdef CONFIG_CMD_NAND +void at91sama5ek_nand_hw_init(void) +{ + struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + writel(1 << ATMEL_ID_SMC, &pmc->pcer); + + /* Configure SMC CS3 for NAND/SmartMedia */ + writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(1) | + AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(1), + &smc->cs[3].setup); + writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(5) | + AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(5), + &smc->cs[3].pulse); + writel(AT91_SMC_CYCLE_NWE(8) | AT91_SMC_CYCLE_NRD(8), + &smc->cs[3].cycle); + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | +#ifdef CONFIG_SYS_NAND_DBW_16 + AT91_SMC_MODE_DBW_16 | +#else /* CONFIG_SYS_NAND_DBW_8 */ + AT91_SMC_MODE_DBW_8 | +#endif + AT91_SMC_MODE_TDF_CYCLE(3), + &smc->cs[3].mode); + + writel(1 << ATMEL_ID_PIOE, &pmc->pcer); +} +#endif + +#ifdef CONFIG_CMD_USB +static void at91sama5ek_usb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + writel(1 << ATMEL_ID_PIODE, &pmc->pcer); + + at91_set_gpio_output(AT91_PIN_PD1, 0); + at91_set_gpio_output(AT91_PIN_PD3, 0); +} +#endif + +#ifdef CONFIG_MACB +static void at91sama5ek_macb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + /* Enable clock */ + writel(1 << (ATMEL_ID_EMAC-32), &pmc->pcer1); + + /* And the pins. */ + at91_macb_hw_init(); +} +#endif + +#ifdef CONFIG_GMACB +static void at91sama5ek_gmacb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + /* Enable clock */ + writel(1 << (ATMEL_ID_GMAC-32), &pmc->pcer1); + writel(1 << ATMEL_ID_PIOB, &pmc->pcer); + + /* And the pins. */ + at91_gmacb_hw_init(); +} +#endif + +#ifdef CONFIG_LCD + +vidinfo_t panel_info = { + vl_col: 480, + vl_row: 272, + vl_clk: 9000000, + vl_sync: ATMEL_LCDC_INVLINE_NORMAL | + ATMEL_LCDC_INVFRAME_NORMAL, + vl_bpix: 3, + vl_tft: 1, + vl_hsync_len: 45, + vl_left_margin: 1, + vl_right_margin:1, + vl_vsync_len: 1, + vl_upper_margin:40, + vl_lower_margin:1, + mmio : ATMEL_BASE_LCDC, +}; + + +void lcd_enable(void) +{ + at91_set_A_periph(AT91_PIN_PE6, 1); /* power up */ +} + +void lcd_disable(void) +{ + at91_set_A_periph(AT91_PIN_PE6, 0); /* power down */ +} + +static void at91sama5ek_lcd_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + at91_set_A_periph(AT91_PIN_PE0, 0); /* LCDDPWR */ + at91_set_A_periph(AT91_PIN_PE2, 0); /* LCDCC */ + at91_set_A_periph(AT91_PIN_PE3, 0); /* LCDVSYNC */ + at91_set_A_periph(AT91_PIN_PE4, 0); /* LCDHSYNC */ + at91_set_A_periph(AT91_PIN_PE5, 0); /* LCDDOTCK */ + + at91_set_A_periph(AT91_PIN_PE7, 0); /* LCDD0 */ + at91_set_A_periph(AT91_PIN_PE8, 0); /* LCDD1 */ + at91_set_A_periph(AT91_PIN_PE9, 0); /* LCDD2 */ + at91_set_A_periph(AT91_PIN_PE10, 0); /* LCDD3 */ + at91_set_A_periph(AT91_PIN_PE11, 0); /* LCDD4 */ + at91_set_A_periph(AT91_PIN_PE12, 0); /* LCDD5 */ + at91_set_A_periph(AT91_PIN_PE13, 0); /* LCDD6 */ + at91_set_A_periph(AT91_PIN_PE14, 0); /* LCDD7 */ + at91_set_A_periph(AT91_PIN_PE15, 0); /* LCDD8 */ + at91_set_A_periph(AT91_PIN_PE16, 0); /* LCDD9 */ + at91_set_A_periph(AT91_PIN_PE17, 0); /* LCDD10 */ + at91_set_A_periph(AT91_PIN_PE18, 0); /* LCDD11 */ + at91_set_A_periph(AT91_PIN_PE19, 0); /* LCDD12 */ + at91_set_B_periph(AT91_PIN_PE20, 0); /* LCDD13 */ + at91_set_A_periph(AT91_PIN_PE21, 0); /* LCDD14 */ + at91_set_A_periph(AT91_PIN_PE22, 0); /* LCDD15 */ + at91_set_A_periph(AT91_PIN_PE23, 0); /* LCDD16 */ + at91_set_A_periph(AT91_PIN_PE24, 0); /* LCDD17 */ + at91_set_A_periph(AT91_PIN_PE25, 0); /* LCDD18 */ + at91_set_A_periph(AT91_PIN_PE26, 0); /* LCDD19 */ + at91_set_A_periph(AT91_PIN_PE27, 0); /* LCDD20 */ + at91_set_B_periph(AT91_PIN_PE28, 0); /* LCDD21 */ + at91_set_A_periph(AT91_PIN_PE29, 0); /* LCDD22 */ + at91_set_A_periph(AT91_PIN_PE30, 0); /* LCDD23 */ + + writel(1 << ATMEL_ID_LCDC, &pmc->pcer); + + gd->fb_base = CONFIG_AT91SAMA5_LCD_BASE; +} + +#ifdef CONFIG_LCD_INFO +#include +#include + +void lcd_show_board_info(void) +{ + ulong dram_size, nand_size; + int i; + char temp[32]; + + lcd_printf ("%s\n", U_BOOT_VERSION); + lcd_printf ("(C) 2008 ATMEL Corp\n"); + lcd_printf ("at91support@atmel.com\n"); + lcd_printf ("%s CPU at %s MHz\n", + ATMEL_CPU_NAME, + strmhz(temp, get_cpu_clk_rate())); + + dram_size = 0; + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) + dram_size += gd->bd->bi_dram[i].size; + nand_size = 0; + for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) + nand_size += nand_info[i].size; + lcd_printf (" %ld MB SDRAM, %ld MB NAND\n", + dram_size >> 20, + nand_size >> 20 ); +} +#endif /* CONFIG_LCD_INFO */ +#endif + +int board_early_init_f(void) +{ +#ifdef CONFIG_USART1 + at91_serial1_hw_init(); +#else + at91_seriald_hw_init(); +#endif + return 0; +} + +int board_init(void) +{ + /* Enable Ctrlc */ + console_init_f(); + + /* arch number of AT91SAMA5EK-Board */ +#if defined CONFIG_AT91SAMA5EK + gd->bd->bi_arch_number = MACH_TYPE_AT91SAMA5EK; +#endif + + /* adress of boot parameters */ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + +#ifdef CONFIG_CMD_NAND + at91sama5ek_nand_hw_init(); +#endif +#ifdef CONFIG_CMD_USB + at91sama5ek_usb_hw_init(); +#endif +#ifdef CONFIG_HAS_DATAFLASH + at91_spi0_hw_init(1 << 0); +#endif +#ifdef CONFIG_ATMEL_SPI + at91_spi0_hw_init(1 << 4); +#endif +#ifdef CONFIG_MACB + at91sama5ek_macb_hw_init(); +#endif +#ifdef CONFIG_GMACB + at91sama5ek_gmacb_hw_init(); +#endif +#ifdef CONFIG_LCD + at91sama5ek_lcd_hw_init(); +#endif + return 0; +} + +int dram_init(void) +{ + gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE, + CONFIG_SYS_SDRAM_SIZE); + return 0; +} + +#ifdef CONFIG_RESET_PHY_R +void reset_phy(void) +{ +} +#endif + +int board_eth_init(bd_t *bis) +{ + int rc = 0; +#ifdef CONFIG_MACB + rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00); +#endif +#ifdef CONFIG_GMACB + rc = gmacb_eth_initialize(0, (void *)ATMEL_BASE_GMAC, 0x00); +#endif + return rc; +} + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs < 2; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 1: + at91_set_gpio_output(AT91_PIN_PB18, 0); + break; + case 0: + default: + at91_set_gpio_output(AT91_PIN_PB3, 0); + break; + } +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 1: + at91_set_gpio_output(AT91_PIN_PB18, 1); + break; + case 0: + default: + at91_set_gpio_output(AT91_PIN_PB3, 1); + break; + } +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/board/atmel/at91sama5ek/config.mk b/board/atmel/at91sama5ek/config.mk new file mode 100644 index 00000000000..6589a12a93c --- /dev/null +++ b/board/atmel/at91sama5ek/config.mk @@ -0,0 +1 @@ +CONFIG_SYS_TEXT_BASE = 0x26f00000 -- cgit v1.2.3 From 5b3b45bf97c8030eaa0e6814c2a3840c39789de3 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Sun, 1 Apr 2012 10:54:24 +0800 Subject: USB: Enable USB Host --- board/atmel/at91sama5ek/at91sama5ek.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index c35a7cd6d55..3b68fa017ac 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -80,10 +80,8 @@ static void at91sama5ek_usb_hw_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - writel(1 << ATMEL_ID_PIODE, &pmc->pcer); - - at91_set_gpio_output(AT91_PIN_PD1, 0); - at91_set_gpio_output(AT91_PIN_PD3, 0); + at91_set_pio_output(AT91_PIO_PORTD, 26, 0); + at91_set_pio_output(AT91_PIO_PORTD, 27, 0); } #endif -- cgit v1.2.3 From 921c3ba740ba0fe39f0508d346e533a58f910729 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Sun, 1 Apr 2012 11:45:43 +0800 Subject: USB: remove unused variable --- board/atmel/at91sama5ek/at91sama5ek.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 3b68fa017ac..2e207ca178b 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -78,8 +78,6 @@ void at91sama5ek_nand_hw_init(void) #ifdef CONFIG_CMD_USB static void at91sama5ek_usb_hw_init(void) { - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - at91_set_pio_output(AT91_PIO_PORTD, 26, 0); at91_set_pio_output(AT91_PIO_PORTD, 27, 0); } -- cgit v1.2.3 From c5718f4800734c33ed891b3a720fd749c85fcd75 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Sun, 1 Apr 2012 15:20:21 +0800 Subject: SPI Flash: Enable serial flash --- board/atmel/at91sama5ek/at91sama5ek.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 2e207ca178b..15c053fdd6e 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -239,7 +239,7 @@ int board_init(void) #ifdef CONFIG_CMD_USB at91sama5ek_usb_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH +#ifdef CONFIG_SYS_USE_DATAFLASH at91_spi0_hw_init(1 << 0); #endif #ifdef CONFIG_ATMEL_SPI @@ -288,18 +288,15 @@ int board_eth_init(bd_t *bis) int spi_cs_is_valid(unsigned int bus, unsigned int cs) { - return bus == 0 && cs < 2; + return bus == 0 && cs < 4; } void spi_cs_activate(struct spi_slave *slave) { switch(slave->cs) { - case 1: - at91_set_gpio_output(AT91_PIN_PB18, 0); - break; case 0: default: - at91_set_gpio_output(AT91_PIN_PB3, 0); + at91_set_pio_output(AT91_PIO_PORTD, 13, 0); break; } } @@ -307,12 +304,9 @@ void spi_cs_activate(struct spi_slave *slave) void spi_cs_deactivate(struct spi_slave *slave) { switch(slave->cs) { - case 1: - at91_set_gpio_output(AT91_PIN_PB18, 1); - break; case 0: default: - at91_set_gpio_output(AT91_PIN_PB3, 1); + at91_set_pio_output(AT91_PIO_PORTD, 13, 1); break; } } -- cgit v1.2.3 From 299c204712a83fff2837d964a3c38b1e4946af2e Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Sun, 1 Apr 2012 16:02:30 +0800 Subject: LCD: Enable uboot boot logo --- board/atmel/at91sama5ek/at91sama5ek.c | 89 ++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 44 deletions(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 15c053fdd6e..f95c10e8cc0 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -113,69 +113,70 @@ static void at91sama5ek_gmacb_hw_init(void) #ifdef CONFIG_LCD vidinfo_t panel_info = { - vl_col: 480, - vl_row: 272, - vl_clk: 9000000, + vl_col: 800, + vl_row: 480, + vl_clk: 24000000, vl_sync: ATMEL_LCDC_INVLINE_NORMAL | ATMEL_LCDC_INVFRAME_NORMAL, - vl_bpix: 3, + vl_bpix: LCD_BPP, vl_tft: 1, - vl_hsync_len: 45, - vl_left_margin: 1, - vl_right_margin:1, - vl_vsync_len: 1, - vl_upper_margin:40, - vl_lower_margin:1, + vl_hsync_len: 128, + vl_left_margin: 64, + vl_right_margin:64, + vl_vsync_len: 2, + vl_upper_margin:22, + vl_lower_margin:21, mmio : ATMEL_BASE_LCDC, }; void lcd_enable(void) { - at91_set_A_periph(AT91_PIN_PE6, 1); /* power up */ + at91_set_a_periph(AT91_PIO_PORTA, 29, 1); /* power up */ } void lcd_disable(void) { - at91_set_A_periph(AT91_PIN_PE6, 0); /* power down */ + at91_set_a_periph(AT91_PIO_PORTA, 29, 0); /* power down */ } static void at91sama5ek_lcd_hw_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - at91_set_A_periph(AT91_PIN_PE0, 0); /* LCDDPWR */ - at91_set_A_periph(AT91_PIN_PE2, 0); /* LCDCC */ - at91_set_A_periph(AT91_PIN_PE3, 0); /* LCDVSYNC */ - at91_set_A_periph(AT91_PIN_PE4, 0); /* LCDHSYNC */ - at91_set_A_periph(AT91_PIN_PE5, 0); /* LCDDOTCK */ - - at91_set_A_periph(AT91_PIN_PE7, 0); /* LCDD0 */ - at91_set_A_periph(AT91_PIN_PE8, 0); /* LCDD1 */ - at91_set_A_periph(AT91_PIN_PE9, 0); /* LCDD2 */ - at91_set_A_periph(AT91_PIN_PE10, 0); /* LCDD3 */ - at91_set_A_periph(AT91_PIN_PE11, 0); /* LCDD4 */ - at91_set_A_periph(AT91_PIN_PE12, 0); /* LCDD5 */ - at91_set_A_periph(AT91_PIN_PE13, 0); /* LCDD6 */ - at91_set_A_periph(AT91_PIN_PE14, 0); /* LCDD7 */ - at91_set_A_periph(AT91_PIN_PE15, 0); /* LCDD8 */ - at91_set_A_periph(AT91_PIN_PE16, 0); /* LCDD9 */ - at91_set_A_periph(AT91_PIN_PE17, 0); /* LCDD10 */ - at91_set_A_periph(AT91_PIN_PE18, 0); /* LCDD11 */ - at91_set_A_periph(AT91_PIN_PE19, 0); /* LCDD12 */ - at91_set_B_periph(AT91_PIN_PE20, 0); /* LCDD13 */ - at91_set_A_periph(AT91_PIN_PE21, 0); /* LCDD14 */ - at91_set_A_periph(AT91_PIN_PE22, 0); /* LCDD15 */ - at91_set_A_periph(AT91_PIN_PE23, 0); /* LCDD16 */ - at91_set_A_periph(AT91_PIN_PE24, 0); /* LCDD17 */ - at91_set_A_periph(AT91_PIN_PE25, 0); /* LCDD18 */ - at91_set_A_periph(AT91_PIN_PE26, 0); /* LCDD19 */ - at91_set_A_periph(AT91_PIN_PE27, 0); /* LCDD20 */ - at91_set_B_periph(AT91_PIN_PE28, 0); /* LCDD21 */ - at91_set_A_periph(AT91_PIN_PE29, 0); /* LCDD22 */ - at91_set_A_periph(AT91_PIN_PE30, 0); /* LCDD23 */ - - writel(1 << ATMEL_ID_LCDC, &pmc->pcer); + at91_set_a_periph(AT91_PIO_PORTA, 24, 0); /* LCDPWM */ + at91_set_a_periph(AT91_PIO_PORTA, 25, 0); /* LCDDISP */ + at91_set_a_periph(AT91_PIO_PORTA, 26, 0); /* LCDVSYNC */ + at91_set_a_periph(AT91_PIO_PORTA, 27, 0); /* LCDHSYNC */ + at91_set_a_periph(AT91_PIO_PORTA, 28, 0); /* LCDDOTCK */ + at91_set_a_periph(AT91_PIO_PORTA, 29, 0); /* LCDDEN */ + + at91_set_a_periph(AT91_PIO_PORTA, 0, 0); /* LCDD0 */ + at91_set_a_periph(AT91_PIO_PORTA, 1, 0); /* LCDD1 */ + at91_set_a_periph(AT91_PIO_PORTA, 2, 0); /* LCDD2 */ + at91_set_a_periph(AT91_PIO_PORTA, 3, 0); /* LCDD3 */ + at91_set_a_periph(AT91_PIO_PORTA, 4, 0); /* LCDD4 */ + at91_set_a_periph(AT91_PIO_PORTA, 5, 0); /* LCDD5 */ + at91_set_a_periph(AT91_PIO_PORTA, 6, 0); /* LCDD6 */ + at91_set_a_periph(AT91_PIO_PORTA, 7, 0); /* LCDD7 */ + at91_set_a_periph(AT91_PIO_PORTA, 8, 0); /* LCDD8 */ + at91_set_a_periph(AT91_PIO_PORTA, 9, 0); /* LCDD9 */ + at91_set_a_periph(AT91_PIO_PORTA, 10, 0); /* LCDD10 */ + at91_set_a_periph(AT91_PIO_PORTA, 11, 0); /* LCDD11 */ + at91_set_a_periph(AT91_PIO_PORTA, 12, 0); /* LCDD12 */ + at91_set_a_periph(AT91_PIO_PORTA, 13, 0); /* LCDD13 */ + at91_set_a_periph(AT91_PIO_PORTA, 14, 0); /* LCDD14 */ + at91_set_a_periph(AT91_PIO_PORTA, 15, 0); /* LCDD15 */ + at91_set_c_periph(AT91_PIO_PORTC, 14, 0); /* LCDD16 */ + at91_set_c_periph(AT91_PIO_PORTC, 13, 0); /* LCDD17 */ + at91_set_c_periph(AT91_PIO_PORTC, 12, 0); /* LCDD18 */ + at91_set_c_periph(AT91_PIO_PORTC, 11, 0); /* LCDD19 */ + at91_set_c_periph(AT91_PIO_PORTC, 10, 0); /* LCDD20 */ + at91_set_c_periph(AT91_PIO_PORTC, 15, 0); /* LCDD21 */ + at91_set_c_periph(AT91_PIO_PORTE, 27, 0); /* LCDD22 */ + at91_set_c_periph(AT91_PIO_PORTE, 28, 0); /* LCDD23 */ + + writel(1 << (ATMEL_ID_LCDC - 32), &pmc->pcer1); gd->fb_base = CONFIG_AT91SAMA5_LCD_BASE; } -- cgit v1.2.3 From 739b3885c18acc1ac121db0f57d9a1c55c7662b4 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Sun, 1 Apr 2012 17:14:55 +0800 Subject: SAMA5: Add function to distinguish CPU type LCDC: using has_lcdc() function to avoid error register NET: using has_emac() and has_gmac to avoid error register --- board/atmel/at91sama5ek/at91sama5ek.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index f95c10e8cc0..9c7ca3ffea0 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -195,7 +195,7 @@ void lcd_show_board_info(void) lcd_printf ("(C) 2008 ATMEL Corp\n"); lcd_printf ("at91support@atmel.com\n"); lcd_printf ("%s CPU at %s MHz\n", - ATMEL_CPU_NAME, + get_cpu_name(), strmhz(temp, get_cpu_clk_rate())); dram_size = 0; @@ -247,10 +247,12 @@ int board_init(void) at91_spi0_hw_init(1 << 4); #endif #ifdef CONFIG_MACB - at91sama5ek_macb_hw_init(); + if(has_emac()) + at91sama5ek_macb_hw_init(); #endif #ifdef CONFIG_GMACB - at91sama5ek_gmacb_hw_init(); + if (has_gmac()) + at91sama5ek_gmacb_hw_init(); #endif #ifdef CONFIG_LCD at91sama5ek_lcd_hw_init(); @@ -275,10 +277,12 @@ int board_eth_init(bd_t *bis) { int rc = 0; #ifdef CONFIG_MACB - rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00); + if (has_emac()) + rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00); #endif #ifdef CONFIG_GMACB - rc = gmacb_eth_initialize(0, (void *)ATMEL_BASE_GMAC, 0x00); + if (has_gmac()) + rc = gmacb_eth_initialize(0, (void *)ATMEL_BASE_GMAC, 0x00); #endif return rc; } -- cgit v1.2.3 From b8742512257922be16e06ed861c061bb303b7fe3 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Sun, 1 Apr 2012 18:01:56 +0800 Subject: LCDC: using has_lcdc() function to avoid error register --- board/atmel/at91sama5ek/at91sama5ek.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 9c7ca3ffea0..b593d796b47 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -255,7 +255,8 @@ int board_init(void) at91sama5ek_gmacb_hw_init(); #endif #ifdef CONFIG_LCD - at91sama5ek_lcd_hw_init(); + if (has_lcdc()) + at91sama5ek_lcd_hw_init(); #endif return 0; } -- cgit v1.2.3 From 93aaa15e7d09489b1c52b0c2955f39c10a72d24d Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Wed, 25 Apr 2012 16:48:53 +0800 Subject: MMC: enable MMC support in u-boot --- board/atmel/at91sama5ek/at91sama5ek.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index b593d796b47..168b6dcdfd1 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -23,6 +23,7 @@ */ #include +#include #include #include #include @@ -83,6 +84,17 @@ static void at91sama5ek_usb_hw_init(void) } #endif +#ifdef CONFIG_GENERIC_ATMEL_MCI +static void at91sama5ek_mci_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + writel(1 << ATMEL_ID_MCI0, &pmc->pcer); + + at91_mci_hw_init(); +} +#endif + #ifdef CONFIG_MACB static void at91sama5ek_macb_hw_init(void) { @@ -240,6 +252,9 @@ int board_init(void) #ifdef CONFIG_CMD_USB at91sama5ek_usb_hw_init(); #endif +#ifdef CONFIG_GENERIC_ATMEL_MCI + at91sama5ek_mci_hw_init(); +#endif #ifdef CONFIG_SYS_USE_DATAFLASH at91_spi0_hw_init(1 << 0); #endif @@ -288,6 +303,17 @@ int board_eth_init(bd_t *bis) return rc; } +#ifdef CONFIG_GENERIC_ATMEL_MCI +int board_mmc_init(bd_t *bis) +{ + int rc = 0; + + rc = atmel_mci_init((void *)ATMEL_BASE_MCI0); + + return rc; +} +#endif + /* SPI chip select control */ #ifdef CONFIG_ATMEL_SPI #include -- cgit v1.2.3 From f1aff0510760efe8a5009df7178bd8d2b1537886 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Wed, 25 Apr 2012 16:57:38 +0800 Subject: MMC: enable save env into sd card --- board/atmel/at91sama5ek/at91sama5ek.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 168b6dcdfd1..74cc04bd010 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -214,8 +214,10 @@ void lcd_show_board_info(void) for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) dram_size += gd->bd->bi_dram[i].size; nand_size = 0; +#ifdef CONFIG_SYS_USE_NANDFLASH for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) nand_size += nand_info[i].size; +#endif lcd_printf (" %ld MB SDRAM, %ld MB NAND\n", dram_size >> 20, nand_size >> 20 ); -- cgit v1.2.3 From 03d7a06a182817b10eb1ba73719f723d18a7268b Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Thu, 26 Apr 2012 14:10:58 +0800 Subject: PMC: rework the peripheral clock enable method --- board/atmel/at91sama5ek/at91sama5ek.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 74cc04bd010..c0b5fc7078b 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -49,9 +49,8 @@ DECLARE_GLOBAL_DATA_PTR; void at91sama5ek_nand_hw_init(void) { struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - writel(1 << ATMEL_ID_SMC, &pmc->pcer); + at91_periph_clk_enable(ATMEL_ID_SMC); /* Configure SMC CS3 for NAND/SmartMedia */ writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(1) | @@ -71,8 +70,6 @@ void at91sama5ek_nand_hw_init(void) #endif AT91_SMC_MODE_TDF_CYCLE(3), &smc->cs[3].mode); - - writel(1 << ATMEL_ID_PIOE, &pmc->pcer); } #endif @@ -87,10 +84,6 @@ static void at91sama5ek_usb_hw_init(void) #ifdef CONFIG_GENERIC_ATMEL_MCI static void at91sama5ek_mci_hw_init(void) { - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - - writel(1 << ATMEL_ID_MCI0, &pmc->pcer); - at91_mci_hw_init(); } #endif @@ -98,12 +91,6 @@ static void at91sama5ek_mci_hw_init(void) #ifdef CONFIG_MACB static void at91sama5ek_macb_hw_init(void) { - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - - /* Enable clock */ - writel(1 << (ATMEL_ID_EMAC-32), &pmc->pcer1); - - /* And the pins. */ at91_macb_hw_init(); } #endif @@ -111,13 +98,6 @@ static void at91sama5ek_macb_hw_init(void) #ifdef CONFIG_GMACB static void at91sama5ek_gmacb_hw_init(void) { - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - - /* Enable clock */ - writel(1 << (ATMEL_ID_GMAC-32), &pmc->pcer1); - writel(1 << ATMEL_ID_PIOB, &pmc->pcer); - - /* And the pins. */ at91_gmacb_hw_init(); } #endif @@ -154,8 +134,6 @@ void lcd_disable(void) static void at91sama5ek_lcd_hw_init(void) { - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - at91_set_a_periph(AT91_PIO_PORTA, 24, 0); /* LCDPWM */ at91_set_a_periph(AT91_PIO_PORTA, 25, 0); /* LCDDISP */ at91_set_a_periph(AT91_PIO_PORTA, 26, 0); /* LCDVSYNC */ @@ -188,9 +166,10 @@ static void at91sama5ek_lcd_hw_init(void) at91_set_c_periph(AT91_PIO_PORTE, 27, 0); /* LCDD22 */ at91_set_c_periph(AT91_PIO_PORTE, 28, 0); /* LCDD23 */ - writel(1 << (ATMEL_ID_LCDC - 32), &pmc->pcer1); - gd->fb_base = CONFIG_AT91SAMA5_LCD_BASE; + + /* Enable clock */ + at91_periph_clk_enable(ATMEL_ID_LCDC); } #ifdef CONFIG_LCD_INFO -- cgit v1.2.3 From ffc40671cbf56d151b4e98e6ab99a85070eff0c9 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Thu, 26 Apr 2012 14:22:21 +0800 Subject: LCD: move lcd pin configuration to devices c file --- board/atmel/at91sama5ek/at91sama5ek.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index c0b5fc7078b..6cbe42c913f 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -134,42 +134,9 @@ void lcd_disable(void) static void at91sama5ek_lcd_hw_init(void) { - at91_set_a_periph(AT91_PIO_PORTA, 24, 0); /* LCDPWM */ - at91_set_a_periph(AT91_PIO_PORTA, 25, 0); /* LCDDISP */ - at91_set_a_periph(AT91_PIO_PORTA, 26, 0); /* LCDVSYNC */ - at91_set_a_periph(AT91_PIO_PORTA, 27, 0); /* LCDHSYNC */ - at91_set_a_periph(AT91_PIO_PORTA, 28, 0); /* LCDDOTCK */ - at91_set_a_periph(AT91_PIO_PORTA, 29, 0); /* LCDDEN */ - - at91_set_a_periph(AT91_PIO_PORTA, 0, 0); /* LCDD0 */ - at91_set_a_periph(AT91_PIO_PORTA, 1, 0); /* LCDD1 */ - at91_set_a_periph(AT91_PIO_PORTA, 2, 0); /* LCDD2 */ - at91_set_a_periph(AT91_PIO_PORTA, 3, 0); /* LCDD3 */ - at91_set_a_periph(AT91_PIO_PORTA, 4, 0); /* LCDD4 */ - at91_set_a_periph(AT91_PIO_PORTA, 5, 0); /* LCDD5 */ - at91_set_a_periph(AT91_PIO_PORTA, 6, 0); /* LCDD6 */ - at91_set_a_periph(AT91_PIO_PORTA, 7, 0); /* LCDD7 */ - at91_set_a_periph(AT91_PIO_PORTA, 8, 0); /* LCDD8 */ - at91_set_a_periph(AT91_PIO_PORTA, 9, 0); /* LCDD9 */ - at91_set_a_periph(AT91_PIO_PORTA, 10, 0); /* LCDD10 */ - at91_set_a_periph(AT91_PIO_PORTA, 11, 0); /* LCDD11 */ - at91_set_a_periph(AT91_PIO_PORTA, 12, 0); /* LCDD12 */ - at91_set_a_periph(AT91_PIO_PORTA, 13, 0); /* LCDD13 */ - at91_set_a_periph(AT91_PIO_PORTA, 14, 0); /* LCDD14 */ - at91_set_a_periph(AT91_PIO_PORTA, 15, 0); /* LCDD15 */ - at91_set_c_periph(AT91_PIO_PORTC, 14, 0); /* LCDD16 */ - at91_set_c_periph(AT91_PIO_PORTC, 13, 0); /* LCDD17 */ - at91_set_c_periph(AT91_PIO_PORTC, 12, 0); /* LCDD18 */ - at91_set_c_periph(AT91_PIO_PORTC, 11, 0); /* LCDD19 */ - at91_set_c_periph(AT91_PIO_PORTC, 10, 0); /* LCDD20 */ - at91_set_c_periph(AT91_PIO_PORTC, 15, 0); /* LCDD21 */ - at91_set_c_periph(AT91_PIO_PORTE, 27, 0); /* LCDD22 */ - at91_set_c_periph(AT91_PIO_PORTE, 28, 0); /* LCDD23 */ - gd->fb_base = CONFIG_AT91SAMA5_LCD_BASE; - /* Enable clock */ - at91_periph_clk_enable(ATMEL_ID_LCDC); + at91_lcd_hw_init(); } #ifdef CONFIG_LCD_INFO -- cgit v1.2.3 From cbd601cdd15b98f9f2eac3b0466899032d852e7c Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Fri, 4 May 2012 09:08:00 +0800 Subject: USB: Add power control for USB Port A --- board/atmel/at91sama5ek/at91sama5ek.c | 1 + 1 file changed, 1 insertion(+) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 6cbe42c913f..75155542bb9 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -76,6 +76,7 @@ void at91sama5ek_nand_hw_init(void) #ifdef CONFIG_CMD_USB static void at91sama5ek_usb_hw_init(void) { + at91_set_pio_output(AT91_PIO_PORTD, 25, 0); at91_set_pio_output(AT91_PIO_PORTD, 26, 0); at91_set_pio_output(AT91_PIO_PORTD, 27, 0); } -- cgit v1.2.3 From a2c3019a34f223ab5e332b9dd63cb700b160ff8b Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Wed, 9 May 2012 14:45:13 +0800 Subject: SMC: Add timings configuration for NAND --- board/atmel/at91sama5ek/at91sama5ek.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 75155542bb9..2f06a70889d 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -61,6 +61,10 @@ void at91sama5ek_nand_hw_init(void) &smc->cs[3].pulse); writel(AT91_SMC_CYCLE_NWE(8) | AT91_SMC_CYCLE_NRD(8), &smc->cs[3].cycle); + writel(AT91_SMC_TIMINGS_TCLR(3) | AT91_SMC_TIMINGS_TADL(10) | + AT91_SMC_TIMINGS_TAR(3) | AT91_SMC_TIMINGS_TRR(4) | + AT91_SMC_TIMINGS_TWB(5) | AT91_SMC_TIMINGS_RBNSEL(3)| + AT91_SMC_TIMINGS_NFSEL(1), &smc->cs[3].timings); writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | AT91_SMC_MODE_EXNW_DISABLE | #ifdef CONFIG_SYS_NAND_DBW_16 -- cgit v1.2.3 From b6bd4c8062e6b66e401087e919c0226dca0ad428 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Tue, 15 May 2012 11:00:07 +0800 Subject: Makefile: remove led compile option, armv7 not support it --- board/atmel/at91sama5ek/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/Makefile b/board/atmel/at91sama5ek/Makefile index c9b6185eef9..bfb26b149d7 100644 --- a/board/atmel/at91sama5ek/Makefile +++ b/board/atmel/at91sama5ek/Makefile @@ -30,7 +30,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o COBJS-y += at91sama5ek.o -COBJS-$(CONFIG_AT91_LED) += led.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) -- cgit v1.2.3 From d6c6293799889bfd73d733a12c23c6a1fbc55529 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 5 Jul 2012 17:01:43 +0200 Subject: SAMA5D3x: modify copyright year Signed-off-by: Nicolas Ferre --- board/atmel/at91sama5ek/at91sama5ek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 2f06a70889d..08826b236e2 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -155,7 +155,7 @@ void lcd_show_board_info(void) char temp[32]; lcd_printf ("%s\n", U_BOOT_VERSION); - lcd_printf ("(C) 2008 ATMEL Corp\n"); + lcd_printf ("(C) 2012 ATMEL Corp\n"); lcd_printf ("at91support@atmel.com\n"); lcd_printf ("%s CPU at %s MHz\n", get_cpu_name(), -- cgit v1.2.3 From 3cda03c7fa4413eef2ee250b5936a88c25dbc1be Mon Sep 17 00:00:00 2001 From: Josh Wu Date: Fri, 21 Sep 2012 10:17:43 +0800 Subject: SAMA5: display nand flash size even in sd, spi flash configuration. --- board/atmel/at91sama5ek/at91sama5ek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board') diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/at91sama5ek/at91sama5ek.c index 08826b236e2..4dc5a5b3dab 100644 --- a/board/atmel/at91sama5ek/at91sama5ek.c +++ b/board/atmel/at91sama5ek/at91sama5ek.c @@ -165,7 +165,7 @@ void lcd_show_board_info(void) for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) dram_size += gd->bd->bi_dram[i].size; nand_size = 0; -#ifdef CONFIG_SYS_USE_NANDFLASH +#ifdef CONFIG_CMD_NAND for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) nand_size += nand_info[i].size; #endif -- cgit v1.2.3