random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

igep00x0: reorder lan9221 code to remove ifdefs

Browse Source 
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
This commit is contained in:
Ladislav Michl 2016-07-12 20:28:28 +02:00 committed by Tom Rini
parent b7e042d6af
commit b0c47633cc
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
board/isee/igep00x0/igep00x0.c
View File

@ -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)
#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)
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)
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)
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