From 1111782e20eb54683629121790de1047dccd8c51 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 26 Aug 2015 14:39:06 +0000 Subject: [PATCH] bcm53xx: use backported patches for UART0 and profiling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 46729 --- ...BCM5301X-Enable-UART0-on-tested-devices.patch} | 15 +++------------ ... 068-ARM-BCM5301X-Add-profiling-support.patch} | 5 +++++ .../patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch | 2 +- ...BCM5301X-Enable-UART0-on-tested-devices.patch} | 15 +++------------ ... 081-ARM-BCM5301X-Add-profiling-support.patch} | 5 +++++ 5 files changed, 17 insertions(+), 25 deletions(-) rename target/linux/bcm53xx/patches-3.18/{130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch => 067-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch} (73%) rename target/linux/bcm53xx/patches-3.18/{340-ARM-BCM5301X-Add-profiling-support.patch => 068-ARM-BCM5301X-Add-profiling-support.patch} (64%) rename target/linux/bcm53xx/patches-4.1/{130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch => 080-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch} (73%) rename target/linux/bcm53xx/patches-4.1/{340-ARM-BCM5301X-Add-profiling-support.patch => 081-ARM-BCM5301X-Add-profiling-support.patch} (64%) 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 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?= -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 Acked-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli --- -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 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 +Date: Wed, 29 Jul 2015 23:51:00 +0200 Subject: [PATCH] ARM: BCM5301X: Add profiling support Signed-off-by: Felix Fietkau +Signed-off-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli +Signed-off-by: Olof Johansson --- --- 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 --- 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 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?= -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 Acked-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli --- -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 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 +Date: Wed, 29 Jul 2015 23:51:00 +0200 Subject: [PATCH] ARM: BCM5301X: Add profiling support Signed-off-by: Felix Fietkau +Signed-off-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli +Signed-off-by: Olof Johansson --- --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi -- 2.30.2