From 6555321eb216b582ca9473b8355e14401640da5c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 17 Sep 2025 18:44:21 -0700 Subject: [PATCH] treewide: remove of_gpio.h of_gpio.h is deprecated in upstream Linux and may be removed soon. Get ahead of things and remove it. Most of these drivers already use the gpiod API. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/20076 Signed-off-by: Robert Marko --- .../kernel/gpio-button-hotplug/src/gpio-button-hotplug.c | 2 +- package/kernel/ubnt-ledbar/src/leds-ubnt-ledbar.c | 1 - .../linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c | 1 - target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c | 1 - .../ath79/patches-6.12/700-phy-add-ath79-usb-phys.patch | 8 ++------ .../bmips/files/drivers/pci/controller/pci-bcm6348.c | 1 - .../bmips/files/drivers/pci/controller/pcie-bcm6318.c | 1 - .../bmips/files/drivers/pci/controller/pcie-bcm6328.c | 1 - .../files/drivers/net/ethernet/ralink/mtk_eth_soc.c | 1 - .../files-6.6/drivers/pci/controller/dwc/pcie-sf21.c | 1 - 10 files changed, 3 insertions(+), 15 deletions(-) diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index 75f358a208..0c16f34b0d 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/package/kernel/ubnt-ledbar/src/leds-ubnt-ledbar.c b/package/kernel/ubnt-ledbar/src/leds-ubnt-ledbar.c index c36a74779c..c908cea0c8 100644 --- a/package/kernel/ubnt-ledbar/src/leds-ubnt-ledbar.c +++ b/package/kernel/ubnt-ledbar/src/leds-ubnt-ledbar.c @@ -7,7 +7,6 @@ #include #include #include -#include #include /** diff --git a/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c b/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c index a0759fe9e3..05bd1fa604 100644 --- a/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c +++ b/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c @@ -13,7 +13,6 @@ #include #include #include -#include #define GPIO_LATCH_DRIVER_NAME "gpio-latch-mikrotik" #define GPIO_LATCH_LINES 9 diff --git a/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c b/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c index d83b690afe..3954cceccd 100644 --- a/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c +++ b/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #define GPIO_RB91X_KEY_DRIVER_NAME "gpio-rb91x-key" diff --git a/target/linux/ath79/patches-6.12/700-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-6.12/700-phy-add-ath79-usb-phys.patch index 1c1b2f2ca1..74731f069a 100644 --- a/target/linux/ath79/patches-6.12/700-phy-add-ath79-usb-phys.patch +++ b/target/linux/ath79/patches-6.12/700-phy-add-ath79-usb-phys.patch @@ -51,7 +51,7 @@ Signed-off-by: John Crispin obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o --- /dev/null +++ b/drivers/phy/phy-ar7100-usb.c -@@ -0,0 +1,117 @@ +@@ -0,0 +1,115 @@ +/* + * Copyright (C) 2018 John Crispin + * @@ -66,7 +66,6 @@ Signed-off-by: John Crispin +#include +#include +#include -+#include + +#include +#include @@ -77,7 +76,6 @@ Signed-off-by: John Crispin + struct reset_control *rst_ohci_dll; + void __iomem *io_base; + struct phy *phy; -+ int gpio; +}; + +static int ar7100_usb_phy_power_off(struct phy *phy) @@ -171,7 +169,7 @@ Signed-off-by: John Crispin +MODULE_LICENSE("GPL"); --- /dev/null +++ b/drivers/phy/phy-ar7200-usb.c -@@ -0,0 +1,111 @@ +@@ -0,0 +1,109 @@ +/* + * Copyright (C) 2015 Alban Bedel + * @@ -185,14 +183,12 @@ Signed-off-by: John Crispin +#include +#include +#include -+#include + +struct ar7200_usb_phy { + struct reset_control *rst_phy; + struct reset_control *rst_phy_analog; + struct reset_control *suspend_override; + struct phy *phy; -+ int gpio; +}; + +static int ar7200_usb_phy_power_on(struct phy *phy) diff --git a/target/linux/bmips/files/drivers/pci/controller/pci-bcm6348.c b/target/linux/bmips/files/drivers/pci/controller/pci-bcm6348.c index c9dc02915e..2ced4bc0e8 100644 --- a/target/linux/bmips/files/drivers/pci/controller/pci-bcm6348.c +++ b/target/linux/bmips/files/drivers/pci/controller/pci-bcm6348.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6318.c b/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6318.c index 265cd0d181..cf0762911f 100644 --- a/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6318.c +++ b/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6318.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6328.c b/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6328.c index 6111fcc9b5..dee52860d9 100644 --- a/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6328.c +++ b/target/linux/bmips/files/drivers/pci/controller/pcie-bcm6328.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c index 9bf486381f..8e1e6f5560 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/target/linux/siflower/files-6.6/drivers/pci/controller/dwc/pcie-sf21.c b/target/linux/siflower/files-6.6/drivers/pci/controller/dwc/pcie-sf21.c index 50be5058c7..bcebe8bfad 100644 --- a/target/linux/siflower/files-6.6/drivers/pci/controller/dwc/pcie-sf21.c +++ b/target/linux/siflower/files-6.6/drivers/pci/controller/dwc/pcie-sf21.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include -- 2.30.2