diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/pm826/pm826.c | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/board/pm826/pm826.c b/board/pm826/pm826.c index c59b028..3ba8ca9 100644 --- a/board/pm826/pm826.c +++ b/board/pm826/pm826.c @@ -72,20 +72,27 @@ const iop_conf_t iop_conf_tab[4][32] = { /* Port B configuration */ { /* conf ppar psor pdir podr pdat */ - /* PB31 */ { 0, 1, 0, 1, 0, 0 }, /* PB31 */ - /* PB30 */ { 0, 1, 0, 0, 0, 0 }, /* PB30 */ - /* PB29 */ { 0, 1, 1, 1, 0, 0 }, /* PB29 */ + /* PB31 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 TX_ER */ + /* PB30 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 RX_DV */ + /* PB29 */ { 1, 1, 1, 1, 0, 0 }, /* FCC2 TX_EN */ +#if defined(CONFIG_ETHER_ON_SCC) && (CONFIG_ETHER_INDEX == 1) +#ifdef CONFIG_ETHER_ON_FCC2 +#error "SCC1 conflicts with FCC2" +#endif /* PB28 */ { 1, 1, 1, 1, 0, 0 }, /* SCC1 TXD */ - /* PB27 */ { 0, 1, 0, 0, 0, 0 }, /* PB27 */ - /* PB26 */ { 0, 1, 0, 0, 0, 0 }, /* PB26 */ - /* PB25 */ { 0, 1, 0, 1, 0, 0 }, /* PB25 */ - /* PB24 */ { 0, 1, 0, 1, 0, 0 }, /* PB24 */ - /* PB23 */ { 0, 1, 0, 1, 0, 0 }, /* PB23 */ - /* PB22 */ { 0, 1, 0, 1, 0, 0 }, /* PB22 */ - /* PB21 */ { 0, 1, 0, 0, 0, 0 }, /* PB21 */ - /* PB20 */ { 0, 1, 0, 0, 0, 0 }, /* PB20 */ - /* PB19 */ { 0, 1, 0, 0, 0, 0 }, /* PB19 */ - /* PB18 */ { 0, 1, 0, 0, 0, 0 }, /* PB18 */ +#else + /* PB28 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 RX_ER */ +#endif + /* PB27 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 COL */ + /* PB26 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 CRS */ + /* PB25 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 TxD[3] */ + /* PB24 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 TxD[2] */ + /* PB23 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 TxD[1] */ + /* PB22 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 TxD[0] */ + /* PB21 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 RxD[0] */ + /* PB20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 RxD[1] */ + /* PB19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 RxD[2] */ + /* PB18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 RxD[3] */ /* PB17 */ { 0, 0, 0, 0, 0, 0 }, /* PB17 */ /* PB16 */ { 0, 0, 0, 0, 0, 0 }, /* PB16 */ /* PB15 */ { 1, 1, 0, 0, 0, 0 }, /* SCC2 RXD */ @@ -119,9 +126,9 @@ const iop_conf_t iop_conf_tab[4][32] = { /* PC23 */ { 0, 1, 0, 1, 0, 0 }, /* PC23 */ /* PC22 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 TXCK */ /* PC21 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 RXCK */ - /* PC20 */ { 0, 1, 0, 0, 0, 0 }, /* PC20 */ - /* PC19 */ { 0, 1, 0, 0, 0, 0 }, /* PC19 */ - /* PC18 */ { 0, 1, 0, 0, 0, 0 }, /* PC18 */ + /* PC20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 TXCK(2) */ + /* PC19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 RXCK */ + /* PC18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 TXCK */ /* PC17 */ { 0, 0, 0, 1, 0, 0 }, /* PC17 */ /* PC16 */ { 0, 0, 0, 1, 0, 0 }, /* PC16 */ /* PC15 */ { 1, 1, 0, 1, 0, 0 }, /* SMC2 TXD */ |