From cc73d39dbf728045e11e563b1aaddc057dd26c22 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 12 Jan 2020 16:11:39 +0000 Subject: [PATCH] core/linux-aarch64 to 5.4.11-1 --- ...ow-mac-address-to-be-set-as-a-parame.patch | 6 +-- ...kchip-disable-pwm0-on-rk3399-firefly.patch | 6 +-- ...ip-add-usb3-controller-node-for-RK33.patch | 6 +-- ...ip-enable-usb3-nodes-on-rk3328-rock6.patch | 6 +-- ...-dts-bcm283x-Fix-critical-trip-point.patch | 38 ------------------- core/linux-aarch64/PKGBUILD | 15 +++----- 6 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 core/linux-aarch64/0005-ARM-dts-bcm283x-Fix-critical-trip-point.patch diff --git a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index b8710d655..aebe26d30 100644 --- a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,7 +1,7 @@ -From 1a96b25c17a89d6b6efc79f16e9aad41e75c6991 Mon Sep 17 00:00:00 2001 +From 61bc86a59f9b5a951bde15a4b60254b6d31af893 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 1/5] net/smsc95xx: Allow mac address to be set as a parameter +Subject: [PATCH 1/4] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ @@ -91,5 +91,5 @@ index 355be77f4241..c94a7193e0b9 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.23.0 +2.24.1 diff --git a/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch b/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch index 7fb5a8404..8aedfeba4 100644 --- a/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch +++ b/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch @@ -1,7 +1,7 @@ -From 110a25d5e289e6254270df2b2fe17d9765f53265 Mon Sep 17 00:00:00 2001 +From 975d2dbfa8aede3260b0e4796a8b12103fa8dd7c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 7 Aug 2017 19:34:57 -0600 -Subject: [PATCH 2/5] arm64: dts: rockchip: disable pwm0 on rk3399-firefly +Subject: [PATCH 2/4] arm64: dts: rockchip: disable pwm0 on rk3399-firefly Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock. --- @@ -22,5 +22,5 @@ index c706db0ee9ec..24adeca99711 100644 &pwm2 { -- -2.23.0 +2.24.1 diff --git a/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch b/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch index d816ccb99..f02f7c128 100644 --- a/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch +++ b/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch @@ -1,7 +1,7 @@ -From 843ecfaf6d1e5ef8759ae4ed272b5c747a843696 Mon Sep 17 00:00:00 2001 +From 171cdc792e52cd86c08d302c442cd9f3ab019489 Mon Sep 17 00:00:00 2001 From: William Wu Date: Mon, 4 Dec 2017 10:40:39 +0100 -Subject: [PATCH 3/5] arm64: dts: rockchip: add usb3 controller node for RK3328 +Subject: [PATCH 3/4] arm64: dts: rockchip: add usb3 controller node for RK3328 SoCs RK3328 has one USB 3.0 OTG controller which uses DWC_USB3 @@ -54,5 +54,5 @@ index 31cc1541f1f5..0feef5ed71b4 100644 compatible = "arm,gic-400"; #interrupt-cells = <3>; -- -2.23.0 +2.24.1 diff --git a/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch b/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch index f2cd8c80e..50c74ab91 100644 --- a/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch +++ b/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch @@ -1,7 +1,7 @@ -From 00bfb3099639e5fde1aba006356af25b1a172eba Mon Sep 17 00:00:00 2001 +From 39517fef304a7f8e84e9a2bae150166c636e7a0d Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Mon, 4 Dec 2017 10:40:41 +0100 -Subject: [PATCH 4/5] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64 +Subject: [PATCH 4/4] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64 Enable the nodes to make the usb3 port usable on that board. @@ -31,5 +31,5 @@ index 62936b432f9a..c684ca7b7e2d 100644 status = "okay"; }; -- -2.23.0 +2.24.1 diff --git a/core/linux-aarch64/0005-ARM-dts-bcm283x-Fix-critical-trip-point.patch b/core/linux-aarch64/0005-ARM-dts-bcm283x-Fix-critical-trip-point.patch deleted file mode 100644 index 3aa846258..000000000 --- a/core/linux-aarch64/0005-ARM-dts-bcm283x-Fix-critical-trip-point.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9d393938a33f304ae2b40a1c4669db48928648cf Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Sat, 30 Nov 2019 13:31:13 +0100 -Subject: [PATCH 5/5] ARM: dts: bcm283x: Fix critical trip point - -During definition of the CPU thermal zone of BCM283x SoC family there was -a misunderstanding of the meaning "criticial trip point" and the thermal -throttling range of the VideoCore firmware. The latter one takes effect -when the core temperature is between 80 and 85 degree celsius. So the -current critical trip point doesn't make sense, because the -thermal shutdown appears before the firmware has a chance to throttle the -ARM core(s). - -Fix these unwanted shutdowns by increasing the critical trip point -to a value which shouldn't be reached with working thermal throttling. - -Fixes: 0fe4d2181cc4 ("ARM: dts: bcm283x: Add CPU thermal zone with 1 trip point") -Signed-off-by: Stefan Wahren ---- - arch/arm/boot/dts/bcm283x.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 2d191fcbc2cc..90125ce19a1b 100644 ---- a/arch/arm/boot/dts/bcm283x.dtsi -+++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -40,7 +40,7 @@ - - trips { - cpu-crit { -- temperature = <80000>; -+ temperature = <90000>; - hysteresis = <0>; - type = "critical"; - }; --- -2.23.0 - diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD index 2224cc822..7602216d2 100644 --- a/core/linux-aarch64/PKGBUILD +++ b/core/linux-aarch64/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-aarch64 _srcname=linux-5.4 _kernelname=${pkgbase#linux} _desc="AArch64 multi-platform" -pkgver=5.4.10 +pkgver=5.4.11 pkgrel=1 arch=('aarch64') url="http://www.kernel.org/" @@ -20,7 +20,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch' '0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch' '0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch' - '0005-ARM-dts-bcm283x-Fix-critical-trip-point.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -29,12 +28,11 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '60-linux.hook' '90-linux.hook') md5sums=('ce9b2d974d27408a61c53a30d3f98fb9' - 'd7b2437393754d4e8fc395f71a7b87d5' - 'f1656e2052c9a25f977b1051136ea85f' - '98bd5a4f6f203d8da94439faf9084dd5' - '4bee45bc09780f8f2b07239ab6594f30' - '0957a4a901282f33c05e1f68390f9ada' - '147b56da6735706dcab3b1bc58b9176e' + '97b423cad77ded9f72f598e09c6987e0' + 'ef75dc5e0eb0223aaac138a86d3ba07e' + '911bd1269580b0969dd30f899d9872e5' + '1637201b3c704d5bf4f243acc8156089' + 'b749ae007c4a2468ac768e761c54c827' '6152f50b70faab3fafb08e9b50ebfa7e' '7f1a96e24f5150f790df94398e9525a3' '61c5ff73c136ed07a7aadbf58db3d96a' @@ -54,7 +52,6 @@ prepare() { git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch git apply ../0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch git apply ../0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch - git apply ../0005-ARM-dts-bcm283x-Fix-critical-trip-point.patch cat "${srcdir}/config" > ./.config