OMAP3: Overo: Update GPMC timing for ethernet chip

The existing timing does not quite meet the minimum requirements
in the LAN9221 datasheet. The timing in this patch solves problems
noticed on some parts. The patch also combines the CS configuration
for the overo and igep0020 boards per request.

Signed-off-by: Philip Balister <philip@opensdr.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/arch/arm/include/asm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h
index bd22bce837f9eaa78aa59c8358d2961539b5555e..800e4ee4a2c061eeae62142a4f5478da2ccb7da8 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/omap_gpmc.h
+++ b/arch/arm/include/asm/arch-omap3/omap_gpmc.h
@@ -80,4 +80,13 @@
 }
 #endif
 
+/* GPMC CS configuration for an SMSC LAN9221 ethernet controller */
+#define NET_LAN9221_GPMC_CONFIG1    0x00001000
+#define NET_LAN9221_GPMC_CONFIG2    0x00060700
+#define NET_LAN9221_GPMC_CONFIG3    0x00020201
+#define NET_LAN9221_GPMC_CONFIG4    0x06000700
+#define NET_LAN9221_GPMC_CONFIG5    0x0006090A
+#define NET_LAN9221_GPMC_CONFIG6    0x87030000
+#define NET_LAN9221_GPMC_CONFIG7    0x00000f6c
+
 #endif /* __ASM_ARCH_OMAP_GPMC_H */

diff --git a/board/isee/igep0020/igep0020.c b/board/isee/igep0020/igep0020.c
index 2279cc0e36efe5902db9b1b84325b645f65dd5f3..6a3777eb8c7cb14385573ceb8098fda5cfdc0f1e 100644 (file)
--- a/board/isee/igep0020/igep0020.c
+++ b/board/isee/igep0020/igep0020.c
@@ -29,6 +29,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/arch/omap_gpmc.h>
 #include <asm/mach-types.h>
 #include "igep0020.h"
 

diff --git a/board/isee/igep0020/igep0020.h b/board/isee/igep0020/igep0020.h
index c08d75832673f898b5792561dc5acac958760624..3d6e15fb7334c57a4264729a71341717c328954e 100644 (file)
--- a/board/isee/igep0020/igep0020.h
+++ b/board/isee/igep0020/igep0020.h
@@ -29,15 +29,6 @@ const omap3_sysinfo sysinfo = {
        "ONENAND",
 };
 
-/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */
-#define NET_LAN9221_GPMC_CONFIG1    0x00001000
-#define NET_LAN9221_GPMC_CONFIG2    0x00080701
-#define NET_LAN9221_GPMC_CONFIG3    0x00020201
-#define NET_LAN9221_GPMC_CONFIG4    0x08030703
-#define NET_LAN9221_GPMC_CONFIG5    0x00060908
-#define NET_LAN9221_GPMC_CONFIG6    0x87030000
-#define NET_LAN9221_GPMC_CONFIG7    0x00000f6c
-
 static void setup_net_chip(void);
 
 /*

diff --git a/board/overo/overo.c b/board/overo/overo.c
index 4bbe1b87beae41d8b846949300ae6806f8a65da0..850dfeecd96330e41759bd88819605973731abcf 100644 (file)
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -36,6 +36,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/arch/omap_gpmc.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
 #include "overo.h"

diff --git a/board/overo/overo.h b/board/overo/overo.h
index 68e1243e9c3f5a1bfca42045805596bf4f1e1c78..57f24570a298b1e3469178f1ccbd66245242aed6 100644 (file)
--- a/board/overo/overo.h
+++ b/board/overo/overo.h
@@ -33,15 +33,6 @@ const omap3_sysinfo sysinfo = {
 #endif
 };
 
-/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */
-#define NET_LAN9221_GPMC_CONFIG1    0x00001000
-#define NET_LAN9221_GPMC_CONFIG2    0x00080701
-#define NET_LAN9221_GPMC_CONFIG3    0x00020201
-#define NET_LAN9221_GPMC_CONFIG4    0x08030703
-#define NET_LAN9221_GPMC_CONFIG5    0x00060908
-#define NET_LAN9221_GPMC_CONFIG6    0x87030000
-#define NET_LAN9221_GPMC_CONFIG7    0x00000f6c
-
 /*
  * IEN  - Input Enable
  * IDIS - Input Disable