Skip to content

Commit

Permalink
ARM: dts: gpio-ranges property is now required
Browse files Browse the repository at this point in the history
[ Upstream commit c801335 ]

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 2ab73c6 ("gpio: Support GPIO controllers without
    pin-ranges")

Link: https://lore.kernel.org/r/20220104170247.956760-1-linus.walleij@linaro.org
Fixes: 2ab73c6 ("gpio: Support GPIO controllers without pin-ranges")
Fixes: 266423e ("pinctrl: bcm2835: Change init order for gpio hogs")
Reported-by: Stefan Wahren <stefan.wahren@i2se.com>
Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Reported-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20211206092237.4105895-3-phil@raspberrypi.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
pelwell authored and gregkh committed Jan 11, 2022
1 parent f63fa1a commit ef81f7d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/bcm2711.dtsi
Expand Up @@ -555,6 +555,8 @@
<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";
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/bcm283x.dtsi
Expand Up @@ -126,6 +126,8 @@
interrupt-controller;
#interrupt-cells = <2>;

gpio-ranges = <&gpio 0 0 54>;

/* Defines common pin muxing groups
*
* While each pin can have its mux selected
Expand Down

0 comments on commit ef81f7d

Please sign in to comment.