From d997712c71eb281b9aab3c73b39b8deae2b7d946 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Fri, 7 Dec 2018 09:42:09 +0100 Subject: [PATCH] ath9k: register GPIO chip for OF targets This partitialy reverts commit f506de2cdaf9. Registering the GPIO chip without a parent device completely breaks the ath9k GPIOs for device tree targets. As long as boards using the devicetree don't have the gpio-controller property set for the ath9k node, the unloading of the driver works as expected. Register the GPIO chip with the ath9k device as parent only for OF targets to find a trade-off between the needs of driver developers and the broken LEDs and buttons seen by users. Fixes: FS#2098 Signed-off-by: Mathias Kresin (cherry picked from commit d35f2a5565fc51fb277f72a8565c871ce1785588) --- .../patches/548-ath9k_enable_gpio_chip.patch | 21 +++++++++++++------ .../549-ath9k_enable_gpio_buttons.patch | 8 +++---- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch index 0b76d330c6..eb9eb26a74 100644 --- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch +++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch @@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau #ifdef CPTCFG_ATH9K_DEBUGFS --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c -@@ -16,13 +16,130 @@ +@@ -16,13 +16,139 @@ #include "ath9k.h" #include @@ -126,7 +126,13 @@ Signed-off-by: Felix Fietkau + gc->sc = sc; + snprintf(gc->label, sizeof(gc->label), "ath9k-%s", + wiphy_name(sc->hw->wiphy)); -+ ++#ifdef CONFIG_OF ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) ++ gc->gchip.parent = sc->dev; ++#else ++ gc->gchip.dev = sc->dev; ++#endif ++#endif + gc->gchip.label = gc->label; + gc->gchip.base = -1; /* determine base automatically */ + gc->gchip.ngpio = ah->caps.num_gpio_pins; @@ -141,6 +147,9 @@ Signed-off-by: Felix Fietkau + return; + } + ++#ifdef CONFIG_OF ++ gc->gchip.owner = NULL; ++#endif + sc->gpiochip = gc; +} + @@ -178,7 +187,7 @@ Signed-off-by: Felix Fietkau static void ath_fill_led_pin(struct ath_softc *sc) { struct ath_hw *ah = sc->sc_ah; -@@ -80,6 +197,12 @@ static int ath_add_led(struct ath_softc +@@ -80,6 +206,12 @@ static int ath_add_led(struct ath_softc else ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low); @@ -191,7 +200,7 @@ Signed-off-by: Felix Fietkau return 0; } -@@ -136,17 +259,24 @@ void ath_deinit_leds(struct ath_softc *s +@@ -136,17 +268,24 @@ void ath_deinit_leds(struct ath_softc *s while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); @@ -216,7 +225,7 @@ Signed-off-by: Felix Fietkau char led_name[32]; const char *trigger; int i; -@@ -156,6 +286,15 @@ void ath_init_leds(struct ath_softc *sc) +@@ -156,6 +295,15 @@ void ath_init_leds(struct ath_softc *sc) if (AR_SREV_9100(sc->sc_ah)) return; @@ -232,7 +241,7 @@ Signed-off-by: Felix Fietkau ath_fill_led_pin(sc); if (pdata && pdata->leds && pdata->num_leds) -@@ -180,6 +319,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -180,6 +328,7 @@ void ath_init_leds(struct ath_softc *sc) ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high); } diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch index e7282ab6b1..bd71b75e76 100644 --- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch +++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau #ifdef CPTCFG_MAC80211_LEDS -@@ -124,6 +126,67 @@ static void ath9k_unregister_gpio_chip(s +@@ -133,6 +135,67 @@ static void ath9k_unregister_gpio_chip(s sc->gpiochip = NULL; } @@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau #else /* CONFIG_GPIOLIB */ static inline void ath9k_register_gpio_chip(struct ath_softc *sc) -@@ -134,6 +197,14 @@ static inline void ath9k_unregister_gpio +@@ -143,6 +206,14 @@ static inline void ath9k_unregister_gpio { } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau #endif /* CONFIG_GPIOLIB */ /********************************/ -@@ -257,6 +328,7 @@ void ath_deinit_leds(struct ath_softc *s +@@ -266,6 +337,7 @@ void ath_deinit_leds(struct ath_softc *s { struct ath_led *led; @@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); #ifdef CONFIG_GPIOLIB -@@ -296,6 +368,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -305,6 +377,7 @@ void ath_init_leds(struct ath_softc *sc) } ath_fill_led_pin(sc); -- 2.25.1