core/linux-aarch64 to 4.20.0-2

This commit is contained in:
Kevin Mihelich 2018-12-29 02:22:34 +00:00
parent 7f6d1506b3
commit 730522ae76
3 changed files with 43 additions and 45 deletions

View file

@ -1,41 +0,0 @@
From 51376c94f734b2e1870eb8f9e50a5e2df6290f7c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 23 Dec 2018 16:15:20 -0700
Subject: [PATCH 5/5] Revert "ARM: dts: bcm2837: Fix polarity of wifi reset
GPIOs"
This reverts commit e25b6783c7b1bb79103d4617336879423f86b05e.
---
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index 93762244be7f..4adb85e66be3 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -31,7 +31,7 @@
wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple";
- reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
};
};
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 89e6fd547c75..c318bcbc6ba7 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -26,7 +26,7 @@
wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple";
- reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
};
};
--
2.19.2

View file

@ -0,0 +1,39 @@
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

@ -8,7 +8,7 @@ _srcname=linux-4.20
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform"
pkgver=4.20.0
pkgrel=1
pkgrel=2
arch=('aarch64')
url="http://www.kernel.org/"
license=('GPL2')
@ -20,7 +20,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.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-Revert-ARM-dts-bcm2837-Fix-polarity-of-wifi-reset-GP.patch'
'0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch'
'config'
'kernel.its'
'kernel.keyblock'
@ -32,7 +32,7 @@ md5sums=('d39dd4ba2d5861c54b90d49be19eaf31'
'6e806f8ea1545422539f3c8c20558a82'
'a43dbc3cc8f52b5329accf1694bd1de9'
'd10a52cb5878020b527cf335b74165e0'
'a7b1c61da189918ed7554282a3a75b21'
'66b2ce380f45395e5ad19274ea335e36'
'38e8d478b72e09dbd952638dc4cf348e'
'7f1a96e24f5150f790df94398e9525a3'
'61c5ff73c136ed07a7aadbf58db3d96a'
@ -51,7 +51,7 @@ 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-Revert-ARM-dts-bcm2837-Fix-polarity-of-wifi-reset-GP.patch
git apply ../0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch
cat "${srcdir}/config" > ./.config