From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 19 Apr 2015 11:38:24 +0000 (+0000)
Subject: brcm63xx: allow using all four rgmii ports on bcm6316x
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=83adccd3993f819e6e168f0338cad87ab44b6412;p=15.05%2Fopenwrt.git

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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45504 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/brcm63xx/patches-3.18/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/brcm63xx/patches-3.18/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
index 22ceeea1c7..1f8a37ac01 100644
--- a/target/linux/brcm63xx/patches-3.18/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
+++ b/target/linux/brcm63xx/patches-3.18/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
@@ -714,15 +714,11 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  		return -ENODEV;
  
  	ret = register_shared();
-@@ -295,8 +297,11 @@ bcm63xx_enetsw_register(const struct bcm
- 
- 	if (BCMCPU_IS_6328())
+@@ -297,6 +299,8 @@ bcm63xx_enetsw_register(const struct bcm
  		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())
+ 	else if (BCMCPU_IS_6362() || BCMCPU_IS_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.dma_has_sram = true;
diff --git a/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
index ead4ee05fb..9fde790d65 100644
--- a/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
+++ b/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
@@ -648,8 +648,8 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
 -	if (BCMCPU_IS_6328())
 +	if (BCMCPU_IS_6318() || BCMCPU_IS_6328())
  		enetsw_pd.num_ports = ENETSW_PORTS_6328;
- 	else if (BCMCPU_IS_6362() || BCMCPU_IS_6368() ||
- 		 BCMCPU_VARIANT_IS_63168() || BCMCPU_VARIANT_IS_63169())
+ 	else if (BCMCPU_IS_6362() || BCMCPU_IS_6368())
+ 		enetsw_pd.num_ports = ENETSW_PORTS_6368;
 --- a/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);