Blackfin: bf518f-ezbrd: don't require SPI logic all the time
PATCH 1/1 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.
--- board/bf518f-ezbrd/bf518f-ezbrd.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-)
board/bf518f-ezbrd/bf518f-ezbrd.c +22 -8
@@ -57,6 +57,13 @@ static void board_init_enetaddr(uchar *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_WRITE 0x02
@@ -109,17 +116,16 @@ static int ksz8893m_reset(struct spi_slave *slave)return ret; } -int board_eth_init (bd_t *bis) +static int board_ksz_init (void ) { -static bool switch_is_alive = false, phy_is_ksz = true; -int ret; +static bool switch_is_alive = false;if (!switch_is_alive) {struct spi_slave *slave =spi_setup_slave (0 ,1 ,KSZ_MAX_HZ ,SPI_MODE_3 );if (slave) {if (!spi_claim_bus (slave)) { - phy_is_ksz = (ksz8893m_reg_read (slave,KSZ_REG_CHID ) ==0x88 ); - ret = phy_is_ksz ?ksz8893m_reset (slave) :0 ; +bool phy_is_ksz = (ksz8893m_reg_read (slave,KSZ_REG_CHID ) ==0x88 ); +int ret = phy_is_ksz ?ksz8893m_reset (slave) :0 ; switch_is_alive = (ret ==0 );spi_release_bus (slave); }
@@ -127,10 +133,18 @@ int board_eth_init(bd_t *bis) } } -if (switch_is_alive) -return bfin_EMAC_initialize (bis); -else +if (!switch_is_alive)return -1 ; +else +return 0 ; +} + +int board_eth_init (bd_t *bis) +{ +if (KSZ_POSSIBLE ) +if (board_ksz_init () ==-1 ) +return 0 ; +return bfin_EMAC_initialize (bis); }#endif
Signature · 1 line
1.7.3.3
PATCH 1/1 Blackfin: bf518f-ezbrd: don't require SPI logic all the time
Dear Mike Frysinger,
Quoted 4 lines · In message <[email protected]> you wrote:
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 <[email protected]>
...
board/bf518f-ezbrd/bf518f-ezbrd.c int board_eth_init(bd_t *bis) · line 140
Quoted 5 lines
board/bf518f-ezbrd/bf518f-ezbrd.c +4
-0+if (!switch_is_alive)return -1 ; +else +return 0 ; +}
Drop the else, and unindent the return 0;
board/bf518f-ezbrd/bf518f-ezbrd.c int board_eth_init(bd_t *bis) · line 146
Quoted 5 lines
board/bf518f-ezbrd/bf518f-ezbrd.c +5
-0+int board_eth_init (bd_t *bis) +{ +if (KSZ_POSSIBLE ) +if (board_ksz_init () ==-1 ) +return 0 ;
Braces needed for multiline statements.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Computers are not intelligent. They only think they are.
PATCH v2 1/1 Blackfin: bf518f-ezbrd: don't require SPI logic all the time
In reply to Mike FrysingerOnly 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.
---
v2
- tweak style
board/bf518f-ezbrd/bf518f-ezbrd.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-)
board/bf518f-ezbrd/bf518f-ezbrd.c +21 -9
@@ -57,6 +57,13 @@ static void board_init_enetaddr(uchar *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_WRITE 0x02
@@ -109,17 +116,16 @@ static int ksz8893m_reset(struct spi_slave *slave)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; -int ret; +static bool switch_is_alive = false;if (!switch_is_alive) {struct spi_slave *slave =spi_setup_slave (0 ,1 ,KSZ_MAX_HZ ,SPI_MODE_3 );if (slave) {if (!spi_claim_bus (slave)) { - phy_is_ksz = (ksz8893m_reg_read (slave,KSZ_REG_CHID ) ==0x88 ); - ret = phy_is_ksz ?ksz8893m_reset (slave) :0 ; +bool phy_is_ksz = (ksz8893m_reg_read (slave,KSZ_REG_CHID ) ==0x88 ); +int ret = phy_is_ksz ?ksz8893m_reset (slave) :0 ; switch_is_alive = (ret ==0 );spi_release_bus (slave); }
@@ -127,10 +133,16 @@ int board_eth_init(bd_t *bis) } } -if (switch_is_alive) -return bfin_EMAC_initialize (bis); -else -return -1 ; +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); }#endif
Signature · 1 line
1.7.3.4