openwrt/target/linux/bcm27xx/patches-4.19/950-0191-BCM2710_DT-fix-gpi...

68 lines
1.6 KiB
Diff

From d5a4fa7ba39e4f9e41271023e1be417204b8a2b7 Mon Sep 17 00:00:00 2001
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Date: Tue, 27 Nov 2018 16:59:10 +0100
Subject: [PATCH] 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 <nsaenzjulienne@suse.de>
---
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(-)
--- 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";
};
};
--- 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";
};
};
--- 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";
};
};