bcm63xx: update patches with upstream submissions

[openwrt.git] / target / linux / brcm63xx / patches-3.8 / 424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch

diff --git a/target/linux/brcm63xx/patches-3.8/424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch b/target/linux/brcm63xx/patches-3.8/424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch
deleted file mode 100644 (file)
index 641175e..0000000
--- a/target/linux/brcm63xx/patches-3.8/424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From a1bd0479a1ddac4f21afd4ebfe8f667b9fa5eff2 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Tue, 14 Jun 2011 21:14:39 +0200
-Subject: [PATCH 50/72] MIPS: BCM63XX: add support for BCM6328 in bcm_enetsw
-
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- arch/mips/bcm63xx/clk.c                               |   15 +++++++++++----
- arch/mips/bcm63xx/dev-enet.c                          |    9 ++++++---
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h |    1 +
- 3 files changed, 18 insertions(+), 7 deletions(-)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -119,11 +119,18 @@ static struct clk clk_ephy = {
-  */
- static void enetsw_set(struct clk *clk, int enable)
- {
--      if (!BCMCPU_IS_6368())
-+      u32 mask;
-+
-+      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
-               return;
--      bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
--                      CKCTL_6368_SWPKT_USB_EN |
--                      CKCTL_6368_SWPKT_SAR_EN, enable);
-+
-+      if (BCMCPU_IS_6328())
-+              mask = CKCTL_6328_ROBOSW_EN;
-+      else
-+              mask = CKCTL_6368_ROBOSW_EN | CKCTL_6368_SWPKT_USB_EN |
-+                      CKCTL_6368_SWPKT_SAR_EN;
-+
-+      bcm_hwclock_set(mask, enable);
-       if (enable) {
-               /* reset switch core afer clock change */
-               bcm63xx_core_set_reset(BCM63XX_RESET_ENETSW, 1);
---- a/arch/mips/bcm63xx/dev-enet.c
-+++ b/arch/mips/bcm63xx/dev-enet.c
-@@ -141,7 +141,7 @@ static int __init register_shared(void)
-       shared_res[0].end = shared_res[0].start;
-       shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
- 
--      if (BCMCPU_IS_6368())
-+      if (BCMCPU_IS_6328() || BCMCPU_IS_6368())
-               chan_count = 32;
-       else
-               chan_count = 16;
-@@ -224,7 +224,7 @@ bcm63xx_enetsw_register(const struct bcm
- {
-       int ret;
- 
--      if (!BCMCPU_IS_6368())
-+      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
-               return -ENODEV;
- 
-       ret = register_shared();
-@@ -241,7 +241,10 @@ bcm63xx_enetsw_register(const struct bcm
- 
-       memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof (*pd));
- 
--      enetsw_pd.num_ports = ENETSW_PORTS_6368;
-+      if (BCMCPU_IS_6328())
-+              enetsw_pd.num_ports = ENETSW_PORTS_6328;
-+      else if (BCMCPU_IS_6368())
-+              enetsw_pd.num_ports = ENETSW_PORTS_6368;
- 
-       ret = platform_device_register(&bcm63xx_enetsw_device);
-       if (ret)
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
-@@ -43,6 +43,7 @@ struct bcm63xx_enet_platform_data {
-  * on board ethernet switch platform data
-  */
- #define ENETSW_MAX_PORT       6
-+#define ENETSW_PORTS_6328 5 /* 4 FE PHY + 1 RGMII */
- #define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */
- 
- #define ENETSW_RGMII_PORT0    4