core/linux-aarch64 to 5.14.8-1

core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch

@@ -1,14 +1,14 @@
-From 4c4a7f5be455b62eab03af8d664b790a6453c999 Mon Sep 17 00:00:00 2001
+From 48da7521af79c8822af5085f1d0eedbec3f08f47 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 1/4] net/smsc95xx: Allow mac address to be set as a parameter
+Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
 
 ---
  drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index ea0d5f04dc3a..88ebceb84193 100644
+index 4c8ee1cff4d4..2ab7d915b5da 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -50,6 +50,7 @@
@@ -91,5 +91,5 @@ index ea0d5f04dc3a..88ebceb84193 100644
  	if (!eth_platform_get_mac_address(&dev->udev->dev,
  			dev->net->dev_addr)) {
 -- 
-2.30.0
+2.33.0
 

core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch

@@ -1,7 +1,7 @@
-From fda1e1c741e44548eb6ef93f34d8e35487302c2e Mon Sep 17 00:00:00 2001
+From 3427bad1eb5e55bb9374cf6bb62eb0d844c72287 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Mon, 7 Aug 2017 19:34:57 -0600
-Subject: [PATCH 2/4] arm64: dts: rockchip: disable pwm0 on rk3399-firefly
+Subject: [PATCH 2/2] arm64: dts: rockchip: disable pwm0 on rk3399-firefly
 
 Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock.
 ---
@@ -9,10 +9,10 @@ Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
-index 6db18808b9c5..c7c49ace4b5b 100644
+index c4dd2a6b4836..2c2a78292148 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
-@@ -640,7 +640,7 @@ diy_led_pin: diy-led-pin {
+@@ -745,7 +745,7 @@ wifi_host_wake_l: wifi-host-wake-l {
  };
  
  &pwm0 {
@@ -22,5 +22,5 @@ index 6db18808b9c5..c7c49ace4b5b 100644
  
  &pwm2 {
 -- 
-2.30.0
+2.33.0
 

core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch

@@ -1,58 +0,0 @@
-From 049261c33ab0f5cb4156f5b9a894f30dcc50e2ab Mon Sep 17 00:00:00 2001
-From: William Wu <william.wu@rock-chips.com>
-Date: Mon, 4 Dec 2017 10:40:39 +0100
-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
-core's general architecture. It can act as static xHCI host
-controller, static device controller, USB 3.0/2.0 OTG basing
-on ID of USB3.0 PHY.
-
-Signed-off-by: William Wu <william.wu@rock-chips.com>
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 27 ++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index db0d5c8e5f96..980dce4830d2 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -983,6 +983,33 @@ usb_host0_ohci: usb@ff5d0000 {
- 		status = "disabled";
- 	};
- 
-+	usbdrd3: usb@ff600000 {
-+		compatible = "rockchip,rk3328-dwc3", "rockchip,rk3399-dwc3";
-+		clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
-+			 <&cru ACLK_USB3OTG>;
-+		clock-names = "ref_clk", "suspend_clk",
-+			      "bus_clk";
-+		#address-cells = <2>;
-+		#size-cells = <2>;
-+		ranges;
-+		status = "disabled";
-+
-+		usbdrd_dwc3: dwc3@ff600000 {
-+			compatible = "snps,dwc3";
-+			reg = <0x0 0xff600000 0x0 0x100000>;
-+			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
-+			dr_mode = "otg";
-+			phy_type = "utmi_wide";
-+			snps,dis_enblslpm_quirk;
-+			snps,dis-u2-freeclk-exists-quirk;
-+			snps,dis_u2_susphy_quirk;
-+			snps,dis_u3_susphy_quirk;
-+			snps,dis-del-phy-power-chg-quirk;
-+			snps,dis-tx-ipgap-linecheck-quirk;
-+			status = "disabled";
-+		};
-+	};
-+
- 	gic: interrupt-controller@ff811000 {
- 		compatible = "arm,gic-400";
- 		#interrupt-cells = <3>;
--- 
-2.30.0
-

core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch

@@ -1,35 +0,0 @@
-From 10446b4ecaee72bb5cdc437fcd73f1aea012e7cc Mon Sep 17 00:00:00 2001
-From: Heiko Stuebner <heiko@sntech.de>
-Date: Mon, 4 Dec 2017 10:40:41 +0100
-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.
-
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 9 +++++++++
- 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 86cfb5c50a94..ae27f449f4a3 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-@@ -392,6 +392,15 @@ &usb_host0_ohci {
- 	status = "okay";
- };
- 
-+&usbdrd3 {
-+	status = "okay";
-+};
-+
-+&usbdrd_dwc3 {
-+	dr_mode = "host";
-+	status = "okay";
-+};
-+
- &vop {
- 	status = "okay";
- };
--- 
-2.30.0
-

core/linux-aarch64/PKGBUILD

@@ -4,10 +4,10 @@
 buildarch=8
 
 pkgbase=linux-aarch64
-_srcname=linux-5.11
+_srcname=linux-5.14
 _kernelname=${pkgbase#linux}
 _desc="AArch64 multi-platform"
-pkgver=5.11.4
+pkgver=5.14.8
 pkgrel=1
 arch=('aarch64')
 url="http://www.kernel.org/"
@@ -18,8 +18,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
         '0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
         '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'
         'config'
         'kernel.its'
         'kernel.keyblock'
@@ -27,14 +25,12 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         'linux.preset'
         '60-linux.hook'
         '90-linux.hook')
-md5sums=('d2985a3f16ef1ea3405c04c406e29dcc'
+md5sums=('a082ef5748b813abca0649dab8be5f52'
-         'afcc9a617c2b4e09c2da1411318a26da'
+         '767e2bd13b4f1497f7500877792cbff2'
-         'f9b6f367eef351eaa89b23a9b1ffc5a2'
+         '21d3e833437461aed3b6ca68b5d8afa0'
-         '369fb1dd626c4e0a4a7e068d27dd51c8'
+         'd679f49645578a193d6e3c220787a40d'
-         '1553fe4abbe675ed8abd4644561d8e8c'
+         '9cadd5e212ed2b3ae60e68a6c9daef0f'
-         '9844db3484f4d4fa3e63c7e083f656f7'
+         'bcec049f6d71e59b28159c8bc8189822'
-         '5e0c36c663ebe0721fb96b9f2bfef451'
-         '7f1a96e24f5150f790df94398e9525a3'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
          '41cb5fef62715ead2dd109dbea8413d6'
@@ -50,8 +46,6 @@ prepare() {
   # ALARM patches
   git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
   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
 
   cat "${srcdir}/config" > ./.config
 

core/linux-aarch64/kernel.its

@@ -3,7 +3,7 @@
 / {
     description = "Chrome OS kernel image with one or more FDT blobs";
     images {
-        kernel@1{
+        kernel {
             description = "kernel";
             data = /incbin/("arch/arm64/boot/Image");
             type = "kernel_noload";
@@ -13,36 +13,36 @@
             load = <0>;
             entry = <0>;
         };
-        fdt@1{
+        fdt-bob {
             description = "rk3399-gru-bob.dtb";
             data = /incbin/("arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dtb");
             type = "flat_dt";
             arch = "arm64";
             compression = "none";
-            hash@1{
+            hash {
                 algo = "sha1";
             };
         };
-        fdt@2{
+        fdt-kevin {
             description = "rk3399-gru-kevin.dtb";
             data = /incbin/("arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb");
             type = "flat_dt";
             arch = "arm64";
             compression = "none";
-            hash@1{
+            hash {
                 algo = "sha1";
             };
         };
     };
     configurations {
-        default = "conf@1";
+        default = "conf-bob";
-        conf@1{
+        conf-bob {
-            kernel = "kernel@1";
+            kernel = "kernel";
-            fdt = "fdt@1";
+            fdt = "fdt-bob";
         };
-        conf@2{
+        conf-kevin {
-            kernel = "kernel@1";
+            kernel = "kernel";
-            fdt = "fdt@2";
+            fdt = "fdt-kevin";
         };
     };
 };