]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: dts: renesas: rzg3s-smarc-som: Guard Ethernet IRQ GPIO hogs
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Thu, 8 Feb 2024 12:42:55 +0000 (14:42 +0200)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:16:49 +0000 (18:16 -0400)
[ Upstream commit 150d81f7a260f36c118cbec253fdd493c671dc29 ]

Ethernet IRQ GPIOs are marked as GPIO hogs.  Thus, these GPIOs are
requested at probe time without considering if there are other
peripherals that need them.  The Ethernet IRQ GPIOs are shared with
SDHI2.  Selection between Ethernet and SDHI2 is done through a hardware
switch.  To avoid scenarios where one wants to boot with SDHI2 support
and some SDHI pins are not propertly configured because of the GPIO
hogs, guard the Ethernet IRQ GPIO hogs with the proper build flag.

Fixes: 932ff0c802c6 ("arm64: dts: renesas: rzg3s-smarc-som: Enable the Ethernet interfaces")
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20240208124300.2740313-13-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi

index f062d4ad78b79d9a2c511b31bd2159e9c89d6e87..d33ab4c8878787cecc72ddde99212044938fc558 100644 (file)
 #endif
 
 &pinctrl {
+#if SW_CONFIG3 == SW_ON
        eth0-phy-irq-hog {
                gpio-hog;
                gpios = <RZG2L_GPIO(12, 0) GPIO_ACTIVE_LOW>;
                input;
                line-name = "eth0-phy-irq";
        };
+#endif
 
        eth0_pins: eth0 {
                txc {
                };
        };
 
+#if SW_CONFIG3 == SW_ON
        eth1-phy-irq-hog {
                gpio-hog;
                gpios = <RZG2L_GPIO(12, 1) GPIO_ACTIVE_LOW>;
                input;
                line-name = "eth1-phy-irq";
        };
+#endif
 
        eth1_pins: eth1 {
                txc {