ARM: OMAP2+: pdata-quirks: stop including wl12xx.h
PATCH v2 1/3 ARM: OMAP2+: pdata-quirks: stop including wl12xx.h
As of commit 2398c41d6432 ("omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251") the code no longer creates an instance of wl1251_platform_data, so there is no need for including this header.
---
Changes in v2: added fix to arch/arm/mach-omap2/pdata-quirks.c Note this series was only compile-tested.
arch/arm/mach-omap2/pdata-quirks.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-omap2/pdata-quirks.c +0 -1
@@ -10,7 +10,6 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/of_platform.h> -#include <linux/wl12xx.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h> #include <linux/power/smartreflex.h>
Signature · 1 line
2.38.1.431.g37b22c650d-goog
PATCH v2 2/3 wifi: wl1251: drop support for platform data
Remove support for configuring the device via platform data because there are no users of wl1251_platform_data left in the mainline kernel.
--- MAINTAINERS | 1 - drivers/net/wireless/ti/Kconfig | 8 ---- .../net/wireless/ti/wilink_platform_data.c | 35 --------------- drivers/net/wireless/ti/wl1251/sdio.c | 8 +--- drivers/net/wireless/ti/wl1251/spi.c | 15 ++----- drivers/net/wireless/ti/wlcore/spi.c | 1 - include/linux/wl12xx.h | 44 ------------------- 7 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 drivers/net/wireless/ti/wilink_platform_data.c delete mode 100644 include/linux/wl12xx.h
MAINTAINERS +0 -1
@@ -20724,7 +20724,6 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx W: https://wireless.wiki.kernel.org/en/users/Drivers/wl1251 T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git F: drivers/net/wireless/ti/ -F: include/linux/wl12xx.h TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER M: John Stultz <[email protected]>
drivers/net/wireless/ti/Kconfig +0 -8
@@ -18,12 +18,4 @@ source "drivers/net/wireless/ti/wl18xx/Kconfig" # keep last for automatic dependencies source "drivers/net/wireless/ti/wlcore/Kconfig" -config WILINK_PLATFORM_DATA - bool "TI WiLink platform data" - depends on WLCORE_SDIO || WL1251_SDIO - default y - help - Small platform data bit needed to pass data to the sdio modules. - - endif # WLAN_VENDOR_TI
drivers/net/wireless/ti/wilink_platform_data.c deleted +0 -35
@@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* This file is part of wl12xx -* -* Copyright (C) 2010-2011 Texas Instruments, Inc. -*/ - -#include <linux/module.h> -#include <linux/err.h> -#include <linux/wl12xx.h> - -static struct wl1251_platform_data *wl1251_platform_data; - -int __init wl1251_set_platform_data (const struct wl1251_platform_data *data) -{ -if (wl1251_platform_data) -return -EBUSY ; -if (!data) -return -EINVAL ; - - wl1251_platform_data =kmemdup (data,sizeof (*data),GFP_KERNEL ); -if (!wl1251_platform_data) -return -ENOMEM ; - -return 0 ; -} - -struct wl1251_platform_data *wl1251_get_platform_data (void ) -{ -if (!wl1251_platform_data) -return ERR_PTR (-ENODEV ); - -return wl1251_platform_data; -} -EXPORT_SYMBOL (wl1251_get_platform_data);
drivers/net/wireless/ti/wl1251/sdio.c +1 -7
@@ -12,7 +12,6 @@#include <linux/mmc/sdio_func.h> #include <linux/mmc/sdio_ids.h> #include <linux/platform_device.h> -#include <linux/wl12xx.h> #include <linux/irq.h> #include <linux/pm_runtime.h> #include <linux/of.h>
@@ -197,7 +196,6 @@ static int wl1251_sdio_probe(struct sdio_func *func,struct wl1251 *wl;struct ieee80211_hw *hw;struct wl1251_sdio *wl_sdio; -const struct wl1251_platform_data *wl1251_board_data;struct device_node *np = func->dev.of_node; hw =wl1251_alloc_hw ();
@@ -225,11 +223,7 @@ static int wl1251_sdio_probe(struct sdio_func *func, wl->if_priv = wl_sdio; wl->if_ops = &wl1251_sdio_ops; - wl1251_board_data =wl1251_get_platform_data (); -if (!IS_ERR (wl1251_board_data)) { - wl->irq = wl1251_board_data->irq; - wl->use_eeprom = wl1251_board_data->use_eeprom; - }else if (np) { +if (np) { wl->use_eeprom =of_property_read_bool (np,"ti,wl1251-has-eeprom" ); wl->irq =of_irq_get (np,0 );if (wl->irq == -EPROBE_DEFER ) {
drivers/net/wireless/ti/wl1251/spi.c +3 -12
@@ -12,7 +12,6 @@#include <linux/swab.h> #include <linux/crc7.h> #include <linux/spi/spi.h> -#include <linux/wl12xx.h> #include <linux/gpio.h> #include <linux/of.h> #include <linux/of_gpio.h>
@@ -226,16 +225,13 @@ static const struct wl1251_if_operations wl1251_spi_ops = {static int wl1251_spi_probe (struct spi_device *spi) { -struct wl1251_platform_data *pdata =dev_get_platdata (&spi->dev);struct device_node *np = spi->dev.of_node;struct ieee80211_hw *hw;struct wl1251 *wl;int ret; -if (!np && !pdata) { -wl1251_error ("no platform data" ); +if (!np)return -ENODEV ; - } hw =wl1251_alloc_hw ();if (IS_ERR (hw))
@@ -259,14 +255,9 @@ static int wl1251_spi_probe(struct spi_device *spi) goto out_free; } -if (np) { - wl->use_eeprom =of_property_read_bool (np,"ti,wl1251-has-eeprom" ); - wl->power_gpio =of_get_named_gpio (np,"ti,power-gpio" ,0 ); - }else if (pdata) { - wl->power_gpio = pdata->power_gpio; - wl->use_eeprom = pdata->use_eeprom; - } + wl->use_eeprom =of_property_read_bool (np,"ti,wl1251-has-eeprom" ); + wl->power_gpio =of_get_named_gpio (np,"ti,power-gpio" ,0 );if (wl->power_gpio == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ; goto out_free;
drivers/net/wireless/ti/wlcore/spi.c +0 -1
@@ -14,7 +14,6 @@#include <linux/swab.h> #include <linux/crc7.h> #include <linux/spi/spi.h> -#include <linux/wl12xx.h> #include <linux/platform_device.h> #include <linux/of_irq.h> #include <linux/regulator/consumer.h>
include/linux/wl12xx.h deleted +0 -44
44 lines not on this page · raw message
Signature · 1 line
2.38.1.431.g37b22c650d-goog
PATCH v2 3/3 wifi: wl1251: switch to using gpiod API
In reply to Dmitry TorokhovSwitch the driver from legacy gpio API to the newer gpiod API.
--- drivers/net/wireless/ti/wl1251/spi.c | 63 +++++++++++++------------ drivers/net/wireless/ti/wl1251/wl1251.h | 1 - 2 files changed, 34 insertions(+), 30 deletions(-)
drivers/net/wireless/ti/wl1251/spi.c +34 -29
@@ -5,6 +5,7 @@* Copyright (C) 2008 Nokia Corporation */ +#include <linux/err.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/module.h>
@@ -12,15 +13,19 @@#include <linux/swab.h> #include <linux/crc7.h> #include <linux/spi/spi.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/regulator/consumer.h> #include "wl1251.h" #include "reg.h" #include "spi.h" +struct wl1251_spi { +struct spi_device *spi; +struct gpio_desc *power_gpio; +}; +static irqreturn_t wl1251_irq (int irq,void *cookie) {struct wl1251 *wl;
@@ -34,13 +39,9 @@ static irqreturn_t wl1251_irq(int irq, void *cookie)return IRQ_HANDLED ; } -static struct spi_device *wl_to_spi (struct wl1251 *wl) -{ -return wl->if_priv; -} -static void wl1251_spi_reset (struct wl1251 *wl) { +struct wl1251_spi *wl_spi = wl->if_priv;u8 *cmd;struct spi_transfer t;struct spi_message m;
@@ -60,7 +61,7 @@ static void wl1251_spi_reset(struct wl1251 *wl) t.len =WSPI_INIT_CMD_LEN ;spi_message_add_tail (&t, &m); -spi_sync (wl_to_spi (wl), &m); +spi_sync (wl_spi->spi, &m);wl1251_dump (DEBUG_SPI ,"spi reset -> " , cmd,WSPI_INIT_CMD_LEN );
@@ -69,6 +70,7 @@ static void wl1251_spi_reset(struct wl1251 *wl)static void wl1251_spi_wake (struct wl1251 *wl) { +struct wl1251_spi *wl_spi = wl->if_priv;struct spi_transfer t;struct spi_message m;u8 *cmd =kzalloc (WSPI_INIT_CMD_LEN ,GFP_KERNEL );
@@ -112,7 +114,7 @@ static void wl1251_spi_wake(struct wl1251 *wl) t.len =WSPI_INIT_CMD_LEN ;spi_message_add_tail (&t, &m); -spi_sync (wl_to_spi (wl), &m); +spi_sync (wl_spi->spi, &m);wl1251_dump (DEBUG_SPI ,"spi init -> " , cmd,WSPI_INIT_CMD_LEN );
@@ -128,6 +130,7 @@ static void wl1251_spi_reset_wake(struct wl1251 *wl)static void wl1251_spi_read (struct wl1251 *wl,int addr,void *buf,size_t len) { +struct wl1251_spi *wl_spi = wl->if_priv;struct spi_transfer t[3 ];struct spi_message m;u8 *busy_buf;
@@ -157,7 +160,7 @@ static void wl1251_spi_read(struct wl1251 *wl, int addr, void *buf, t[2 ].len = len;spi_message_add_tail (&t[2 ], &m); -spi_sync (wl_to_spi (wl), &m); +spi_sync (wl_spi->spi, &m);/* FIXME: check busy words */
@@ -168,6 +171,7 @@ static void wl1251_spi_read(struct wl1251 *wl, int addr, void *buf,static void wl1251_spi_write (struct wl1251 *wl,int addr,void *buf,size_t len) { +struct wl1251_spi *wl_spi = wl->if_priv;struct spi_transfer t[2 ];struct spi_message m;u32 *cmd;
@@ -190,7 +194,7 @@ static void wl1251_spi_write(struct wl1251 *wl, int addr, void *buf, t[1 ].len = len;spi_message_add_tail (&t[1 ], &m); -spi_sync (wl_to_spi (wl), &m); +spi_sync (wl_spi->spi, &m);wl1251_dump (DEBUG_SPI ,"spi_write cmd -> " , cmd,sizeof (*cmd));wl1251_dump (DEBUG_SPI ,"spi_write buf -> " , buf, len);
@@ -208,8 +212,10 @@ static void wl1251_spi_disable_irq(struct wl1251 *wl)static int wl1251_spi_set_power (struct wl1251 *wl,bool enable) { -if (gpio_is_valid (wl->power_gpio)) -gpio_set_value (wl->power_gpio, enable); +struct wl1251_spi *wl_spi = wl->if_priv; + +if (wl_spi->power_gpio) +gpiod_set_value_cansleep (wl_spi->power_gpio, enable);return 0 ; }
@@ -227,12 +233,19 @@ static int wl1251_spi_probe(struct spi_device *spi) {struct device_node *np = spi->dev.of_node;struct ieee80211_hw *hw; +struct wl1251_spi *wl_spi;struct wl1251 *wl;int ret;if (!np)return -ENODEV ; + wl_spi =devm_kzalloc (&spi->dev,sizeof (*wl_spi),GFP_KERNEL ); +if (!wl_spi) +return -ENOMEM ; + + wl_spi->spi = spi; + hw =wl1251_alloc_hw ();if (IS_ERR (hw))return PTR_ERR (hw);
@@ -241,7 +254,7 @@ static int wl1251_spi_probe(struct spi_device *spi)SET_IEEE80211_DEV (hw, &spi->dev);spi_set_drvdata (spi, wl); - wl->if_priv = spi; + wl->if_priv = wl_spi; wl->if_ops = &wl1251_spi_ops;/* This is the only SPI value that we need to set here, the rest
@@ -257,25 +270,17 @@ static int wl1251_spi_probe(struct spi_device *spi) wl->use_eeprom =of_property_read_bool (np,"ti,wl1251-has-eeprom" ); - wl->power_gpio =of_get_named_gpio (np,"ti,power-gpio" ,0 ); -if (wl->power_gpio == -EPROBE_DEFER ) { - ret = -EPROBE_DEFER ; - goto out_free; - } - -if (gpio_is_valid (wl->power_gpio)) { - ret =devm_gpio_request_one (&spi->dev, wl->power_gpio, -GPIOF_OUT_INIT_LOW ,"wl1251 power" ); -if (ret) { + wl_spi->power_gpio =devm_gpiod_get_optional (&spi->dev,"ti,power" , +GPIOD_OUT_LOW ); + ret =PTR_ERR_OR_ZERO (wl_spi->power_gpio); +if (ret) { +if (ret != -EPROBE_DEFER )wl1251_error ("Failed to request gpio: %d\n" , ret); - goto out_free; - } - }else { -wl1251_error ("set power gpio missing in platform data" ); - ret = -ENODEV ; goto out_free; } +gpiod_set_consumer_name (wl_spi->power_gpio,"wl1251 power" ); + wl->irq = spi->irq;if (wl->irq <0 ) {wl1251_error ("irq missing in platform data" );
drivers/net/wireless/ti/wl1251/wl1251.h +0 -1
@@ -262,7 +262,6 @@ struct wl1251 {void *if_priv;const struct wl1251_if_operations *if_ops; -int power_gpio;int irq;bool use_eeprom;
Signature · 1 line
2.38.1.431.g37b22c650d-goog
Quoted 3 lines · Dmitry Torokhov
As of commit
2398c41d6432("omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251") the code no longer creates an instance ofwl1251_platform_data, so there is no need for including this header.
Best to merge this together with the rest of the series:
Quoted 8 lines · Tony Lindgren
Quoted 3 lines · Dmitry Torokhov
As of commit
2398c41d6432("omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251") the code no longer creates an instance ofwl1251_platform_data, so there is no need for including this header.Best to merge this together with the rest of the series:
Acked-by Tony Lindgren <[email protected]>
Ok, so I'll plan to take the full series to wireless-next. Please let me know if I misunderstood.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 6 lines · Dmitry Torokhov
As of commit
2398c41d6432("omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251") the code no longer creates an instance ofwl1251_platform_data, so there is no need for including this header.Signed-off-by Dmitry Torokhov <[email protected]>Acked-by Tony Lindgren <[email protected]>
3 patches applied to wireless-next.git, thanks.
e14e4c933e00 ARM: OMAP2+: pdata-quirks: stop including wl12xx.h 06463f6e98df wifi: wl1251: drop support for platform data a1d0b9535cd8 wifi: wl1251: switch to using gpiod API
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches