Allow the address of the Ten Bit Interface (TBI) to be changed in the event of a conflict with another device.

Signed-off by: Joe Hamman joe.hamman@embeddedspecialties.com

diff -uprN -X ../dontdiff a/drivers/tsec.c b/drivers/tsec.c --- a/drivers/tsec.c 2007-08-09 08:35:02.000000000 -0500 +++ b/drivers/tsec.c 2007-08-09 08:31:34.000000000 -0500 @@ -296,9 +296,9 @@ static int init_phy(struct eth_device *d volatile tsec_t *regs = (volatile tsec_t *)(TSEC_BASE_ADDR);

/* Assign a Physical address to the TBI */ - regs->tbipa = TBIPA_VALUE; + regs->tbipa = CFG_TBIPA_VALUE; regs = (volatile tsec_t *)(TSEC_BASE_ADDR + TSEC_SIZE); - regs->tbipa = TBIPA_VALUE; + regs->tbipa = CFG_TBIPA_VALUE; asm("sync");

/* Reset MII (due to new addresses) */ diff -uprN -X ../dontdiff a/drivers/tsec.h b/drivers/tsec.h --- a/drivers/tsec.h 2007-08-09 08:35:02.000000000 -0500 +++ b/drivers/tsec.h 2007-08-09 08:31:04.000000000 -0500 @@ -70,7 +70,9 @@ #define miim_end -2 #define miim_read -1

-#define TBIPA_VALUE 0x1f +#ifndef CFG_TBIPA_VALUE + #define CFG_TBIPA_VALUE 0x1f +#endif #define MIIMCFG_INIT_VALUE 0x00000003 #define MIIMCFG_RESET 0x80000000