From: Martin Blumenstingl Date: Fri, 1 Jul 2016 13:41:19 +0000 (+0200) Subject: kernel: mac80211: set the parent of the ath9k gpio_chip X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=70afc0bdd1fb0474b864998f7674316a00954715;p=openwrt%2Fstaging%2Fnbd.git kernel: mac80211: set the parent of the ath9k gpio_chip This allows gpiolib to re-use ath9k's devicetree node as GPIO controller. Example: ath9k: ath9k@0 { #gpio-cells = <2>; gpio-controller; } Now the ath9k node can be used just like any other GPIO controller: gpios = <&ath9k 1 GPIO_ACTIVE_HIGH>; Signed-off-by: Martin Blumenstingl --- 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 f516b8d6a8..116860d75c 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,135 @@ #include "ath9k.h" #include @@ -125,6 +125,11 @@ Signed-off-by: Felix Fietkau + + snprintf(gc->label, sizeof(gc->label), "ath9k-%s", + wiphy_name(sc->hw->wiphy)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) ++ gc->gchip.parent = sc->dev; ++#else ++ gc->gchip.dev = sc->dev; ++#endif + gc->gchip.label = gc->label; + gc->gchip.base = -1; /* determine base automatically */ + gc->gchip.ngpio = ah->caps.num_gpio_pins; @@ -178,7 +183,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 +202,12 @@ static int ath_add_led(struct ath_softc else ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low); @@ -191,7 +196,7 @@ Signed-off-by: Felix Fietkau return 0; } -@@ -136,12 +259,18 @@ void ath_deinit_leds(struct ath_softc *s +@@ -136,12 +264,18 @@ void ath_deinit_leds(struct ath_softc *s while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); @@ -210,7 +215,7 @@ Signed-off-by: Felix Fietkau } void ath_init_leds(struct ath_softc *sc) -@@ -158,6 +287,8 @@ void ath_init_leds(struct ath_softc *sc) +@@ -158,6 +292,8 @@ void ath_init_leds(struct ath_softc *sc) ath_fill_led_pin(sc); @@ -219,7 +224,7 @@ Signed-off-by: Felix Fietkau if (pdata && pdata->led_name) strncpy(led_name, pdata->led_name, sizeof(led_name)); else -@@ -178,6 +309,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -178,6 +314,7 @@ void ath_init_leds(struct ath_softc *sc) for (i = 0; i < pdata->num_leds; i++) ath_create_platform_led(sc, &pdata->leds[i]); } 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 9d887ceb5e..d331b15b52 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,64 @@ static void ath9k_unregister_gpio_chip(s +@@ -129,6 +131,64 @@ static void ath9k_unregister_gpio_chip(s sc->gpiochip = NULL; } @@ -94,7 +94,7 @@ Signed-off-by: Felix Fietkau #else /* CONFIG_GPIOLIB */ static inline void ath9k_register_gpio_chip(struct ath_softc *sc) -@@ -134,6 +194,14 @@ static inline void ath9k_unregister_gpio +@@ -139,6 +199,14 @@ static inline void ath9k_unregister_gpio { } @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau #endif /* CONFIG_GPIOLIB */ /********************************/ -@@ -257,6 +325,7 @@ void ath_deinit_leds(struct ath_softc *s +@@ -262,6 +330,7 @@ void ath_deinit_leds(struct ath_softc *s { struct ath_led *led; @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); #ifdef CONFIG_GPIOLIB -@@ -288,6 +357,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -293,6 +362,7 @@ void ath_init_leds(struct ath_softc *sc) ath_fill_led_pin(sc); ath9k_register_gpio_chip(sc); @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau if (pdata && pdata->led_name) strncpy(led_name, pdata->led_name, sizeof(led_name)); -@@ -303,7 +373,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -308,7 +378,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);