[OpenWrt-Devel] [PATCH 1/6] bcm53xx: refresh patches

Álvaro Fernández Rojas noltari at gmail.com
Sat May 16 06:53:19 EDT 2015


Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
 .../linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch   | 4 ++--
 .../linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch   | 2 +-
 .../058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch   | 5 -----
 .../059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch        | 8 --------
 .../060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch            | 8 --------
 .../patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch | 8 --------
 .../patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch | 8 --------
 ...20-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch | 5 -----
 .../700-bgmac-add-support-for-the-3rd-bus-core-device.patch      | 9 ++-------
 .../710-b53-add-hacky-CPU-port-fix-for-Netgear-R8000.patch       | 7 +------
 10 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch b/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch
index b13a6fb..8150979 100644
--- a/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch
+++ b/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch
@@ -234,7 +234,7 @@
  	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
  
  	instr->state = MTD_ERASE_DONE;
-@@ -341,11 +380,6 @@ static int spi_nor_lock(struct mtd_info 
+@@ -341,11 +380,6 @@ static int spi_nor_lock(struct mtd_info
  	if (ret)
  		return ret;
  
@@ -510,7 +510,7 @@
  	case CFI_MFR_MACRONIX:
  		status = macronix_quad_enable(nor);
  		if (status) {
-@@ -909,11 +925,6 @@ static int spi_nor_check(struct spi_nor 
+@@ -909,11 +925,6 @@ static int spi_nor_check(struct spi_nor
  		return -EINVAL;
  	}
  
diff --git a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
index 22fb687..ab7b0bb 100644
--- a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
+++ b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
@@ -77,7 +77,7 @@
  static int set_quad_mode(struct spi_nor *nor, struct flash_info *info)
  {
  	int status;
-@@ -907,6 +947,13 @@ static int set_quad_mode(struct spi_nor 
+@@ -907,6 +947,13 @@ static int set_quad_mode(struct spi_nor
  			return -EINVAL;
  		}
  		return status;
diff --git a/target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
index 6ba241b..290ea0a 100644
--- a/target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
+++ b/target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
@@ -9,8 +9,6 @@ Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
  arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-index b359c1e..78e95c0 100644
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 @@ -47,6 +47,12 @@
@@ -26,6 +24,3 @@ index b359c1e..78e95c0 100644
  		power0 {
  			label = "bcm53xx:red:power";
  			gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch b/target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
index 363a3ab..4bf5e04 100644
--- a/target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
+++ b/target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
@@ -15,8 +15,6 @@ Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
  2 files changed, 128 insertions(+)
  create mode 100644 arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 86217db..d34785a 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -62,6 +62,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
@@ -27,9 +25,6 @@ index 86217db..d34785a 100644
  	bcm4709-netgear-r8000.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
-diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-new file mode 100644
-index 0000000..548e93b
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 @@ -0,0 +1,127 @@
@@ -160,6 +155,3 @@ index 0000000..548e93b
 +		};
 +	};
 +};
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch b/target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch
index 3edac1e..2213d3b 100644
--- a/target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch
+++ b/target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch
@@ -14,8 +14,6 @@ Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
  2 files changed, 120 insertions(+)
  create mode 100644 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index d34785a..59f7970 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -59,6 +59,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
@@ -26,9 +24,6 @@ index d34785a..59f7970 100644
  	bcm47081-asus-rt-n18u.dtb \
  	bcm47081-buffalo-wzr-600dhp2.dtb \
  	bcm47081-buffalo-wzr-900dhp.dtb \
-diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
-new file mode 100644
-index 0000000..66dfb53
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 @@ -0,0 +1,119 @@
@@ -151,6 +146,3 @@ index 0000000..66dfb53
 +		};
 +	};
 +};
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch b/target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
index 618a2cd..77ae2f7 100644
--- a/target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
+++ b/target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
@@ -14,8 +14,6 @@ Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
  2 files changed, 84 insertions(+)
  create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 59f7970..1e8b8b7 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.
@@ -26,9 +24,6 @@ index 59f7970..1e8b8b7 100644
  	bcm4708-buffalo-wzr-1750dhp.dtb \
  	bcm4708-luxul-xwc-1000.dtb \
  	bcm4708-netgear-r6250.dtb \
-diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
-new file mode 100644
-index 0000000..8b62836
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
 @@ -0,0 +1,83 @@
@@ -115,6 +110,3 @@ index 0000000..8b62836
 +		};
 +	};
 +};
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch b/target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
index 12809ff..58e33e0 100644
--- a/target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
+++ b/target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
@@ -14,8 +14,6 @@ Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
  2 files changed, 97 insertions(+)
  create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 1e8b8b7..4802376 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.
@@ -26,9 +24,6 @@ index 1e8b8b7..4802376 100644
  	bcm4708-asus-rt-ac68u.dtb \
  	bcm4708-buffalo-wzr-1750dhp.dtb \
  	bcm4708-luxul-xwc-1000.dtb \
-diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
-new file mode 100644
-index 0000000..71cff8d
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 @@ -0,0 +1,96 @@
@@ -128,6 +123,3 @@ index 0000000..71cff8d
 +		};
 +	};
 +};
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch
index 4eaf5a7..af4c6b2 100644
--- a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch
+++ b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch
@@ -13,8 +13,6 @@ Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
  arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
-diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-index 4b02a0b..2c691a8 100644
 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 @@ -24,6 +24,23 @@
@@ -41,6 +39,3 @@ index 4b02a0b..2c691a8 100644
  	leds {
  		compatible = "gpio-leds";
  
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch b/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch
index 18ee2f1..6be75bb 100644
--- a/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch
+++ b/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch
@@ -15,11 +15,9 @@ Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
  drivers/net/ethernet/broadcom/bgmac.c | 28 +++++++++++++++++++++++-----
  1 file changed, 23 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
-index f66c416..0614cae 100644
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1561,11 +1561,20 @@ static int bgmac_probe(struct bcma_device *core)
+@@ -1561,11 +1561,20 @@ static int bgmac_probe(struct bcma_devic
  	struct net_device *net_dev;
  	struct bgmac *bgmac;
  	struct ssb_sprom *sprom = &core->bus->sprom;
@@ -43,7 +41,7 @@ index f66c416..0614cae 100644
  		pr_err("Unsupported core_unit %d\n", core->core_unit);
  		return -ENOTSUPP;
  	}
-@@ -1600,8 +1609,17 @@ static int bgmac_probe(struct bcma_device *core)
+@@ -1600,8 +1609,17 @@ static int bgmac_probe(struct bcma_devic
  	}
  	bgmac->cmn = core->bus->drv_gmac_cmn.core;
  
@@ -63,6 +61,3 @@ index f66c416..0614cae 100644
  	bgmac->phyaddr &= BGMAC_PHY_MASK;
  	if (bgmac->phyaddr == BGMAC_PHY_MASK) {
  		bgmac_err(bgmac, "No PHY found\n");
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fix-for-Netgear-R8000.patch b/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fix-for-Netgear-R8000.patch
index 1e37b49..0d0352f 100644
--- a/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fix-for-Netgear-R8000.patch
+++ b/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fix-for-Netgear-R8000.patch
@@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
  drivers/net/phy/b53/b53_common.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/net/phy/b53/b53_common.c b/drivers/net/phy/b53/b53_common.c
-index 2b05d5d..ba16107 100644
 --- a/drivers/net/phy/b53/b53_common.c
 +++ b/drivers/net/phy/b53/b53_common.c
 @@ -25,6 +25,7 @@
@@ -23,7 +21,7 @@ index 2b05d5d..ba16107 100644
  
  #include "b53_regs.h"
  #include "b53_priv.h"
-@@ -1313,6 +1314,9 @@ static int b53_switch_init(struct b53_device *dev)
+@@ -1313,6 +1314,9 @@ static int b53_switch_init(struct b53_de
  			sw_dev->cpu_port = 5;
  	}
  
@@ -33,6 +31,3 @@ index 2b05d5d..ba16107 100644
  	/* cpu port is always last */
  	sw_dev->ports = sw_dev->cpu_port + 1;
  	dev->enabled_ports |= BIT(sw_dev->cpu_port);
--- 
-1.8.4.5
-
-- 
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list