ARMV7: OMAP: Configure Overo's second network chip

Confiures GPMC timings for both chips and also configures pinmux
for GPIO_65, which is used as the interrupt signal for the second chip

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/board/overo/overo.c b/board/overo/overo.c
index 1c7087b7ed8cfa5138446617c96e6825a1fe745a..4a6091720119be076bac6572ae4484489704c160 100644 (file)
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -43,6 +43,17 @@
 static void setup_net_chip(void);
 #endif
 
+/* GPMC definitions for LAN9221 chips on Tobi expansion boards */
+static const u32 gpmc_lan_config[] = {
+    NET_LAN9221_GPMC_CONFIG1,
+    NET_LAN9221_GPMC_CONFIG2,
+    NET_LAN9221_GPMC_CONFIG3,
+    NET_LAN9221_GPMC_CONFIG4,
+    NET_LAN9221_GPMC_CONFIG5,
+    NET_LAN9221_GPMC_CONFIG6,
+    /*CONFIG7- computed as params */
+};
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -131,14 +142,13 @@ static void setup_net_chip(void)
 {
        struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
 
-       /* Configure GPMC registers */
-       writel(NET_LAN9221_GPMC_CONFIG1, &gpmc_cfg->cs[5].config1);
-       writel(NET_LAN9221_GPMC_CONFIG2, &gpmc_cfg->cs[5].config2);
-       writel(NET_LAN9221_GPMC_CONFIG3, &gpmc_cfg->cs[5].config3);
-       writel(NET_LAN9221_GPMC_CONFIG4, &gpmc_cfg->cs[5].config4);
-       writel(NET_LAN9221_GPMC_CONFIG5, &gpmc_cfg->cs[5].config5);
-       writel(NET_LAN9221_GPMC_CONFIG6, &gpmc_cfg->cs[5].config6);
-       writel(NET_LAN9221_GPMC_CONFIG7, &gpmc_cfg->cs[5].config7);
+       /* first lan chip */
+       enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5], 0x2C000000,
+                       GPMC_SIZE_16M);
+
+       /* second lan chip */
+       enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[4], 0x2B000000,
+                       GPMC_SIZE_16M);
 
        /* Enable off mode for NWE in PADCONF_GPMC_NWE register */
        writew(readw(&ctrl_base ->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe);

diff --git a/board/overo/overo.h b/board/overo/overo.h
index a4e49b91a06df29b691328ea6120210e48f992c5..2744ffee6986861dedd472b5adc7c083d1036787 100644 (file)
--- a/board/overo/overo.h
+++ b/board/overo/overo.h
@@ -138,7 +138,7 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(GPMC_WAIT1),         (IEN  | PTU | EN  | M0)) /*GPMC_WAIT1*/\
        MUX_VAL(CP(GPMC_WAIT2),         (IEN  | PTU | EN  | M4)) /*GPIO_64*/\
                                                                 /* - SMSC911X_NRES*/\
-       MUX_VAL(CP(GPMC_WAIT3),         (IEN  | PTU | EN  | M0)) /*GPMC_nCS3*/\
+       MUX_VAL(CP(GPMC_WAIT3),         (IEN  | PTU | DIS | M4)) /*GPIO_65*/\
  /*DSS*/\
        MUX_VAL(CP(DSS_PCLK),           (IDIS | PTD | DIS | M0)) /*DSS_PCLK*/\
        MUX_VAL(CP(DSS_HSYNC),          (IDIS | PTD | DIS | M0)) /*DSS_HSYNC*/\