| Message ID | 20211129105556.675235-3-phil@raspberrypi.com |
|---|---|
| State | Accepted |
| Commit | e8f24c58d1b69ecf410a673c22f546dc732bb879 |
| Headers | show |
| Series | pinctrl: bcm2835: Fix gpio hogs and pin reinitialisation | expand |
On Mon, Nov 29, 2021 at 11:56 AM Phil Elwell <phil@raspberrypi.com> wrote: > Since [1], added in 5.7, the absence of a gpio-ranges property has > prevented GPIOs from being restored to inputs when released. > Add those properties for BCM283x and BCM2711 devices. > > [1] commit 2ab73c6d8323 ("gpio: Support GPIO controllers without > pin-ranges") > > Fixes: 2ab73c6d8323 ("gpio: Support GPIO controllers without > pin-ranges") > Signed-off-by: Phil Elwell <phil@raspberrypi.com> With the funny linebreak fixed: Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Please merge this patch through the Broadcom/SoC tree. Yours, Linus Walleij
diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 9e01dbca4a01..dff18fc9a906 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -582,6 +582,8 @@ &gpio { <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; + gpio-ranges = <&gpio 0 0 58>; + gpclk0_gpio49: gpclk0_gpio49 { pin-gpclk { pins = "gpio49"; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index a3e06b680947..c113661a6668 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -126,6 +126,8 @@ gpio: gpio@7e200000 { interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&gpio 0 0 54>; + /* Defines common pin muxing groups * * While each pin can have its mux selected
Since [1], added in 5.7, the absence of a gpio-ranges property has prevented GPIOs from being restored to inputs when released. Add those properties for BCM283x and BCM2711 devices. [1] commit 2ab73c6d8323 ("gpio: Support GPIO controllers without pin-ranges") Fixes: 2ab73c6d8323 ("gpio: Support GPIO controllers without pin-ranges") Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- arch/arm/boot/dts/bcm2711.dtsi | 2 ++ arch/arm/boot/dts/bcm283x.dtsi | 2 ++ 2 files changed, 4 insertions(+)