From e0f289e7a521485e1f735d72a284f3f1e5186623 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 8 Apr 2019 00:45:38 +0000 Subject: [PATCH] core/linux-aarch64-rc to 5.1.rc4-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 | 10 +++---- ...ip-enable-usb3-nodes-on-rk3328-rock6.patch | 10 +++---- ...ip-Fix-vcc_host1_5v-GPIO-polarity-on.patch | 30 ------------------- core/linux-aarch64-rc/PKGBUILD | 17 +++++------ core/linux-aarch64-rc/config | 3 +- 7 files changed, 24 insertions(+), 58 deletions(-) delete mode 100644 core/linux-aarch64-rc/0005-arm64-dts-rockchip-Fix-vcc_host1_5v-GPIO-polarity-on.patch diff --git a/core/linux-aarch64-rc/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-aarch64-rc/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index bf37a40f3..98cfc0051 100644 --- a/core/linux-aarch64-rc/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-aarch64-rc/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,7 +1,7 @@ -From 9455b79231ace06946c9402354c698d8c690f2e9 Mon Sep 17 00:00:00 2001 +From 9d67e07fc4387a19c35ac5a26d7f4d1fb1d9f4ba 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 e3d08626828e..2eaae00b4033 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.20.1 +2.21.0 diff --git a/core/linux-aarch64-rc/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch b/core/linux-aarch64-rc/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch index 09af13daa..8ca67d04e 100644 --- a/core/linux-aarch64-rc/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch +++ b/core/linux-aarch64-rc/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch @@ -1,7 +1,7 @@ -From c4792b5f38f9f9b1f8feb55b808c7bbf5f54321d Mon Sep 17 00:00:00 2001 +From d33b99832841943f7e787605d7f364fd49f5f007 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.20.1 +2.21.0 diff --git a/core/linux-aarch64-rc/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch b/core/linux-aarch64-rc/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch index 73a68c06e..e9afa0019 100644 --- a/core/linux-aarch64-rc/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch +++ b/core/linux-aarch64-rc/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch @@ -1,7 +1,7 @@ -From 6611e957265287091088c812ab5ecdf092c0cd1b Mon Sep 17 00:00:00 2001 +From 1a9d394ffb964839f90b4d4efd1b9730c16efd22 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 @@ -16,10 +16,10 @@ Signed-off-by: Heiko Stuebner 1 file changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index ecd7f19c3542..36f68bcbfd35 100644 +index dabef1a21649..56e4a0649ec2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -903,6 +903,33 @@ +@@ -917,6 +917,33 @@ status = "disabled"; }; @@ -54,5 +54,5 @@ index ecd7f19c3542..36f68bcbfd35 100644 compatible = "arm,gic-400"; #interrupt-cells = <3>; -- -2.20.1 +2.21.0 diff --git a/core/linux-aarch64-rc/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch b/core/linux-aarch64-rc/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch index 067b9e145..5db4e5833 100644 --- a/core/linux-aarch64-rc/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch +++ b/core/linux-aarch64-rc/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch @@ -1,7 +1,7 @@ -From 3eada47651e60376fbc4262c39ccd7bcca6b994e Mon Sep 17 00:00:00 2001 +From fc0ef0a1243aaa7992157260e928ea96c5ff7986 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. @@ -11,10 +11,10 @@ Signed-off-by: Heiko Stuebner 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index bd937d68ca3b..593aeb8d38f3 100644 +index 79b4d1d4b5d6..57c8741665c3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -@@ -346,6 +346,15 @@ +@@ -369,6 +369,15 @@ status = "okay"; }; @@ -31,5 +31,5 @@ index bd937d68ca3b..593aeb8d38f3 100644 status = "okay"; }; -- -2.20.1 +2.21.0 diff --git a/core/linux-aarch64-rc/0005-arm64-dts-rockchip-Fix-vcc_host1_5v-GPIO-polarity-on.patch b/core/linux-aarch64-rc/0005-arm64-dts-rockchip-Fix-vcc_host1_5v-GPIO-polarity-on.patch deleted file mode 100644 index 0d2aea60b..000000000 --- a/core/linux-aarch64-rc/0005-arm64-dts-rockchip-Fix-vcc_host1_5v-GPIO-polarity-on.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 227725c79d73765e22a50e5b00f063f2714139bf Mon Sep 17 00:00:00 2001 -From: Tomohiro Mayama -Date: Fri, 8 Mar 2019 01:18:33 +0900 -Subject: [PATCH 5/5] arm64: dts: rockchip: Fix vcc_host1_5v GPIO polarity on - rk3328-rock64 - -This patch makes USB ports functioning again. - -Signed-off-by: Tomohiro Mayama ---- - arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index e37f5f4141ab..870d472bdec5 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -@@ -46,8 +46,7 @@ - - vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { - compatible = "regulator-fixed"; -- enable-active-high; -- gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; -+ gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&usb20_host_drv>; - regulator-name = "vcc_host1_5v"; --- -2.21.0 - diff --git a/core/linux-aarch64-rc/PKGBUILD b/core/linux-aarch64-rc/PKGBUILD index e06c16d7e..252916d3b 100644 --- a/core/linux-aarch64-rc/PKGBUILD +++ b/core/linux-aarch64-rc/PKGBUILD @@ -4,7 +4,7 @@ buildarch=8 _rcver=5.1 -_rcrel=3 +_rcrel=4 pkgbase=linux-aarch64-rc _srcname=linux-${_rcver}-rc${_rcrel} @@ -22,7 +22,6 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" '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-arm64-dts-rockchip-Fix-vcc_host1_5v-GPIO-polarity-on.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -30,13 +29,12 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" 'linux.preset' '60-linux.hook' '90-linux.hook') -md5sums=('53e9207a94532d73bbef91cd80ef2e10' - 'bca6950ebc7146384de4d37579bf576b' - '4aa33b50a14edcc63a406a4de744c413' - 'dc8ec5415f6a1af425316c310f747fa7' - '4477684c49622c88884efb4bb7aeb3a3' - 'fc1413b1931091271449b9d78a05c984' - 'cb6d0271d0281481dd73f712905e024f' +md5sums=('dc9b389c12d4c34ff38cc63e29d2aaea' + '6af957dedb319049ddc903f5730d3ae8' + 'eee2e8059822d48f18086f4b36ed30bf' + '910651d04b2f5fea9889df596b329035' + 'bd11e72a670134a38a75da3435bf8bcb' + 'f33cae1834229d8cc11074b6b3680a16' '7f1a96e24f5150f790df94398e9525a3' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -52,7 +50,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-arm64-dts-rockchip-Fix-vcc_host1_5v-GPIO-polarity-on.patch cat "${srcdir}/config" > ./.config diff --git a/core/linux-aarch64-rc/config b/core/linux-aarch64-rc/config index ddf3cda8d..183ab8217 100644 --- a/core/linux-aarch64-rc/config +++ b/core/linux-aarch64-rc/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.1.0-rc3-1 Kernel Configuration +# Linux/arm64 5.1.0-rc4-1 Kernel Configuration # # @@ -3555,7 +3555,6 @@ CONFIG_HW_RANDOM_XGENE=m CONFIG_HW_RANDOM_MESON=y CONFIG_HW_RANDOM_CAVIUM=y CONFIG_HW_RANDOM_MTK=y -CONFIG_R3964=m # CONFIG_APPLICOM is not set CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192