core/linux-aarch64 to 5.2.13-1

This commit is contained in:
Kevin Mihelich 2019-09-09 00:42:21 +00:00
parent 4190dec3f6
commit 948ef3124b
6 changed files with 26 additions and 59 deletions

View file

@ -1,17 +1,17 @@
From 9d67e07fc4387a19c35ac5a26d7f4d1fb1d9f4ba Mon Sep 17 00:00:00 2001
From fff1880075d038c759fc3ffe345769722365c3a1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
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 ++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index e3d08626828e..2eaae00b4033 100644
index 355be77f4241..c94a7193e0b9 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -60,6 +60,7 @@
@@ -48,6 +48,7 @@
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
@ -19,7 +19,7 @@ index e3d08626828e..2eaae00b4033 100644
#define CARRIER_CHECK_DELAY (2 * HZ)
@@ -82,6 +83,10 @@ static bool turbo_mode = true;
@@ -70,6 +71,10 @@ static bool turbo_mode = true;
module_param(turbo_mode, bool, 0644);
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
@ -30,7 +30,7 @@ index e3d08626828e..2eaae00b4033 100644
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
@@ -911,8 +916,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
@@ -899,8 +904,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
@ -91,5 +91,5 @@ index e3d08626828e..2eaae00b4033 100644
/* maybe the boot loader passed the MAC address in devicetree */
--
2.21.0
2.23.0

View file

@ -1,7 +1,7 @@
From d33b99832841943f7e787605d7f364fd49f5f007 Mon Sep 17 00:00:00 2001
From 914336ab6e1648641c0b195be8e95c7cb389de38 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/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.21.0
2.23.0

View file

@ -1,7 +1,7 @@
From 1a9d394ffb964839f90b4d4efd1b9730c16efd22 Mon Sep 17 00:00:00 2001
From 9e2f00e9727ffefb3bbddcb4104465493379cde4 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/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 <heiko@sntech.de>
1 file changed, 27 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index dabef1a21649..56e4a0649ec2 100644
index 994468671b19..0f300c01db83 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -917,6 +917,33 @@
@@ -920,6 +920,33 @@
status = "disabled";
};
@ -54,5 +54,5 @@ index dabef1a21649..56e4a0649ec2 100644
compatible = "arm,gic-400";
#interrupt-cells = <3>;
--
2.21.0
2.23.0

View file

@ -1,7 +1,7 @@
From fc0ef0a1243aaa7992157260e928ea96c5ff7986 Mon Sep 17 00:00:00 2001
From 5827af0761f0a84235fa3c1cdba33c0546e63f46 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/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 <heiko@sntech.de>
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 79b4d1d4b5d6..57c8741665c3 100644
index 7cfd5ca6cc85..2e8b99bb57b2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -369,6 +369,15 @@
@@ -398,6 +398,15 @@
status = "okay";
};
@ -31,5 +31,5 @@ index 79b4d1d4b5d6..57c8741665c3 100644
status = "okay";
};
--
2.21.0
2.23.0

View file

@ -1,30 +0,0 @@
From 5aef2cc938fd9446724b175d92a0f7701b9934e2 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Wed, 15 May 2019 19:14:18 +0200
Subject: [PATCH 5/5] watchdog: bcm2835_wdt: Fix module autoload
The commit 5e6acc3e678e ("bcm2835-pm: Move bcm2835-watchdog's DT probe
to an MFD.") broke module autoloading on Raspberry Pi. So add a
module alias this fix this.
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/watchdog/bcm2835_wdt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 1834524ae373..c7695a0c933f 100644
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -241,6 +241,7 @@ module_param(nowayout, bool, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+MODULE_ALIAS("platform:bcm2835-wdt");
MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
MODULE_DESCRIPTION("Driver for Broadcom BCM2835 watchdog timer");
MODULE_LICENSE("GPL");
--
2.21.0

View file

@ -7,7 +7,7 @@ pkgbase=linux-aarch64
_srcname=linux-5.2
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform"
pkgver=5.2.11
pkgver=5.2.13
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-watchdog-bcm2835_wdt-Fix-module-autoload.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=('ddf994de00d7b18395886dd9b30b9262'
'44dfa2755410b72ee660fa29bfb15af1'
'6ee347975dca719ecd63a846cc5983b2'
'7005141e542864b4e3cf6141ff642cf9'
'9986e28b5c2c3c62a5c3bb53abd94640'
'552ea82c3a5e14ca9149da8c4b4d5a82'
'79a9339191904f10f5659eea9cf51a6c'
'3310549071f185161b8b605ac43d3dd0'
'bc405f8eb01befe32ab2bbb606f4b413'
'998caeb6bae60b0f19d0b829f654675c'
'b8691a95898fd04c095d2a5d4a9338b5'
'afde6f05ddca17b5d296ca38e1b60e5b'
'aa697ec98d7e2016a85fb4c237559794'
'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-watchdog-bcm2835_wdt-Fix-module-autoload.patch
cat "${srcdir}/config" > ./.config