All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-18 20:25 ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel


Here we have a set of scattered patches to make the OpenPandora WiFi work again.

v4.7 did break the pdata-quirks which made the mmc3 interface
fail completely, because some code now assumes device tree
based instantiation.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

v4.11 did break the sdio qirks for wl1251 which made the driver no longer
load, although the device was found as an sdio client.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

To solve these issues:
* we convert mmc3 and wl1251 initialization from pdata-quirks
  to device tree
* we make the wl1251 driver read properties from device tree
* we fix the mmc core vendor ids and quirks
* we fix the wl1251 (and wl1271) driver to use only vendor ids
  from header file instead of (potentially conflicting) local
  definitions


H. Nikolaus Schaller (9):
  Documentation: dt: wireless: update wl1251 for sdio
  net: wireless: ti: wl1251 add device tree support
  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
    of pandora_wl1251_init_card
  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
  mmc: sdio: fix wl1251 vendor id
  mmc: core: fix wl1251 sdio quirks
  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions

 .../bindings/net/wireless/ti,wl1251.txt       | 26 +++++++++++++
 arch/arm/boot/dts/omap3-pandora-common.dtsi   | 37 ++++++++++++++++++-
 arch/arm/mach-omap2/pdata-quirks.c            | 13 +++----
 drivers/mmc/core/quirks.h                     |  7 ++++
 drivers/mmc/host/omap_hsmmc.c                 | 21 +++++++++++
 drivers/net/wireless/ti/wl1251/sdio.c         | 23 +++++++-----
 drivers/net/wireless/ti/wlcore/sdio.c         |  8 ----
 include/linux/mmc/sdio_ids.h                  |  2 +
 8 files changed, 111 insertions(+), 26 deletions(-)

-- 
2.19.1


^ permalink raw reply	[flat|nested] 46+ messages in thread

* [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-18 20:25 ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, netdev, linux-omap, linux-arm-kernel


Here we have a set of scattered patches to make the OpenPandora WiFi work again.

v4.7 did break the pdata-quirks which made the mmc3 interface
fail completely, because some code now assumes device tree
based instantiation.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

v4.11 did break the sdio qirks for wl1251 which made the driver no longer
load, although the device was found as an sdio client.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

To solve these issues:
* we convert mmc3 and wl1251 initialization from pdata-quirks
  to device tree
* we make the wl1251 driver read properties from device tree
* we fix the mmc core vendor ids and quirks
* we fix the wl1251 (and wl1271) driver to use only vendor ids
  from header file instead of (potentially conflicting) local
  definitions


H. Nikolaus Schaller (9):
  Documentation: dt: wireless: update wl1251 for sdio
  net: wireless: ti: wl1251 add device tree support
  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
    of pandora_wl1251_init_card
  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
  mmc: sdio: fix wl1251 vendor id
  mmc: core: fix wl1251 sdio quirks
  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions

 .../bindings/net/wireless/ti,wl1251.txt       | 26 +++++++++++++
 arch/arm/boot/dts/omap3-pandora-common.dtsi   | 37 ++++++++++++++++++-
 arch/arm/mach-omap2/pdata-quirks.c            | 13 +++----
 drivers/mmc/core/quirks.h                     |  7 ++++
 drivers/mmc/host/omap_hsmmc.c                 | 21 +++++++++++
 drivers/net/wireless/ti/wl1251/sdio.c         | 23 +++++++-----
 drivers/net/wireless/ti/wlcore/sdio.c         |  8 ----
 include/linux/mmc/sdio_ids.h                  |  2 +
 8 files changed, 111 insertions(+), 26 deletions(-)

-- 
2.19.1

^ permalink raw reply	[flat|nested] 46+ messages in thread

* [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-18 20:25 ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, netdev, linux-omap, linux-arm-kernel


Here we have a set of scattered patches to make the OpenPandora WiFi work again.

v4.7 did break the pdata-quirks which made the mmc3 interface
fail completely, because some code now assumes device tree
based instantiation.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

v4.11 did break the sdio qirks for wl1251 which made the driver no longer
load, although the device was found as an sdio client.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

To solve these issues:
* we convert mmc3 and wl1251 initialization from pdata-quirks
  to device tree
* we make the wl1251 driver read properties from device tree
* we fix the mmc core vendor ids and quirks
* we fix the wl1251 (and wl1271) driver to use only vendor ids
  from header file instead of (potentially conflicting) local
  definitions


H. Nikolaus Schaller (9):
  Documentation: dt: wireless: update wl1251 for sdio
  net: wireless: ti: wl1251 add device tree support
  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
    of pandora_wl1251_init_card
  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
  mmc: sdio: fix wl1251 vendor id
  mmc: core: fix wl1251 sdio quirks
  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions

 .../bindings/net/wireless/ti,wl1251.txt       | 26 +++++++++++++
 arch/arm/boot/dts/omap3-pandora-common.dtsi   | 37 ++++++++++++++++++-
 arch/arm/mach-omap2/pdata-quirks.c            | 13 +++----
 drivers/mmc/core/quirks.h                     |  7 ++++
 drivers/mmc/host/omap_hsmmc.c                 | 21 +++++++++++
 drivers/net/wireless/ti/wl1251/sdio.c         | 23 +++++++-----
 drivers/net/wireless/ti/wlcore/sdio.c         |  8 ----
 include/linux/mmc/sdio_ids.h                  |  2 +
 8 files changed, 111 insertions(+), 26 deletions(-)

-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 46+ messages in thread

* [PATCH 1/9] Documentation: dt: wireless: update wl1251 for sdio
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel

The standard method for sdio devices connected to
an sdio interface is to define them as a child node
like we can see with wlcore.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 .../bindings/net/wireless/ti,wl1251.txt       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt b/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
index bb2fcde6f7ff..88612ff29f2d 100644
--- a/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
+++ b/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
@@ -35,3 +35,29 @@ Examples:
 		ti,power-gpio = <&gpio3 23 GPIO_ACTIVE_HIGH>; /* 87 */
 	};
 };
+
+&mmc3 {
+	vmmc-supply = <&wlan_en>;
+
+	bus-width = <4>;
+	non-removable;
+	ti,non-removable;
+	cap-power-off-card;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins>;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	wlan: wl1251@1 {
+		compatible = "ti,wl1251";
+
+		reg = <1>;
+
+		interrupt-parent = <&gpio1>;
+		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */
+
+		ti,wl1251-has-eeprom;
+	};
+};
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 1/9] Documentation: dt: wireless: update wl1251 for sdio
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, netdev, linux-omap, linux-arm-kernel

The standard method for sdio devices connected to
an sdio interface is to define them as a child node
like we can see with wlcore.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 .../bindings/net/wireless/ti,wl1251.txt       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt b/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
index bb2fcde6f7ff..88612ff29f2d 100644
--- a/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
+++ b/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
@@ -35,3 +35,29 @@ Examples:
 		ti,power-gpio = <&gpio3 23 GPIO_ACTIVE_HIGH>; /* 87 */
 	};
 };
+
+&mmc3 {
+	vmmc-supply = <&wlan_en>;
+
+	bus-width = <4>;
+	non-removable;
+	ti,non-removable;
+	cap-power-off-card;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins>;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	wlan: wl1251@1 {
+		compatible = "ti,wl1251";
+
+		reg = <1>;
+
+		interrupt-parent = <&gpio1>;
+		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */
+
+		ti,wl1251-has-eeprom;
+	};
+};
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 1/9] Documentation: dt: wireless: update wl1251 for sdio
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, netdev, linux-omap, linux-arm-kernel

The standard method for sdio devices connected to
an sdio interface is to define them as a child node
like we can see with wlcore.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 .../bindings/net/wireless/ti,wl1251.txt       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt b/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
index bb2fcde6f7ff..88612ff29f2d 100644
--- a/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
+++ b/Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
@@ -35,3 +35,29 @@ Examples:
 		ti,power-gpio = <&gpio3 23 GPIO_ACTIVE_HIGH>; /* 87 */
 	};
 };
+
+&mmc3 {
+	vmmc-supply = <&wlan_en>;
+
+	bus-width = <4>;
+	non-removable;
+	ti,non-removable;
+	cap-power-off-card;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins>;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	wlan: wl1251@1 {
+		compatible = "ti,wl1251";
+
+		reg = <1>;
+
+		interrupt-parent = <&gpio1>;
+		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */
+
+		ti,wl1251-has-eeprom;
+	};
+};
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 2/9] net: wireless: ti: wl1251 add device tree support
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel

We will have the wl1251 defined as a child node of the mmc interface
and can read setup for gpios, interrupts and the ti,use-eeprom
property from there instead of pdata to be provided by pdata-quirks.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 drivers/net/wireless/ti/wl1251/sdio.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 677f1146ccf0..c54a273713ed 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -16,6 +16,9 @@
 #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"
 
@@ -217,6 +220,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 	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();
 	if (IS_ERR(hw))
@@ -248,6 +252,15 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 		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->irq = of_irq_get(np, 0);
+
+		if (wl->power_gpio == -EPROBE_DEFER || wl->irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto disable;
+		}
 	}
 
 	if (gpio_is_valid(wl->power_gpio)) {
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 2/9] net: wireless: ti: wl1251 add device tree support
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, netdev, linux-omap, linux-arm-kernel

We will have the wl1251 defined as a child node of the mmc interface
and can read setup for gpios, interrupts and the ti,use-eeprom
property from there instead of pdata to be provided by pdata-quirks.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 drivers/net/wireless/ti/wl1251/sdio.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 677f1146ccf0..c54a273713ed 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -16,6 +16,9 @@
 #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"
 
@@ -217,6 +220,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 	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();
 	if (IS_ERR(hw))
@@ -248,6 +252,15 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 		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->irq = of_irq_get(np, 0);
+
+		if (wl->power_gpio == -EPROBE_DEFER || wl->irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto disable;
+		}
 	}
 
 	if (gpio_is_valid(wl->power_gpio)) {
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 2/9] net: wireless: ti: wl1251 add device tree support
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, netdev, linux-omap, linux-arm-kernel

We will have the wl1251 defined as a child node of the mmc interface
and can read setup for gpios, interrupts and the ti,use-eeprom
property from there instead of pdata to be provided by pdata-quirks.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 drivers/net/wireless/ti/wl1251/sdio.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 677f1146ccf0..c54a273713ed 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -16,6 +16,9 @@
 #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"
 
@@ -217,6 +220,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 	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();
 	if (IS_ERR(hw))
@@ -248,6 +252,15 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 		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->irq = of_irq_get(np, 0);
+
+		if (wl->power_gpio == -EPROBE_DEFER || wl->irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto disable;
+		}
 	}
 
 	if (gpio_is_valid(wl->power_gpio)) {
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

Since v4.7 the dma initialization requires that there is a
device tree property for "rx" and "tx" channels which is
not provided by the pdata-quirks initialization.

By conversion of the mmc3 setup to device tree this will
finally allows to remove the OpenPandora wlan specific omap3
data-quirks.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 arch/arm/boot/dts/omap3-pandora-common.dtsi | 37 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index ec5891718ae6..c595b3eb314d 100644
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -226,6 +226,18 @@
 		gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;	/* GPIO_164 */
 	};
 
+	/* wl1251 wifi+bt module */
+	wlan_en: fixed-regulator-wg7210_en {
+		compatible = "regulator-fixed";
+		regulator-name = "vwlan";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		startup-delay-us = <50000>;
+		regulator-always-on;
+		enable-active-high;
+		gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+	};
+
 	/* wg7210 (wifi+bt module) 32k clock buffer */
 	wg7210_32k: fixed-regulator-wg7210_32k {
 		compatible = "regulator-fixed";
@@ -522,9 +534,30 @@
 	/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/	/* GPIO_127 */
 };
 
-/* mmc3 is probed using pdata-quirks to pass wl1251 card data */
 &mmc3 {
-	status = "disabled";
+	vmmc-supply = <&wlan_en>;
+
+	bus-width = <4>;
+	non-removable;
+	ti,non-removable;
+	cap-power-off-card;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins>;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	wlan: wl1251@1 {
+		compatible = "ti,wl1251";
+
+		reg = <1>;
+
+		interrupt-parent = <&gpio1>;
+		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */
+
+		ti,wl1251-has-eeprom;
+	};
 };
 
 /* bluetooth*/
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

Since v4.7 the dma initialization requires that there is a
device tree property for "rx" and "tx" channels which is
not provided by the pdata-quirks initialization.

By conversion of the mmc3 setup to device tree this will
finally allows to remove the OpenPandora wlan specific omap3
data-quirks.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 arch/arm/boot/dts/omap3-pandora-common.dtsi | 37 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index ec5891718ae6..c595b3eb314d 100644
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -226,6 +226,18 @@
 		gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;	/* GPIO_164 */
 	};
 
+	/* wl1251 wifi+bt module */
+	wlan_en: fixed-regulator-wg7210_en {
+		compatible = "regulator-fixed";
+		regulator-name = "vwlan";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		startup-delay-us = <50000>;
+		regulator-always-on;
+		enable-active-high;
+		gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+	};
+
 	/* wg7210 (wifi+bt module) 32k clock buffer */
 	wg7210_32k: fixed-regulator-wg7210_32k {
 		compatible = "regulator-fixed";
@@ -522,9 +534,30 @@
 	/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/	/* GPIO_127 */
 };
 
-/* mmc3 is probed using pdata-quirks to pass wl1251 card data */
 &mmc3 {
-	status = "disabled";
+	vmmc-supply = <&wlan_en>;
+
+	bus-width = <4>;
+	non-removable;
+	ti,non-removable;
+	cap-power-off-card;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins>;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	wlan: wl1251@1 {
+		compatible = "ti,wl1251";
+
+		reg = <1>;
+
+		interrupt-parent = <&gpio1>;
+		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */
+
+		ti,wl1251-has-eeprom;
+	};
 };
 
 /* bluetooth*/
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

Since v4.7 the dma initialization requires that there is a
device tree property for "rx" and "tx" channels which is
not provided by the pdata-quirks initialization.

By conversion of the mmc3 setup to device tree this will
finally allows to remove the OpenPandora wlan specific omap3
data-quirks.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 arch/arm/boot/dts/omap3-pandora-common.dtsi | 37 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index ec5891718ae6..c595b3eb314d 100644
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -226,6 +226,18 @@
 		gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;	/* GPIO_164 */
 	};
 
+	/* wl1251 wifi+bt module */
+	wlan_en: fixed-regulator-wg7210_en {
+		compatible = "regulator-fixed";
+		regulator-name = "vwlan";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		startup-delay-us = <50000>;
+		regulator-always-on;
+		enable-active-high;
+		gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+	};
+
 	/* wg7210 (wifi+bt module) 32k clock buffer */
 	wg7210_32k: fixed-regulator-wg7210_32k {
 		compatible = "regulator-fixed";
@@ -522,9 +534,30 @@
 	/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/	/* GPIO_127 */
 };
 
-/* mmc3 is probed using pdata-quirks to pass wl1251 card data */
 &mmc3 {
-	status = "disabled";
+	vmmc-supply = <&wlan_en>;
+
+	bus-width = <4>;
+	non-removable;
+	ti,non-removable;
+	cap-power-off-card;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins>;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	wlan: wl1251@1 {
+		compatible = "ti,wl1251";
+
+		reg = <1>;
+
+		interrupt-parent = <&gpio1>;
+		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */
+
+		ti,wl1251-has-eeprom;
+	};
 };
 
 /* bluetooth*/
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 4/9] mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

Pandora_wl1251_init_card was used to do special pdata based
setup of the sdio mmc interface. This does no longer work with
v4.7 and later. A fix requires a device tree based mmc3 setup.

Therefore we move the special setup to omap_hsmmc.c instead
of calling some pdata supplied init_card function.

The new code checks for a DT child node compatible to wl1251
so it will not affect other MMC3 use cases.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 drivers/mmc/host/omap_hsmmc.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 952fa4063ff8..03ba80bcf319 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1512,6 +1512,27 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
 
 	if (mmc_pdata(host)->init_card)
 		mmc_pdata(host)->init_card(card);
+	else if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) {
+		struct device_node *np = mmc_dev(mmc)->of_node;
+
+		np = of_get_compatible_child(np, "ti,wl1251");
+		if (np) {
+			/*
+			 * We have TI wl1251 attached to MMC3. Pass this information to
+			 * SDIO core because it can't be probed by normal methods.
+			 */
+
+			dev_info(host->dev, "found wl1251\n");
+			card->quirks |= MMC_QUIRK_NONSTD_SDIO;
+			card->cccr.wide_bus = 1;
+			card->cis.vendor = 0x104c;
+			card->cis.device = 0x9066;
+			card->cis.blksize = 512;
+			card->cis.max_dtr = 24000000;
+			card->ocr = 0x80;
+			of_node_put(np);
+		}
+	}
 }
 
 static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 4/9] mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

Pandora_wl1251_init_card was used to do special pdata based
setup of the sdio mmc interface. This does no longer work with
v4.7 and later. A fix requires a device tree based mmc3 setup.

Therefore we move the special setup to omap_hsmmc.c instead
of calling some pdata supplied init_card function.

The new code checks for a DT child node compatible to wl1251
so it will not affect other MMC3 use cases.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 drivers/mmc/host/omap_hsmmc.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 952fa4063ff8..03ba80bcf319 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1512,6 +1512,27 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
 
 	if (mmc_pdata(host)->init_card)
 		mmc_pdata(host)->init_card(card);
+	else if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) {
+		struct device_node *np = mmc_dev(mmc)->of_node;
+
+		np = of_get_compatible_child(np, "ti,wl1251");
+		if (np) {
+			/*
+			 * We have TI wl1251 attached to MMC3. Pass this information to
+			 * SDIO core because it can't be probed by normal methods.
+			 */
+
+			dev_info(host->dev, "found wl1251\n");
+			card->quirks |= MMC_QUIRK_NONSTD_SDIO;
+			card->cccr.wide_bus = 1;
+			card->cis.vendor = 0x104c;
+			card->cis.device = 0x9066;
+			card->cis.blksize = 512;
+			card->cis.max_dtr = 24000000;
+			card->ocr = 0x80;
+			of_node_put(np);
+		}
+	}
 }
 
 static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 4/9] mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

Pandora_wl1251_init_card was used to do special pdata based
setup of the sdio mmc interface. This does no longer work with
v4.7 and later. A fix requires a device tree based mmc3 setup.

Therefore we move the special setup to omap_hsmmc.c instead
of calling some pdata supplied init_card function.

The new code checks for a DT child node compatible to wl1251
so it will not affect other MMC3 use cases.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 drivers/mmc/host/omap_hsmmc.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 952fa4063ff8..03ba80bcf319 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1512,6 +1512,27 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
 
 	if (mmc_pdata(host)->init_card)
 		mmc_pdata(host)->init_card(card);
+	else if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) {
+		struct device_node *np = mmc_dev(mmc)->of_node;
+
+		np = of_get_compatible_child(np, "ti,wl1251");
+		if (np) {
+			/*
+			 * We have TI wl1251 attached to MMC3. Pass this information to
+			 * SDIO core because it can't be probed by normal methods.
+			 */
+
+			dev_info(host->dev, "found wl1251\n");
+			card->quirks |= MMC_QUIRK_NONSTD_SDIO;
+			card->cccr.wide_bus = 1;
+			card->cis.vendor = 0x104c;
+			card->cis.device = 0x9066;
+			card->cis.blksize = 512;
+			card->cis.max_dtr = 24000000;
+			card->ocr = 0x80;
+			of_node_put(np);
+		}
+	}
 }
 
 static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 5/9] omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

With a wl1251 child node of mmc3 in the device tree decoded
in omap_hsmmc.c to handle special wl1251 initialization, we do
no longer need to instantiate the mmc3 through pdata quirks.

We also can remove the wlan regulator and reset/interrupt definitions
and do them through device tree.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 arch/arm/mach-omap2/pdata-quirks.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index d942a3357090..231bf4dc55fa 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -304,14 +304,17 @@ static void __init omap3_logicpd_torpedo_init(void)
 }
 
 /* omap3pandora legacy devices */
-#define PANDORA_WIFI_IRQ_GPIO		21
-#define PANDORA_WIFI_NRESET_GPIO	23
 
 static struct platform_device pandora_backlight = {
 	.name	= "pandora-backlight",
 	.id	= -1,
 };
 
+#if OLD_WL1251
+
+#define PANDORA_WIFI_IRQ_GPIO		21
+#define PANDORA_WIFI_NRESET_GPIO	23
+
 static struct regulator_consumer_supply pandora_vmmc3_supply[] = {
 	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"),
 };
@@ -407,15 +410,11 @@ static void __init pandora_wl1251_init(void)
 fail:
 	pr_err("wl1251 board initialisation failed\n");
 }
+#endif
 
 static void __init omap3_pandora_legacy_init(void)
 {
 	platform_device_register(&pandora_backlight);
-	gpiod_add_lookup_table(&pandora_vwlan_gpiod_table);
-	platform_device_register(&pandora_vwlan_device);
-	omap_hsmmc_init(pandora_mmc3);
-	omap_hsmmc_late_init(pandora_mmc3);
-	pandora_wl1251_init();
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 5/9] omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

With a wl1251 child node of mmc3 in the device tree decoded
in omap_hsmmc.c to handle special wl1251 initialization, we do
no longer need to instantiate the mmc3 through pdata quirks.

We also can remove the wlan regulator and reset/interrupt definitions
and do them through device tree.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 arch/arm/mach-omap2/pdata-quirks.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index d942a3357090..231bf4dc55fa 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -304,14 +304,17 @@ static void __init omap3_logicpd_torpedo_init(void)
 }
 
 /* omap3pandora legacy devices */
-#define PANDORA_WIFI_IRQ_GPIO		21
-#define PANDORA_WIFI_NRESET_GPIO	23
 
 static struct platform_device pandora_backlight = {
 	.name	= "pandora-backlight",
 	.id	= -1,
 };
 
+#if OLD_WL1251
+
+#define PANDORA_WIFI_IRQ_GPIO		21
+#define PANDORA_WIFI_NRESET_GPIO	23
+
 static struct regulator_consumer_supply pandora_vmmc3_supply[] = {
 	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"),
 };
@@ -407,15 +410,11 @@ static void __init pandora_wl1251_init(void)
 fail:
 	pr_err("wl1251 board initialisation failed\n");
 }
+#endif
 
 static void __init omap3_pandora_legacy_init(void)
 {
 	platform_device_register(&pandora_backlight);
-	gpiod_add_lookup_table(&pandora_vwlan_gpiod_table);
-	platform_device_register(&pandora_vwlan_device);
-	omap_hsmmc_init(pandora_mmc3);
-	omap_hsmmc_late_init(pandora_mmc3);
-	pandora_wl1251_init();
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 5/9] omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

With a wl1251 child node of mmc3 in the device tree decoded
in omap_hsmmc.c to handle special wl1251 initialization, we do
no longer need to instantiate the mmc3 through pdata quirks.

We also can remove the wlan regulator and reset/interrupt definitions
and do them through device tree.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 arch/arm/mach-omap2/pdata-quirks.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index d942a3357090..231bf4dc55fa 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -304,14 +304,17 @@ static void __init omap3_logicpd_torpedo_init(void)
 }
 
 /* omap3pandora legacy devices */
-#define PANDORA_WIFI_IRQ_GPIO		21
-#define PANDORA_WIFI_NRESET_GPIO	23
 
 static struct platform_device pandora_backlight = {
 	.name	= "pandora-backlight",
 	.id	= -1,
 };
 
+#if OLD_WL1251
+
+#define PANDORA_WIFI_IRQ_GPIO		21
+#define PANDORA_WIFI_NRESET_GPIO	23
+
 static struct regulator_consumer_supply pandora_vmmc3_supply[] = {
 	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"),
 };
@@ -407,15 +410,11 @@ static void __init pandora_wl1251_init(void)
 fail:
 	pr_err("wl1251 board initialisation failed\n");
 }
+#endif
 
 static void __init omap3_pandora_legacy_init(void)
 {
 	platform_device_register(&pandora_backlight);
-	gpiod_add_lookup_table(&pandora_vwlan_gpiod_table);
-	platform_device_register(&pandora_vwlan_device);
-	omap_hsmmc_init(pandora_mmc3);
-	omap_hsmmc_late_init(pandora_mmc3);
-	pandora_wl1251_init();
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 6/9] mmc: sdio: fix wl1251 vendor id
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

v4.11-rc1 did introduce a patch series that rearranged the
sdio quirks into a header file. Unfortunately this did forget
to handle SDIO_VENDOR_ID_TI differently between wl1251 and
wl1271 with the result that although the wl1251 was found on
the sdio bus, the firmware did not load any more and there was
no interface registration.

This patch defines separate constants to be used by sdio quirks
and drivers.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 include/linux/mmc/sdio_ids.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index d1a5d5df02f5..08b25c02b5a1 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -71,6 +71,8 @@
 
 #define SDIO_VENDOR_ID_TI			0x0097
 #define SDIO_DEVICE_ID_TI_WL1271		0x4076
+#define SDIO_VENDOR_ID_TI_WL1251		0x104c
+#define SDIO_DEVICE_ID_TI_WL1251		0x9066
 
 #define SDIO_VENDOR_ID_STE			0x0020
 #define SDIO_DEVICE_ID_STE_CW1200		0x2280
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 6/9] mmc: sdio: fix wl1251 vendor id
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

v4.11-rc1 did introduce a patch series that rearranged the
sdio quirks into a header file. Unfortunately this did forget
to handle SDIO_VENDOR_ID_TI differently between wl1251 and
wl1271 with the result that although the wl1251 was found on
the sdio bus, the firmware did not load any more and there was
no interface registration.

This patch defines separate constants to be used by sdio quirks
and drivers.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 include/linux/mmc/sdio_ids.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index d1a5d5df02f5..08b25c02b5a1 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -71,6 +71,8 @@
 
 #define SDIO_VENDOR_ID_TI			0x0097
 #define SDIO_DEVICE_ID_TI_WL1271		0x4076
+#define SDIO_VENDOR_ID_TI_WL1251		0x104c
+#define SDIO_DEVICE_ID_TI_WL1251		0x9066
 
 #define SDIO_VENDOR_ID_STE			0x0020
 #define SDIO_DEVICE_ID_STE_CW1200		0x2280
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 6/9] mmc: sdio: fix wl1251 vendor id
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

v4.11-rc1 did introduce a patch series that rearranged the
sdio quirks into a header file. Unfortunately this did forget
to handle SDIO_VENDOR_ID_TI differently between wl1251 and
wl1271 with the result that although the wl1251 was found on
the sdio bus, the firmware did not load any more and there was
no interface registration.

This patch defines separate constants to be used by sdio quirks
and drivers.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 include/linux/mmc/sdio_ids.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index d1a5d5df02f5..08b25c02b5a1 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -71,6 +71,8 @@
 
 #define SDIO_VENDOR_ID_TI			0x0097
 #define SDIO_DEVICE_ID_TI_WL1271		0x4076
+#define SDIO_VENDOR_ID_TI_WL1251		0x104c
+#define SDIO_DEVICE_ID_TI_WL1251		0x9066
 
 #define SDIO_VENDOR_ID_STE			0x0020
 #define SDIO_DEVICE_ID_STE_CW1200		0x2280
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 7/9] mmc: core: fix wl1251 sdio quirks
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

wl1251 and wl1271 have different vendor id and device id.
So we need to handle both with sdio quirks.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/mmc/core/quirks.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
index 2d2d9ea8be4f..3dba15bccce2 100644
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -119,7 +119,14 @@ static const struct mmc_fixup mmc_ext_csd_fixups[] = {
 	END_FIXUP
 };
 
+
 static const struct mmc_fixup sdio_fixup_methods[] = {
+	SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251,
+		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
+
+	SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251,
+		   add_quirk, MMC_QUIRK_DISABLE_CD),
+
 	SDIO_FIXUP(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271,
 		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
 
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 7/9] mmc: core: fix wl1251 sdio quirks
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

wl1251 and wl1271 have different vendor id and device id.
So we need to handle both with sdio quirks.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/mmc/core/quirks.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
index 2d2d9ea8be4f..3dba15bccce2 100644
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -119,7 +119,14 @@ static const struct mmc_fixup mmc_ext_csd_fixups[] = {
 	END_FIXUP
 };
 
+
 static const struct mmc_fixup sdio_fixup_methods[] = {
+	SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251,
+		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
+
+	SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251,
+		   add_quirk, MMC_QUIRK_DISABLE_CD),
+
 	SDIO_FIXUP(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271,
 		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
 
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 7/9] mmc: core: fix wl1251 sdio quirks
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

wl1251 and wl1271 have different vendor id and device id.
So we need to handle both with sdio quirks.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/mmc/core/quirks.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
index 2d2d9ea8be4f..3dba15bccce2 100644
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -119,7 +119,14 @@ static const struct mmc_fixup mmc_ext_csd_fixups[] = {
 	END_FIXUP
 };
 
+
 static const struct mmc_fixup sdio_fixup_methods[] = {
+	SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251,
+		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
+
+	SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251,
+		   add_quirk, MMC_QUIRK_DISABLE_CD),
+
 	SDIO_FIXUP(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271,
 		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
 
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 8/9] net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

SDIO_VENDOR_ID_TI_WL1251 is now defined in mmc/sdio_ids.h separately
from SDIO_VENDOR_ID_TI for wl1271.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/net/wireless/ti/wl1251/sdio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index c54a273713ed..42b55f3a50df 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -52,7 +52,7 @@ static void wl1251_sdio_interrupt(struct sdio_func *func)
 }
 
 static const struct sdio_device_id wl1251_devices[] = {
-	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1251) },
+	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251) },
 	{}
 };
 MODULE_DEVICE_TABLE(sdio, wl1251_devices);
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 8/9] net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

SDIO_VENDOR_ID_TI_WL1251 is now defined in mmc/sdio_ids.h separately
from SDIO_VENDOR_ID_TI for wl1271.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/net/wireless/ti/wl1251/sdio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index c54a273713ed..42b55f3a50df 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -52,7 +52,7 @@ static void wl1251_sdio_interrupt(struct sdio_func *func)
 }
 
 static const struct sdio_device_id wl1251_devices[] = {
-	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1251) },
+	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251) },
 	{}
 };
 MODULE_DEVICE_TABLE(sdio, wl1251_devices);
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 8/9] net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

SDIO_VENDOR_ID_TI_WL1251 is now defined in mmc/sdio_ids.h separately
from SDIO_VENDOR_ID_TI for wl1271.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/net/wireless/ti/wl1251/sdio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index c54a273713ed..42b55f3a50df 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -52,7 +52,7 @@ static void wl1251_sdio_interrupt(struct sdio_func *func)
 }
 
 static const struct sdio_device_id wl1251_devices[] = {
-	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1251) },
+	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251) },
 	{}
 };
 MODULE_DEVICE_TABLE(sdio, wl1251_devices);
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 9/9] net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

They are already included from mmc/sdio_ids.h and do not need
a local definition.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/net/wireless/ti/wl1251/sdio.c | 8 --------
 drivers/net/wireless/ti/wlcore/sdio.c | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 42b55f3a50df..3c4d5e38c66c 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -22,14 +22,6 @@
 
 #include "wl1251.h"
 
-#ifndef SDIO_VENDOR_ID_TI
-#define SDIO_VENDOR_ID_TI		0x104c
-#endif
-
-#ifndef SDIO_DEVICE_ID_TI_WL1251
-#define SDIO_DEVICE_ID_TI_WL1251	0x9066
-#endif
-
 struct wl1251_sdio {
 	struct sdio_func *func;
 	u32 elp_val;
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 7afaf35f2453..9fd8cf2d270c 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -26,14 +26,6 @@
 #include "wl12xx_80211.h"
 #include "io.h"
 
-#ifndef SDIO_VENDOR_ID_TI
-#define SDIO_VENDOR_ID_TI		0x0097
-#endif
-
-#ifndef SDIO_DEVICE_ID_TI_WL1271
-#define SDIO_DEVICE_ID_TI_WL1271	0x4076
-#endif
-
 static bool dump = false;
 
 struct wl12xx_sdio_glue {
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 9/9] net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman
  Cc: linux-omap, devicetree, linux-kernel, linux-arm-kernel,
	linux-mmc, linux-wireless, netdev, letux-kernel, kernel, stable

They are already included from mmc/sdio_ids.h and do not need
a local definition.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/net/wireless/ti/wl1251/sdio.c | 8 --------
 drivers/net/wireless/ti/wlcore/sdio.c | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 42b55f3a50df..3c4d5e38c66c 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -22,14 +22,6 @@
 
 #include "wl1251.h"
 
-#ifndef SDIO_VENDOR_ID_TI
-#define SDIO_VENDOR_ID_TI		0x104c
-#endif
-
-#ifndef SDIO_DEVICE_ID_TI_WL1251
-#define SDIO_DEVICE_ID_TI_WL1251	0x9066
-#endif
-
 struct wl1251_sdio {
 	struct sdio_func *func;
 	u32 elp_val;
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 7afaf35f2453..9fd8cf2d270c 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -26,14 +26,6 @@
 #include "wl12xx_80211.h"
 #include "io.h"
 
-#ifndef SDIO_VENDOR_ID_TI
-#define SDIO_VENDOR_ID_TI		0x0097
-#endif
-
-#ifndef SDIO_DEVICE_ID_TI_WL1271
-#define SDIO_DEVICE_ID_TI_WL1271	0x4076
-#endif
-
 static bool dump = false;
 
 struct wl12xx_sdio_glue {
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [PATCH 9/9] net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
@ 2019-10-18 20:25   ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-18 20:25 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Kalle Valo, Mike Rapoport,
	David Sterba, Rafael J. Wysocki, Petr Mladek, Sakari Ailus,
	H. Nikolaus Schaller, Kefeng Wang, Yangtao Li, Alexios Zavras,
	Thomas Gleixner, Allison Randal, Greg Kroah-Hartman, John Stultz,
	Bjorn Helgaas
  Cc: devicetree, letux-kernel, linux-mmc, kernel, linux-wireless,
	linux-kernel, stable, netdev, linux-omap, linux-arm-kernel

They are already included from mmc/sdio_ids.h and do not need
a local definition.

Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.11.0
---
 drivers/net/wireless/ti/wl1251/sdio.c | 8 --------
 drivers/net/wireless/ti/wlcore/sdio.c | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 42b55f3a50df..3c4d5e38c66c 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -22,14 +22,6 @@
 
 #include "wl1251.h"
 
-#ifndef SDIO_VENDOR_ID_TI
-#define SDIO_VENDOR_ID_TI		0x104c
-#endif
-
-#ifndef SDIO_DEVICE_ID_TI_WL1251
-#define SDIO_DEVICE_ID_TI_WL1251	0x9066
-#endif
-
 struct wl1251_sdio {
 	struct sdio_func *func;
 	u32 elp_val;
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 7afaf35f2453..9fd8cf2d270c 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -26,14 +26,6 @@
 #include "wl12xx_80211.h"
 #include "io.h"
 
-#ifndef SDIO_VENDOR_ID_TI
-#define SDIO_VENDOR_ID_TI		0x0097
-#endif
-
-#ifndef SDIO_DEVICE_ID_TI_WL1271
-#define SDIO_DEVICE_ID_TI_WL1271	0x4076
-#endif
-
 static bool dump = false;
 
 struct wl12xx_sdio_glue {
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
  2019-10-18 20:25 ` H. Nikolaus Schaller
  (?)
@ 2019-10-19 11:06   ` Kalle Valo
  -1 siblings, 0 replies; 46+ messages in thread
From: Kalle Valo @ 2019-10-19 11:06 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas, linux-omap,
	devicetree, linux-kernel, linux-arm-kernel, linux-mmc,
	linux-wireless, netdev, letux-kernel, kernel

"H. Nikolaus Schaller" <hns@goldelico.com> writes:

> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>
> v4.7 did break the pdata-quirks which made the mmc3 interface
> fail completely, because some code now assumes device tree
> based instantiation.
>
> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>
> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
> load, although the device was found as an sdio client.
>
> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>
> To solve these issues:
> * we convert mmc3 and wl1251 initialization from pdata-quirks
>   to device tree
> * we make the wl1251 driver read properties from device tree
> * we fix the mmc core vendor ids and quirks
> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>   from header file instead of (potentially conflicting) local
>   definitions
>
>
> H. Nikolaus Schaller (9):
>   Documentation: dt: wireless: update wl1251 for sdio
>   net: wireless: ti: wl1251 add device tree support
>   DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>   mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>     of pandora_wl1251_init_card
>   omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>   mmc: sdio: fix wl1251 vendor id
>   mmc: core: fix wl1251 sdio quirks
>   net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>   net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions

I didn't get patches 3-7 so I don't know what they have, but what's the
plan how these should be applied? Normally wl1251 patches go via
wireless-drivers-next but are you planning something else?

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-19 11:06   ` Kalle Valo
  0 siblings, 0 replies; 46+ messages in thread
From: Kalle Valo @ 2019-10-19 11:06 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas

"H. Nikolaus Schaller" <hns@goldelico.com> writes:

> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>
> v4.7 did break the pdata-quirks which made the mmc3 interface
> fail completely, because some code now assumes device tree
> based instantiation.
>
> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>
> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
> load, although the device was found as an sdio client.
>
> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>
> To solve these issues:
> * we convert mmc3 and wl1251 initialization from pdata-quirks
>   to device tree
> * we make the wl1251 driver read properties from device tree
> * we fix the mmc core vendor ids and quirks
> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>   from header file instead of (potentially conflicting) local
>   definitions
>
>
> H. Nikolaus Schaller (9):
>   Documentation: dt: wireless: update wl1251 for sdio
>   net: wireless: ti: wl1251 add device tree support
>   DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>   mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>     of pandora_wl1251_init_card
>   omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>   mmc: sdio: fix wl1251 vendor id
>   mmc: core: fix wl1251 sdio quirks
>   net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>   net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions

I didn't get patches 3-7 so I don't know what they have, but what's the
plan how these should be applied? Normally wl1251 patches go via
wireless-drivers-next but are you planning something else?

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-19 11:06   ` Kalle Valo
  0 siblings, 0 replies; 46+ messages in thread
From: Kalle Valo @ 2019-10-19 11:06 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Mark Rutland, Ulf Hansson, devicetree, Tony Lindgren,
	linux-wireless, Kefeng Wang, Bjorn Helgaas, letux-kernel,
	Rafael J. Wysocki, Russell King, Mike Rapoport, Yangtao Li,
	linux-arm-kernel, Petr Mladek, Benoît Cousson, kernel,
	Alexios Zavras, Rob Herring, John Stultz, David Sterba,
	Thomas Gleixner, linux-omap, Allison Randal, Greg Kroah-Hartman,
	linux-mmc, linux-kernel, Sakari Ailus, netdev

"H. Nikolaus Schaller" <hns@goldelico.com> writes:

> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>
> v4.7 did break the pdata-quirks which made the mmc3 interface
> fail completely, because some code now assumes device tree
> based instantiation.
>
> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>
> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
> load, although the device was found as an sdio client.
>
> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>
> To solve these issues:
> * we convert mmc3 and wl1251 initialization from pdata-quirks
>   to device tree
> * we make the wl1251 driver read properties from device tree
> * we fix the mmc core vendor ids and quirks
> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>   from header file instead of (potentially conflicting) local
>   definitions
>
>
> H. Nikolaus Schaller (9):
>   Documentation: dt: wireless: update wl1251 for sdio
>   net: wireless: ti: wl1251 add device tree support
>   DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>   mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>     of pandora_wl1251_init_card
>   omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>   mmc: sdio: fix wl1251 vendor id
>   mmc: core: fix wl1251 sdio quirks
>   net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>   net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions

I didn't get patches 3-7 so I don't know what they have, but what's the
plan how these should be applied? Normally wl1251 patches go via
wireless-drivers-next but are you planning something else?

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
  2019-10-19 11:06   ` Kalle Valo
  (?)
@ 2019-10-19 11:25     ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-19 11:25 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas, linux-omap,
	devicetree, linux-kernel, linux-arm-kernel, linux-mmc,
	linux-wireless, netdev, letux-kernel, kernel

Hi,

> Am 19.10.2019 um 13:06 schrieb Kalle Valo <kvalo@codeaurora.org>:
> 
> "H. Nikolaus Schaller" <hns@goldelico.com> writes:
> 
>> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>> 
>> v4.7 did break the pdata-quirks which made the mmc3 interface
>> fail completely, because some code now assumes device tree
>> based instantiation.
>> 
>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>> 
>> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
>> load, although the device was found as an sdio client.
>> 
>> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>> 
>> To solve these issues:
>> * we convert mmc3 and wl1251 initialization from pdata-quirks
>>  to device tree
>> * we make the wl1251 driver read properties from device tree
>> * we fix the mmc core vendor ids and quirks
>> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>>  from header file instead of (potentially conflicting) local
>>  definitions
>> 
>> 
>> H. Nikolaus Schaller (9):
>>  Documentation: dt: wireless: update wl1251 for sdio
>>  net: wireless: ti: wl1251 add device tree support
>>  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>>  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>>    of pandora_wl1251_init_card
>>  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>>  mmc: sdio: fix wl1251 vendor id
>>  mmc: core: fix wl1251 sdio quirks
>>  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>>  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
> 
> I didn't get patches 3-7

oh sorry. I don't know why.

Here they are all: https://patchwork.kernel.org/cover/11199599/

> so I don't know what they have, but what's the
> plan how these should be applied? Normally wl1251 patches go via
> wireless-drivers-next but are you planning something else?

Well, I have no plan for that except that all should end up fixed in mainline
and stable.

The issue is that multiple subsystems are involved (net/wireless, mmc and arm/omap)
and all patches should be ideally be applied in combination.

BR and thanks,
Nikolaus


^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-19 11:25     ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-19 11:25 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas

Hi,

> Am 19.10.2019 um 13:06 schrieb Kalle Valo <kvalo@codeaurora.org>:
> 
> "H. Nikolaus Schaller" <hns@goldelico.com> writes:
> 
>> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>> 
>> v4.7 did break the pdata-quirks which made the mmc3 interface
>> fail completely, because some code now assumes device tree
>> based instantiation.
>> 
>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>> 
>> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
>> load, although the device was found as an sdio client.
>> 
>> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>> 
>> To solve these issues:
>> * we convert mmc3 and wl1251 initialization from pdata-quirks
>>  to device tree
>> * we make the wl1251 driver read properties from device tree
>> * we fix the mmc core vendor ids and quirks
>> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>>  from header file instead of (potentially conflicting) local
>>  definitions
>> 
>> 
>> H. Nikolaus Schaller (9):
>>  Documentation: dt: wireless: update wl1251 for sdio
>>  net: wireless: ti: wl1251 add device tree support
>>  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>>  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>>    of pandora_wl1251_init_card
>>  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>>  mmc: sdio: fix wl1251 vendor id
>>  mmc: core: fix wl1251 sdio quirks
>>  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>>  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
> 
> I didn't get patches 3-7

oh sorry. I don't know why.

Here they are all: https://patchwork.kernel.org/cover/11199599/

> so I don't know what they have, but what's the
> plan how these should be applied? Normally wl1251 patches go via
> wireless-drivers-next but are you planning something else?

Well, I have no plan for that except that all should end up fixed in mainline
and stable.

The issue is that multiple subsystems are involved (net/wireless, mmc and arm/omap)
and all patches should be ideally be applied in combination.

BR and thanks,
Nikolaus

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-19 11:25     ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-19 11:25 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Mark Rutland, Ulf Hansson, devicetree, Tony Lindgren,
	linux-wireless, Kefeng Wang, Bjorn Helgaas, letux-kernel,
	Rafael J. Wysocki, Russell King, Mike Rapoport, Yangtao Li,
	linux-arm-kernel, Petr Mladek, Benoît Cousson, kernel,
	Alexios Zavras, Rob Herring, John Stultz, David Sterba,
	Thomas Gleixner, linux-omap, Allison Randal, Greg Kroah-Hartman,
	linux-mmc, linux-kernel, Sakari Ailus, netdev

Hi,

> Am 19.10.2019 um 13:06 schrieb Kalle Valo <kvalo@codeaurora.org>:
> 
> "H. Nikolaus Schaller" <hns@goldelico.com> writes:
> 
>> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>> 
>> v4.7 did break the pdata-quirks which made the mmc3 interface
>> fail completely, because some code now assumes device tree
>> based instantiation.
>> 
>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>> 
>> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
>> load, although the device was found as an sdio client.
>> 
>> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>> 
>> To solve these issues:
>> * we convert mmc3 and wl1251 initialization from pdata-quirks
>>  to device tree
>> * we make the wl1251 driver read properties from device tree
>> * we fix the mmc core vendor ids and quirks
>> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>>  from header file instead of (potentially conflicting) local
>>  definitions
>> 
>> 
>> H. Nikolaus Schaller (9):
>>  Documentation: dt: wireless: update wl1251 for sdio
>>  net: wireless: ti: wl1251 add device tree support
>>  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>>  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>>    of pandora_wl1251_init_card
>>  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>>  mmc: sdio: fix wl1251 vendor id
>>  mmc: core: fix wl1251 sdio quirks
>>  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>>  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
> 
> I didn't get patches 3-7

oh sorry. I don't know why.

Here they are all: https://patchwork.kernel.org/cover/11199599/

> so I don't know what they have, but what's the
> plan how these should be applied? Normally wl1251 patches go via
> wireless-drivers-next but are you planning something else?

Well, I have no plan for that except that all should end up fixed in mainline
and stable.

The issue is that multiple subsystems are involved (net/wireless, mmc and arm/omap)
and all patches should be ideally be applied in combination.

BR and thanks,
Nikolaus


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
  2019-10-19 11:25     ` H. Nikolaus Schaller
  (?)
@ 2019-10-19 11:34       ` Kalle Valo
  -1 siblings, 0 replies; 46+ messages in thread
From: Kalle Valo @ 2019-10-19 11:34 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Benoît Cousson, Tony Lindgren, Rob Herring, Mark Rutland,
	Russell King, Ulf Hansson, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas, linux-omap,
	devicetree, linux-kernel, linux-arm-kernel, linux-mmc,
	linux-wireless, netdev, letux-kernel, kernel

"H. Nikolaus Schaller" <hns@goldelico.com> writes:

> Hi,
>
>> Am 19.10.2019 um 13:06 schrieb Kalle Valo <kvalo@codeaurora.org>:
>> 
>> "H. Nikolaus Schaller" <hns@goldelico.com> writes:
>> 
>>> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>>> 
>>> v4.7 did break the pdata-quirks which made the mmc3 interface
>>> fail completely, because some code now assumes device tree
>>> based instantiation.
>>> 
>>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>>> 
>>> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
>>> load, although the device was found as an sdio client.
>>> 
>>> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>>> 
>>> To solve these issues:
>>> * we convert mmc3 and wl1251 initialization from pdata-quirks
>>>  to device tree
>>> * we make the wl1251 driver read properties from device tree
>>> * we fix the mmc core vendor ids and quirks
>>> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>>>  from header file instead of (potentially conflicting) local
>>>  definitions
>>> 
>>> 
>>> H. Nikolaus Schaller (9):
>>>  Documentation: dt: wireless: update wl1251 for sdio
>>>  net: wireless: ti: wl1251 add device tree support
>>>  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>>>  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>>>    of pandora_wl1251_init_card
>>>  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>>>  mmc: sdio: fix wl1251 vendor id
>>>  mmc: core: fix wl1251 sdio quirks
>>>  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>>>  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
>> 
>> I didn't get patches 3-7
>
> oh sorry. I don't know why.
>
> Here they are all: https://patchwork.kernel.org/cover/11199599/

Thanks.

>> so I don't know what they have, but what's the
>> plan how these should be applied? Normally wl1251 patches go via
>> wireless-drivers-next but are you planning something else?
>
> Well, I have no plan for that except that all should end up fixed in mainline
> and stable.
>
> The issue is that multiple subsystems are involved (net/wireless, mmc and arm/omap)
> and all patches should be ideally be applied in combination.

Ok, I then assume someone else is going to handle these, wl1251 rarely
has any changes so the chance of conflicts is small anyway, and I'll
drop the wl1251 patches from my patchwork.

For wl1251 patches 1, 2, 8 and 9:

Acked-by: Kalle Valo <kvalo@codeaurora.org>

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-19 11:34       ` Kalle Valo
  0 siblings, 0 replies; 46+ messages in thread
From: Kalle Valo @ 2019-10-19 11:34 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Mark Rutland, Ulf Hansson, devicetree, Tony Lindgren,
	linux-wireless, Kefeng Wang, Bjorn Helgaas, letux-kernel,
	Rafael J. Wysocki, Russell King, Mike Rapoport, Yangtao Li,
	linux-arm-kernel, Petr Mladek, Benoît Cousson, kernel,
	Alexios Zavras, Rob Herring, John Stultz, David Sterba,
	Thomas Gleixner, linux-omap, Allison Randal, Greg Kroah-Hartman

"H. Nikolaus Schaller" <hns@goldelico.com> writes:

> Hi,
>
>> Am 19.10.2019 um 13:06 schrieb Kalle Valo <kvalo@codeaurora.org>:
>> 
>> "H. Nikolaus Schaller" <hns@goldelico.com> writes:
>> 
>>> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>>> 
>>> v4.7 did break the pdata-quirks which made the mmc3 interface
>>> fail completely, because some code now assumes device tree
>>> based instantiation.
>>> 
>>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>>> 
>>> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
>>> load, although the device was found as an sdio client.
>>> 
>>> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>>> 
>>> To solve these issues:
>>> * we convert mmc3 and wl1251 initialization from pdata-quirks
>>>  to device tree
>>> * we make the wl1251 driver read properties from device tree
>>> * we fix the mmc core vendor ids and quirks
>>> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>>>  from header file instead of (potentially conflicting) local
>>>  definitions
>>> 
>>> 
>>> H. Nikolaus Schaller (9):
>>>  Documentation: dt: wireless: update wl1251 for sdio
>>>  net: wireless: ti: wl1251 add device tree support
>>>  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>>>  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>>>    of pandora_wl1251_init_card
>>>  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>>>  mmc: sdio: fix wl1251 vendor id
>>>  mmc: core: fix wl1251 sdio quirks
>>>  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>>>  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
>> 
>> I didn't get patches 3-7
>
> oh sorry. I don't know why.
>
> Here they are all: https://patchwork.kernel.org/cover/11199599/

Thanks.

>> so I don't know what they have, but what's the
>> plan how these should be applied? Normally wl1251 patches go via
>> wireless-drivers-next but are you planning something else?
>
> Well, I have no plan for that except that all should end up fixed in mainline
> and stable.
>
> The issue is that multiple subsystems are involved (net/wireless, mmc and arm/omap)
> and all patches should be ideally be applied in combination.

Ok, I then assume someone else is going to handle these, wl1251 rarely
has any changes so the chance of conflicts is small anyway, and I'll
drop the wl1251 patches from my patchwork.

For wl1251 patches 1, 2, 8 and 9:

Acked-by: Kalle Valo <kvalo@codeaurora.org>

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
@ 2019-10-19 11:34       ` Kalle Valo
  0 siblings, 0 replies; 46+ messages in thread
From: Kalle Valo @ 2019-10-19 11:34 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Mark Rutland, Ulf Hansson, devicetree, Tony Lindgren,
	linux-wireless, Kefeng Wang, Bjorn Helgaas, letux-kernel,
	Rafael J. Wysocki, Russell King, Mike Rapoport, Yangtao Li,
	linux-arm-kernel, Petr Mladek, Benoît Cousson, kernel,
	Alexios Zavras, Rob Herring, John Stultz, David Sterba,
	Thomas Gleixner, linux-omap, Allison Randal, Greg Kroah-Hartman,
	linux-mmc, linux-kernel, Sakari Ailus, netdev

"H. Nikolaus Schaller" <hns@goldelico.com> writes:

> Hi,
>
>> Am 19.10.2019 um 13:06 schrieb Kalle Valo <kvalo@codeaurora.org>:
>> 
>> "H. Nikolaus Schaller" <hns@goldelico.com> writes:
>> 
>>> Here we have a set of scattered patches to make the OpenPandora WiFi work again.
>>> 
>>> v4.7 did break the pdata-quirks which made the mmc3 interface
>>> fail completely, because some code now assumes device tree
>>> based instantiation.
>>> 
>>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
>>> 
>>> v4.11 did break the sdio qirks for wl1251 which made the driver no longer
>>> load, although the device was found as an sdio client.
>>> 
>>> Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
>>> 
>>> To solve these issues:
>>> * we convert mmc3 and wl1251 initialization from pdata-quirks
>>>  to device tree
>>> * we make the wl1251 driver read properties from device tree
>>> * we fix the mmc core vendor ids and quirks
>>> * we fix the wl1251 (and wl1271) driver to use only vendor ids
>>>  from header file instead of (potentially conflicting) local
>>>  definitions
>>> 
>>> 
>>> H. Nikolaus Schaller (9):
>>>  Documentation: dt: wireless: update wl1251 for sdio
>>>  net: wireless: ti: wl1251 add device tree support
>>>  DTS: ARM: pandora-common: define wl1251 as child node of mmc3
>>>  mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid
>>>    of pandora_wl1251_init_card
>>>  omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
>>>  mmc: sdio: fix wl1251 vendor id
>>>  mmc: core: fix wl1251 sdio quirks
>>>  net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition
>>>  net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
>> 
>> I didn't get patches 3-7
>
> oh sorry. I don't know why.
>
> Here they are all: https://patchwork.kernel.org/cover/11199599/

Thanks.

>> so I don't know what they have, but what's the
>> plan how these should be applied? Normally wl1251 patches go via
>> wireless-drivers-next but are you planning something else?
>
> Well, I have no plan for that except that all should end up fixed in mainline
> and stable.
>
> The issue is that multiple subsystems are involved (net/wireless, mmc and arm/omap)
> and all patches should be ideally be applied in combination.

Ok, I then assume someone else is going to handle these, wl1251 rarely
has any changes so the chance of conflicts is small anyway, and I'll
drop the wl1251 patches from my patchwork.

For wl1251 patches 1, 2, 8 and 9:

Acked-by: Kalle Valo <kvalo@codeaurora.org>

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 5/9] omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
       [not found]     ` <A0434659-A282-44AA-90E9-D234ADF8A04A@goldelico.com>
@ 2019-10-19 16:22       ` Tony Lindgren
  0 siblings, 0 replies; 46+ messages in thread
From: Tony Lindgren @ 2019-10-19 16:22 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Sasha Levin, devicetree, linux-omap, stable, Benoît Cousson,
	kernel, Discussions about the Letux Kernel

* H. Nikolaus Schaller <hns@goldelico.com> [191019 15:18]:
> 
> > Am 19.10.2019 um 15:36 schrieb Sasha Levin <sashal@kernel.org>:
> > 
> > Hi,
> > 
> > [This is an automated email]
> > 
> > This commit has been processed because it contains a "Fixes:" tag,
> > fixing commit: 81eef6ca92014 mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel.
> > 
> > The bot has tested the following trees: v5.3.6, v4.19.79, v4.14.149, v4.9.196.
> > 
> > v5.3.6: Build OK!
> > v4.19.79: Failed to apply! Possible dependencies:
> >    Unable to calculate
> > 
> > v4.14.149: Failed to apply! Possible dependencies:
> >    0486738928bf0 ("ARM: OMAP1: ams-delta: add GPIO lookup tables")
> >    0920ca103f8d8 ("ARM: sa1100: provide infrastructure to support generic CF sockets")
> >    29786e9b6551b ("ARM: sa1100/assabet: convert to generic CF sockets")
> >    2bcb1be092370 ("Input: ams_delta_serio: Replace power GPIO with regulator")
> >    56de7570b3264 ("Input: ams_delta_serio: use private structure")
> >    7be893aa2d6a1 ("pcmcia: sa1100: provide generic CF support")
> >    b51af86559d4b ("ARM: sa1100/shannon: convert to generic CF sockets")
> >    b955153bfa68d ("ARM: sa1100/assabet: add BCR/BSR GPIO driver")
> >    c2f9b05fd5c12 ("media: arch: sh: ecovec: Use new renesas-ceu camera driver")
> >    df88c57689278 ("Input: ams_delta_serio: convert to platform driver")
> >    efdfeb079cc3b ("regulator: fixed: Convert to use GPIO descriptor only")
> 
> ^^^ this is the relevant one.
> 
> > 
> > v4.9.196: Failed to apply! Possible dependencies:
> >    0486738928bf0 ("ARM: OMAP1: ams-delta: add GPIO lookup tables")
> >    072f58af1dfbc ("ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6)")
> >    1aa1d858f582c ("ARM: dts: bcm283x: Add dtsi for OTG mode")
> >    29786e9b6551b ("ARM: sa1100/assabet: convert to generic CF sockets")
> >    2bcb1be092370 ("Input: ams_delta_serio: Replace power GPIO with regulator")
> >    3bfe25fa9f8a5 ("ARM: dts: bcm283x: Move the BCM2837 DT contents from arm64 to arm.")
> >    56de7570b3264 ("Input: ams_delta_serio: use private structure")
> >    6c1b417adc8fa ("ARM: pxa: ezx: use the new pxa_camera platform_data")
> >    7ade445c26269 ("ARM: pxa: magician: Add support for ADS7846 touchscreen")
> >    8f9bafbb92c03 ("ARM: dts: aspeed: Add Romulus BMC platform")
> >    b24413180f560 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
> >    b5478c1b67bcd ("alpha: add asm/extable.h")
> >    b955153bfa68d ("ARM: sa1100/assabet: add BCR/BSR GPIO driver")
> >    d9fa04725f27f ("ARM: pxa: em-x270: use the new pxa_camera platform_data")
> >    df88c57689278 ("Input: ams_delta_serio: convert to platform driver")
> >    efdfeb079cc3b ("regulator: fixed: Convert to use GPIO descriptor only")
> >    fe7bf9dcfff5b ("ARM: dts: add a devicetree for Raidsonic NAS IB-4220-B")
> > 
> > 
> > NOTE: The patch will not be queued to stable trees until it is upstream.
> > 
> > How should we proceed with this patch?
> 
> I have checked and the reason is that 
> 
> efdfeb079cc3b ("regulator: fixed: Convert to use GPIO descriptor only")
> 
> was introduced after v.4.19 which was also partially reverted by this patch
> if based on mainline.
> 
> I have split it up into the partial revert of efdfeb079cc3b  for mainline
> and the real patch which now applies to all relevant stable trees.
> 
> So I'll sent a v2 asap.

Please also remove arch/arm/mach-omap2/hsmmc.[ch] as I think that
can be now done :)

Regards,

Tony

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
  2019-10-18 20:25   ` H. Nikolaus Schaller
  (?)
@ 2019-10-21 17:13     ` Tony Lindgren
  -1 siblings, 0 replies; 46+ messages in thread
From: Tony Lindgren @ 2019-10-21 17:13 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Benoît Cousson, Rob Herring, Mark Rutland, Russell King,
	Ulf Hansson, Kalle Valo, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas, linux-omap,
	devicetree, linux-kernel, linux-arm-kernel, linux-mmc,
	linux-wireless, netdev, letux-kernel, kernel, stable

* H. Nikolaus Schaller <hns@goldelico.com> [191018 20:28]:
> Since v4.7 the dma initialization requires that there is a
> device tree property for "rx" and "tx" channels which is
> not provided by the pdata-quirks initialization.
> 
> By conversion of the mmc3 setup to device tree this will
> finally allows to remove the OpenPandora wlan specific omap3
> data-quirks.
> 
> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Here you have the subject line the wrong way around,
please update it to start with "ARM: dts: ...".

Regards,

Tony

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
@ 2019-10-21 17:13     ` Tony Lindgren
  0 siblings, 0 replies; 46+ messages in thread
From: Tony Lindgren @ 2019-10-21 17:13 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Benoît Cousson, Rob Herring, Mark Rutland, Russell King,
	Ulf Hansson, Kalle Valo, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas

* H. Nikolaus Schaller <hns@goldelico.com> [191018 20:28]:
> Since v4.7 the dma initialization requires that there is a
> device tree property for "rx" and "tx" channels which is
> not provided by the pdata-quirks initialization.
> 
> By conversion of the mmc3 setup to device tree this will
> finally allows to remove the OpenPandora wlan specific omap3
> data-quirks.
> 
> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Here you have the subject line the wrong way around,
please update it to start with "ARM: dts: ...".

Regards,

Tony

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
@ 2019-10-21 17:13     ` Tony Lindgren
  0 siblings, 0 replies; 46+ messages in thread
From: Tony Lindgren @ 2019-10-21 17:13 UTC (permalink / raw)
  To: H. Nikolaus Schaller
  Cc: Mark Rutland, Ulf Hansson, devicetree, Yangtao Li,
	linux-wireless, Kefeng Wang, Bjorn Helgaas, letux-kernel,
	Rafael J. Wysocki, Russell King, Mike Rapoport, Kalle Valo,
	Petr Mladek, Benoît Cousson, kernel, Alexios Zavras,
	Rob Herring, John Stultz, David Sterba, Thomas Gleixner,
	linux-omap, Allison Randal, linux-arm-kernel, Greg Kroah-Hartman,
	linux-mmc, linux-kernel, stable, Sakari Ailus, netdev

* H. Nikolaus Schaller <hns@goldelico.com> [191018 20:28]:
> Since v4.7 the dma initialization requires that there is a
> device tree property for "rx" and "tx" channels which is
> not provided by the pdata-quirks initialization.
> 
> By conversion of the mmc3 setup to device tree this will
> finally allows to remove the OpenPandora wlan specific omap3
> data-quirks.
> 
> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Here you have the subject line the wrong way around,
please update it to start with "ARM: dts: ...".

Regards,

Tony

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
  2019-10-21 17:13     ` Tony Lindgren
  (?)
@ 2019-10-21 18:22       ` H. Nikolaus Schaller
  -1 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-21 18:22 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Benoît Cousson, Rob Herring, Mark Rutland, Russell King,
	Ulf Hansson, Kalle Valo, Mike Rapoport, David Sterba,
	Rafael J. Wysocki, Petr Mladek, Sakari Ailus, Kefeng Wang,
	Yangtao Li, Alexios Zavras, Thomas Gleixner, Allison Randal,
	Greg Kroah-Hartman, John Stultz, Bjorn Helgaas, linux-omap,
	devicetree, linux-kernel, linux-arm-kernel, linux-mmc,
	linux-wireless, netdev, letux-kernel, kernel, stable


> Am 21.10.2019 um 19:13 schrieb Tony Lindgren <tony@atomide.com>:
> 
> * H. Nikolaus Schaller <hns@goldelico.com> [191018 20:28]:
>> Since v4.7 the dma initialization requires that there is a
>> device tree property for "rx" and "tx" channels which is
>> not provided by the pdata-quirks initialization.
>> 
>> By conversion of the mmc3 setup to device tree this will
>> finally allows to remove the OpenPandora wlan specific omap3
>> data-quirks.
>> 
>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
> 
> Here you have the subject line the wrong way around,
> please update it to start with "ARM: dts: ...".

Ok.


^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
@ 2019-10-21 18:22       ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-21 18:22 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Mark Rutland, Ulf Hansson, devicetree, Yangtao Li,
	linux-wireless, Kefeng Wang, Bjorn Helgaas, letux-kernel,
	Rafael J. Wysocki, Russell King, Mike Rapoport, Kalle Valo,
	Petr Mladek, Benoît Cousson, kernel, Alexios Zavras,
	Rob Herring, John Stultz, David Sterba, Thomas Gleixner,
	linux-omap, Allison Randal, linux-arm-kernel, Greg Kroah-Hartman


> Am 21.10.2019 um 19:13 schrieb Tony Lindgren <tony@atomide.com>:
> 
> * H. Nikolaus Schaller <hns@goldelico.com> [191018 20:28]:
>> Since v4.7 the dma initialization requires that there is a
>> device tree property for "rx" and "tx" channels which is
>> not provided by the pdata-quirks initialization.
>> 
>> By conversion of the mmc3 setup to device tree this will
>> finally allows to remove the OpenPandora wlan specific omap3
>> data-quirks.
>> 
>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
> 
> Here you have the subject line the wrong way around,
> please update it to start with "ARM: dts: ...".

Ok.

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3
@ 2019-10-21 18:22       ` H. Nikolaus Schaller
  0 siblings, 0 replies; 46+ messages in thread
From: H. Nikolaus Schaller @ 2019-10-21 18:22 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Mark Rutland, Ulf Hansson, devicetree, Yangtao Li,
	linux-wireless, Kefeng Wang, Bjorn Helgaas, letux-kernel,
	Rafael J. Wysocki, Russell King, Mike Rapoport, Kalle Valo,
	Petr Mladek, Benoît Cousson, kernel, Alexios Zavras,
	Rob Herring, John Stultz, David Sterba, Thomas Gleixner,
	linux-omap, Allison Randal, linux-arm-kernel, Greg Kroah-Hartman,
	linux-mmc, linux-kernel, stable, Sakari Ailus, netdev


> Am 21.10.2019 um 19:13 schrieb Tony Lindgren <tony@atomide.com>:
> 
> * H. Nikolaus Schaller <hns@goldelico.com> [191018 20:28]:
>> Since v4.7 the dma initialization requires that there is a
>> device tree property for "rx" and "tx" channels which is
>> not provided by the pdata-quirks initialization.
>> 
>> By conversion of the mmc3 setup to device tree this will
>> finally allows to remove the OpenPandora wlan specific omap3
>> data-quirks.
>> 
>> Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
> 
> Here you have the subject line the wrong way around,
> please update it to start with "ARM: dts: ...".

Ok.


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 46+ messages in thread

end of thread, other threads:[~2019-10-21 18:22 UTC | newest]

Thread overview: 46+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-18 20:25 [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again H. Nikolaus Schaller
2019-10-18 20:25 ` H. Nikolaus Schaller
2019-10-18 20:25 ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 1/9] Documentation: dt: wireless: update wl1251 for sdio H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 2/9] net: wireless: ti: wl1251 add device tree support H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 3/9] DTS: ARM: pandora-common: define wl1251 as child node of mmc3 H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-21 17:13   ` Tony Lindgren
2019-10-21 17:13     ` Tony Lindgren
2019-10-21 17:13     ` Tony Lindgren
2019-10-21 18:22     ` H. Nikolaus Schaller
2019-10-21 18:22       ` H. Nikolaus Schaller
2019-10-21 18:22       ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 4/9] mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 5/9] omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
     [not found]   ` <20191019133621.C1CE421897@mail.kernel.org>
     [not found]     ` <A0434659-A282-44AA-90E9-D234ADF8A04A@goldelico.com>
2019-10-19 16:22       ` Tony Lindgren
2019-10-18 20:25 ` [PATCH 6/9] mmc: sdio: fix wl1251 vendor id H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 7/9] mmc: core: fix wl1251 sdio quirks H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 8/9] net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25 ` [PATCH 9/9] net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-18 20:25   ` H. Nikolaus Schaller
2019-10-19 11:06 ` [PATCH 0/9] OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again Kalle Valo
2019-10-19 11:06   ` Kalle Valo
2019-10-19 11:06   ` Kalle Valo
2019-10-19 11:25   ` H. Nikolaus Schaller
2019-10-19 11:25     ` H. Nikolaus Schaller
2019-10-19 11:25     ` H. Nikolaus Schaller
2019-10-19 11:34     ` Kalle Valo
2019-10-19 11:34       ` Kalle Valo
2019-10-19 11:34       ` Kalle Valo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.