wifi: ath9k: add ahb OF support
Subsystems (4)
v3 cover wifi: ath9k: add ahb OF support
First two commits are small cleanups to make the changes of the third simpler. The fourth actually adds dts definitions to use ahb.
v2: Add documentation, use kernel_ulong_t, and of_device_get_match_data
v3: Use qcom prefix and wifi suffix as in other ath drivers.
Rosen Penev (5):
wifi: ath9k: ahb: reorder declarations
wifi: ath9k: ahb: reorder includes
wifi: ath9k: ahb: replace id_table with of
dt-bindings: net: wireless: ath9k: add OF bindings
mips: dts: qca: add wmac support
.../bindings/net/wireless/qca,ath9k.yaml | 23 ++++++- arch/mips/boot/dts/qca/ar9132.dtsi | 9 +++ .../boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ++ arch/mips/boot/dts/qca/ar9331.dtsi | 9 +++ arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 4 ++ .../mips/boot/dts/qca/ar9331_dragino_ms14.dts | 4 ++ arch/mips/boot/dts/qca/ar9331_omega.dts | 4 ++ .../qca/ar9331_openembed_som9331_board.dts | 4 ++ arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 4 ++ drivers/net/wireless/ath/ath9k/ahb.c | 60 +++++++------------ 10 files changed, 84 insertions(+), 41 deletions(-)
Signature · 1 line
2.49.0
PATCH v3 1/5 wifi: ath9k: ahb: reorder declarations
Easier to look at. Follows netdev style.
Also remove ret assignment. Because of all of these devm conversions, ret = 0 is a path that never gets hit. The first time it does it when request_irq fails, but that ends up reassigning it.
--- drivers/net/wireless/ath/ath9k/ahb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +5 -5
@@ -71,14 +71,14 @@ static const struct ath_bus_ops ath_ahb_bus_ops = {static int ath_ahb_probe (struct platform_device *pdev) { -void __iomem *mem; -struct ath_softc *sc; -struct ieee80211_hw *hw;const struct platform_device_id *id =platform_get_device_id (pdev); -int irq; -int ret =0 ; +struct ieee80211_hw *hw; +struct ath_softc *sc;struct ath_hw *ah; +void __iomem *mem;char hw_name[64 ]; +int irq; +int ret;if (!dev_get_platdata (&pdev->dev)) {dev_err (&pdev->dev,"no platform data specified\n" );
Signature · 1 line
2.49.0
PATCH v3 2/5 wifi: ath9k: ahb: reorder includes
In reply to Rosen PenevAlphabetic includes are easier to look at and to make further changes to them.
--- drivers/net/wireless/ath/ath9k/ahb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +3 -2
@@ -16,10 +16,11 @@* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <linux/mod_devicetable.h> +#include <linux/module.h> #include <linux/nl80211.h> #include <linux/platform_device.h> -#include <linux/module.h> -#include <linux/mod_devicetable.h> +#include "ath9k.h" static const struct platform_device_id ath9k_platform_id_table[] = {
Signature · 1 line
2.49.0
PATCH v3 3/5 dt-bindings: net: wireless: ath9k: add WIFI bindings
In reply to Rosen PenevThese are for the wireless chips that come built in with various Atheros/QCA SoCs. dts wise, the difference between pcie and the wmac is
AHB > PCIE > WIFI
AHB > WIFI
These will be used to replace the platform_device code with OF in the following patch.
--- .../bindings/net/wireless/qca,ath9k.yaml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +19 -1
@@ -12,7 +12,7 @@ maintainers: description: | This node provides properties for configuring the ath9k wireless device. The node is expected to be specified as a child node of the PCI controller - to which the wireless chip is connected. + or AHB bus to which the wireless chip is connected. allOf: - $ref: ieee80211.yaml#
@@ -35,6 +35,12 @@ properties: - pci168c,0034 # AR9462 - pci168c,0036 # AR9565 - pci168c,0037 # AR1111 and AR9485 + - qcom,ar9130-wifi + - qcom,ar9330-wifi + - qcom,ar9340-wifi + - qcom,qca9530-wifi + - qcom,qca9550-wifi + - qcom,qca9560-wifi reg: maxItems: 1
@@ -88,3 +94,15 @@ examples: nvmem-cell-names = "mac-address", "calibration"; }; }; + - | + ahb { + compatible = "simple-bus"; + ranges; + + wifi@180c0000 { + compatible = "qca,ar9130-wifi"; + reg = <0x180c0000 0x230000>; + + interrupts = <2>; + }; + };
Signature · 1 line
2.49.0
Re: [PATCHv3 3/5] dt-bindings: net: wireless: ath9k: add WIFI bindings
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml examples: · line 100
Quoted 10 lines · Rosen Penev
reg:
maxItems: 1Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +4
-0@@ -88,3 +94,15 @@ examples: nvmem-cell-names = "mac-address", "calibration"; }; }; + - | + ahb { + compatible = "simple-bus"; + ranges;
Not much improved... Code is now actually wrong. Remember to notice where the comments appear. We are using here mailing list style of communication.
In any case: 1 patchset per 24h.
Best regards,
Krzysztof
Re: [PATCHv3 3/5] dt-bindings: net: wireless: ath9k: add WIFI bindings
Quoted 16 lines · Krzysztof Kozlowski
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml examples: · line 100
Quoted 10 lines · Rosen Penev
reg:
maxItems: 1Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +4
-0@@ -88,3 +94,15 @@ examples: nvmem-cell-names = "mac-address", "calibration"; }; }; + - | + ahb { + compatible = "simple-bus"; + ranges;Not much improved... Code is now actually wrong. Remember to notice where the comments appear. We are using here mailing list style of communication.
Will fix. I ran make dt_binding_check just to make sure. The example's compatible is also wrong. Will fix as well.
Quoted 2 lines
In any case: 1 patchset per 24h.
Ah right. Apologies.
Quoted 5 lines
Best regards,
Krzysztof
Rob Herring (Arm)
maintainerRe: [PATCHv3 3/5] dt-bindings: net: wireless: ath9k: add WIFI bindings
In reply to Rosen PenevQuoted 6 lines · Rosen Penev
These are for the wireless chips that come built in with various Atheros/QCA SoCs. dts wise, the difference between pcie and the wmac is
AHB > PCIE > WIFI
AHB > WIFI
Quoted 8 lines
These will be used to replace the
platform_devicecode with OF in the following patch.Signed-off-by Rosen Penev <[email protected]>--- .../bindings/net/wireless/qca,ath9k.yaml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dts:90.13-41: Warning (reg_format): /example-2/ahb/wifi@180c0000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1) Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dts:86.11-18: Warning (ranges_format): /example-2/ahb:ranges: empty "ranges" property but its #address-cells (2) differs from /example-2 (1) Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: Warning (pci_device_reg): Failed prerequisite 'reg_format' Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: Warning (pci_device_bus_num): Failed prerequisite 'reg_format' Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: Warning (simple_bus_reg): Failed prerequisite 'reg_format' Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: Warning (i2c_bus_reg): Failed prerequisite 'reg_format' Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: Warning (spi_bus_reg): Failed prerequisite 'reg_format' Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dts:88.25-93.13: Warning (avoid_default_addr_size): /example-2/ahb/wifi@180c0000: Relying on default #address-cells value Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dts:88.25-93.13: Warning (avoid_default_addr_size): /example-2/ahb/wifi@180c0000: Relying on default #size-cells value Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: Warning (unique_unit_address_if_enabled): Failed prerequisite 'avoid_default_addr_size' /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: ahb (simple-bus): '#address-cells' is a required property
from schema $id: http://devicetree.org/schemas/simple-bus.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: ahb (simple-bus): '#size-cells' is a required property
from schema $id: http://devicetree.org/schemas/simple-bus.yaml#Documentation/devicetree/bindings/net/wireless/qca,ath9k.example.dtb: /example-2/ahb/wifi@180c0000: failed to match any schema with compatible: ['qca,ar9130-wifi']
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
PATCH v3 4/5 wifi: ath9k: ahb: replace id_table with of
In reply to Rosen PenevSince 2b0996c7646 , all of this platform code became no-op with no OF replacement. Not only that, there are no users of AHB here. Add an OF match table that mostly mirrors the original platform device id table. Use a qca prefix as is done for the only other property: qca,no-eeprom. Also used qca prefix for ar9530 as the latter seems to be a mistake.
Use qcom, prefix as done with the other ath wireless drivers.
--- drivers/net/wireless/ath/ath9k/ahb.c | 47 ++++++++-------------------- 1 file changed, 13 insertions(+), 34 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +13 -34
@@ -19,35 +19,18 @@#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/nl80211.h> +#include <linux/of.h> #include <linux/platform_device.h> #include "ath9k.h" -static const struct platform_device_id ath9k_platform_id_table[] = { - { - .name ="ath9k" , - .driver_data =AR5416_AR9100_DEVID , - }, - { - .name ="ar933x_wmac" , - .driver_data =AR9300_DEVID_AR9330 , - }, - { - .name ="ar934x_wmac" , - .driver_data =AR9300_DEVID_AR9340 , - }, - { - .name ="qca955x_wmac" , - .driver_data =AR9300_DEVID_QCA955X , - }, - { - .name ="qca953x_wmac" , - .driver_data =AR9300_DEVID_AR953X , - }, - { - .name ="qca956x_wmac" , - .driver_data =AR9300_DEVID_QCA956X , - }, +static const struct of_device_id ath9k_of_match_table[] = { + { .compatible ="qcom,ar9130-wifi" , .data = (void *)AR5416_AR9100_DEVID }, + { .compatible ="qcom,ar9330-wifi" , .data = (void *)AR9300_DEVID_AR9330 }, + { .compatible ="qcom,ar9340-wifi" , .data = (void *)AR9300_DEVID_AR9340 }, + { .compatible ="qcom,qca9530-wifi" , .data = (void *)AR9300_DEVID_AR953X }, + { .compatible ="qcom,qca9550-wifi" , .data = (void *)AR9300_DEVID_QCA955X }, + { .compatible ="qcom,qca9560-wifi" , .data = (void *)AR9300_DEVID_QCA956X }, {}, };
@@ -72,20 +55,15 @@ static const struct ath_bus_ops ath_ahb_bus_ops = {static int ath_ahb_probe (struct platform_device *pdev) { -const struct platform_device_id *id =platform_get_device_id (pdev);struct ieee80211_hw *hw;struct ath_softc *sc;struct ath_hw *ah;void __iomem *mem;char hw_name[64 ]; +u16 dev_id;int irq;int ret; -if (!dev_get_platdata (&pdev->dev)) { -dev_err (&pdev->dev,"no platform data specified\n" ); -return -EINVAL ; - } - mem =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (mem)) {dev_err (&pdev->dev,"ioremap failed\n" );
@@ -118,7 +96,8 @@ static int ath_ahb_probe(struct platform_device *pdev) goto err_free_hw; } - ret =ath9k_init_device (id->driver_data, sc, &ath_ahb_bus_ops); + dev_id = (u16 )(kernel_ulong_t )of_device_get_match_data (&pdev->dev); + ret =ath9k_init_device (dev_id, sc, &ath_ahb_bus_ops);if (ret) {dev_err (&pdev->dev,"failed to initialize device\n" ); goto err_irq;
@@ -156,11 +135,11 @@ static struct platform_driver ath_ahb_driver = { .remove = ath_ahb_remove, .driver = { .name = "ath9k", + .of_match_table = ath9k_of_match_table, }, - .id_table = ath9k_platform_id_table, }; -MODULE_DEVICE_TABLE (platform, ath9k_platform_id_table); +MODULE_DEVICE_TABLE (of, ath9k_of_match_table);int ath_ahb_init (void ) {
Signature · 1 line
2.49.0
PATCH v3 5/5 mips: dts: qca: add wmac support
In reply to Rosen PenevNow that OF ahb support was added to the ath9k driver, we can use it to enable and use the SoC wireless found in these chipsets.
--- arch/mips/boot/dts/qca/ar9132.dtsi | 9 +++++++++ arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331.dtsi | 9 +++++++++ arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_omega.dts | 4 ++++ .../mips/boot/dts/qca/ar9331_openembed_som9331_board.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 4 ++++ 8 files changed, 42 insertions(+)
arch/mips/boot/dts/qca/ar9132.dtsi +9 -0
@@ -155,6 +155,15 @@ spi: spi@1f000000 { #address-cells = <1>; #size-cells = <0>; }; + + wifi: wifi@180c0000 { + compatible = "qcom,ar9130-wifi"; + reg = <0x180c0000 0x230000>; + + interrupts = <2>; + + status = "disabled"; + }; }; usb_phy: usb-phy {
arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts +4 -0
@@ -108,3 +108,7 @@ partition@2 { }; }; }; + +&wifi { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331.dtsi +9 -0
@@ -285,6 +285,15 @@ spi: spi@1f000000 { status = "disabled"; }; + + wifi: wifi@18100000 { + compatible = "qcom,ar9330-wifi"; + reg = <0x18100000 0x20000>; + + interrupts = <2>; + + status = "disabled"; + }; }; usb_phy: usb-phy {
arch/mips/boot/dts/qca/ar9331_dpt_module.dts +4 -0
@@ -97,3 +97,7 @@ &phy_port0 { &phy_port4 { status = "okay"; }; + +&wifi { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts +4 -0
@@ -98,3 +98,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wifi { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_omega.dts +4 -0
@@ -74,3 +74,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wifi { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts +4 -0
@@ -106,3 +106,7 @@ &phy_port2 { &phy_port4 { status = "okay"; }; + +&wifi { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts +4 -0
@@ -114,3 +114,7 @@ spiflash: s25sl032p@0 { reg = <0>; }; }; + +&wifi { + status = "okay"; +};
Signature · 1 line
2.49.0