Commit b0c47633 authored by Ladislav Michl's avatar Ladislav Michl Committed by Tom Rini

igep00x0: reorder lan9221 code to remove ifdefs

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
parent b7e042d6
...@@ -39,18 +39,6 @@ const omap3_sysinfo sysinfo = { ...@@ -39,18 +39,6 @@ const omap3_sysinfo sysinfo = {
#endif #endif
}; };
#if defined(CONFIG_CMD_NET)
/* GPMC definitions for LAN9221 chips */
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,
};
#endif
static const struct ns16550_platdata igep_serial = { static const struct ns16550_platdata igep_serial = {
.base = OMAP34XX_UART3, .base = OMAP34XX_UART3,
.reg_shift = 2, .reg_shift = 2,
...@@ -119,7 +107,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) ...@@ -119,7 +107,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
#endif #endif
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
static void reset_net_chip(int gpio) static void reset_net_chip(int gpio)
{ {
if (!gpio_request(gpio, "eth nrst")) { if (!gpio_request(gpio, "eth nrst")) {
...@@ -140,6 +127,14 @@ static void reset_net_chip(int gpio) ...@@ -140,6 +127,14 @@ static void reset_net_chip(int gpio)
static void setup_net_chip(void) static void setup_net_chip(void)
{ {
struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE; struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
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,
};
enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5], enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5],
CONFIG_SMC911X_BASE, GPMC_SIZE_16M); CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
...@@ -154,6 +149,15 @@ static void setup_net_chip(void) ...@@ -154,6 +149,15 @@ static void setup_net_chip(void)
reset_net_chip(64); reset_net_chip(64);
} }
int board_eth_init(bd_t *bis)
{
#ifdef CONFIG_SMC911X
return smc911x_initialize(0, CONFIG_SMC911X_BASE);
#else
return 0;
#endif
}
#else #else
static inline void setup_net_chip(void) {} static inline void setup_net_chip(void) {}
#endif #endif
...@@ -219,14 +223,3 @@ void set_muxconf_regs(void) ...@@ -219,14 +223,3 @@ void set_muxconf_regs(void)
MUX_IGEP0030(); MUX_IGEP0030();
#endif #endif
} }
#if defined(CONFIG_CMD_NET)
int board_eth_init(bd_t *bis)
{
#ifdef CONFIG_SMC911X
return smc911x_initialize(0, CONFIG_SMC911X_BASE);
#else
return 0;
#endif
}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment