revert parts of r27488 to uboot-lantiq

Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>

SVN-Revision: 27663
This commit is contained in:
John Crispin 2011-07-17 19:27:24 +00:00
parent a6ceecd973
commit c0c7c82a2f

View file

@ -259,12 +259,12 @@ static int external_switch_init(void)
/* earlier no valid response is available, at least on Twinpass & Tantos @ 111MHz, M4530 platform */ /* earlier no valid response is available, at least on Twinpass & Tantos @ 111MHz, M4530 platform */
udelay(100000); udelay(100000);
printf("\nsearching for Samurai switch ... "); debug("\nsearching for Samurai switch ... ");
if ( (miiphy_read(name, PHYADDR(SAMURAI_ID_REG0), &chipid0)==0) && if ( (miiphy_read(name, PHYADDR(SAMURAI_ID_REG0), &chipid0)==0) &&
(miiphy_read(name, PHYADDR(SAMURAI_ID_REG1), &chipid1)==0) ) { (miiphy_read(name, PHYADDR(SAMURAI_ID_REG1), &chipid1)==0) ) {
if (((chipid0 & 0xFFF0) == ID_SAMURAI_0) && if (((chipid0 & 0xFFF0) == ID_SAMURAI_0) &&
((chipid1 & 0x000F) == ID_SAMURAI_1)) { ((chipid1 & 0x000F) == ID_SAMURAI_1)) {
printf("found"); debug("found");
/* enable "Crossover Auto Detect" + defaults */ /* enable "Crossover Auto Detect" + defaults */
/* P0 */ /* P0 */
@ -288,11 +288,10 @@ static int external_switch_init(void)
} }
} }
printf("%04X %04x\n", chipid0, chipid1); debug("\nsearching for TANTOS switch ... ");
printf("\nsearching for TANTOS switch ... ");
if (miiphy_read(name, PHYADDR(0x101), &chipid0) == 0) { if (miiphy_read(name, PHYADDR(0x101), &chipid0) == 0) {
if (chipid0 == ID_TANTOS) { if (chipid0 == ID_TANTOS) {
printf("found"); debug("found");
/* P5 Basic Control: Force Link Up */ /* P5 Basic Control: Force Link Up */
miiphy_write(name, PHYADDR(0xA1), 0x0004); miiphy_write(name, PHYADDR(0xA1), 0x0004);