wifi: rt2x00: add OF bindings + cleanup
Subsystems (5)
v6 cover wifi: rt2x00: add OF bindings + cleanup
It doesn't even compile. Added OF bindings, documentation, and other stuff to hopefully this doesn't happen again.
v2: move all of 2x00soc to 2800soc. I didn't realize only two functions remained for no good reason.
Fixed typos.
Slightly changed probe for clarity.
v3: fix wrong compatible in Documentation.
v4: renamed documentation file as there's only a single compatible.
v5: made clocks and interrupts required in the documentation.
v6: add missing Reviewed-by tag.
Rosen Penev (7):
wifi: rt2x00: add COMPILE_TEST
wifi: rt2x00: remove mod_name from platform_driver
wifi: rt2800soc: allow loading from OF
wifi: rt2800: move 2x00soc to 2800soc
wifi: rt2x00: soc: modernize probe
MIPS: dts: ralink: mt7620a: add wifi
dt-bindings: net: wireless: rt2800: add
.../bindings/net/wireless/ralink,rt2800.yaml | 47 ++++++ arch/mips/boot/dts/ralink/mt7620a.dtsi | 10 ++ drivers/net/wireless/ralink/rt2x00/Kconfig | 7 +- drivers/net/wireless/ralink/rt2x00/Makefile | 1 - .../net/wireless/ralink/rt2x00/rt2800soc.c | 102 +++++++++++- .../net/wireless/ralink/rt2x00/rt2x00soc.c | 151 ------------------ .../net/wireless/ralink/rt2x00/rt2x00soc.h | 29 ---- 7 files changed, 156 insertions(+), 191 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/wireless/ralink,rt2800.yaml delete mode 100644 drivers/net/wireless/ralink/rt2x00/rt2x00soc.c delete mode 100644 drivers/net/wireless/ralink/rt2x00/rt2x00soc.h
Signature · 1 line
2.50.0
PATCH v6 1/7 wifi: rt2x00: add COMPILE_TEST
While this driver is for a specific arch, there is nothing preventing it from being compiled on other platforms.
Allows the various bots to test compilation and complain if a patch is bad.
--- drivers/net/wireless/ralink/rt2x00/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/Kconfig +1 -1
@@ -202,7 +202,7 @@ endif config RT2800SOC tristate "Ralink WiSoC support" - depends on SOC_RT288X || SOC_RT305X || SOC_MT7620 + depends on SOC_RT288X || SOC_RT305X || SOC_MT7620 || COMPILE_TEST select RT2X00_LIB_SOC select RT2X00_LIB_MMIO select RT2X00_LIB_CRYPTO
Signature · 1 line
2.50.1
PATCH v6 2/7 wifi: rt2x00: remove mod_name from platform_driver
In reply to Rosen Penevmod_name is a legacy debugging feature with no real modern use. An analysis of the underlying MIPS setup code reveals it to also be unused.
--- drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/rt2800soc.c +0 -1
@@ -246,7 +246,6 @@ static int rt2800soc_probe(struct platform_device *pdev)static struct platform_driver rt2800soc_driver = { .driver = { .name ="rt2800_wmac" , - .mod_name =KBUILD_MODNAME , }, .probe = rt2800soc_probe, .remove = rt2x00soc_remove,
Signature · 1 line
2.50.1
PATCH v6 3/7 wifi: rt2800soc: allow loading from OF
In reply to Rosen PenevAdd a single binding to help the already present dts files load the driver. More are possible but there doesn't seem to be a significant difference between them to justify this.
Use wifi name per dtschema requirements.
Added OF dependency to SOC CONFIG as adding of_match_table without OF being present makes no sense.
--- drivers/net/wireless/ralink/rt2x00/Kconfig | 2 +- drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/Kconfig +1 -1
@@ -202,7 +202,7 @@ endif config RT2800SOC tristate "Ralink WiSoC support" - depends on SOC_RT288X || SOC_RT305X || SOC_MT7620 || COMPILE_TEST + depends on OF && (SOC_RT288X || SOC_RT305X || SOC_MT7620 || COMPILE_TEST) select RT2X00_LIB_SOC select RT2X00_LIB_MMIO select RT2X00_LIB_CRYPTO
drivers/net/wireless/ralink/rt2x00/rt2800soc.c +7 -0
@@ -243,9 +243,16 @@ static int rt2800soc_probe(struct platform_device *pdev)return rt2x00soc_probe (pdev, &rt2800soc_ops); } +static const struct of_device_id rt2880_wmac_match[] = { + { .compatible ="ralink,rt2880-wifi" }, + {}, +}; +MODULE_DEVICE_TABLE (of, rt2880_wmac_match); +static struct platform_driver rt2800soc_driver = { .driver = { .name ="rt2800_wmac" , + .of_match_table = rt2880_wmac_match, }, .probe = rt2800soc_probe, .remove = rt2x00soc_remove,
Signature · 1 line
2.50.1
PATCH v6 4/7 wifi: rt2800: move 2x00soc to 2800soc
In reply to Rosen PenevThis driver was written with multiple SOC platforms in mind. However since Ralink was aquired by Mediatek, it only effectively got used by older platforms. As such, we can slim down the driver slightly by moving all of rt2x00soc to rt2800soc in order to benefit from inlining.
--- drivers/net/wireless/ralink/rt2x00/Kconfig | 5 - drivers/net/wireless/ralink/rt2x00/Makefile | 1 - .../net/wireless/ralink/rt2x00/rt2800soc.c | 119 +++++++++++++- .../net/wireless/ralink/rt2x00/rt2x00soc.c | 151 ------------------ .../net/wireless/ralink/rt2x00/rt2x00soc.h | 29 ---- 5 files changed, 118 insertions(+), 187 deletions(-) delete mode 100644 drivers/net/wireless/ralink/rt2x00/rt2x00soc.c delete mode 100644 drivers/net/wireless/ralink/rt2x00/rt2x00soc.h
drivers/net/wireless/ralink/rt2x00/Kconfig +0 -5
@@ -203,7 +203,6 @@ endif config RT2800SOC tristate "Ralink WiSoC support" depends on OF && (SOC_RT288X || SOC_RT305X || SOC_MT7620 || COMPILE_TEST) - select RT2X00_LIB_SOC select RT2X00_LIB_MMIO select RT2X00_LIB_CRYPTO select RT2X00_LIB_FIRMWARE
@@ -231,10 +230,6 @@ config RT2X00_LIB_PCI tristate select RT2X00_LIB -config RT2X00_LIB_SOC - tristate - select RT2X00_LIB - config RT2X00_LIB_USB tristate select RT2X00_LIB
drivers/net/wireless/ralink/rt2x00/Makefile +0 -1
@@ -12,7 +12,6 @@ rt2x00lib-$(CONFIG_RT2X00_LIB_LEDS) += rt2x00leds.o obj-$(CONFIG_RT2X00_LIB) += rt2x00lib.o obj-$(CONFIG_RT2X00_LIB_MMIO) += rt2x00mmio.o obj-$(CONFIG_RT2X00_LIB_PCI) += rt2x00pci.o -obj-$(CONFIG_RT2X00_LIB_SOC) += rt2x00soc.o obj-$(CONFIG_RT2X00_LIB_USB) += rt2x00usb.o obj-$(CONFIG_RT2800_LIB) += rt2800lib.o obj-$(CONFIG_RT2800_LIB_MMIO) += rt2800mmio.o
drivers/net/wireless/ralink/rt2x00/rt2800soc.c +118 -1
131 lines not on this page · raw message
drivers/net/wireless/ralink/rt2x00/rt2x00soc.c deleted +0 -151
151 lines not on this page · raw message
drivers/net/wireless/ralink/rt2x00/rt2x00soc.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* -Copyright (C) 2004 - 2009 Ivo van Doorn <[email protected]> -<http://rt2x00.serialmonkey.com> - -*/ - -/* -Module: rt2x00soc -Abstract: Data structures for the rt2x00soc module. -*/ - -#ifndef RT2X00SOC_H -#define RT2X00SOC_H - -/* -* SoC driver handlers. -*/ -int rt2x00soc_probe (struct platform_device *pdev,const struct rt2x00_ops *ops); -void rt2x00soc_remove (struct platform_device *pdev); -#ifdef CONFIG_PM -int rt2x00soc_suspend (struct platform_device *pdev,pm_message_t state); -int rt2x00soc_resume (struct platform_device *pdev); -#else -#define rt2x00soc_suspend NULL -#define rt2x00soc_resume NULL -#endif /* CONFIG_PM */ - -#endif /* RT2X00SOC_H */
Signature · 1 line
2.50.1
PATCH v6 5/7 wifi: rt2x00: soc: modernize probe
In reply to Rosen PenevRemove a bunch of static memory management functions and simplify with devm.
Also move allocation before ieee80211_alloc_hw to get rid of goto statements and clarify the error handling a bit more.
--- .../net/wireless/ralink/rt2x00/rt2800soc.c | 187 ++++++++---------- 1 file changed, 82 insertions(+), 105 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2800soc.c +82 -105
@@ -18,6 +18,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include "rt2x00.h"
@@ -130,108 +131,8 @@ static int rt2800soc_write_firmware(struct rt2x00_dev *rt2x00dev,return 0 ; } -static void rt2x00soc_free_reg (struct rt2x00_dev *rt2x00dev) -{ -kfree (rt2x00dev->rf); - rt2x00dev->rf =NULL ; - -kfree (rt2x00dev->eeprom); - rt2x00dev->eeprom =NULL ; - -iounmap (rt2x00dev->csr.base); -} - -static int rt2x00soc_alloc_reg (struct rt2x00_dev *rt2x00dev) -{ -struct platform_device *pdev =to_platform_device (rt2x00dev->dev); -struct resource *res; - - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -ENODEV ; - - rt2x00dev->csr.base =ioremap (res->start,resource_size (res)); -if (!rt2x00dev->csr.base) -return -ENOMEM ; - - rt2x00dev->eeprom =kzalloc (rt2x00dev->ops->eeprom_size,GFP_KERNEL ); -if (!rt2x00dev->eeprom) - goto exit; - - rt2x00dev->rf =kzalloc (rt2x00dev->ops->rf_size,GFP_KERNEL ); -if (!rt2x00dev->rf) - goto exit; - -return 0 ; - -exit: -rt2x00_probe_err ("Failed to allocate registers\n" ); -rt2x00soc_free_reg (rt2x00dev); - -return -ENOMEM ; -} - -static int rt2x00soc_probe (struct platform_device *pdev,const struct rt2x00_ops *ops) -{ -struct ieee80211_hw *hw; -struct rt2x00_dev *rt2x00dev; -int retval; - - hw =ieee80211_alloc_hw (sizeof (struct rt2x00_dev ), ops->hw); -if (!hw) { -rt2x00_probe_err ("Failed to allocate hardware\n" ); -return -ENOMEM ; - } - -platform_set_drvdata (pdev, hw); - - rt2x00dev = hw->priv; - rt2x00dev->dev = &pdev->dev; - rt2x00dev->ops = ops; - rt2x00dev->hw = hw; - rt2x00dev->irq =platform_get_irq (pdev,0 ); - rt2x00dev->name = pdev->dev.driver->name; - - rt2x00dev->clk =clk_get (&pdev->dev,NULL ); -if (IS_ERR (rt2x00dev->clk)) - rt2x00dev->clk =NULL ; - -rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_SOC ); - - retval =rt2x00soc_alloc_reg (rt2x00dev); -if (retval) - goto exit_free_device; - - retval =rt2x00lib_probe_dev (rt2x00dev); -if (retval) - goto exit_free_reg; - -return 0 ; - -exit_free_reg: -rt2x00soc_free_reg (rt2x00dev); - -exit_free_device: -ieee80211_free_hw (hw); - -return retval; -} - -static void rt2x00soc_remove (struct platform_device *pdev) -{ -struct ieee80211_hw *hw =platform_get_drvdata (pdev); -struct rt2x00_dev *rt2x00dev = hw->priv; - -/* -* Free all allocated data. -*/ -rt2x00lib_remove_dev (rt2x00dev); -rt2x00soc_free_reg (rt2x00dev); -ieee80211_free_hw (hw); -} -#ifdef CONFIG_PM -static int rt2x00soc_suspend (struct platform_device *pdev,pm_message_t state) +static int rt2800soc_suspend (struct platform_device *pdev,pm_message_t state) {struct ieee80211_hw *hw =platform_get_drvdata (pdev);struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -239,7 +140,7 @@ static int rt2x00soc_suspend(struct platform_device *pdev, pm_message_t state)return rt2x00lib_suspend (rt2x00dev); } -static int rt2x00soc_resume (struct platform_device *pdev) +static int rt2800soc_resume (struct platform_device *pdev) {struct ieee80211_hw *hw =platform_get_drvdata (pdev);struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -355,11 +256,85 @@ static const struct rt2x00_ops rt2800soc_ops = {#endif /* CONFIG_RT2X00_LIB_DEBUGFS */ }; +static int rt2x00soc_probe (struct platform_device *pdev,const struct rt2x00_ops *ops) +{ +struct rt2x00_dev *rt2x00dev; +struct ieee80211_hw *hw; +void __iomem *mem; +struct clk *clk; +__le16 *eeprom; +int retval; +u32 *rf; +int irq; + + mem =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (mem)) +return PTR_ERR (mem); + + irq =platform_get_irq (pdev,0 ); +if (irq <0 ) +return irq; + + clk =devm_clk_get_optional (&pdev->dev,NULL ); +if (IS_ERR (clk)) +return PTR_ERR (clk); + + eeprom =devm_kzalloc (&pdev->dev, ops->eeprom_size,GFP_KERNEL ); +if (!eeprom) +return -ENOMEM ; + + rf =devm_kzalloc (&pdev->dev, ops->rf_size,GFP_KERNEL ); +if (!rf) +return -ENOMEM ; + + hw =ieee80211_alloc_hw (sizeof (struct rt2x00_dev ), ops->hw); +if (!hw) +return dev_err_probe (&pdev->dev, -ENOMEM ,"Failed to allocate hardware" ); + +platform_set_drvdata (pdev, hw); + + rt2x00dev = hw->priv; + rt2x00dev->dev = &pdev->dev; + rt2x00dev->ops = ops; + rt2x00dev->hw = hw; + rt2x00dev->irq = irq; + rt2x00dev->clk = clk; + rt2x00dev->eeprom = eeprom; + rt2x00dev->rf = rf; + rt2x00dev->name = pdev->dev.driver->name; + rt2x00dev->csr.base = mem; + +rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_SOC ); + + retval =rt2x00lib_probe_dev (rt2x00dev); +if (retval) + goto exit_free_device; + +return 0 ; + +exit_free_device: +ieee80211_free_hw (hw); + +return retval; +} +static int rt2800soc_probe (struct platform_device *pdev) {return rt2x00soc_probe (pdev, &rt2800soc_ops); } +static void rt2800soc_remove (struct platform_device *pdev) +{ +struct ieee80211_hw *hw =platform_get_drvdata (pdev); +struct rt2x00_dev *rt2x00dev = hw->priv; + +/* +* Free all allocated data. +*/ +rt2x00lib_remove_dev (rt2x00dev); +ieee80211_free_hw (hw); +} +static const struct of_device_id rt2880_wmac_match[] = { { .compatible ="ralink,rt2880-wifi" }, {},
@@ -372,9 +347,11 @@ static struct platform_driver rt2800soc_driver = { .of_match_table = rt2880_wmac_match, }, .probe = rt2800soc_probe, - .remove = rt2x00soc_remove, - .suspend = rt2x00soc_suspend, - .resume = rt2x00soc_resume, + .remove = rt2800soc_remove, +#ifdef CONFIG_PM + .suspend = rt2800soc_suspend, + .resume = rt2800soc_resume, +#endif };module_platform_driver (rt2800soc_driver);
Signature · 1 line
2.50.1
PATCH v6 6/7 MIPS: dts: ralink: mt7620a: add wifi
In reply to Rosen PenevMT7620A devices all contain a wifi device as part of the SOC. Add it here to get it working.
--- arch/mips/boot/dts/ralink/mt7620a.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/mips/boot/dts/ralink/mt7620a.dtsi +10 -0
@@ -62,4 +62,14 @@ uartlite@c00 { reg-shift = <2>; }; }; + + wmac: wifi@10180000 { + compatible = "ralink,rt2880-wifi"; + reg = <0x10180000 0x40000>; + + clocks = <&sysc 16>; + + interrupt-parent = <&cpuintc>; + interrupts = <6>; + }; };
Signature · 1 line
2.50.1
PATCH v6 7/7 dt-bindings: net: wireless: rt2800: add SOC Wifi
In reply to Rosen PenevAdd device-tree bindings for the RT2800 SOC wifi device found in older Ralink/Mediatek devices.
--- .../bindings/net/wireless/ralink,rt2880.yaml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/wireless/ralink,rt2880.yaml
Documentation/devicetree/bindings/net/wireless/ralink,rt2880.yaml new file +49 -0
@@ -0,0 +1,49 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/wireless/ralink,rt2880.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Ralink RT2880 wireless device + +maintainers: + - Stanislaw Gruszka <[email protected]> + +description: | + This node provides properties for configuring RT2880 SOC wifi devices. + The node is expected to be specified as a root node of the device. + +allOf: + - $ref: ieee80211.yaml# + +properties: + compatible: + enum: + - ralink,rt2880-wifi + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - interrupts + +additionalProperties: false + +examples: + - | + wifi@110180000 { + compatible = "ralink,rt2880-wifi"; + reg = <0x10180000 0x40000>; + clocks = <&sysc 16>; + interrupt-parent = <&cpuintc>; + interrupts = <6>; + };
Signature · 1 line
2.50.1