brcm2708: update to latest patches from RPi Foundation

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0441-overlays-Fix-mmc-related-overlays-after-refactor.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0441-overlays-Fix-mmc-related-overlays-after-refactor.patch b/target/linux/brcm2708/patches-4.19/950-0441-overlays-Fix-mmc-related-overlays-after-refactor.patch
new file mode 100644 (file)
index 0000000..468aa30
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0441-overlays-Fix-mmc-related-overlays-after-refactor.patch
@@ -0,0 +1,73 @@
+From dadcb33e1f4ee70bc77da7fa7054b8571a22d5ea Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Thu, 30 May 2019 12:25:29 +0100
+Subject: [PATCH] overlays: Fix mmc-related overlays after refactor
+
+The addition of the mmcnr node to the base dtbs caused some overlays to
+not work as they should. Patch up pi3-disable-wifi, balena-fin and
+sdhost.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+---
+ arch/arm/boot/dts/overlays/balena-fin-overlay.dts       | 7 ++++---
+ arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts | 7 +++++++
+ arch/arm/boot/dts/overlays/sdhost-overlay.dts           | 7 +++++++
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
++++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
+@@ -5,13 +5,12 @@
+       compatible = "brcm,bcm2835";
+ 
+       fragment@0 {
+-              target = <&mmc>;
+-              sdio_wifi: __overlay__ {
++              target = <&mmcnr>;
++              __overlay__ {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&sdio_pins>;
+                       bus-width = <4>;
+                       brcm,overclock-50 = <35>;
+-                      non-removable;
+                       status = "okay";
+               };
+       };
+@@ -43,6 +42,8 @@
+                               compatible = "gpio-poweroff";
+                               gpios = <&gpio 40 1>;
+                               force;
++                              pinctrl-names = "default";
++                              pinctrl-0 = <&power_ctrl_pins>;
+                       };
+ 
+                       i2c_soft: i2c@0 {
+--- a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
++++ b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
+@@ -10,4 +10,11 @@
+                       status = "disabled";
+               };
+       };
++
++      fragment@1 {
++              target = <&mmcnr>;
++              __overlay__ {
++                      status = "disabled";
++              };
++      };
+ };
+--- a/arch/arm/boot/dts/overlays/sdhost-overlay.dts
++++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
+@@ -22,6 +22,13 @@
+               };
+       };
+ 
++      fragment@2 {
++              target = <&mmcnr>;
++              __overlay__ {
++                      status = "disabled";
++              };
++      };
++
+       __overrides__ {
+               overclock_50     = <&frag0>,"brcm,overclock-50:0";
+               force_pio        = <&frag0>,"brcm,force-pio?";