minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 13:35:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

AT91: fix related at91 system/driver files

Browse Source 
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
This commit is contained in:
Reinhard Meyer 2010-11-03 15:39:55 +01:00 committed by Albert ARIBAUD
parent 83f1072e06
commit 9f3fe90f09
7 changed files with 33 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/cpu/arm926ejs/at91/Makefile
View File

@ -28,6 +28,7 @@ LIB = $(obj)lib$(SOC).o
COBJS-$(CONFIG_AT91CAP9) += at91cap9_devices.o COBJS-$(CONFIG_AT91CAP9) += at91cap9_devices.o
COBJS-$(CONFIG_AT91SAM9260) += at91sam9260_devices.o COBJS-$(CONFIG_AT91SAM9260) += at91sam9260_devices.o
COBJS-$(CONFIG_AT91SAM9G20) += at91sam9260_devices.o COBJS-$(CONFIG_AT91SAM9G20) += at91sam9260_devices.o
COBJS-$(CONFIG_AT91SAM9XE) += at91sam9260_devices.o
COBJS-$(CONFIG_AT91SAM9261) += at91sam9261_devices.o COBJS-$(CONFIG_AT91SAM9261) += at91sam9261_devices.o
COBJS-$(CONFIG_AT91SAM9G10) += at91sam9261_devices.o COBJS-$(CONFIG_AT91SAM9G10) += at91sam9261_devices.o
COBJS-$(CONFIG_AT91SAM9263) += at91sam9263_devices.o COBJS-$(CONFIG_AT91SAM9263) += at91sam9263_devices.o

45
arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
View File

@ -45,70 +45,51 @@
void at91_serial0_hw_init(void) 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_PORTB, 4, 1); /* TXD0 */ at91_set_a_periph(AT91_PIO_PORTB, 4, 1); /* TXD0 */
at91_set_a_periph(AT91_PIO_PORTB, 5, PUP); /* RXD0 */ at91_set_a_periph(AT91_PIO_PORTB, 5, PUP); /* RXD0 */
writel(1 << AT91SAM9260_ID_US0, &pmc->pcer); writel(1 << ATMEL_ID_USART0, &pmc->pcer);
} }
void at91_serial1_hw_init(void) 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_PORTB, 6, 1); /* TXD1 */ at91_set_a_periph(AT91_PIO_PORTB, 6, 1); /* TXD1 */
at91_set_a_periph(AT91_PIO_PORTB, 7, PUP); /* RXD1 */ at91_set_a_periph(AT91_PIO_PORTB, 7, PUP); /* RXD1 */
writel(1 << AT91SAM9260_ID_US1, &pmc->pcer); writel(1 << ATMEL_ID_USART1, &pmc->pcer);
} }
void at91_serial2_hw_init(void) 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_PORTB, 8, 1); /* TXD2 */ at91_set_a_periph(AT91_PIO_PORTB, 8, 1); /* TXD2 */
at91_set_a_periph(AT91_PIO_PORTB, 9, PUP); /* RXD2 */ at91_set_a_periph(AT91_PIO_PORTB, 9, PUP); /* RXD2 */
writel(1 << AT91SAM9260_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_PORTB, 14, PUP); /* DRXD */ at91_set_a_periph(AT91_PIO_PORTB, 14, PUP); /* DRXD */
at91_set_a_periph(AT91_PIO_PORTB, 15, 1); /* DTXD */ at91_set_a_periph(AT91_PIO_PORTB, 15, 1); /* DTXD */
writel(1 << AT91_ID_SYS, &pmc->pcer); writel(1 << ATMEL_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
} }
#if defined(CONFIG_HAS_DATAFLASH) || defined(CONFIG_ATMEL_SPI) #if defined(CONFIG_HAS_DATAFLASH) || defined(CONFIG_ATMEL_SPI)
void at91_spi0_hw_init(unsigned long cs_mask) 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, PUP); /* SPI0_MISO */ 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, 1, PUP); /* SPI0_MOSI */
at91_set_a_periph(AT91_PIO_PORTA, 2, PUP); /* SPI0_SPCK */ at91_set_a_periph(AT91_PIO_PORTA, 2, PUP); /* SPI0_SPCK */
/* Enable clock */ /* Enable clock */
writel(1 << AT91SAM9260_ID_SPI0, &pmc->pcer); writel(1 << ATMEL_ID_SPI0, &pmc->pcer);
if (cs_mask & (1 << 0)) { if (cs_mask & (1 << 0)) {
at91_set_a_periph(AT91_PIO_PORTA, 3, 1); at91_set_a_periph(AT91_PIO_PORTA, 3, 1);
@ -138,14 +119,14 @@ void at91_spi0_hw_init(unsigned long cs_mask)
void at91_spi1_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, 0, PUP); /* SPI1_MISO */ at91_set_a_periph(AT91_PIO_PORTB, 0, PUP); /* SPI1_MISO */
at91_set_a_periph(AT91_PIO_PORTB, 1, PUP); /* SPI1_MOSI */ at91_set_a_periph(AT91_PIO_PORTB, 1, PUP); /* SPI1_MOSI */
at91_set_a_periph(AT91_PIO_PORTB, 2, PUP); /* SPI1_SPCK */ at91_set_a_periph(AT91_PIO_PORTB, 2, PUP); /* SPI1_SPCK */
/* Enable clock */ /* Enable clock */
writel(1 << AT91SAM9260_ID_SPI1, &pmc->pcer); writel(1 << ATMEL_ID_SPI1, &pmc->pcer);
if (cs_mask & (1 << 0)) { if (cs_mask & (1 << 0)) {
at91_set_a_periph(AT91_PIO_PORTB, 3, 1); at91_set_a_periph(AT91_PIO_PORTB, 3, 1);

6
arch/arm/cpu/arm926ejs/at91/clock.c
View File

@ -57,7 +57,7 @@ static unsigned long at91_css_to_rate(unsigned long css)
{ {
switch (css) { switch (css) {
case AT91_PMC_MCKR_CSS_SLOW: case AT91_PMC_MCKR_CSS_SLOW:
return AT91_SLOW_CLOCK; return CONFIG_SYS_AT91_SLOW_CLOCK;
case AT91_PMC_MCKR_CSS_MAIN: case AT91_PMC_MCKR_CSS_MAIN:
return gd->main_clk_rate_hz; return gd->main_clk_rate_hz;
case AT91_PMC_MCKR_CSS_PLLA: case AT91_PMC_MCKR_CSS_PLLA:
@ -145,7 +145,7 @@ static u32 at91_pll_rate(u32 freq, u32 reg)
int at91_clock_init(unsigned long main_clock) int at91_clock_init(unsigned long main_clock)
{ {
unsigned freq, mckr; unsigned freq, mckr;
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
#ifndef CONFIG_SYS_AT91_MAIN_CLOCK #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
unsigned tmp; unsigned tmp;
/* /*
@ -159,7 +159,7 @@ int at91_clock_init(unsigned long main_clock)
tmp = readl(&pmc->mcfr); tmp = readl(&pmc->mcfr);
} while (!(tmp & AT91_PMC_MCFR_MAINRDY)); } while (!(tmp & AT91_PMC_MCFR_MAINRDY));
tmp &= AT91_PMC_MCFR_MAINF_MASK; tmp &= AT91_PMC_MCFR_MAINF_MASK;
main_clock = tmp * (AT91_SLOW_CLOCK / 16); main_clock = tmp * (CONFIG_SYS_AT91_SLOW_CLOCK / 16);
} }
#endif #endif
gd->main_clk_rate_hz = main_clock; gd->main_clk_rate_hz = main_clock;

8
arch/arm/cpu/arm926ejs/at91/cpu.c
View File

@ -44,7 +44,7 @@ int arch_cpu_init(void)
void arch_preboot_os(void) void arch_preboot_os(void)
{ {
ulong cpiv; ulong cpiv;
at91_pit_t *pit = (at91_pit_t *) AT91_PIT_BASE; at91_pit_t *pit = (at91_pit_t *) ATMEL_BASE_PIT;
cpiv = AT91_PIT_MR_PIV_MASK(readl(&pit->piir)); cpiv = AT91_PIT_MR_PIV_MASK(readl(&pit->piir));
@ -61,7 +61,7 @@ int print_cpuinfo(void)
{ {
char buf[32]; char buf[32];
printf("CPU: %s\n", CONFIG_SYS_AT91_CPU_NAME); printf("CPU: %s\n", ATMEL_CPU_NAME);
printf("Crystal frequency: %8s MHz\n", printf("Crystal frequency: %8s MHz\n",
strmhz(buf, get_main_clk_rate())); strmhz(buf, get_main_clk_rate()));
printf("CPU clock : %8s MHz\n", printf("CPU clock : %8s MHz\n",
@ -80,7 +80,7 @@ int print_cpuinfo(void)
*/ */
void bootcount_store (ulong a) void bootcount_store (ulong a)
{ {
at91_gpbr_t *gpbr = (at91_gpbr_t *) AT91_GPR_BASE; at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
writel((BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff), writel((BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff),
&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]); &gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
@ -88,7 +88,7 @@ void bootcount_store (ulong a)
ulong bootcount_load (void) ulong bootcount_load (void)
{ {
at91_gpbr_t *gpbr = (at91_gpbr_t *) AT91_GPR_BASE; at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
ulong val = readl(&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]); ulong val = readl(&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000)) if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))

14
arch/arm/cpu/arm926ejs/at91/eflash.c
View File

@ -77,8 +77,8 @@ static u32 pagesize;
unsigned long flash_init (void) unsigned long flash_init (void)
{ {
at91_eefc_t *eefc = (at91_eefc_t *) 0xfffffa00; at91_eefc_t *eefc = (at91_eefc_t *) ATMEL_BASE_EEFC;
at91_dbu_t *dbu = (at91_dbu_t *) 0xfffff200; at91_dbu_t *dbu = (at91_dbu_t *) ATMEL_BASE_DBGU;
u32 id, size, nplanes, planesize, nlocks; u32 id, size, nplanes, planesize, nlocks;
u32 addr, i, tmp=0; u32 addr, i, tmp=0;
@ -119,7 +119,7 @@ unsigned long flash_init (void)
flash_info[0].sector_count = nlocks; flash_info[0].sector_count = nlocks;
flash_info[0].flash_id = id; flash_info[0].flash_id = id;
addr = AT91SAM9XE_FLASH_BASE; addr = ATMEL_BASE_FLASH;
for (i=0; i<nlocks; i++) { for (i=0; i<nlocks; i++) {
tmp = readl(&eefc->frr); /* words 4+nplanes+1.. */ tmp = readl(&eefc->frr); /* words 4+nplanes+1.. */
flash_info[0].start[i] = addr; flash_info[0].start[i] = addr;
@ -167,8 +167,8 @@ void flash_print_info (flash_info_t *info)
int flash_real_protect (flash_info_t *info, long sector, int prot) int flash_real_protect (flash_info_t *info, long sector, int prot)
{ {
at91_eefc_t *eefc = (at91_eefc_t *) 0xfffffa00; at91_eefc_t *eefc = (at91_eefc_t *) ATMEL_BASE_EEFC;
u32 pagenum = (info->start[sector]-AT91SAM9XE_FLASH_BASE)/pagesize; u32 pagenum = (info->start[sector]-ATMEL_BASE_FLASH)/pagesize;
u32 i, tmp=0; u32 i, tmp=0;
debug("protect sector=%ld prot=%d\n", sector, prot); debug("protect sector=%ld prot=%d\n", sector, prot);
@ -205,7 +205,7 @@ int flash_real_protect (flash_info_t *info, long sector, int prot)
static u32 erase_write_page (u32 pagenum) static u32 erase_write_page (u32 pagenum)
{ {
at91_eefc_t *eefc = (at91_eefc_t *) 0xfffffa00; at91_eefc_t *eefc = (at91_eefc_t *) ATMEL_BASE_EEFC;
debug("erase+write page=%u\n", pagenum); debug("erase+write page=%u\n", pagenum);
@ -249,7 +249,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
} }
/* now start copying data */ /* now start copying data */
pagenum = (addr-AT91SAM9XE_FLASH_BASE)/pagesize; pagenum = (addr-ATMEL_BASE_FLASH)/pagesize;
src32 = (u32 *) src; src32 = (u32 *) src;
dst32 = (u32 *) addr; dst32 = (u32 *) addr;
while (cnt > 0) { while (cnt > 0) {

2
arch/arm/cpu/arm926ejs/at91/reset.c
View File

@ -30,7 +30,7 @@
/* Reset the cpu by telling the reset controller to do so */ /* Reset the cpu by telling the reset controller to do so */
void reset_cpu(ulong ignored) void reset_cpu(ulong ignored)
{ {
at91_rstc_t *rstc = (at91_rstc_t *) AT91_RSTC_BASE; at91_rstc_t *rstc = (at91_rstc_t *) ATMEL_BASE_RSTC;
writel(AT91_RSTC_KEY writel(AT91_RSTC_KEY
| AT91_RSTC_CR_PROCRST /* Processor Reset */ | AT91_RSTC_CR_PROCRST /* Processor Reset */

8
arch/arm/cpu/arm926ejs/at91/timer.c
View File

@ -70,11 +70,11 @@ static inline unsigned long long usec_to_tick(unsigned long long usec)
*/ */
int timer_init(void) int timer_init(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
at91_pit_t *pit = (at91_pit_t *) AT91_PIT_BASE; at91_pit_t *pit = (at91_pit_t *) ATMEL_BASE_PIT;
/* Enable PITC Clock */ /* Enable PITC Clock */
writel(1 << AT91_ID_SYS, &pmc->pcer); writel(1 << ATMEL_ID_SYS, &pmc->pcer);
/* Enable PITC */ /* Enable PITC */
writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr); writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr);
@ -90,7 +90,7 @@ int timer_init(void)
*/ */
unsigned long long get_ticks(void) unsigned long long get_ticks(void)
{ {
at91_pit_t *pit = (at91_pit_t *) AT91_PIT_BASE; at91_pit_t *pit = (at91_pit_t *) ATMEL_BASE_PIT;
ulong now = readl(&pit->piir); ulong now = readl(&pit->piir);