aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-08-26 14:39:06 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-08-26 14:39:06 +0000
commit1111782e20eb54683629121790de1047dccd8c51 (patch)
tree3aca9c9835c5c2c39ffb74539d06aabff7fbfc3d /target/linux
parent05a3cdd71fae682bdb03a1f7dc8cc2d0ceaf192b (diff)
downloadupstream-1111782e20eb54683629121790de1047dccd8c51.tar.gz
upstream-1111782e20eb54683629121790de1047dccd8c51.tar.bz2
upstream-1111782e20eb54683629121790de1047dccd8c51.zip
bcm53xx: use backported patches for UART0 and profiling
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 46729
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/bcm53xx/patches-3.18/067-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch (renamed from target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch)15
-rw-r--r--target/linux/bcm53xx/patches-3.18/068-ARM-BCM5301X-Add-profiling-support.patch (renamed from target/linux/bcm53xx/patches-3.18/340-ARM-BCM5301X-Add-profiling-support.patch)5
-rw-r--r--target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch2
-rw-r--r--target/linux/bcm53xx/patches-4.1/080-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch (renamed from target/linux/bcm53xx/patches-4.1/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch)15
-rw-r--r--target/linux/bcm53xx/patches-4.1/081-ARM-BCM5301X-Add-profiling-support.patch (renamed from target/linux/bcm53xx/patches-4.1/340-ARM-BCM5301X-Add-profiling-support.patch)5
5 files changed, 17 insertions, 25 deletions
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
index 9317aed830..ce69cca473 100644
--- 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
index 291ec72f2c..afd1ce6959 100644
--- 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 ca6462e3c7..3d054a80d6 100644
--- 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
index 9317aed830..ce69cca473 100644
--- 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
index eed44f7997..afd73f5db7 100644
--- 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