core/linux-aarch64-rc to 5.0.rc4-1

This commit is contained in:
Kevin Mihelich 2019-01-29 01:00:05 +00:00
parent 2952cdd8b9
commit b110a1c285
6 changed files with 24 additions and 66 deletions

View file

@ -1,14 +1,14 @@
From c5956fc1fea49fd02939aab309f4543fc11481c2 Mon Sep 17 00:00:00 2001
From 9455b79231ace06946c9402354c698d8c690f2e9 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 f2d01cb6f958..6a39efed33ea 100644
index e3d08626828e..2eaae00b4033 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -60,6 +60,7 @@
@ -30,7 +30,7 @@ index f2d01cb6f958..6a39efed33ea 100644
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
@@ -913,8 +918,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
@@ -911,8 +916,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 f2d01cb6f958..6a39efed33ea 100644
/* maybe the boot loader passed the MAC address in devicetree */
--
2.19.2
2.20.1

View file

@ -1,7 +1,7 @@
From d6601dcc2d68c0d2502d5728e03c23dddd32b8a4 Mon Sep 17 00:00:00 2001
From c4792b5f38f9f9b1f8feb55b808c7bbf5f54321d 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.19.2
2.20.1

View file

@ -1,7 +1,7 @@
From 89778382da66dedeb2fe0d6ab438fad972be9810 Mon Sep 17 00:00:00 2001
From 6611e957265287091088c812ab5ecdf092c0cd1b 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 e1a33dd981e0..6b480d723fca 100644
index ecd7f19c3542..36f68bcbfd35 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -900,6 +900,33 @@
@@ -903,6 +903,33 @@
status = "disabled";
};
@ -54,5 +54,5 @@ index e1a33dd981e0..6b480d723fca 100644
compatible = "arm,gic-400";
#interrupt-cells = <3>;
--
2.19.2
2.20.1

View file

@ -1,7 +1,7 @@
From b85afb76c61dbb8d14e3e40e149bab87b540ebdb Mon Sep 17 00:00:00 2001
From 3eada47651e60376fbc4262c39ccd7bcca6b994e 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 dc20145dd393..6330ca9abbc0 100644
index bd937d68ca3b..593aeb8d38f3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -345,6 +345,15 @@
@@ -346,6 +346,15 @@
status = "okay";
};
@ -31,5 +31,5 @@ index dc20145dd393..6330ca9abbc0 100644
status = "okay";
};
--
2.19.2
2.20.1

View file

@ -1,39 +0,0 @@
From 6b6d85cc36b148e26cf03f5a8ca412e694d11456 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <stefan.wahren@i2se.com>
Date: Sun, 23 Dec 2018 21:59:17 +0100
Subject: [PATCH 5/5] mmc: sdhci-iproc: handle mmc_of_parse() errors during
probe
We need to handle mmc_of_parse() errors during probe.
This finally fixes the wifi regression on Raspberry Pi 3 series.
In error case the wifi chip was permanently in reset because of
the power sequence depending on the deferred probe of the GPIO expander.
Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver")
Cc: stable@vger.kernel.org
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci-iproc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
index 0db99057c44f..9d12c06c7fd6 100644
--- a/drivers/mmc/host/sdhci-iproc.c
+++ b/drivers/mmc/host/sdhci-iproc.c
@@ -296,7 +296,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
iproc_host->data = iproc_data;
- mmc_of_parse(host->mmc);
+ ret = mmc_of_parse(host->mmc);
+ if (ret)
+ goto err;
+
sdhci_get_property(pdev);
host->mmc->caps |= iproc_host->data->mmc_caps;
--
2.19.2

View file

@ -4,7 +4,7 @@
buildarch=8
_rcver=5.0
_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-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch'
'config'
'kernel.its'
'kernel.keyblock'
@ -30,12 +29,11 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
'linux.preset'
'60-linux.hook'
'90-linux.hook')
md5sums=('2453a5fc6de5cf8c2904d5eede7a8090'
'6280bbce4412b246197daa4c910488c2'
'6e806f8ea1545422539f3c8c20558a82'
'a43dbc3cc8f52b5329accf1694bd1de9'
'd10a52cb5878020b527cf335b74165e0'
'66b2ce380f45395e5ad19274ea335e36'
md5sums=('0e3328af9808c4482df175d8c7f46ea7'
'ba4daec24d71b25d6db1e29bf95ba22f'
'dd09eca8f8c516667e995fc3db1d2236'
'a8f434da98e1b192f0486b6ba6458616'
'a36f126cb864d14294a6735124c795c5'
'06a5b5917dc5d66fb08c583de7ed828a'
'7f1a96e24f5150f790df94398e9525a3'
'61c5ff73c136ed07a7aadbf58db3d96a'
@ -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-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch
cat "${srcdir}/config" > ./.config