e5aa498acb
Fixes CVE-2020-10757 via upstream commit df4988aa1c96 ("mm: Fix mremap
not considering huge pmd devmap").
Resolved merge conflict in the following patches:
bcm27xx: 950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
Refreshed patches, removed upstreamed patch:
generic: 751-v5.8-net-dsa-mt7530-set-CPU-port-to-fallback-mode.patch
generic: 754-v5.7-net-dsa-mt7530-fix-roaming-from-DSA-user-ports.patch
Run tested: qemu-x86-64
Build tested: x86/64, imx6, sunxi/a53
Signed-off-by: Petr Štetiar <ynezz@true.cz>
34 lines
999 B
Diff
34 lines
999 B
Diff
From 4792ff641cc8993606013d27d84cda59d8cc76c5 Mon Sep 17 00:00:00 2001
|
|
From: Tim Harvey <tharvey@gateworks.com>
|
|
Date: Tue, 12 May 2020 15:02:34 -0700
|
|
Subject: [PATCH 08/20] ARM: dts: imx6qdl-gw5910: fix wlan regulator
|
|
|
|
Connect the wl_reg regulator to usdhc2 such that it can be enabled
|
|
and disabled as needed. There is no need for this to be always-on.
|
|
|
|
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
|
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
|
---
|
|
arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
|
@@ -81,7 +81,6 @@
|
|
enable-active-high;
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
- regulator-always-on;
|
|
};
|
|
};
|
|
|
|
@@ -251,7 +250,7 @@
|
|
&usdhc2 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usdhc2>;
|
|
- vmmc-supply = <®_3p3v>;
|
|
+ vmmc-supply = <®_wl>;
|
|
non-removable;
|
|
bus-width = <4>;
|
|
status = "okay";
|