update arm/at91rm9200 work with rework rework110202

PATCH New Jens Scharsig 2 participants 3 messages Feb 10, 2011 – Feb 11, 2011

Subsystems (3)

Network drivers Arm (32-bit) Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Jens Scharsig

author

2011-02-10 19:31 UTC #0 lore raw

PATCH 1/1 update arm/at91rm9200 work with rework rework110202

* update arm920t/at91 to ATMEL_xxx name scheme
* convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
* update arm920t/at91 soc lib
* update at91_emac driver

Signed-off-by Jens Scharsig <[email protected]>

---

The eb_cpux9k2 board can compile and runs after patch changes The at91rm9200ek can compile, but i have no hardware to test it.

 arch/arm/cpu/arm920t/at91/reset.c           |    2 +-
 arch/arm/cpu/arm920t/at91/timer.c           |   10 +-
 arch/arm/include/asm/arch-at91/at91_mc.h    |   12 +-
 arch/arm/include/asm/arch-at91/at91_pmc.h   |   10 +-
 arch/arm/include/asm/arch-at91/at91rm9200.h |  209 ++++++++++++++-------------
 board/BuS/eb_cpux9k2/cpux9k2.c              |   52 ++++----
 board/atmel/at91rm9200ek/at91rm9200ek.c     |    4 +-
 board/atmel/at91rm9200ek/led.c              |   22 ++--
 drivers/net/at91_emac.c                     |   32 ++--
 include/configs/at91rm9200ek.h              |    2 +-
 include/configs/eb_cpux9k2.h                |   29 +++--
 11 files changed, 201 insertions(+), 183 deletions(-)

arch/arm/cpu/arm920t/at91/reset.c +1 -1

index 51043ec..4fa0f98 100644
@@ -42,7 +42,7 @@ void  __attribute__((weak)) board_reset(void)
 
 void reset_cpu(ulong ignored)
 {
-	at91_st_t *st = (at91_st_t *) AT91_ST_BASE;
+	at91_st_t *st = (at91_st_t *) ATMEL_BASE_ST;
 #if defined(CONFIG_AT91RM9200_USART)
 	/*shutdown the console to avoid strange chars during reset */
 	serial_exit();

arch/arm/cpu/arm920t/at91/timer.c +5 -5

index c4c5eef..f0ad7d6 100644
@@ -44,11 +44,11 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int timer_init(void)
 {
-	at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
-	at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE;
+	at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
+	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
 
 	/* enables TC1.0 clock */
-	writel(1 << AT91_ID_TC0, &pmc->pcer);	/* enable clock */
+	writel(1 << ATMEL_ID_TC0, &pmc->pcer);	/* enable clock */
 
 	writel(0, &tc->bcr);
 	writel(AT91_TC_BMR_TC0XC0S_NONE | AT91_TC_BMR_TC1XC1S_NONE |

@@ -96,14 +96,14 @@ void __udelay(unsigned long usec)
 void reset_timer_masked(void)
 {
 	/* reset time */
-	at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
+	at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
 	gd->lastinc = readl(&tc->tc[0].cv) & 0x0000ffff;
 	gd->tbl = 0;
 }
 
 ulong get_timer_raw(void)
 {
-	at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
+	at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
 	u32 now;
 
 	now = readl(&tc->tc[0].cv) & 0x0000ffff;

arch/arm/include/asm/arch-at91/at91_mc.h +6 -6

index acfbd10..e0d1320 100644
@@ -23,12 +23,12 @@
 #ifndef AT91_MC_H
 #define AT91_MC_H
 
-#define AT91_ASM_MC_EBI_CSA	(AT91_MC_BASE + 0x60)
-#define AT91_ASM_MC_EBI_CFG	(AT91_MC_BASE + 0x64)
-#define AT91_ASM_MC_SMC_CSR0	(AT91_MC_BASE + 0x70)
-#define AT91_ASM_MC_SDRAMC_MR	(AT91_MC_BASE + 0x90)
-#define AT91_ASM_MC_SDRAMC_TR	(AT91_MC_BASE + 0x94)
-#define AT91_ASM_MC_SDRAMC_CR	(AT91_MC_BASE + 0x98)
+#define AT91_ASM_MC_EBI_CSA	(ATMEL_BASE_MC + 0x60)
+#define AT91_ASM_MC_EBI_CFG	(ATMEL_BASE_MC + 0x64)
+#define AT91_ASM_MC_SMC_CSR0	(ATMEL_BASE_MC + 0x70)
+#define AT91_ASM_MC_SDRAMC_MR	(ATMEL_BASE_MC + 0x90)
+#define AT91_ASM_MC_SDRAMC_TR	(ATMEL_BASE_MC + 0x94)
+#define AT91_ASM_MC_SDRAMC_CR	(ATMEL_BASE_MC + 0x98)
 
 #ifndef __ASSEMBLY__

arch/arm/include/asm/arch-at91/at91_pmc.h +5 -5

index fb8bb17..086cb9b 100644
@@ -17,11 +17,11 @@
 #ifndef AT91_PMC_H
 #define AT91_PMC_H
 
-#define	AT91_ASM_PMC_MOR	(AT91_PMC_BASE + 0x20)
-#define	AT91_ASM_PMC_PLLAR	(AT91_PMC_BASE + 0x28)
-#define	AT91_ASM_PMC_PLLBR	(AT91_PMC_BASE + 0x2c)
-#define AT91_ASM_PMC_MCKR	(AT91_PMC_BASE + 0x30)
-#define AT91_ASM_PMC_SR		(AT91_PMC_BASE + 0x68)
+#define	AT91_ASM_PMC_MOR	(ATMEL_BASE_PMC + 0x20)
+#define	AT91_ASM_PMC_PLLAR	(ATMEL_BASE_PMC + 0x28)
+#define	AT91_ASM_PMC_PLLBR	(ATMEL_BASE_PMC + 0x2c)
+#define AT91_ASM_PMC_MCKR	(ATMEL_BASE_PMC + 0x30)
+#define AT91_ASM_PMC_SR		(ATMEL_BASE_PMC + 0x68)
 
 #ifndef __ASSEMBLY__

arch/arm/include/asm/arch-at91/at91rm9200.h +110 ~~-99~~

225 lines not on this page · raw message

board/BuS/eb_cpux9k2/cpux9k2.c +26 ~~-26~~

134 lines not on this page · raw message

board/atmel/at91rm9200ek/at91rm9200ek.c +2 -2

index d242583..5ebc24d 100644
@@ -44,7 +44,7 @@ int board_init(void)
 	 * Correct IRDA resistor problem
 	 * Set PA23_TXD in Output
 	 */
-	writel(AT91_PMX_AA_TXD2, &pio->pioa.oer);
+	writel(ATMEL_PMX_AA_TXD2, &pio->pioa.oer);
 
 	/* arch number of AT91RM9200EK-Board */
 	gd->bd->bi_arch_number = MACH_TYPE_AT91RM9200EK;

@@ -65,6 +65,6 @@ int dram_init (void)
 #ifdef CONFIG_DRIVER_AT91EMAC
 int board_eth_init(bd_t *bis)
 {
-	return at91emac_register(bis, (u32) AT91_EMAC_BASE);
+	return at91emac_register(bis, (u32) ATMEL_BASE_EMAC);
 }
 #endif

board/atmel/at91rm9200ek/led.c +12 ~~-10~~

index 8d512e0..1766ddf 100644
@@ -26,8 +26,10 @@
  */
 
 #include <common.h>
-#include <asm/arch/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_pio.h>
 
 /* bit mask in PIO port B */
 #define	GREEN_LED	(1<<0)

@@ -36,47 +38,47 @@
 
 void	green_LED_on(void)
 {
-	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+	at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 	writel(GREEN_LED, &pio->piob.codr);
 }
 
 void	 yellow_LED_on(void)
 {
-	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+	at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 	writel(YELLOW_LED, &pio->piob.codr);
 }
 
 void	 red_LED_on(void)
 {
-	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+	at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 	writel(RED_LED, &pio->piob.codr);
 }
 
 void	green_LED_off(void)
 {
-	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+	at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 	writel(GREEN_LED, &pio->piob.sodr);
 }
 
 void	yellow_LED_off(void)
 {
-	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+	at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 	writel(YELLOW_LED, &pio->piob.sodr);
 }
 
 void	red_LED_off(void)
 {
-	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+	at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 	writel(RED_LED, &pio->piob.sodr);
 }
 
 void coloured_LED_init (void)
 {
-	at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE;
-	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+	at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
+	at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 
 	/* Enable PIOB clock */
-	writel(1 << AT91_ID_PIOB, &pmc->pcer);
+	writel(1 << ATMEL_ID_PIOB, &pmc->pcer);
 
 	/* Disable peripherals on LEDs */
 	writel(GREEN_LED | YELLOW_LED | RED_LED, &pio->piob.per);

drivers/net/at91_emac.c +16 ~~-16~~

index 4e5685c..228dbae 100644
@@ -342,34 +342,34 @@ static int at91emac_init(struct eth_device *netdev, bd_t *bd)
 	u32 value;
 	emac_device *dev;
 	at91_emac_t *emac;
-	at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
-	at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE;
+	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
+	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
 
 	emac = (at91_emac_t *) netdev->iobase;
 	dev = (emac_device *) netdev->priv;
 
 	/* PIO Disable Register */
-	value =	AT91_PMX_AA_EMDIO |	AT91_PMX_AA_EMDC |
-		AT91_PMX_AA_ERXER |	AT91_PMX_AA_ERX1 |
-		AT91_PMX_AA_ERX0 |	AT91_PMX_AA_ECRS |
-		AT91_PMX_AA_ETX1 |	AT91_PMX_AA_ETX0 |
-		AT91_PMX_AA_ETXEN |	AT91_PMX_AA_EREFCK;
+	value =	ATMEL_PMX_AA_EMDIO |	ATMEL_PMX_AA_EMDC |
+		ATMEL_PMX_AA_ERXER |	ATMEL_PMX_AA_ERX1 |
+		ATMEL_PMX_AA_ERX0 |	ATMEL_PMX_AA_ECRS |
+		ATMEL_PMX_AA_ETX1 |	ATMEL_PMX_AA_ETX0 |
+		ATMEL_PMX_AA_ETXEN |	ATMEL_PMX_AA_EREFCK;
 
 	writel(value, &pio->pioa.pdr);
 	writel(value, &pio->pioa.asr);
 
 #ifdef CONFIG_RMII
-	value = AT91_PMX_BA_ERXCK;
+	value = ATMEL_PMX_BA_ERXCK;
 #else
-	value = AT91_PMX_BA_ERXCK |	AT91_PMX_BA_ECOL |
-		AT91_PMX_BA_ERXDV |	AT91_PMX_BA_ERX3 |
-		AT91_PMX_BA_ERX2 |	AT91_PMX_BA_ETXER |
-		AT91_PMX_BA_ETX3 |	AT91_PMX_BA_ETX2;
+	value = ATMEL_PMX_BA_ERXCK |	ATMEL_PMX_BA_ECOL |
+		ATMEL_PMX_BA_ERXDV |	ATMEL_PMX_BA_ERX3 |
+		ATMEL_PMX_BA_ERX2 |	ATMEL_PMX_BA_ETXER |
+		ATMEL_PMX_BA_ETX3 |	ATMEL_PMX_BA_ETX2;
 #endif
 	writel(value, &pio->piob.pdr);
 	writel(value, &pio->piob.bsr);
 
-	writel(1 << AT91_ID_EMAC, &pmc->pcer);
+	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
 	writel(readl(&emac->ctl) | AT91_EMAC_CTL_CSR, &emac->ctl);
 
 	/* Init Ethernet buffers */

@@ -476,11 +476,11 @@ static int at91emac_write_hwaddr(struct eth_device *netdev)
 {
 	emac_device *dev;
 	at91_emac_t *emac;
-	at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE;
+	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
 	emac = (at91_emac_t *) netdev->iobase;
 	dev = (emac_device *) netdev->priv;
 
-	writel(1 << AT91_ID_EMAC, &pmc->pcer);
+	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
 	DEBUG_AT91EMAC("init MAC-ADDR %x%x \n",
 		cpu_to_le16(*((u16 *)(netdev->enetaddr + 4))),
 		cpu_to_le32(*((u32 *)netdev->enetaddr)));

@@ -498,7 +498,7 @@ int at91emac_register(bd_t *bis, unsigned long iobase)
 	struct eth_device *dev;
 
 	if (iobase == 0)
-		iobase = AT91_EMAC_BASE;
+		iobase = ATMEL_BASE_EMAC;
 	emac = malloc(sizeof(*emac)+512);
 	if (emac == NULL)
 		return -1;

include/configs/at91rm9200ek.h +1 -1

index 810023a..33212c3 100644
@@ -172,7 +172,7 @@
 #define CONFIG_DOS_PARTITION			1
 
 #define CONFIG_SYS_USB_OHCI_CPU_INIT		1
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		AT91_USB_HOST_BASE
+#define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_USB_HOST_BASE
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91rm9200"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15

include/configs/eb_cpux9k2.h +17 ~~-12~~

index 754fc8b..a635e58 100644
@@ -29,12 +29,13 @@
 
 /*--------------------------------------------------------------------------*/
 
-#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-#define CONFIG_EB_CPUX9K2	1	/* on an EP+CPUX9K2 Board	*/
-#define USE_920T_MMU		1
+#define CONFIG_ARM920T			/* This is an ARM920T Core	*/
+#define CONFIG_AT91FAMILY
+#define CONFIG_AT91RM9200		/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_EB_CPUX9K2		/* on an EP+CPUX9K2 Board	*/
+#define USE_920T_MMU
 
-#define CONFIG_VERSION_VARIABLE 1
+#define CONFIG_VERSION_VARIABLE
 #define CONFIG_IDENT_STRING	" on EB+CPUx9K2"
 
 #include <asm/arch/hardware.h>	/* needed for port definitions */

@@ -186,8 +187,12 @@
 #define CONFIG_NET_RETRY_COUNT		10
 #define CONFIG_RESET_PHY_R		1
 
+
 #define CONFIG_DRIVER_AT91EMAC		1
 #define CONFIG_DRIVER_AT91EMAC_QUIET	1
+/*
+#define CONFIG_DRIVER_MACB		1
+*/
 #define CONFIG_SYS_RX_ETH_BUFFER	8
 #define CONFIG_MII			1

@@ -217,19 +222,19 @@
 #define CONFIG_SYS_I2C_INIT_BOARD
 
 #define I2C_INIT	i2c_init_board();
-#define I2C_ACTIVE	writel(AT91_PMX_AA_TWD, &pio->pioa.mddr);
-#define I2C_TRISTATE	writel(AT91_PMX_AA_TWD, &pio->pioa.mder);
-#define I2C_READ	((readl(&pio->pioa.pdsr) & AT91_PMX_AA_TWD) != 0)
+#define I2C_ACTIVE	writel(ATMEL_PMX_AA_TWD, &pio->pioa.mddr);
+#define I2C_TRISTATE	writel(ATMEL_PMX_AA_TWD, &pio->pioa.mder);
+#define I2C_READ	((readl(&pio->pioa.pdsr) & ATMEL_PMX_AA_TWD) != 0)
 #define I2C_SDA(bit)						\
 	if (bit)						\
-		writel(AT91_PMX_AA_TWD, &pio->pioa.sodr);	\
+		writel(ATMEL_PMX_AA_TWD, &pio->pioa.sodr);	\
 	else							\
-		writel(AT91_PMX_AA_TWD, &pio->pioa.codr);
+		writel(ATMEL_PMX_AA_TWD, &pio->pioa.codr);
 #define I2C_SCL(bit)						\
 	if (bit)						\
-		writel(AT91_PMX_AA_TWCK, &pio->pioa.sodr);	\
+		writel(ATMEL_PMX_AA_TWCK, &pio->pioa.sodr);	\
 	else							\
-		writel(AT91_PMX_AA_TWCK, &pio->pioa.codr);
+		writel(ATMEL_PMX_AA_TWCK, &pio->pioa.codr);
 
 #define I2C_DELAY	udelay(2500000/CONFIG_SYS_I2C_SPEED)

Signature · 1 line

1.7.1

Andreas Bießmann

2011-02-11 08:11 UTC #1 lore raw

PATCH 1/1 update arm/at91rm9200 work with rework rework110202

Dear Jens Scharsig,

Am 10.02.2011 um 20:31 schrieb Jens Scharsig:

Quoted 6 lines

* update arm920t/at91 to ATMEL_xxx name scheme
* convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
* update arm920t/at91 soc lib
* update at91_emac driver
Signed-off-by Jens Scharsig <[email protected]>

Tested-by Andreas Bie?mann <[email protected]>

But some changes

Quoted 4 lines

---
The eb_cpux9k2 board can compile and runs after patch changes The at91rm9200ek can compile, but i have no hardware to test it.

at91rm9200ek is working but the change for timer.c is needed
Testet peripheral for at91rm9200ek is:
- USB (fatls)
- EMAC (tftp)

Quoted 4 lines

arch/arm/cpu/arm920t/at91/reset.c           |    2 +-
arch/arm/cpu/arm920t/at91/timer.c           |   10 +-
arch/arm/include/asm/arch-at91/at91_mc.h    |   12 +-
arch/arm/include/asm/arch-at91/at91_pmc.h   |   10 +-

Quoted 8 lines

arch/arm/include/asm/arch-at91/at91rm9200.h |  209 ++++++++++++++-------------
board/BuS/eb_cpux9k2/cpux9k2.c              |   52 ++++----
board/atmel/at91rm9200ek/at91rm9200ek.c     |    4 +-
board/atmel/at91rm9200ek/led.c              |   22 ++--
drivers/net/at91_emac.c                     |   32 ++--
include/configs/at91rm9200ek.h              |    2 +-
include/configs/eb_cpux9k2.h                |   29 +++--
11 files changed, 201 insertions(+), 183 deletions(-)

[reset.c is OK]

Please add:

arch/arm/cpu/arm920t/at91/timer.c +1 -1

index e2630b8..f0ad7d6 100644
@@ -32,7 +32,7 @@
 
 #include <common.h>
 
-#include <asm/arch/io.h>
+#include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_tc.h>
 #include <asm/arch/at91_pmc.h>

[other changes to timer.c are OK]
[at91_mc.h is OK]
[at91_pmc.h is OK]

arch/arm/include/asm/arch-at91/at91rm9200.h line 26

Quoted 11 lines

arch/arm/include/asm/arch-at91/at91rm9200.h +3 -0

index 1bee6f2..58f0e39 100644
@@ -21,115 +21,126 @@
 #ifndef __AT91RM9200_H__
 #define __AT91RM9200_H__
 
+#define CONFIG_AT91FAMILY	/* it's a member of AT91 */
+#define CONFIG_ARM920T		/* This is an ARM920T Core	*/
+

These are defined in board header .. I saw they are defined also in other at91xxx.h files, we should discuss where to define these since all of the at91xx.h files are included by hardware.h

arch/arm/include/asm/arch-at91/at91rm9200.h line 27

Quoted 1 line

arch/arm/include/asm/arch-at91/at91rm9200.h +0 -0
 /* Periperial Identifiers */

[snip changes to at91rm9200.h which are obviously OK]

arch/arm/include/asm/arch-at91/at91rm9200.h line 28

Quoted 1 line

arch/arm/include/asm/arch-at91/at91rm9200.h +1 -0
+#define ATMEL_PIO_PORTS		4	/* theese SoCs have 3 PIO */

3 or 4 PIO?

arch/arm/include/asm/arch-at91/at91rm9200.h line 33

Quoted 5 lines

arch/arm/include/asm/arch-at91/at91rm9200.h +3 -0

+#define ATMEL_PMC_UHP		AT91RM9200_PMC_UHP
+
+#define CONFIG_SYS_ATMEL_CPU_NAME	"AT91RM9200"
 
 #endif

[cpux9k2.c is OK]
[at91rm9200ek.c is OK]
[at91rm9200ek/led.c is OK]
[at91_emac.c is OK]
[at91rm9200ek.h is OK]

Quoted 22 lines

include/configs/eb_cpux9k2.h +6 -5

@@ -29,12 +29,13 @@
 
 /*--------------------------------------------------------------------------*/
 
-#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-#define CONFIG_EB_CPUX9K2	1	/* on an EP+CPUX9K2 Board	*/
-#define USE_920T_MMU		1
+#define CONFIG_ARM920T			/* This is an ARM920T Core	*/
+#define CONFIG_AT91FAMILY
+#define CONFIG_AT91RM9200		/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_EB_CPUX9K2		/* on an EP+CPUX9K2 Board	*/
+#define USE_920T_MMU
 
-#define CONFIG_VERSION_VARIABLE 1
+#define CONFIG_VERSION_VARIABLE
 #define CONFIG_IDENT_STRING	" on EB+CPUx9K2"
 
 #include <asm/arch/hardware.h>	/* needed for port definitions */

include/configs/eb_cpux9k2.h line 190

Quoted 4 lines

include/configs/eb_cpux9k2.h +1 -0

@@ -186,8 +187,12 @@
 #define CONFIG_NET_RETRY_COUNT		10
 #define CONFIG_RESET_PHY_R		1
 
+

please remove this additional empty line

include/configs/eb_cpux9k2.h line 195

Quoted 5 lines

include/configs/eb_cpux9k2.h +3 -0

 #define CONFIG_DRIVER_AT91EMAC		1
 #define CONFIG_DRIVER_AT91EMAC_QUIET	1
+/*
+#define CONFIG_DRIVER_MACB		1
+*/

why this? Either it is needed or not.

Quoted 33 lines

include/configs/eb_cpux9k2.h +7 -7

 #define CONFIG_SYS_RX_ETH_BUFFER	8
 #define CONFIG_MII			1

@@ -217,19 +222,19 @@
 #define CONFIG_SYS_I2C_INIT_BOARD
 
 #define I2C_INIT	i2c_init_board();
-#define I2C_ACTIVE	writel(AT91_PMX_AA_TWD, &pio->pioa.mddr);
-#define I2C_TRISTATE	writel(AT91_PMX_AA_TWD, &pio->pioa.mder);
-#define I2C_READ	((readl(&pio->pioa.pdsr) & AT91_PMX_AA_TWD) != 0)
+#define I2C_ACTIVE	writel(ATMEL_PMX_AA_TWD, &pio->pioa.mddr);
+#define I2C_TRISTATE	writel(ATMEL_PMX_AA_TWD, &pio->pioa.mder);
+#define I2C_READ	((readl(&pio->pioa.pdsr) & ATMEL_PMX_AA_TWD) != 0)
 #define I2C_SDA(bit)						\
 	if (bit)						\
-		writel(AT91_PMX_AA_TWD, &pio->pioa.sodr);	\
+		writel(ATMEL_PMX_AA_TWD, &pio->pioa.sodr);	\
 	else							\
-		writel(AT91_PMX_AA_TWD, &pio->pioa.codr);
+		writel(ATMEL_PMX_AA_TWD, &pio->pioa.codr);
 #define I2C_SCL(bit)						\
 	if (bit)						\
-		writel(AT91_PMX_AA_TWCK, &pio->pioa.sodr);	\
+		writel(ATMEL_PMX_AA_TWCK, &pio->pioa.sodr);	\
 	else							\
-		writel(AT91_PMX_AA_TWCK, &pio->pioa.codr);
+		writel(ATMEL_PMX_AA_TWCK, &pio->pioa.codr);
 
 #define I2C_DELAY	udelay(2500000/CONFIG_SYS_I2C_SPEED)

Signature · 1 line

1.7.1

Jens Scharsig

author

2011-02-11 17:36 UTC #2 lore raw

PATCH 1/1 update arm/at91rm9200 work with rework rework110202

Dear Andreas Bie?mann,

I'm offline for the net 10 days. So I fast include your comments to a V2 patch version

Am 11.02.2011 09:11, schrieb Andreas Bie?mann:

Quoted 9 lines

Dear Jens Scharsig,
Am 10.02.2011 um 20:31 schrieb Jens Scharsig:
Quoted 5 lines
* update arm920t/at91 to ATMEL_xxx name scheme
* convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
* update arm920t/at91 soc lib
* update at91_emac driver

Quoted 5 lines

Quoted 1 line
Signed-off-by Jens Scharsig <[email protected]>
Tested-by Andreas Bie?mann <[email protected]>
But some changes

I have prepare a second version of my patch.

Quoted 7 lines

Quoted 5 lines
---
The eb_cpux9k2 board can compile and runs after patch changes The at91rm9200ek can compile, but i have no hardware to test it.
at91rm9200ek is working but the change for timer.c is needed

The timer.c changes I sent i a previous patch. I have join them to V2

Quoted 10 lines

Testet peripheral for at91rm9200ek is:
- USB (fatls)
- EMAC (tftp)
Review
Quoted 4 lines
(quoted diff) +3 -0
+#define CONFIG_AT91FAMILY	/* it's a member of AT91 */
+#define CONFIG_ARM920T		/* This is an ARM920T Core	*/
+
These are defined in board header .. I saw they are defined also in other at91xxx.h files, we should discuss where to define these since all of the at91xx.h files are included by hardware.h

In V2 a have remove the define from board config's

Quoted 8 lines

Quoted 2 lines
/* Periperial Identifiers */
[snip changes to at91rm9200.h which are obviously OK]
Quoted 1 line
+#define ATMEL_PIO_PORTS 4 /* theese SoCs have 3 PIO */
3 or 4 PIO?

3 for PLCC and 4 for BGA variants. In PLCC the 4th port is not bound out. I set the comment to 4 in V2

Quoted 4 lines

Quoted 2 lines
+
please remove this additional empty line

removed

Quoted 9 lines

Review
Quoted 6 lines
#define CONFIG_DRIVER_AT91EMAC 1
#define CONFIG_DRIVER_AT91EMAC_QUIET 1
(quoted diff) +3 -0
+/*
+#define CONFIG_DRIVER_MACB		1
+*/
why this? Either it is needed or not.

waste from testing, removed

Best regard

Jens Scharsig