AT91: change common at91sam9261 files to compile with new scheme
Subsystems (2)
PATCH 1/1 AT91: change common at91sam9261 files to compile with new scheme
From: Asen Dimov <[email protected]>
Signed-off-by Asen Dimov <[email protected]>
Signed-off-by Reinhard Meyer <[email protected]>
--- arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c | 76 ++++++++++----------- arch/arm/include/asm/arch-at91/at91sam9261.h | 3 +- 2 files changed, 38 insertions(+), 41 deletions(-)
arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c +36 -40
@@ -23,77 +23,73 @@*/ #include <common.h> +#include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/gpio.h> -#include <asm/arch/io.h> + +/* +* if CONFIG_AT91_GPIO_PULLUP ist set, keep pullups on on all +* peripheral pins. Good to have if hardware is soldered optionally +* or in case of SPI no slave is selected. Avoid lines to float +* needlessly. Use a short local PUP define. +* +* Due to errata "TXD floats when CTS is inactive" pullups are always +* on for TXD pins. +*/ +#ifdef CONFIG_AT91_GPIO_PULLUP +# define PUP CONFIG_AT91_GPIO_PULLUP +#else +# define PUP 0 +#endif void at91_serial0_hw_init (void ) { -at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; +at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC ;at91_set_a_periph (AT91_PIO_PORTC ,8 ,1 );/* TXD0 */ at91_set_a_periph (AT91_PIO_PORTC ,9 ,0 );/* RXD0 */ -writel (1 <<AT91SAM9261_ID_US0 , &pmc->pcer); +writel (1 <<ATMEL_ID_USART0 , &pmc->pcer); }void at91_serial1_hw_init (void ) { -at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; +at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC ;at91_set_a_periph (AT91_PIO_PORTC ,12 ,1 );/* TXD1 */ at91_set_a_periph (AT91_PIO_PORTC ,13 ,0 );/* RXD1 */ -writel (1 <<AT91SAM9261_ID_US1 , &pmc->pcer); +writel (1 <<ATMEL_ID_USART1 , &pmc->pcer); }void at91_serial2_hw_init (void ) { -at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; +at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC ;at91_set_a_periph (AT91_PIO_PORTC ,14 ,1 );/* TXD2 */ at91_set_a_periph (AT91_PIO_PORTC ,15 ,0 );/* RXD2 */ -writel (1 <<AT91SAM9261_ID_US2 , &pmc->pcer); +writel (1 <<ATMEL_ID_USART2 , &pmc->pcer); } -void at91_serial3_hw_init (void ) +void at91_seriald_hw_init (void ) { -at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; +at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC ;at91_set_a_periph (AT91_PIO_PORTA ,9 ,0 );/* DRXD */ at91_set_a_periph (AT91_PIO_PORTA ,10 ,1 );/* DTXD */ -writel (1 <<AT91_ID_SYS , &pmc->pcer); -} - -void at91_serial_hw_init (void ) -{ -#ifdef CONFIG_USART0 -at91_serial0_hw_init (); -#endif - -#ifdef CONFIG_USART1 -at91_serial1_hw_init (); -#endif - -#ifdef CONFIG_USART2 -at91_serial2_hw_init (); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ -at91_serial3_hw_init (); -#endif +writel (1 <<ATMEL_ID_SYS , &pmc->pcer); } -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_HAS_DATAFLASH ) || defined(CONFIG_ATMEL_SPI )void at91_spi0_hw_init (unsigned long cs_mask) { -at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; +at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC ; -at91_set_a_periph (AT91_PIO_PORTA ,0 ,0 );/* SPI0_MISO */ -at91_set_a_periph (AT91_PIO_PORTA ,1 ,0 );/* SPI0_MOSI */ -at91_set_a_periph (AT91_PIO_PORTA ,2 ,0 );/* SPI0_SPCK */ +at91_set_a_periph (AT91_PIO_PORTA ,0 ,PUP );/* SPI0_MISO */ +at91_set_a_periph (AT91_PIO_PORTA ,1 ,PUP );/* SPI0_MOSI */ +at91_set_a_periph (AT91_PIO_PORTA ,2 ,PUP );/* SPI0_SPCK */ /* Enable clock */ -writel (1 <<AT91SAM9261_ID_SPI0 , &pmc->pcer); +writel (1 <<ATMEL_ID_SPI0 , &pmc->pcer);if (cs_mask & (1 <<0 )) {at91_set_a_periph (AT91_PIO_PORTA ,3 ,1 );
@@ -123,14 +119,14 @@ void at91_spi0_hw_init(unsigned long cs_mask)void at91_spi1_hw_init (unsigned long cs_mask) { -at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; +at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC ; -at91_set_a_periph (AT91_PIO_PORTB ,30 ,0 );/* SPI1_MISO */ -at91_set_a_periph (AT91_PIO_PORTB ,31 ,0 );/* SPI1_MOSI */ -at91_set_a_periph (AT91_PIO_PORTB ,29 ,0 );/* SPI1_SPCK */ +at91_set_a_periph (AT91_PIO_PORTB ,30 ,PUP );/* SPI1_MISO */ +at91_set_a_periph (AT91_PIO_PORTB ,31 ,PUP );/* SPI1_MOSI */ +at91_set_a_periph (AT91_PIO_PORTB ,29 ,PUP );/* SPI1_SPCK */ /* Enable clock */ -writel (1 <<AT91SAM9261_ID_SPI1 , &pmc->pcer); +writel (1 <<ATMEL_ID_SPI1 , &pmc->pcer);if (cs_mask & (1 <<0 )) {at91_set_a_periph (AT91_PIO_PORTB ,28 ,1 );
arch/arm/include/asm/arch-at91/at91sam9261.h +2 -1
@@ -104,7 +104,7 @@#define ATMEL_SIZE_SRAM 0x00028000/* Internal SRAM size (160Kb) */ #define ATMEL_BASE_ROM 0x00400000/* Internal ROM base address */ -#define ATMEL_SIZE_ROM SZ_32K/* Internal ROM size (32Kb) */ +#define ATMEL_SIZE_ROM 0x00008000/* Internal ROM size (32Kb) */ #define ATMEL_BASE_UHP 0x00500000/* USB Host controller */ #define ATMEL_BASE_LCDC 0x00600000/* LDC controller */
@@ -125,6 +125,7 @@* Other misc defines */ #define ATMEL_PIO_PORTS 3/* theese SoCs have 3 PIO */ +#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP#define ATMEL_BASE_PIO ATMEL_BASE_PIOA/*
Signature · 1 line
1.7.4.1
PATCH 1/1 AT91: change common at91sam9261 files to compile with new scheme
Dear Asen Dimov, Reinhard Meyer:
Quoted 8 lines
From: Asen Dimov <[email protected]>
Signed-off-by Asen Dimov <[email protected]>Signed-off-by Reinhard Meyer <[email protected]>--- arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c | 76 ++++++++++----------- arch/arm/include/asm/arch-at91/at91sam9261.h | 3 +- 2 files changed, 38 insertions(+), 41 deletions(-)
Applied to u-boot-atmel/master.
Thanks, Reinhard