bcm53xx: use backported patches for UART0 and profiling

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 46729

diff --git a/target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch b/target/linux/bcm53xx/patches-3.18/067-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
similarity index 73%
rename from target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
rename to target/linux/bcm53xx/patches-3.18/067-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
index 9317aed830cb29d6f37085b7417ce627dc025b71..ce69cca473681fa84e2f2f2a8731ca3acb06cb47 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
+++ b/target/linux/bcm53xx/patches-3.18/067-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
@@ -1,7 +1,6 @@
-From 7ad224b884d85e8df3339d0149c7e7c8c3ce058c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Sun, 28 Jun 2015 19:40:16 +0200
-Subject: [PATCH V2] ARM: BCM5301X: Enable UART0 on tested devices
+Date: Mon, 29 Jun 2015 07:22:16 +0200
+Subject: [PATCH] ARM: BCM5301X: Enable UART0 on tested devices
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,16 +12,8 @@ doesn't have uart1 connected.
 
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
-V2: Drop old overwrite on R6250
----
- arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  |  4 ++++
- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts       |  4 ++++
- arch/arm/boot/dts/bcm4708-netgear-r6250.dts        | 14 ++++----------
- arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts      |  4 ++++
- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts |  4 ++++
- 5 files changed, 20 insertions(+), 10 deletions(-)
-
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 @@ -135,3 +135,7 @@

diff --git a/target/linux/bcm53xx/patches-3.18/340-ARM-BCM5301X-Add-profiling-support.patch b/target/linux/bcm53xx/patches-3.18/068-ARM-BCM5301X-Add-profiling-support.patch
similarity index 64%
rename from target/linux/bcm53xx/patches-3.18/340-ARM-BCM5301X-Add-profiling-support.patch
rename to target/linux/bcm53xx/patches-3.18/068-ARM-BCM5301X-Add-profiling-support.patch
index 291ec72f2cc1c34b1964b1f1fd3309b1d45989ed..afd1ce69594c99c4cfeac676927b283cddbc51e9 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/340-ARM-BCM5301X-Add-profiling-support.patch
+++ b/target/linux/bcm53xx/patches-3.18/068-ARM-BCM5301X-Add-profiling-support.patch
@@ -1,6 +1,11 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Wed, 29 Jul 2015 23:51:00 +0200
 Subject: [PATCH] ARM: BCM5301X: Add profiling support
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Olof Johansson <olof@lixom.net>
 ---
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi

diff --git a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch
index ca6462e3c7eeea60c73d0c7507db5106ea339b60..3d054a80d687de190ca1bf338e65df3d668fc8aa 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch
+++ b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch
@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -95,6 +95,10 @@
+@@ -102,6 +102,10 @@
                };
        };
  

diff --git a/target/linux/bcm53xx/patches-4.1/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch b/target/linux/bcm53xx/patches-4.1/080-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
similarity index 73%
rename from target/linux/bcm53xx/patches-4.1/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
rename to target/linux/bcm53xx/patches-4.1/080-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
index 9317aed830cb29d6f37085b7417ce627dc025b71..ce69cca473681fa84e2f2f2a8731ca3acb06cb47 100644 (file)
--- a/target/linux/bcm53xx/patches-4.1/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
+++ b/target/linux/bcm53xx/patches-4.1/080-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
@@ -1,7 +1,6 @@
-From 7ad224b884d85e8df3339d0149c7e7c8c3ce058c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Sun, 28 Jun 2015 19:40:16 +0200
-Subject: [PATCH V2] ARM: BCM5301X: Enable UART0 on tested devices
+Date: Mon, 29 Jun 2015 07:22:16 +0200
+Subject: [PATCH] ARM: BCM5301X: Enable UART0 on tested devices
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,16 +12,8 @@ doesn't have uart1 connected.
 
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
-V2: Drop old overwrite on R6250
----
- arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  |  4 ++++
- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts       |  4 ++++
- arch/arm/boot/dts/bcm4708-netgear-r6250.dts        | 14 ++++----------
- arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts      |  4 ++++
- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts |  4 ++++
- 5 files changed, 20 insertions(+), 10 deletions(-)
-
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 @@ -135,3 +135,7 @@

diff --git a/target/linux/bcm53xx/patches-4.1/340-ARM-BCM5301X-Add-profiling-support.patch b/target/linux/bcm53xx/patches-4.1/081-ARM-BCM5301X-Add-profiling-support.patch
similarity index 64%
rename from target/linux/bcm53xx/patches-4.1/340-ARM-BCM5301X-Add-profiling-support.patch
rename to target/linux/bcm53xx/patches-4.1/081-ARM-BCM5301X-Add-profiling-support.patch
index eed44f7997233561f277de81a0524a5a390a0f89..afd73f5db7cb9d17f1d3d42a0b54963adddd65dd 100644 (file)
--- a/target/linux/bcm53xx/patches-4.1/340-ARM-BCM5301X-Add-profiling-support.patch
+++ b/target/linux/bcm53xx/patches-4.1/081-ARM-BCM5301X-Add-profiling-support.patch
@@ -1,6 +1,11 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Wed, 29 Jul 2015 23:51:00 +0200
 Subject: [PATCH] ARM: BCM5301X: Add profiling support
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Olof Johansson <olof@lixom.net>
 ---
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi