RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-02-26 01:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: rework gpio chip/button support to build on platforms without CONFIG_GPIOLIB

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48938
This commit is contained in:
Felix Fietkau 2016-03-07 09:20:22 +00:00
parent 4802f611cb
commit 2cfd943fe9
2 changed files with 128 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch → package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
View File

@ -6,12 +6,8 @@ Enable access to GPIO chip and its pins for Atheros AR92xx
wireless devices. For now AR9285 and AR9287 are supported. wireless devices. For now AR9285 and AR9287 are supported.
Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- ---
ath9k.h | 23 ++++++++++++
gpio.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
init.c | 2 +
3 files changed, 146 insertions(+)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h --- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
@ -22,93 +18,42 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
#include "common.h" #include "common.h"
#include "debug.h" #include "debug.h"
@@ -817,6 +818,13 @@ void ath_fill_led_pin(struct ath_softc * @@ -963,6 +964,14 @@ struct ath_led {
int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
const char *trigger, bool active_low);
+/***************/
+/* GPIO Chip */
+/***************/
+
+void ath9k_register_gpio_chip(struct ath_softc *sc);
+void ath9k_unregister_gpio_chip(struct ath_softc *sc);
+
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
@@ -828,6 +836,14 @@ static inline void ath_deinit_leds(struc
static inline void ath_fill_led_pin(struct ath_softc *sc)
{
}
+
+static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
+{
+}
+
+static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
+{
+}
#endif
/************************/
@@ -963,6 +979,12 @@ struct ath_led {
struct led_classdev cdev; struct led_classdev cdev;
}; };
+#ifdef CONFIG_GPIOLIB
+struct ath9k_gpio_chip { +struct ath9k_gpio_chip {
+ struct ath_softc *sc; + struct ath_softc *sc;
+ char label[32]; + char label[32];
+ struct gpio_chip gchip; + struct gpio_chip gchip;
+}; +};
+#endif
+ +
struct ath_softc { struct ath_softc {
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
struct device *dev; struct device *dev;
@@ -1017,6 +1039,7 @@ struct ath_softc { @@ -1017,6 +1026,9 @@ struct ath_softc {
#ifdef CPTCFG_MAC80211_LEDS #ifdef CPTCFG_MAC80211_LEDS
const char *led_default_trigger; const char *led_default_trigger;
struct list_head leds; struct list_head leds;
+#ifdef CONFIG_GPIOLIB
+ struct ath9k_gpio_chip *gpiochip; + struct ath9k_gpio_chip *gpiochip;
+#endif
#endif #endif
#ifdef CPTCFG_ATH9K_DEBUGFS #ifdef CPTCFG_ATH9K_DEBUGFS
--- a/drivers/net/wireless/ath/ath9k/gpio.c --- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -22,6 +22,9 @@ @@ -16,12 +16,138 @@
/********************************/
#ifdef CPTCFG_MAC80211_LEDS #include "ath9k.h"
#include <linux/ath9k_platform.h>
+#include <linux/gpio.h>
+ +
+#include <asm-generic/gpio.h> +#ifdef CPTCFG_MAC80211_LEDS
+ +
static void ath_led_brightness(struct led_classdev *led_cdev, +#ifdef CONFIG_GPIOLIB
enum led_brightness brightness)
{
@@ -60,6 +63,10 @@ static int ath_add_led(struct ath_softc
else
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
+ /* If there is GPIO chip configured, reserve LED pin */
+ if (sc->gpiochip)
+ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
+
return 0;
}
@@ -116,6 +123,9 @@ void ath_deinit_leds(struct ath_softc *s
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
+ /* If there is GPIO chip configured, free LED pin */
+ if (sc->gpiochip)
+ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
list_del(&led->list);
ath_led_brightness(&led->cdev, LED_OFF);
led_classdev_unregister(&led->cdev);
@@ -186,6 +196,117 @@ void ath_fill_led_pin(struct ath_softc *
/* LED off, active low */
ath9k_hw_set_gpio(ah, ah->led_pin, (ah->config.led_active_high) ? 0 : 1);
}
+ +
+/***************/ +/***************/
+/* GPIO Chip */ +/* GPIO Chip */
@ -169,7 +114,7 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
+} +}
+ +
+/* register GPIO chip */ +/* register GPIO chip */
+void ath9k_register_gpio_chip(struct ath_softc *sc) +static void ath9k_register_gpio_chip(struct ath_softc *sc)
+{ +{
+ struct ath9k_gpio_chip *gc; + struct ath9k_gpio_chip *gc;
+ u16 ng; + u16 ng;
@ -208,7 +153,7 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
+} +}
+ +
+/* remove GPIO chip */ +/* remove GPIO chip */
+void ath9k_unregister_gpio_chip(struct ath_softc *sc) +static void ath9k_unregister_gpio_chip(struct ath_softc *sc)
+{ +{
+ struct ath9k_gpio_chip *gc = sc->gpiochip; + struct ath9k_gpio_chip *gc = sc->gpiochip;
+ +
@ -219,25 +164,72 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
+ kfree(gc); + kfree(gc);
+ sc->gpiochip = NULL; + sc->gpiochip = NULL;
+} +}
+
+#else /* CONFIG_GPIOLIB */
+
+static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
+{
+}
+
+static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
+{
+}
+
+#endif /* CONFIG_GPIOLIB */
/********************************/
/* LED functions */
/********************************/
-#ifdef CPTCFG_MAC80211_LEDS
static void ath_led_brightness(struct led_classdev *led_cdev,
enum led_brightness brightness)
{
@@ -60,6 +186,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)
+ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
+#endif
+
return 0;
}
@@ -116,11 +248,17 @@ 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)
+ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
+#endif
list_del(&led->list);
ath_led_brightness(&led->cdev, LED_OFF);
led_classdev_unregister(&led->cdev);
kfree(led);
}
+ ath9k_unregister_gpio_chip(sc);
}
void ath_init_leds(struct ath_softc *sc)
@@ -135,6 +273,8 @@ void ath_init_leds(struct ath_softc *sc)
if (AR_SREV_9100(sc->sc_ah))
return;
+ ath9k_register_gpio_chip(sc);
+
if (pdata && pdata->led_name)
strncpy(led_name, pdata->led_name, sizeof(led_name));
else
@@ -186,6 +326,7 @@ void ath_fill_led_pin(struct ath_softc *
/* LED off, active low */
ath9k_hw_set_gpio(ah, ah->led_pin, (ah->config.led_active_high) ? 0 : 1);
}
+ +
#endif #endif
/*******************/ /*******************/
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -975,6 +975,7 @@ int ath9k_init_device(u16 devid, struct
goto debug_cleanup;
}
+ ath9k_register_gpio_chip(sc);
ath_init_leds(sc);
ath_start_rfkill_poll(sc);
@@ -1022,6 +1023,7 @@ void ath9k_deinit_device(struct ath_soft
wiphy_rfkill_stop_polling(sc->hw->wiphy);
ath_deinit_leds(sc);
+ ath9k_unregister_gpio_chip(sc);
ath9k_ps_restore(sc);

117
package/kernel/mac80211/patches/550-ath9k_enable_gpio_buttons.patch → package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
View File

@ -6,73 +6,30 @@ Key poller is activated for attached platform buttons.
Requires ath9k GPIO chip access. Requires ath9k GPIO chip access.
Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- ---
drivers/net/wireless/ath/ath9k/ath9k.h | 16 ++++++
drivers/net/wireless/ath/ath9k/gpio.c | 77 +++++++++++++++++++++++++++++++++
drivers/net/wireless/ath/ath9k/init.c | 2
include/linux/ath9k_platform.h | 4 +
4 files changed, 99 insertions(+)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h --- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -825,6 +825,13 @@ int ath_create_gpio_led(struct ath_softc @@ -1028,6 +1028,7 @@ struct ath_softc {
void ath9k_register_gpio_chip(struct ath_softc *sc);
void ath9k_unregister_gpio_chip(struct ath_softc *sc);
+/******************/
+/* GPIO Buttons */
+/******************/
+
+void ath9k_init_buttons(struct ath_softc *sc);
+void ath9k_deinit_buttons(struct ath_softc *sc);
+
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
@@ -844,6 +851,14 @@ static inline void ath9k_register_gpio_c
static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
{
}
+
+static inline void ath9k_init_buttons(struct ath_softc *sc)
+{
+}
+
+static inline void ath9k_deinit_buttons(struct ath_softc *sc)
+{
+}
#endif
/************************/
@@ -1040,6 +1055,7 @@ struct ath_softc {
const char *led_default_trigger;
struct list_head leds; struct list_head leds;
#ifdef CONFIG_GPIOLIB
struct ath9k_gpio_chip *gpiochip; struct ath9k_gpio_chip *gpiochip;
+ struct platform_device *btnpdev; /* gpio-keys-polled */ + struct platform_device *btnpdev; /* gpio-keys-polled */
#endif #endif
#endif
#ifdef CPTCFG_ATH9K_DEBUGFS
--- a/drivers/net/wireless/ath/ath9k/gpio.c --- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -24,6 +24,8 @@ @@ -17,6 +17,8 @@
#ifdef CPTCFG_MAC80211_LEDS #include "ath9k.h"
#include <linux/ath9k_platform.h>
#include <asm-generic/gpio.h> #include <linux/gpio.h>
+#include <linux/platform_device.h> +#include <linux/platform_device.h>
+#include <linux/gpio_keys.h> +#include <linux/gpio_keys.h>
static void ath_led_brightness(struct led_classdev *led_cdev, #ifdef CPTCFG_MAC80211_LEDS
enum led_brightness brightness)
@@ -159,7 +161,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);
- if (!pdata) @@ -132,6 +134,63 @@ static void ath9k_unregister_gpio_chip(s
+ if (!pdata || !pdata->leds || !pdata->num_leds)
return;
for (i = 0; i < pdata->num_leds; i++)
@@ -307,6 +309,63 @@ void ath9k_unregister_gpio_chip(struct a
sc->gpiochip = NULL; sc->gpiochip = NULL;
} }
@ -81,7 +38,7 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
+/******************/ +/******************/
+ +
+/* add GPIO buttons */ +/* add GPIO buttons */
+void ath9k_init_buttons(struct ath_softc *sc) +static void ath9k_init_buttons(struct ath_softc *sc)
+{ +{
+ struct ath9k_platform_data *pdata = sc->dev->platform_data; + struct ath9k_platform_data *pdata = sc->dev->platform_data;
+ struct platform_device *pdev; + struct platform_device *pdev;
@ -123,7 +80,7 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
+} +}
+ +
+/* remove GPIO buttons */ +/* remove GPIO buttons */
+void ath9k_deinit_buttons(struct ath_softc *sc) +static void ath9k_deinit_buttons(struct ath_softc *sc)
+{ +{
+ if (!sc->gpiochip || !sc->btnpdev) + if (!sc->gpiochip || !sc->btnpdev)
+ return; + return;
@ -133,27 +90,49 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
+ sc->btnpdev = NULL; + sc->btnpdev = NULL;
+} +}
+ +
#endif #else /* CONFIG_GPIOLIB */
/*******************/ static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
--- a/drivers/net/wireless/ath/ath9k/init.c @@ -142,6 +201,14 @@ static inline void ath9k_unregister_gpio
+++ b/drivers/net/wireless/ath/ath9k/init.c {
@@ -977,6 +977,7 @@ int ath9k_init_device(u16 devid, struct }
+static inline void ath9k_init_buttons(struct ath_softc *sc)
+{
+}
+
+static inline void ath9k_deinit_buttons(struct ath_softc *sc)
+{
+}
+
#endif /* CONFIG_GPIOLIB */
/********************************/
@@ -246,6 +313,7 @@ void ath_deinit_leds(struct ath_softc *s
{
struct ath_led *led;
+ ath9k_deinit_buttons(sc);
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
#ifdef CONFIG_GPIOLIB
@@ -274,6 +342,7 @@ void ath_init_leds(struct ath_softc *sc)
return;
ath9k_register_gpio_chip(sc); ath9k_register_gpio_chip(sc);
ath_init_leds(sc);
+ ath9k_init_buttons(sc); + ath9k_init_buttons(sc);
ath_start_rfkill_poll(sc);
return 0; if (pdata && pdata->led_name)
@@ -1022,6 +1023,7 @@ void ath9k_deinit_device(struct ath_soft strncpy(led_name, pdata->led_name, sizeof(led_name));
ath9k_ps_wakeup(sc); @@ -289,7 +358,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);
wiphy_rfkill_stop_polling(sc->hw->wiphy); - if (!pdata)
+ ath9k_deinit_buttons(sc); + if (!pdata || !pdata->leds || !pdata->num_leds)
ath_deinit_leds(sc); return;
ath9k_unregister_gpio_chip(sc);
for (i = 0; i < pdata->num_leds; i++)
--- a/include/linux/ath9k_platform.h --- a/include/linux/ath9k_platform.h
+++ b/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h
@@ -46,6 +46,10 @@ struct ath9k_platform_data { @@ -46,6 +46,10 @@ struct ath9k_platform_data {