| Message ID | 20220104170247.956760-1-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c8013355ead68dce152cf426686f8a5f80d88b40 |
| Headers | show |
| Series | ARM: dts: gpio-ranges property is now required | expand |
On 1/4/22 9:02 AM, Linus Walleij wrote: > From: Phil Elwell <phil@raspberrypi.com> > > 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") > Fixes: 266423e60ea1 ("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> > --- > Hi SoC maintainers, please apply this directly for fixes, the > missing patch is wreacking havoc in the RPi world. Acked-by: Florian Fainelli <f.fainelli@gmail.com> Now that "pinctrl: bcm2835: Change init order for gpio hogs" is in Linus' master this patch can go in... what a mess, let's not do this again.
Hi Olof, Am 04.01.22 um 18:02 schrieb Linus Walleij: > From: Phil Elwell <phil@raspberrypi.com> > > 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") > Fixes: 266423e60ea1 ("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> > --- > Hi SoC maintainers, please apply this directly for fixes, the > missing patch is wreacking havoc in the RPi world. this patch has been send to soc@kernel.org in order to fix a regression [1] caused by "pinctrl: bcm2835: Change init order for gpio hog". Would be great to get it into 5.16 [1] - https://lore.kernel.org/all/ec60b52b-7a59-266d-9608-11c0da9053a6@i2se.com/
On Sat, Jan 8, 2022 at 1:04 PM Stefan Wahren <stefan.wahren@i2se.com> wrote: > > Hi Olof, > > Am 04.01.22 um 18:02 schrieb Linus Walleij: > > From: Phil Elwell <phil@raspberrypi.com> > > > > 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") > > Fixes: 266423e60ea1 ("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> > > --- > > Hi SoC maintainers, please apply this directly for fixes, the > > missing patch is wreacking havoc in the RPi world. > > this patch has been send to soc@kernel.org in order to fix a regression > [1] caused by "pinctrl: bcm2835: Change init order for gpio hog". Would > be great to get it into 5.16 > > [1] - > https://lore.kernel.org/all/ec60b52b-7a59-266d-9608-11c0da9053a6@i2se.com/ Yeah, my bad -- I only scanned for pull requests and missed this patch. I'll send it up. Linus just merged the pull request I sent so I'll do an incremental one. -Olof
Hello: This patch was applied to soc/soc.git (arm/fixes) by Olof Johansson <olof@lixom.net>: On Tue, 4 Jan 2022 18:02:47 +0100 you wrote: > From: Phil Elwell <phil@raspberrypi.com> > > 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") > > [...] Here is the summary with links: - ARM: dts: gpio-ranges property is now required https://git.kernel.org/soc/soc/c/c8013355ead6 You are awesome, thank you!
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