* [PATCH v2 1/3] dt-bindings: net: add st,stlc45xx
2023-04-04 8:23 [PATCH v2 0/3] p54spi devicetree conversion Arnd Bergmann
@ 2023-04-04 8:23 ` Arnd Bergmann
2023-04-07 7:04 ` Krzysztof Kozlowski
2023-04-04 8:24 ` [PATCH v2 2/3] ARM: dts: omap2: add stlc4560 spi-wireless node Arnd Bergmann
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2023-04-04 8:23 UTC (permalink / raw)
To: Tony Lindgren
Cc: soc, Arnd Bergmann, Aaro Koskinen, Bartosz Golaszewski,
Benoît Cousson, Christian Lamparter, David S. Miller,
Dmitry Torokhov, Eric Dumazet, Felipe Balbi, Jakub Kicinski,
Johannes Berg, Krzysztof Kozlowski, Linus Walleij, Paolo Abeni,
Rob Herring, linux-wireless, netdev, devicetree, linux-kernel,
linux-arm-kernel, linux-gpio, linux-omap, Christian Lamparter
From: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/all/e8dc9acb-6f85-e0a9-a145-d101ca6da201@gmail.com/
Acked-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
.../bindings/net/wireless/st,stlc45xx.yaml | 58 +++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/wireless/st,stlc45xx.yaml
diff --git a/Documentation/devicetree/bindings/net/wireless/st,stlc45xx.yaml b/Documentation/devicetree/bindings/net/wireless/st,stlc45xx.yaml
new file mode 100644
index 000000000000..99f13d8d3816
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/wireless/st,stlc45xx.yaml
@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/wireless/st,stlc45xx.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: ST/Intersil/Conexant stlc45xx/p54spi/cx3110x SPI wireless device
+
+maintainers:
+ - Christian Lamparter <chunkeey@gmail.com>
+
+description:
+ The SPI variant of the Intersil Prism54 wireless device was sold
+ under a variety of names, including Conexant CX3110x and
+ ST Microelectronics STLC5460.
+
+allOf:
+ - $ref: ieee80211.yaml#
+ - $ref: /schemas/spi/spi-peripheral-props.yaml#
+
+properties:
+ compatible:
+ enum:
+ - cnxt,3110x
+ - isil,p54spi
+ - st,stlc4550
+ - st,stlc4560
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ powerdown-gpios:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ spi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ wifi@0 {
+ compatible = "st,stlc4560";
+ reg = <0>;
+ spi-max-frequency = <48000000>;
+ interrupts-extended = <&gpio 23>;
+ powerdown-gpios = <&gpio 1>;
+ };
+ };
--
2.39.2
_______________________________________________
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] 8+ messages in thread* [PATCH v2 2/3] ARM: dts: omap2: add stlc4560 spi-wireless node
2023-04-04 8:23 [PATCH v2 0/3] p54spi devicetree conversion Arnd Bergmann
2023-04-04 8:23 ` [PATCH v2 1/3] dt-bindings: net: add st,stlc45xx Arnd Bergmann
@ 2023-04-04 8:24 ` Arnd Bergmann
2023-04-07 7:05 ` Krzysztof Kozlowski
2023-04-04 8:24 ` [PATCH v2 3/3] p54spi: convert to devicetree Arnd Bergmann
2023-04-04 11:06 ` [PATCH v2 0/3] p54spi devicetree conversion Arnd Bergmann
3 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2023-04-04 8:24 UTC (permalink / raw)
To: Tony Lindgren
Cc: soc, Arnd Bergmann, Aaro Koskinen, Bartosz Golaszewski,
Benoît Cousson, Christian Lamparter, David S. Miller,
Dmitry Torokhov, Eric Dumazet, Felipe Balbi, Jakub Kicinski,
Johannes Berg, Krzysztof Kozlowski, Linus Walleij, Paolo Abeni,
Rob Herring, linux-wireless, netdev, devicetree, linux-kernel,
linux-arm-kernel, linux-gpio, linux-omap
From: Arnd Bergmann <arnd@arndb.de>
Converted from the platform_device creation in board-n8x0.c.
Link: https://lore.kernel.org/all/20230314163201.955689-1-arnd@kernel.org/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/boot/dts/omap2.dtsi | 4 ++++
arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index afabb36a8ac1..fdc1790adf43 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -129,6 +129,8 @@ i2c2: i2c@48072000 {
};
mcspi1: spi@48098000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
compatible = "ti,omap2-mcspi";
ti,hwmods = "mcspi1";
reg = <0x48098000 0x100>;
@@ -140,6 +142,8 @@ mcspi1: spi@48098000 {
};
mcspi2: spi@4809a000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
compatible = "ti,omap2-mcspi";
ti,hwmods = "mcspi2";
reg = <0x4809a000 0x100>;
diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index 63b0b4921e4e..fe9dd8bbfc85 100644
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -109,3 +109,15 @@ partition@5 {
};
};
};
+
+&mcspi2 {
+ status = "okay";
+
+ wifi@0 {
+ reg = <0>;
+ compatible = "st,stlc4560";
+ spi-max-frequency = <48000000>;
+ interrupts-extended = <&gpio3 23 IRQ_TYPE_EDGE_RISING>;
+ powerdown-gpios = <&gpio4 1 GPIO_ACTIVE_LOW>; /* gpio 97 */
+ };
+};
--
2.39.2
_______________________________________________
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] 8+ messages in thread* [PATCH v2 3/3] p54spi: convert to devicetree
2023-04-04 8:23 [PATCH v2 0/3] p54spi devicetree conversion Arnd Bergmann
2023-04-04 8:23 ` [PATCH v2 1/3] dt-bindings: net: add st,stlc45xx Arnd Bergmann
2023-04-04 8:24 ` [PATCH v2 2/3] ARM: dts: omap2: add stlc4560 spi-wireless node Arnd Bergmann
@ 2023-04-04 8:24 ` Arnd Bergmann
2023-04-07 7:10 ` Krzysztof Kozlowski
2023-04-04 11:06 ` [PATCH v2 0/3] p54spi devicetree conversion Arnd Bergmann
3 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2023-04-04 8:24 UTC (permalink / raw)
To: Tony Lindgren
Cc: soc, Arnd Bergmann, Aaro Koskinen, Bartosz Golaszewski,
Benoît Cousson, Christian Lamparter, David S. Miller,
Dmitry Torokhov, Eric Dumazet, Felipe Balbi, Jakub Kicinski,
Johannes Berg, Krzysztof Kozlowski, Linus Walleij, Paolo Abeni,
Rob Herring, linux-wireless, netdev, devicetree, linux-kernel,
linux-arm-kernel, linux-gpio, linux-omap, Christian Lamparter
From: Arnd Bergmann <arnd@arndb.de>
The Prism54 SPI driver hardcodes GPIO numbers and expects users to
pass them as module parameters, apparently a relic from its life as a
staging driver. This works because there is only one user, the Nokia
N8x0 tablet.
Convert this to the gpio descriptor interface and DT based probing
to improve this and simplify the code at the same time.
Acked-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
MAINTAINERS | 1 +
arch/arm/mach-omap2/board-n8x0.c | 18 ------
drivers/net/wireless/intersil/p54/p54spi.c | 71 ++++++++--------------
drivers/net/wireless/intersil/p54/p54spi.h | 3 +
4 files changed, 30 insertions(+), 63 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4f57deee1a08..9b08dcea913a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15793,6 +15793,7 @@ M: Christian Lamparter <chunkeey@googlemail.com>
L: linux-wireless@vger.kernel.org
S: Maintained
W: https://wireless.wiki.kernel.org/en/users/Drivers/p54
+F: Documentation/devicetree/bindings/net/wireless/st,stlc45xx.yaml
F: drivers/net/wireless/intersil/p54/
PACKET SOCKETS
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 3353b0a923d9..6a2949f50653 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -19,7 +19,6 @@
#include <linux/spi/spi.h>
#include <linux/usb/musb.h>
#include <linux/mmc/host.h>
-#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/mmc-omap.h>
#include <linux/mfd/menelaus.h>
@@ -142,21 +141,6 @@ static void __init n8x0_usb_init(void) {}
#endif /*CONFIG_USB_MUSB_TUSB6010 */
-
-static struct omap2_mcspi_device_config p54spi_mcspi_config = {
- .turbo_mode = 0,
-};
-
-static struct spi_board_info n800_spi_board_info[] __initdata = {
- {
- .modalias = "p54spi",
- .bus_num = 2,
- .chip_select = 0,
- .max_speed_hz = 48000000,
- .controller_data = &p54spi_mcspi_config,
- },
-};
-
#if defined(CONFIG_MENELAUS) && IS_ENABLED(CONFIG_MMC_OMAP)
/*
@@ -585,7 +569,5 @@ omap_late_initcall(n8x0_late_initcall);
void * __init n8x0_legacy_init(void)
{
board_check_revision();
- spi_register_board_info(n800_spi_board_info,
- ARRAY_SIZE(n800_spi_board_info));
return &mmc1_data;
}
diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c
index 19152fd449ba..130b36f9eec0 100644
--- a/drivers/net/wireless/intersil/p54/p54spi.c
+++ b/drivers/net/wireless/intersil/p54/p54spi.c
@@ -8,6 +8,7 @@
*/
#include <linux/module.h>
+#include <linux/mod_devicetable.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/firmware.h>
@@ -15,7 +16,7 @@
#include <linux/irq.h>
#include <linux/spi/spi.h>
#include <linux/etherdevice.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/slab.h>
#include "p54spi.h"
@@ -29,19 +30,6 @@
MODULE_FIRMWARE("3826.arm");
-/* gpios should be handled in board files and provided via platform data,
- * but because it's currently impossible for p54spi to have a header file
- * in include/linux, let's use module paramaters for now
- */
-
-static int p54spi_gpio_power = 97;
-module_param(p54spi_gpio_power, int, 0444);
-MODULE_PARM_DESC(p54spi_gpio_power, "gpio number for power line");
-
-static int p54spi_gpio_irq = 87;
-module_param(p54spi_gpio_irq, int, 0444);
-MODULE_PARM_DESC(p54spi_gpio_irq, "gpio number for irq line");
-
static void p54spi_spi_read(struct p54s_priv *priv, u8 address,
void *buf, size_t len)
{
@@ -261,14 +249,14 @@ static int p54spi_upload_firmware(struct ieee80211_hw *dev)
static void p54spi_power_off(struct p54s_priv *priv)
{
- disable_irq(gpio_to_irq(p54spi_gpio_irq));
- gpio_set_value(p54spi_gpio_power, 0);
+ disable_irq(priv->irq);
+ gpiod_set_value(priv->gpiodown_power, 1);
}
static void p54spi_power_on(struct p54s_priv *priv)
{
- gpio_set_value(p54spi_gpio_power, 1);
- enable_irq(gpio_to_irq(p54spi_gpio_irq));
+ gpiod_set_value(priv->gpio_powerdown, 0);
+ enable_irq(priv->irq);
/* need to wait a while before device can be accessed, the length
* is just a guess
@@ -607,32 +595,20 @@ static int p54spi_probe(struct spi_device *spi)
goto err_free;
}
- ret = gpio_request(p54spi_gpio_power, "p54spi power");
- if (ret < 0) {
- dev_err(&priv->spi->dev, "power GPIO request failed: %d", ret);
+ priv->gpio_powerdown = gpiod_get(&spi->dev, "powerdown", GPIOD_OUT_HIGH);
+ if (IS_ERR(priv->gpio_powerdown)) {
+ ret = PTR_ERR(priv->gpio_powerdown);
+ dev_err(&priv->spi->dev, "powerdown GPIO request failed: %d", ret);
goto err_free;
}
- ret = gpio_request(p54spi_gpio_irq, "p54spi irq");
- if (ret < 0) {
- dev_err(&priv->spi->dev, "irq GPIO request failed: %d", ret);
- goto err_free_gpio_power;
- }
-
- gpio_direction_output(p54spi_gpio_power, 0);
- gpio_direction_input(p54spi_gpio_irq);
-
- ret = request_irq(gpio_to_irq(p54spi_gpio_irq),
- p54spi_interrupt, 0, "p54spi",
- priv->spi);
+ ret = request_irq(spi->irq, p54spi_interrupt, 0, "p54spi", priv->spi);
if (ret < 0) {
dev_err(&priv->spi->dev, "request_irq() failed");
- goto err_free_gpio_irq;
+ goto err_free_gpio_power;
}
- irq_set_irq_type(gpio_to_irq(p54spi_gpio_irq), IRQ_TYPE_EDGE_RISING);
-
- disable_irq(gpio_to_irq(p54spi_gpio_irq));
+ disable_irq(priv->irq);
INIT_WORK(&priv->work, p54spi_work);
init_completion(&priv->fw_comp);
@@ -660,11 +636,9 @@ static int p54spi_probe(struct spi_device *spi)
err_free_common:
release_firmware(priv->firmware);
- free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
-err_free_gpio_irq:
- gpio_free(p54spi_gpio_irq);
+ free_irq(priv->irq, spi);
err_free_gpio_power:
- gpio_free(p54spi_gpio_power);
+ gpiod_put(priv->gpio_powerdown);
err_free:
p54_free_common(priv->hw);
return ret;
@@ -676,10 +650,8 @@ static void p54spi_remove(struct spi_device *spi)
p54_unregister_common(priv->hw);
- free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
-
- gpio_free(p54spi_gpio_power);
- gpio_free(p54spi_gpio_irq);
+ free_irq(priv->irq, spi);
+ gpiod_put(priv->gpio_powerdown);
release_firmware(priv->firmware);
mutex_destroy(&priv->mutex);
@@ -687,10 +659,19 @@ static void p54spi_remove(struct spi_device *spi)
p54_free_common(priv->hw);
}
+struct of_device_id p54spi_of_ids[] = {
+ { .compatible = "cnxt,3110x", },
+ { .compatible = "isil,p54spi", },
+ { .compatible = "st,stlc4550", },
+ { .compatible = "st,stlc4560", },
+ { },
+};
+MODULE_DEVICE_TABLE(of, p54spi_of_ids);
static struct spi_driver p54spi_driver = {
.driver = {
.name = "p54spi",
+ .of_match_table = p54spi_of_ids,
},
.probe = p54spi_probe,
diff --git a/drivers/net/wireless/intersil/p54/p54spi.h b/drivers/net/wireless/intersil/p54/p54spi.h
index e5619a13fd61..118785cc635a 100644
--- a/drivers/net/wireless/intersil/p54/p54spi.h
+++ b/drivers/net/wireless/intersil/p54/p54spi.h
@@ -107,6 +107,9 @@ struct p54s_priv {
enum fw_state fw_state;
const struct firmware *firmware;
+
+ struct gpio_desc *gpio_powerdown;
+ int irq;
};
#endif /* P54SPI_H */
--
2.39.2
_______________________________________________
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] 8+ messages in thread* Re: [PATCH v2 0/3] p54spi devicetree conversion
2023-04-04 8:23 [PATCH v2 0/3] p54spi devicetree conversion Arnd Bergmann
` (2 preceding siblings ...)
2023-04-04 8:24 ` [PATCH v2 3/3] p54spi: convert to devicetree Arnd Bergmann
@ 2023-04-04 11:06 ` Arnd Bergmann
3 siblings, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2023-04-04 11:06 UTC (permalink / raw)
To: Arnd Bergmann, Tony Lindgren
Cc: soc, Aaro Koskinen, Bartosz Golaszewski, Benoît Cousson,
Christian Lamparter, David S . Miller, Dmitry Torokhov,
Eric Dumazet, Felipe Balbi, Jakub Kicinski, Johannes Berg,
Krzysztof Kozlowski, Linus Walleij, Paolo Abeni, Rob Herring,
linux-wireless, Netdev, devicetree, linux-kernel,
linux-arm-kernel, open list:GPIO SUBSYSTEM, Linux-OMAP
On Tue, Apr 4, 2023, at 10:23, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> I now revisited the earlier submission, hopefully addressing
> all of the feedback correctly. This is still untested, but if
> everyone is happy, it could still make it into v6.4.
>
> Patch 3 touches both driver and platform parts, and can't
> easily be split up without breaking bisectability, so I think
> it's easiest to merge it through the soc tree, with Christian's
> Ack.
>
> Tony, I see you already sent a set of pull requests, let me know
> if you want to pick up these patches for a future round (6.4
> or 6.5), or if I should just apply them on top.
I just spotted two mistakes myself, so there will have to be a v3:
Patch 1 is missing a changelog text, and patch 3 contains a typo
that only now triggered in my randconfig builds.
Arnd
_______________________________________________
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] 8+ messages in thread