summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2011-10-11 11:23:22 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-10-27 21:56:35 +0200
commit8f7109b3abb7b667bfa3f9b242cd43c55ad6b8c9 (patch)
tree22cefac94954ba3d14d46491d0ad00bbc0c48ee3
parent75b988a2e6fc4750ca734a777f4f1996ff835473 (diff)
downloadu-boot-imx-8f7109b3abb7b667bfa3f9b242cd43c55ad6b8c9.zip
u-boot-imx-8f7109b3abb7b667bfa3f9b242cd43c55ad6b8c9.tar.gz
u-boot-imx-8f7109b3abb7b667bfa3f9b242cd43c55ad6b8c9.tar.bz2
OMAP3: overo: Move ethernet CS4 configuration to execute based on board id
By moving the CS4 configuration into the board specific configuration, it is left free for custom carrier boards. The USRP-E1XX series uses CS4 to control access to an FPGA, so without this patch the device driver cannot claim CS4. Signed-off-by: Philip Balister <philip@opensdr.com> Tested-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
-rw-r--r--board/overo/overo.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/board/overo/overo.c b/board/overo/overo.c
index 850dfee..2f9eba6 100644
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -233,6 +233,9 @@ int misc_init_r(void)
printf("Recognized Tobi Duo expansion board (rev %d %s)\n",
expansion_config.revision,
expansion_config.fab_revision);
+ /* second lan chip */
+ enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[4],
+ 0x2B000000, GPMC_SIZE_16M);
break;
case GUMSTIX_PALO35:
printf("Recognized Palo35 expansion board (rev %d %s)\n",
@@ -310,10 +313,6 @@ static void setup_net_chip(void)
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);
/* Enable off mode for NOE in PADCONF_GPMC_NADV_ALE register */