diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-21 14:36:25 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-21 14:36:25 +0100 |
| commit | 0ce0fdd1bc153eca91c4611dd4348cde12fd935a (patch) | |
| tree | 56872d7651e7beee94a1ff2d07215572fbc1810d | |
| parent | 3413a00af42b1c7d4f6cf09c990af5438d686160 (diff) | |
| parent | 6ac86401fddbb261474c953445ae9ea4a91e49aa (diff) | |
| download | kernel-0ce0fdd1bc153eca91c4611dd4348cde12fd935a.tar.gz kernel-0ce0fdd1bc153eca91c4611dd4348cde12fd935a.tar.xz kernel-0ce0fdd1bc153eca91c4611dd4348cde12fd935a.zip | |
Merge remote-tracking branch 'origin/f28' into f28-user-thl-vanilla-fedora
| -rw-r--r-- | bcm2837-fix-wifi-gpio-polarity.patch | 51 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 3 insertions, 54 deletions
diff --git a/bcm2837-fix-wifi-gpio-polarity.patch b/bcm2837-fix-wifi-gpio-polarity.patch deleted file mode 100644 index 96055f78a..000000000 --- a/bcm2837-fix-wifi-gpio-polarity.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e25b6783c7b1bb79103d4617336879423f86b05e Mon Sep 17 00:00:00 2001 -From: Stefan Wahren <stefan.wahren@i2se.com> -Date: Mon, 3 Dec 2018 19:37:08 +0100 -Subject: ARM: dts: bcm2837: Fix polarity of wifi reset GPIOs - -The commit b1b8f45b3130 ("ARM: dts: bcm2837: Add missing GPIOs of Expander") -introduced a wifi power sequence. Unfortunately the polarity of the reset -GPIOs were wrong and broke the wifi support on Raspberry Pi 3 B and -later in 3 B+. This wasn't discovered before since the power sequence -takes only effect in case the relevant MMC driver is compiled as a module. - -Fixes: b1b8f45b3130 ("ARM: dts: bcm2837: Add missing GPIOs of Expander") -Cc: stable@vger.kernel.org -Reported-by: Matthias Lueschner <lueschem@gmail.com> -Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911443 -Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> -Reviewed-by: Eric Anholt <eric@anholt.net> -Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> ---- - 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 4adb85e66be3..93762244be7f 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_HIGH>; -+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; - }; - }; - -diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index c318bcbc6ba7..89e6fd547c75 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_HIGH>; -+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; - }; - }; - --- -cgit 1.2-0.3.lf.el7 diff --git a/kernel.spec b/kernel.spec index cfb1f5256..4c1ad388d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -616,9 +616,6 @@ Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch # From 4.20, fix eth link/act lights on 3B+ Patch334: bcm2837-fix-eth-leds.patch -# From 4.20, fix wifi gpio polarity -Patch335: bcm2837-fix-wifi-gpio-polarity.patch - # Patches enabling device specific brcm firmware nvram # https://www.spinics.net/lists/linux-wireless/msg178827.html Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch @@ -1901,6 +1898,9 @@ fi # # %changelog +* Thu Dec 20 2018 Jeremy Cline <jcline@redhat.com> - 4.19.11-200 +- Linux v4.19.11 + * Mon Dec 17 2018 Jeremy Cline <jcline@redhat.com> - 4.19.10-200 - Linux v4.19.10 |