wl1251: remove ti,power-gpio for sdio mode
Subsystems (5)
v2 cover wl1251: remove ti,power-gpio for sdio mode
* use just "wl1251: " as title prefix - by Kalle Valo <[email protected]>
* fix error handling: we still have to check for wl->irq returning -EPROBE_DEFER
PATCH V1 2019-11-24 11:35:48:
The driver has been updated to use the mmc/sdio core which does full power control. So we do no longer need the power control gipo.
Note that it is still needed for the SPI based interface (N900).
Suggested by: Ulf Hansson <[email protected]>
Tested by: H. Nikolaus Schaller <[email protected]> # OpenPandora 600MHz
H. Nikolaus Schaller (2):
DTS: bindings: wl1251: mark ti,power-gpio as optional
wl1251: remove ti,power-gpio for SDIO mode
.../bindings/net/wireless/ti,wl1251.txt | 3 +- drivers/net/wireless/ti/wl1251/sdio.c | 32 ++----------------- 2 files changed, 4 insertions(+), 31 deletions(-)
Signature · 1 line
2.23.0
PATCH v2 1/2 DTS: bindings: wl1251: mark ti,power-gpio as optional
It is now only useful for SPI interface. Power control of SDIO mode is done through mmc core.
Suggested by: Ulf Hansson <[email protected]>
--- Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt +2 -1
@@ -9,11 +9,12 @@ Required properties: - spi-max-frequency : Maximum SPI clocking speed of device in Hz - interrupts : Should contain interrupt line - vio-supply : phandle to regulator providing VIO -- ti,power-gpio : GPIO connected to chip's PMEN pin Optional properties: - ti,wl1251-has-eeprom : boolean, the wl1251 has an eeprom connected, which provides configuration data (calibration, MAC, ...) +- ti,power-gpio : GPIO connected to chip's PMEN pin if operated in + SPI mode - Please consult Documentation/devicetree/bindings/spi/spi-bus.txt for optional SPI connection related properties,
Signature · 1 line
2.23.0
Rob Herring
maintainerRe: [PATCH v2 1/2] DTS: bindings: wl1251: mark ti,power-gpio as optional
Quoted 9 lines · H. Nikolaus Schaller
It is now only useful for SPI interface. Power control of SDIO mode is done through mmc core.
Suggested by: Ulf Hansson <[email protected]>
Signed-off-by H. Nikolaus Schaller <[email protected]>--- Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Please add Acked-by/Reviewed-by tags when posting new versions. However, there's no need to repost patches *only* to add the tags. The upstream maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.
Re: [PATCH v2 1/2] DTS: bindings: wl1251: mark ti,power-gpio as optional
Quoted 14 lines
Am 18.12.2019 um 03:44 schrieb Rob Herring <[email protected]>:
Quoted 9 lines · H. Nikolaus Schaller
It is now only useful for SPI interface. Power control of SDIO mode is done through mmc core.
Suggested by: Ulf Hansson <[email protected]>
Signed-off-by H. Nikolaus Schaller <[email protected]>---
Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt| 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 5 lines
Please add Acked-by/Reviewed-by tags when posting new versions. However, there's no need to repost patches *only* to add the tags. The upstream maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.
Sorry, I just forgot to add. There was no change.
Re: [PATCH v2 1/2] DTS: bindings: wl1251: mark ti, power-gpio as optional
In reply to H. Nikolaus SchallerQuoted 6 lines · H. Nikolaus Schaller
It is now only useful for SPI interface. Power control of SDIO mode is done through mmc core.
Suggested by: Ulf Hansson <[email protected]>
Acked-by Rob Herring <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>
Failed to apply to wireless-drivers-next, please rebase and resend.
fatal: sha1 information is lacking or useless (drivers/net/wireless/ti/wl1251/sdio.c).
error: could not build fake ancestor
Applying: wl1251: remove ti,power-gpio for SDIO mode
Patch failed at 0001 wl1251: remove ti,power-gpio for SDIO mode
The copy of the patch that failed is found in: .git/rebase-apply/patch
2 patches set to Changes Requested.
11298403 [PATCH v2 1/2] DTS: bindings: wl1251: mark ti,power-gpio as optional 11298399 [v2,2/2] wl1251: remove ti,power-gpio for SDIO mode
Signature · 3 lines
https://patchwork.kernel.org/patch/11298403/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: ***UNCHECKED*** Re: [PATCH v2 1/2] DTS: bindings: wl1251: mark ti, power-gpio as optional
Hi,
Quoted 4 lines
Am 26.01.2020 um 16:31 schrieb Kalle Valo <[email protected]>:
"H. Nikolaus Schaller" <[email protected]> wrote:
Quoted 8 lines
Quoted 6 lines
It is now only useful for SPI interface. Power control of SDIO mode is done through mmc core.
Suggested by: Ulf Hansson <[email protected]>
Acked-by Rob Herring <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>Failed to apply to wireless-drivers-next, please rebase and resend.
On which commit and/or tree do you want to apply it?
Quoted 6 lines
fatal: sha1 information is lacking or useless (
drivers/net/wireless/ti/wl1251/sdio.c).
error: could not build fake ancestor
Applying: wl1251: remove ti,power-gpio for SDIO mode
Patch failed at 0001 wl1251: remove ti,power-gpio for SDIO mode
The copy of the patch that failed is found in: .git/rebase-apply/patch
Quoted 9 lines
2 patches set to Changes Requested.
11298403 [PATCH v2 1/2] DTS: bindings: wl1251: mark ti,power-gpio as optional 11298399 [v2,2/2] wl1251: remove ti,power-gpio for SDIO mode
Signature · 3 lines
https://patchwork.kernel.org/patch/11298403/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
BR and thanks,
Nikolaus Schaller
Re: ***UNCHECKED*** Re: [PATCH v2 1/2] DTS: bindings: wl1251: mark ti, power-gpio as optional
Quoted 9 lines · H. Nikolaus Schaller
Hi,
Quoted 7 lines
Am 26.01.2020 um 16:31 schrieb Kalle Valo <[email protected]>:
Quoted 3 lines · H. Nikolaus Schaller
It is now only useful for SPI interface. Power control of SDIO mode is done through mmc core.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Suggested by: Ulf Hansson <[email protected]>
Acked-by Rob Herring <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>Failed to apply to wireless-drivers-next, please rebase and resend.
On which commit and/or tree do you want to apply it?
I said it above, wireless-drivers-next:
https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: ***UNCHECKED*** Re: [PATCH v2 1/2] DTS: bindings: wl1251: mark ti, power-gpio as optional
Hi Kalle,
Quoted 17 lines
Am 26.01.2020 um 17:16 schrieb Kalle Valo <[email protected]>:
Quoted 13 lines · H. Nikolaus Schaller
Hi,
Quoted 11 lines
Am 26.01.2020 um 16:31 schrieb Kalle Valo <[email protected]>:
Quoted 6 lines · H. Nikolaus Schaller
It is now only useful for SPI interface. Power control of SDIO mode is done through mmc core.
Suggested by: Ulf Hansson <[email protected]>
Acked-by Rob Herring <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Failed to apply to wireless-drivers-next, please rebase and resend.
On which commit and/or tree do you want to apply it?
I said it above, wireless-drivers-next:
https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/
Ah, sorry. I did overlook it.
I could easily cherry pick it so I think that the guard lines of the original submission did not match.
v3 (rebased on tag wireless-drivers-next-2020-01-26) coming immediately.
BR and thanks,
Nikolaus
PATCH v2 2/2 wl1251: remove ti,power-gpio for SDIO mode
In reply to H. Nikolaus SchallerRemove handling of this property from code.
Note that wl->power_gpio is still needed in
the header file for SPI mode (N900).
Suggested by: Ulf Hansson <[email protected]>
--- drivers/net/wireless/ti/wl1251/sdio.c | 32 ++------------------------- 1 file changed, 2 insertions(+), 30 deletions(-)
drivers/net/wireless/ti/wl1251/sdio.c +2 -30
@@ -15,9 +15,7 @@#include <linux/wl12xx.h> #include <linux/irq.h> #include <linux/pm_runtime.h> -#include <linux/gpio.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/of_irq.h> #include "wl1251.h"
@@ -162,15 +160,6 @@ static int wl1251_sdio_set_power(struct wl1251 *wl, bool enable)printk ("%s %d\n" , __func__, enable);if (enable) { -/* -* Power is controlled by runtime PM, but we still call board -* callback in case it wants to do any additional setup, -* for example enabling clock buffer for the module. -*/ -if (gpio_is_valid (wl->power_gpio)) -gpio_set_value (wl->power_gpio, true); - - ret =pm_runtime_get_sync (&func->dev);if (ret <0 ) {pm_runtime_put_sync (&func->dev);
@@ -188,9 +177,6 @@ printk("%s %d\n", __func__, enable); ret =pm_runtime_put_sync (&func->dev);if (ret <0 ) goto out; - -if (gpio_is_valid (wl->power_gpio)) -gpio_set_value (wl->power_gpio, false); } out:
@@ -245,31 +231,17 @@ printk("%s: of=%pOFcC\n", __func__, np); wl1251_board_data =wl1251_get_platform_data ();if (!IS_ERR (wl1251_board_data)) { - wl->power_gpio = wl1251_board_data->power_gpio; wl->irq = wl1251_board_data->irq; wl->use_eeprom = wl1251_board_data->use_eeprom; }else 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 ); + wl->use_eeprom =of_property_read_bool (np,"ti,wl1251-has-eeprom" ); wl->irq =of_irq_get (np,0 ); - -if (wl->power_gpio == -EPROBE_DEFER || - wl->irq == -EPROBE_DEFER ) { +if (wl->irq == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ; goto disable; } } -if (gpio_is_valid (wl->power_gpio)) { - ret =devm_gpio_request (&func->dev, wl->power_gpio, -"wl1251 power" ); -if (ret) { -wl1251_error ("Failed to request gpio: %d\n" , ret); - goto disable; - } - } -if (wl->irq) {irq_set_status_flags (wl->irq,IRQ_NOAUTOEN ); ret =request_irq (wl->irq, wl1251_line_irq,0 ,"wl1251" , wl);
Signature · 1 line
2.23.0
Quoted 19 lines · H. Nikolaus Schaller
* use just "wl1251: " as title prefix - by Kalle Valo <[email protected]>
* fix error handling: we still have to check forwl->irqreturning -EPROBE_DEFERPATCH V1 2019-11-24 11:35:48:
The driver has been updated to use the mmc/sdio core which does full power control. So we do no longer need the power control gipo.Note that it is still needed for the SPI based interface (N900).
Suggested by: Ulf Hansson <[email protected]>
Tested by: H. Nikolaus Schaller <[email protected]> # OpenPandora 600MHzH. Nikolaus Schaller (2):
DTS: bindings: wl1251: mark ti,power-gpio as optional
wl1251: remove ti,power-gpio for SDIO mode
Quoted 7 lines
.../bindings/net/wireless/ti,wl1251.txt | 3 +- drivers/net/wireless/ti/wl1251/sdio.c | 32 ++----------------- 2 files changed, 4 insertions(+), 31 deletions(-)--
2.23.0
Kind regards
Uffe