brcm2708: add linux 4.19 support
[oweals/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0516-overlays-Fix-mmc-related-overlays-after-refactor.patch
1 From 59ffffa03628f1df3dc63d8f2f1b61bce4b322c2 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Thu, 30 May 2019 12:25:29 +0100
4 Subject: [PATCH 516/703] overlays: Fix mmc-related overlays after refactor
5
6 The addition of the mmcnr node to the base dtbs caused some overlays to
7 not work as they should. Patch up pi3-disable-wifi, balena-fin and
8 sdhost.
9
10 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
11 ---
12  arch/arm/boot/dts/overlays/balena-fin-overlay.dts       | 7 ++++---
13  arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts | 7 +++++++
14  arch/arm/boot/dts/overlays/sdhost-overlay.dts           | 7 +++++++
15  3 files changed, 18 insertions(+), 3 deletions(-)
16
17 --- a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
18 +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
19 @@ -5,13 +5,12 @@
20         compatible = "brcm,bcm2835";
21  
22         fragment@0 {
23 -               target = <&mmc>;
24 -               sdio_wifi: __overlay__ {
25 +               target = <&mmcnr>;
26 +               __overlay__ {
27                         pinctrl-names = "default";
28                         pinctrl-0 = <&sdio_pins>;
29                         bus-width = <4>;
30                         brcm,overclock-50 = <35>;
31 -                       non-removable;
32                         status = "okay";
33                 };
34         };
35 @@ -43,6 +42,8 @@
36                                 compatible = "gpio-poweroff";
37                                 gpios = <&gpio 40 1>;
38                                 force;
39 +                               pinctrl-names = "default";
40 +                               pinctrl-0 = <&power_ctrl_pins>;
41                         };
42  
43                         i2c_soft: i2c@0 {
44 --- a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
45 +++ b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
46 @@ -10,4 +10,11 @@
47                         status = "disabled";
48                 };
49         };
50 +
51 +       fragment@1 {
52 +               target = <&mmcnr>;
53 +               __overlay__ {
54 +                       status = "disabled";
55 +               };
56 +       };
57  };
58 --- a/arch/arm/boot/dts/overlays/sdhost-overlay.dts
59 +++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
60 @@ -22,6 +22,13 @@
61                 };
62         };
63  
64 +       fragment@2 {
65 +               target = <&mmcnr>;
66 +               __overlay__ {
67 +                       status = "disabled";
68 +               };
69 +       };
70 +
71         __overrides__ {
72                 overclock_50     = <&frag0>,"brcm,overclock-50:0";
73                 force_pio        = <&frag0>,"brcm,force-pio?";