target/linux/brcm2708/patches-4.19/950-0216-BCM2710_DT-fix-gpio-expander-bindings.patch

   1 From adb1b1d1154ad7a8efd914c6a977dd0c14223b6d Mon Sep 17 00:00:00 2001
   2 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
   3 Date: Tue, 27 Nov 2018 16:59:10 +0100
   4 Subject: [PATCH 216/782] BCM2710_DT: fix gpio expander bindings
   5
   6 The upstreamed driver for the GPIO expander expects to be a children of
   7 the "firmware" node.
   8
   9 The patch also removes the "firmware" phandle as it's useless.
  10
  11 Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  12 ---
  13  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 3 +--
  14  arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 4 +++-
  15  arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 4 +++-
  16  3 files changed, 7 insertions(+), 4 deletions(-)
  17
  18 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  19 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  20 @@ -83,12 +83,11 @@
  21         brcm,overclock-50 = <0>;
  22  };
  23
  24 -&soc {
  25 +&firmware {
  26         expgpio: expgpio {
  27                 compatible = "raspberrypi,firmware-gpio";
  28                 gpio-controller;
  29                 #gpio-cells = <2>;
  30 -               firmware = <&firmware>;
  31                 status = "okay";
  32         };
  33  };
  34 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  35 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  36 @@ -92,11 +92,13 @@
  37                 status = "okay";
  38         };
  39
  40 +};
  41 +
  42 +&firmware {
  43         expgpio: expgpio {
  44                 compatible = "raspberrypi,firmware-gpio";
  45                 gpio-controller;
  46                 #gpio-cells = <2>;
  47 -               firmware = <&firmware>;
  48                 status = "okay";
  49         };
  50  };
  51 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
  52 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
  53 @@ -53,11 +53,13 @@
  54                 status = "okay";
  55         };
  56
  57 +};
  58 +
  59 +&firmware {
  60         expgpio: expgpio {
  61                 compatible = "raspberrypi,firmware-gpio";
  62                 gpio-controller;
  63                 #gpio-cells = <2>;
  64 -               firmware = <&firmware>;
  65                 status = "okay";
  66         };
  67  };