From af5c27ea4bc6e648ef4a21d01f7cdab2ede1fd5f Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Tue, 27 Nov 2018 16:59:10 +0100 Subject: [PATCH 216/432] BCM2710_DT: fix gpio expander bindings The upstreamed driver for the GPIO expander expects to be a children of the "firmware" node. The patch also removes the "firmware" phandle as it's useless. Signed-off-by: Nicolas Saenz Julienne --- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 3 +-- arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 4 +++- arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts index fe1e2d2daf62..898ab48479e3 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -83,12 +83,11 @@ brcm,overclock-50 = <0>; }; -&soc { +&firmware { expgpio: expgpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; #gpio-cells = <2>; - firmware = <&firmware>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts index 36c567517186..61ecb46b9c06 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -92,11 +92,13 @@ status = "okay"; }; +}; + +&firmware { expgpio: expgpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; #gpio-cells = <2>; - firmware = <&firmware>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts index 2ed05b73e824..9490177443a5 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -53,11 +53,13 @@ status = "okay"; }; +}; + +&firmware { expgpio: expgpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; #gpio-cells = <2>; - firmware = <&firmware>; status = "okay"; }; }; -- 2.19.1