brcm63xx: allow using all four rgmii ports on bcm6316x

At least the third rgmii port is available on 63169, so assume all are
available. Simplifies cpu vs. variant handling.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 45504
This commit is contained in:
Jonas Gorski 2015-04-19 11:38:24 +00:00
parent a285a0a034
commit 440124dcbb
2 changed files with 5 additions and 9 deletions

View File

@ -714,15 +714,11 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
return -ENODEV; return -ENODEV;
ret = register_shared(); ret = register_shared();
@@ -295,8 +297,11 @@ bcm63xx_enetsw_register(const struct bcm @@ -297,6 +299,8 @@ bcm63xx_enetsw_register(const struct bcm
if (BCMCPU_IS_6328())
enetsw_pd.num_ports = ENETSW_PORTS_6328; enetsw_pd.num_ports = ENETSW_PORTS_6328;
- else if (BCMCPU_IS_6362() || BCMCPU_IS_6368()) else if (BCMCPU_IS_6362() || BCMCPU_IS_6368())
+ else if (BCMCPU_IS_6362() || BCMCPU_IS_6368() ||
+ BCMCPU_VARIANT_IS_63168() || BCMCPU_VARIANT_IS_63169())
enetsw_pd.num_ports = ENETSW_PORTS_6368; enetsw_pd.num_ports = ENETSW_PORTS_6368;
+ else if (BCMCPU_VARIANT_IS_63268() || BCMCPU_VARIANT_IS_63269()) + else if (BCMCPU_IS_63268())
+ enetsw_pd.num_ports = ENETSW_PORTS_63268; + enetsw_pd.num_ports = ENETSW_PORTS_63268;
enetsw_pd.dma_has_sram = true; enetsw_pd.dma_has_sram = true;

View File

@ -648,8 +648,8 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
- if (BCMCPU_IS_6328()) - if (BCMCPU_IS_6328())
+ if (BCMCPU_IS_6318() || BCMCPU_IS_6328()) + if (BCMCPU_IS_6318() || BCMCPU_IS_6328())
enetsw_pd.num_ports = ENETSW_PORTS_6328; enetsw_pd.num_ports = ENETSW_PORTS_6328;
else if (BCMCPU_IS_6362() || BCMCPU_IS_6368() || else if (BCMCPU_IS_6362() || BCMCPU_IS_6368())
BCMCPU_VARIANT_IS_63168() || BCMCPU_VARIANT_IS_63169()) enetsw_pd.num_ports = ENETSW_PORTS_6368;
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
@@ -9,6 +9,8 @@ int __init bcm63xx_gpio_init(void); @@ -9,6 +9,8 @@ int __init bcm63xx_gpio_init(void);