From mboxrd@z Thu Jan 1 00:00:00 1970 From: RONETIX - Asen Dimov Date: Tue, 26 Jul 2011 12:11:54 +0300 Subject: [U-Boot] [PATCH, AT91, rework v2] change common at91sam9261 files after AT91 rework In-Reply-To: <1311664464.3635.16.camel@ubuntu> References: <1307606409-29818-2-git-send-email-dimov@ronetix.at> <1311008656-28387-1-git-send-email-dimov@ronetix.at> <1311664464.3635.16.camel@ubuntu> Message-ID: <4E2E84DA.8070403@ronetix.at> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Reinhard, On 07/26/2011 10:14 AM, Reinhard Meyer wrote: > Dear Asen Dimov, >> Signed-off-by: Asen Dimov >> --- >> Note: >> This patch was a part of patches, but it is better to be done step by step and >> so this patch is a split from the patch series with message id: >> <1307606409-29818-2-git-send-email-dimov@ronetix.at> >> and Patchwork: >> http://patchwork.ozlabs.org/patch/99665/ >> >> Changes for v2: >> - add CONFIG_AT91_GPIO_PIULLUP >> - reneme at91_serial3_hw_init() to at91_seriald_hw_init() >> - remove at91_serial_hw_init() > What I miss in at91sam9261_devices.c (as compared to the 9260) > is support for MACB and MCI. Don't 9261 systems use Ethernet? > Or is that part still in the board specific files? > > Then, I would like to add the following changes: > > -------------- arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c > @@ -79,14 +79,14 @@ void at91_seriald_hw_init(void) > 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 *) 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<< ATMEL_ID_SPI0,&pmc->pcer); > @@ -121,9 +121,9 @@ void at91_spi1_hw_init(unsigned long cs_mask) > { > 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<< ATMEL_ID_SPI1,&pmc->pcer); > > ----------------- arch/arm/include/asm/arch-at91/at91sam9261.h > @@ -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 */ > > I have this as a local patch and could squash this onto yours, or > you may provide an updated patch. I will try once more to make it as it should be. > Thanks, > Reinhard Regards, Asen