diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-26 11:27:35 +0000 |
|---|---|---|
| committer | Prafulla Wadaskar <prafulla@marvell.com> | 2013-01-09 04:12:10 +0530 |
| commit | 0a16ea593355d1a0fd415286089961f9c9ad1614 (patch) | |
| tree | c48b54df3a173902a73dcd2588c27ff46605a734 /include/netdev.h | |
| parent | 136846d77f9788431d0405a7291e93f9996bb016 (diff) | |
| download | blackbird-obmc-uboot-0a16ea593355d1a0fd415286089961f9c9ad1614.tar.gz blackbird-obmc-uboot-0a16ea593355d1a0fd415286089961f9c9ad1614.zip | |
mv88e61xx: refactor PHY and SWITCH level-code
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'include/netdev.h')
| -rw-r--r-- | include/netdev.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/include/netdev.h b/include/netdev.h index b8d303d089..7f158d433b 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -163,10 +163,9 @@ static inline int pci_eth_init(bd_t *bis) * the stuct and enums here are used to specify switch configuration params */ #if defined(CONFIG_MV88E61XX_SWITCH) -enum mv88e61xx_cfg_vlan { - MV88E61XX_VLANCFG_DEFAULT, - MV88E61XX_VLANCFG_ROUTER -}; + +/* constants for any 88E61xx switch */ +#define MV88E61XX_MAX_PORTS_NUM 6 enum mv88e61xx_cfg_mdip { MV88E61XX_MDIP_NOCHANGE, @@ -192,7 +191,7 @@ enum mv88e61xx_cfg_prtstt { struct mv88e61xx_config { char *name; - enum mv88e61xx_cfg_vlan vlancfg; + u8 vlancfg[MV88E61XX_MAX_PORTS_NUM]; enum mv88e61xx_cfg_rgmiid rgmii_delay; enum mv88e61xx_cfg_prtstt portstate; enum mv88e61xx_cfg_ledinit led_init; @@ -201,6 +200,18 @@ struct mv88e61xx_config { u8 cpuport; }; +/* + * Common mappings for Internal VLANs + * These mappings consider that all ports are useable; the driver + * will mask inexistent/unused ports. + */ + +/* Switch mode : routes any port to any port */ +#define MV88E61XX_VLANCFG_SWITCH { 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F } + +/* Router mode: routes only CPU port 5 to/from non-CPU ports 0-4 */ +#define MV88E61XX_VLANCFG_ROUTER { 0x20, 0x20, 0x20, 0x20, 0x20, 0x1F } + int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig); #endif /* CONFIG_MV88E61XX_SWITCH */ |
