diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-07-22 11:25:56 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-07-22 11:25:56 +0100 |
| commit | 9bcf3a0532108f856a0cd21bb914c4522d1e305b (patch) | |
| tree | ac4f842d05123955fc1e34f3a4f5c9f7613c0200 | |
| parent | 5f157382633f142b80d408fcc55cd1c45558f85d (diff) | |
| download | kernel-9bcf3a0532108f856a0cd21bb914c4522d1e305b.tar.gz kernel-9bcf3a0532108f856a0cd21bb914c4522d1e305b.tar.xz kernel-9bcf3a0532108f856a0cd21bb914c4522d1e305b.zip | |
Fix bcm2837 SDIO (WiFi)
| -rw-r--r-- | bcm2837-arm32-support.patch (renamed from bcm2837-initial-support.patch) | 0 | ||||
| -rw-r--r-- | bcm2837-sdhost.patch | 42 | ||||
| -rw-r--r-- | kernel.spec | 7 |
3 files changed, 48 insertions, 1 deletions
diff --git a/bcm2837-initial-support.patch b/bcm2837-arm32-support.patch index 021ae1069..021ae1069 100644 --- a/bcm2837-initial-support.patch +++ b/bcm2837-arm32-support.patch diff --git a/bcm2837-sdhost.patch b/bcm2837-sdhost.patch new file mode 100644 index 000000000..ea6cf1d97 --- /dev/null +++ b/bcm2837-sdhost.patch @@ -0,0 +1,42 @@ +From e199a012a0fb0be11ccd26b4a502ae830eb10db0 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <kraxel@redhat.com> +Date: Tue, 21 Jun 2016 11:47:56 +0200 +Subject: arm64: dts: bcm2837: add &sdhci and &sdhost + +For the raspberry pi 3 we'll need both sdhci (handles sdio wifi) and +sdhost (handles sdcard). + +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> +Acked-by: Eric Anholt <eric@anholt.net> +--- + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts +index c309633..972f14d 100644 +--- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts +@@ -22,3 +22,20 @@ + &uart1 { + status = "okay"; + }; ++ ++/* SDHCI is used to control the SDIO for wireless */ ++&sdhci { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emmc_gpio34>; ++ status = "okay"; ++ bus-width = <4>; ++ non-removable; ++}; ++ ++/* SDHOST is used to drive the SD card */ ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ status = "okay"; ++ bus-width = <4>; ++}; +-- +cgit v0.12 + diff --git a/kernel.spec b/kernel.spec index d19d31929..53b7dabc9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -614,11 +614,13 @@ Patch320: bcm283x-vc4-fix-vblank.patch # https://patchwork.kernel.org/patch/9802555/ Patch321: bcm2835-pinctrl-Avoid-warning-from-__irq_do_set_handler.patch +Patch322: bcm2837-sdhost.patch + Patch323: bcm2835-clk-audio-jitter-issues.patch Patch324: bcm2835-fix-potential-null-pointer-dereferences.patch # http://www.spinics.net/lists/devicetree/msg163238.html -Patch325: bcm2837-initial-support.patch +Patch325: bcm2837-arm32-support.patch # http://www.spinics.net/lists/dri-devel/msg132235.html Patch326: bcm283x-drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch @@ -2237,6 +2239,9 @@ fi # # %changelog +* Sat Jul 22 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Fix bcm2837 SDIO (WiFi) + * Fri Jul 21 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.3-100 - Linux v4.12.3 - Fixes CVE-2017-7541 (rhbz 1473198 1473199) |