LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blackfin: bf518f-ezbrd: don't require SPI logic all the time 

Only the first run of boards had a ksz switch on it, so if building for a
newer silicon rev or SPI is disabled, don't bother checking for the ksz.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-12-03 00:31:48 -05:00
parent 4db2fa7f94
commit f57689e795
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
board/bf518f-ezbrd/bf518f-ezbrd.c
View File

@ -57,6 +57,13 @@ static void board_init_enetaddr(uchar *mac_addr)
eth_setenv_enetaddr("ethaddr", mac_addr); eth_setenv_enetaddr("ethaddr", mac_addr);
} }
/* Only the first run of boards had a KSZ switch */
#if defined(CONFIG_BFIN_SPI) && __SILICON_REVISION__ == 0
# define KSZ_POSSIBLE 1
#else
# define KSZ_POSSIBLE 0
#endif
#define KSZ_MAX_HZ 5000000 #define KSZ_MAX_HZ 5000000
#define KSZ_WRITE 0x02 #define KSZ_WRITE 0x02
@ -109,17 +116,16 @@ static int ksz8893m_reset(struct spi_slave *slave)
return ret; return ret;
} }
int board_eth_init(bd_t *bis) static bool board_ksz_init(void)
{ {
static bool switch_is_alive = false, phy_is_ksz = true; static bool switch_is_alive = false;
int ret;
if (!switch_is_alive) { if (!switch_is_alive) {
struct spi_slave *slave = spi_setup_slave(0, 1, KSZ_MAX_HZ, SPI_MODE_3); struct spi_slave *slave = spi_setup_slave(0, 1, KSZ_MAX_HZ, SPI_MODE_3);
if (slave) { if (slave) {
if (!spi_claim_bus(slave)) { if (!spi_claim_bus(slave)) {
phy_is_ksz = (ksz8893m_reg_read(slave, KSZ_REG_CHID) == 0x88); bool phy_is_ksz = (ksz8893m_reg_read(slave, KSZ_REG_CHID) == 0x88);
ret = phy_is_ksz ? ksz8893m_reset(slave) : 0; int ret = phy_is_ksz ? ksz8893m_reset(slave) : 0;
switch_is_alive = (ret == 0); switch_is_alive = (ret == 0);
spi_release_bus(slave); spi_release_bus(slave);
} }
@ -127,10 +133,16 @@ int board_eth_init(bd_t *bis)
} }
} }
if (switch_is_alive) return switch_is_alive;
}
int board_eth_init(bd_t *bis)
{
if (KSZ_POSSIBLE) {
if (!board_ksz_init())
return 0;
}
return bfin_EMAC_initialize(bis); return bfin_EMAC_initialize(bis);
else
return -1;
} }
#endif #endif