[openwrt/openwrt] Revert "mac80211: ath9k: clean up gpiochip"
LEDE Commits
lede-commits at lists.infradead.org
Wed Jan 1 02:23:08 PST 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/04601004befe75a430696139e50595a54140e750
commit 04601004befe75a430696139e50595a54140e750
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Wed Jan 1 11:22:30 2025 +0100
Revert "mac80211: ath9k: clean up gpiochip"
This reverts commit 2af552372d4e0feda947d44eba3775b335d242db.
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
.../patches/ath9k/548-ath9k_enable_gpio_chip.patch | 111 ++++++++++++---------
.../ath9k/549-ath9k_enable_gpio_buttons.patch | 22 ++--
2 files changed, 77 insertions(+), 56 deletions(-)
diff --git a/package/kernel/mac80211/patches/ath9k/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/ath9k/548-ath9k_enable_gpio_chip.patch
index b2aee815a6..0efe23b9dc 100644
--- a/package/kernel/mac80211/patches/ath9k/548-ath9k_enable_gpio_chip.patch
+++ b/package/kernel/mac80211/patches/ath9k/548-ath9k_enable_gpio_chip.patch
@@ -10,32 +10,47 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -25,6 +25,8 @@
+@@ -25,6 +25,7 @@
#include <linux/completion.h>
#include <linux/time.h>
#include <linux/hw_random.h>
+#include <linux/gpio/driver.h>
-+#include <linux/gpio/consumer.h>
#include "common.h"
#include "debug.h"
-@@ -1046,6 +1048,10 @@ struct ath_softc {
+@@ -991,6 +992,14 @@ struct ath_led {
+ struct led_classdev cdev;
+ };
+
++#ifdef CONFIG_GPIOLIB
++struct ath9k_gpio_chip {
++ struct ath_softc *sc;
++ char label[32];
++ struct gpio_chip gchip;
++};
++#endif
++
+ struct ath_softc {
+ struct ieee80211_hw *hw;
+ struct device *dev;
+@@ -1046,6 +1055,9 @@ struct ath_softc {
#ifdef CPTCFG_MAC80211_LEDS
const char *led_default_trigger;
struct list_head leds;
+#ifdef CONFIG_GPIOLIB
-+ struct gpio_chip *gpiochip;
-+ struct gpio_desc *gpiodesc;
++ struct ath9k_gpio_chip *gpiochip;
+#endif
#endif
#ifdef CPTCFG_ATH9K_DEBUGFS
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -16,12 +16,123 @@
+@@ -15,13 +15,131 @@
+ */
#include "ath9k.h"
-
++#include <linux/gpio.h>
++
+#ifdef CPTCFG_MAC80211_LEDS
+
+#ifdef CONFIG_GPIOLIB
@@ -47,9 +62,10 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
+/* gpio_chip handler : set GPIO to input */
+static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
+{
-+ struct ath_softc *sc = gpiochip_get_data(chip);
++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
++ gchip);
+
-+ ath9k_hw_gpio_request_in(sc->sc_ah, offset, "ath9k-gpio");
++ ath9k_hw_gpio_request_in(gc->sc->sc_ah, offset, "ath9k-gpio");
+
+ return 0;
+}
@@ -58,11 +74,12 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
+static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
+ int value)
+{
-+ struct ath_softc *sc = gpiochip_get_data(chip);
++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
++ gchip);
+
-+ ath9k_hw_gpio_request_out(sc->sc_ah, offset, "ath9k-gpio",
++ ath9k_hw_gpio_request_out(gc->sc->sc_ah, offset, "ath9k-gpio",
+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-+ ath9k_hw_set_gpio(sc->sc_ah, offset, value);
++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
+
+ return 0;
+}
@@ -70,8 +87,9 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
+/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
+static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
+{
-+ struct ath_softc *sc = gpiochip_get_data(chip);
-+ struct ath_hw *ah = sc->sc_ah;
++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
++ gchip);
++ struct ath_hw *ah = gc->sc->sc_ah;
+
+ return !((REG_READ(ah, AR_GPIO_OE_OUT(ah)) >> (offset * 2)) & 3);
+}
@@ -79,62 +97,65 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
+/* gpio_chip handler : get GPIO pin value */
+static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
+{
-+ struct ath_softc *sc = gpiochip_get_data(chip);
++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
++ gchip);
+
-+ return ath9k_hw_gpio_get(sc->sc_ah, offset);
++ return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
+}
+
+/* gpio_chip handler : set GPIO pin to value */
+static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
+ int value)
+{
-+ struct ath_softc *sc = gpiochip_get_data(chip);
++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
++ gchip);
+
-+ ath9k_hw_set_gpio(sc->sc_ah, offset, value);
++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
+}
+
+/* register GPIO chip */
+static void ath9k_register_gpio_chip(struct ath_softc *sc)
+{
-+ struct gpio_chip *gc = sc->gpiochip;
++ struct ath9k_gpio_chip *gc;
+ struct ath_hw *ah = sc->sc_ah;
+
-+ gc = kzalloc(sizeof(struct gpio_chip), GFP_KERNEL);
++ gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
+ if (!gc)
+ return;
+
-+ gc->label = kasprintf(GFP_KERNEL, "ath9k-%s",
-+ wiphy_name(sc->hw->wiphy));
-+ if (!gc->label)
-+ return;
-+
-+ gc->parent = sc->dev;
-+ gc->base = -1; /* determine base automatically */
-+ gc->ngpio = ah->caps.num_gpio_pins;
-+ gc->direction_input = ath9k_gpio_pin_cfg_input;
-+ gc->direction_output = ath9k_gpio_pin_cfg_output;
-+ gc->get_direction = ath9k_gpio_pin_get_dir;
-+ gc->get = ath9k_gpio_pin_get;
-+ gc->set = ath9k_gpio_pin_set;
-+
-+ if (gpiochip_add_data(gc, sc)) {
-+ kfree(gc->label);
++ gc->sc = sc;
++ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
++ wiphy_name(sc->hw->wiphy));
++ gc->gchip.parent = sc->dev;
++ gc->gchip.label = gc->label;
++ gc->gchip.base = -1; /* determine base automatically */
++ gc->gchip.ngpio = ah->caps.num_gpio_pins;
++ gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
++ gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
++ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
++ gc->gchip.get = ath9k_gpio_pin_get;
++ gc->gchip.set = ath9k_gpio_pin_set;
++
++ if (gpiochip_add(&gc->gchip)) {
+ kfree(gc);
+ return;
+ }
++
++ gc->gchip.owner = NULL;
++ sc->gpiochip = gc;
+}
+
+/* remove GPIO chip */
+static void ath9k_unregister_gpio_chip(struct ath_softc *sc)
+{
-+ struct gpio_chip *gc = sc->gpiochip;
++ struct ath9k_gpio_chip *gc = sc->gpiochip;
+
+ if (!gc)
+ return;
+
-+ gpiochip_remove(gc);
-+ kfree(gc->label);
++ gpiochip_remove(&gc->gchip);
+ kfree(gc);
++ sc->gpiochip = NULL;
+}
+
+#else /* CONFIG_GPIOLIB */
@@ -148,7 +169,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
+}
+
+#endif /* CONFIG_GPIOLIB */
-+
+
/********************************/
/* LED functions */
/********************************/
@@ -158,27 +179,27 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
static void ath_fill_led_pin(struct ath_softc *sc)
{
struct ath_hw *ah = sc->sc_ah;
-@@ -79,6 +190,12 @@ static int ath_add_led(struct ath_softc
+@@ -79,6 +197,12 @@ static int ath_add_led(struct ath_softc
else
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
+#ifdef CONFIG_GPIOLIB
+ /* If there is GPIO chip configured, reserve LED pin */
+ if (sc->gpiochip)
-+ sc->gpiodesc = gpiod_get(sc->dev, gpio->name, GPIOD_ASIS);
++ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
+#endif
+
return 0;
}
-@@ -117,17 +234,24 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -117,17 +241,24 @@ void ath_deinit_leds(struct ath_softc *s
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
+#ifdef CONFIG_GPIOLIB
+ /* If there is GPIO chip configured, free LED pin */
+ if (sc->gpiochip)
-+ gpiod_put(sc->gpiodesc);
++ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
+#endif
list_del(&led->list);
ath_led_brightness(&led->cdev, LED_OFF);
@@ -196,7 +217,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
char led_name[32];
const char *trigger;
-@@ -136,6 +260,12 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -136,6 +267,12 @@ void ath_init_leds(struct ath_softc *sc)
if (AR_SREV_9100(sc->sc_ah))
return;
diff --git a/package/kernel/mac80211/patches/ath9k/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/ath9k/549-ath9k_enable_gpio_buttons.patch
index 728b6663a2..78700222a9 100644
--- a/package/kernel/mac80211/patches/ath9k/549-ath9k_enable_gpio_buttons.patch
+++ b/package/kernel/mac80211/patches/ath9k/549-ath9k_enable_gpio_buttons.patch
@@ -10,27 +10,27 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -1051,6 +1051,7 @@ struct ath_softc {
+@@ -1057,6 +1057,7 @@ struct ath_softc {
+ struct list_head leds;
#ifdef CONFIG_GPIOLIB
- struct gpio_chip *gpiochip;
- struct gpio_desc *gpiodesc;
+ struct ath9k_gpio_chip *gpiochip;
+ struct platform_device *btnpdev; /* gpio-keys-polled */
#endif
#endif
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -15,6 +15,8 @@
- */
+@@ -16,6 +16,8 @@
#include "ath9k.h"
+ #include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/gpio_keys.h>
#ifdef CPTCFG_MAC80211_LEDS
-@@ -117,6 +119,67 @@ static void ath9k_unregister_gpio_chip(s
- kfree(gc);
+@@ -124,6 +126,67 @@ static void ath9k_unregister_gpio_chip(s
+ sc->gpiochip = NULL;
}
+/******************/
@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
+
+ ath9k_hw_gpio_request_in(sc->sc_ah, ah->btns[i].gpio,
+ "ath9k-gpio");
-+ bt[i].gpio = sc->gpiochip->base + ah->btns[i].gpio;
++ bt[i].gpio = sc->gpiochip->gchip.base + ah->btns[i].gpio;
+ }
+
+ memset(&gkpdata, 0, sizeof(struct gpio_keys_platform_data));
@@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
#else /* CONFIG_GPIOLIB */
static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-@@ -127,6 +190,14 @@ static inline void ath9k_unregister_gpio
+@@ -134,6 +197,14 @@ static inline void ath9k_unregister_gpio
{
}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
#endif /* CONFIG_GPIOLIB */
/********************************/
-@@ -232,6 +303,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -239,6 +310,7 @@ void ath_deinit_leds(struct ath_softc *s
{
struct ath_led *led;
@@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
#ifdef CONFIG_GPIOLIB
-@@ -267,6 +339,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -274,6 +346,7 @@ void ath_init_leds(struct ath_softc *sc)
}
ath_fill_led_pin(sc);
More information about the lede-commits
mailing list