diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-02-22 11:16:44 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-02-22 11:16:44 +0000 |
| commit | 6f3f9388ffac260f81d483f276a0d1b68062661e (patch) | |
| tree | 3ddb11ad8b984ddd2eb33d72deb0ffc99c24b4ba /target/linux | |
| parent | fadaddac3599cef7831400bc0a37c78374a434d3 (diff) | |
brcm63xx: fix number of switch ports for BCM63168/63268
BCM63168 has 6 ports (3 FE PHY, 1 GE PHY, two RGMII) and BCM63268
has two additional RGMII ports, making it 8.
Fix this by checking the chip variant and applying an appropriate
limit.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39677 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/339-MIPS-BCM63XX-add-support-for-BCM63268.patch | 12 | ||||
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/341-MIPS-BCM63XX-add-support-for-BCM6318.patch | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/brcm63xx/patches-3.10/339-MIPS-BCM63XX-add-support-for-BCM63268.patch index 2245c2e469..45eec0733b 100644 --- a/target/linux/brcm63xx/patches-3.10/339-MIPS-BCM63XX-add-support-for-BCM63268.patch +++ b/target/linux/brcm63xx/patches-3.10/339-MIPS-BCM63XX-add-support-for-BCM63268.patch @@ -744,11 +744,15 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> return -ENODEV; ret = register_shared(); -@@ -297,6 +299,8 @@ bcm63xx_enetsw_register(const struct bcm +@@ -295,8 +297,11 @@ bcm63xx_enetsw_register(const struct bcm + + if (BCMCPU_IS_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; -+ else if (BCMCPU_IS_63268()) ++ else if (BCMCPU_VARIANT_IS_63268() || BCMCPU_VARIANT_IS_63269()) + enetsw_pd.num_ports = ENETSW_PORTS_63268; enetsw_pd.dma_has_sram = true; @@ -759,7 +763,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> #define ENETSW_MAX_PORT 8 #define ENETSW_PORTS_6328 5 /* 4 FE PHY + 1 RGMII */ #define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */ -+#define ENETSW_PORTS_63268 4 /* 3 FE PHY + 1 RGMII */ ++#define ENETSW_PORTS_63268 8 /* 3 FE PHY + 1 GE PHY + 4 RGMII */ #define ENETSW_RGMII_PORT0 4 diff --git a/target/linux/brcm63xx/patches-3.10/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-3.10/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index abfc17ce9c..46aea36e75 100644 --- a/target/linux/brcm63xx/patches-3.10/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/brcm63xx/patches-3.10/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -644,8 +644,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()) - enetsw_pd.num_ports = ENETSW_PORTS_6368; + else if (BCMCPU_IS_6362() || BCMCPU_IS_6368() || + BCMCPU_VARIANT_IS_63168() || BCMCPU_VARIANT_IS_63169()) --- 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); |