summaryrefslogtreecommitdiff
path: root/board/omap3
diff options
context:
space:
mode:
Diffstat (limited to 'board/omap3')
-rw-r--r--board/omap3/evm/evm.c15
-rw-r--r--board/omap3/zoom2/zoom2.c3
2 files changed, 8 insertions, 10 deletions
diff --git a/board/omap3/evm/evm.c b/board/omap3/evm/evm.c
index 71905f6..0718a08 100644
--- a/board/omap3/evm/evm.c
+++ b/board/omap3/evm/evm.c
@@ -93,17 +93,16 @@ void set_muxconf_regs(void)
static void setup_net_chip(void)
{
struct gpio *gpio3_base = (struct gpio *)OMAP34XX_GPIO3_BASE;
- struct gpmc *gpmc = (struct gpmc *)GPMC_BASE;
struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
/* Configure GPMC registers */
- writel(NET_GPMC_CONFIG1, &gpmc->cs[5].config1);
- writel(NET_GPMC_CONFIG2, &gpmc->cs[5].config2);
- writel(NET_GPMC_CONFIG3, &gpmc->cs[5].config3);
- writel(NET_GPMC_CONFIG4, &gpmc->cs[5].config4);
- writel(NET_GPMC_CONFIG5, &gpmc->cs[5].config5);
- writel(NET_GPMC_CONFIG6, &gpmc->cs[5].config6);
- writel(NET_GPMC_CONFIG7, &gpmc->cs[5].config7);
+ writel(NET_GPMC_CONFIG1, &gpmc_cfg->cs[5].config1);
+ writel(NET_GPMC_CONFIG2, &gpmc_cfg->cs[5].config2);
+ writel(NET_GPMC_CONFIG3, &gpmc_cfg->cs[5].config3);
+ writel(NET_GPMC_CONFIG4, &gpmc_cfg->cs[5].config4);
+ writel(NET_GPMC_CONFIG5, &gpmc_cfg->cs[5].config5);
+ writel(NET_GPMC_CONFIG6, &gpmc_cfg->cs[5].config6);
+ writel(NET_GPMC_CONFIG7, &gpmc_cfg->cs[5].config7);
/* 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/omap3/zoom2/zoom2.c b/board/omap3/zoom2/zoom2.c
index d64730e..d9e2ae5 100644
--- a/board/omap3/zoom2/zoom2.c
+++ b/board/omap3/zoom2/zoom2.c
@@ -123,14 +123,13 @@ void zoom2_identify(void)
int board_init (void)
{
DECLARE_GLOBAL_DATA_PTR;
- struct gpmc *gpmc = (struct gpmc *)GPMC_BASE;
u32 *gpmc_config;
gpmc_init (); /* in SRAM or SDRAM, finish GPMC */
/* Configure console support on zoom2 */
gpmc_config = gpmc_serial_TL16CP754C;
- enable_gpmc_cs_config(gpmc_config, &gpmc->cs[4],
+ enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[4],
SERIAL_TL16CP754C_BASE, GPMC_SIZE_16M);
/* board id for Linux */