wifi: ath9k: add ahb OF support
Subsystems (4)
v2 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
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 v2 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 v2 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 v2 3/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.
This will be used to add ath9k support for the various ath79 devices here.
--- 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 ="qca,ar9130-wmac" , .data = (void *)AR5416_AR9100_DEVID }, + { .compatible ="qca,ar9330-wmac" , .data = (void *)AR9300_DEVID_AR9330 }, + { .compatible ="qca,ar9340-wmac" , .data = (void *)AR9300_DEVID_AR9340 }, + { .compatible ="qca,qca9530-wmac" , .data = (void *)AR9300_DEVID_AR953X }, + { .compatible ="qca,qca9550-wmac" , .data = (void *)AR9300_DEVID_QCA955X }, + { .compatible ="qca,qca9560-wmac" , .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 v2 4/5 dt-bindings: net: wireless: ath9k: add OF bindings
In reply to Rosen PenevNow that support was added to the driver, document it.
--- .../bindings/net/wireless/qca,ath9k.yaml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +22 -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 + - qca,ar9130-wmac + - qca,ar9330-wmac + - qca,ar9340-wmac + - qca,qca9530-wmac + - qca,qca9550-wmac + - qca,qca9560-wmac reg: maxItems: 1
@@ -88,3 +94,18 @@ examples: nvmem-cell-names = "mac-address", "calibration"; }; }; + - | + apb { + compatible = "simple-bus"; + ranges; + + #address-cells = <1>; + #size-cells = <1>; + + wifi@180c0000 { + compatible = "qca,ar9130-wmac"; + reg = <0x180c0000 0x230000>; + + interrupts = <2>; + }; + };
Signature · 1 line
2.49.0
PATCH v2 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>; }; + + wmac: wifi@180c0000 { + compatible = "qca,ar9130-wmac"; + 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 { }; }; }; + +&wmac { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331.dtsi +9 -0
@@ -285,6 +285,15 @@ spi: spi@1f000000 { status = "disabled"; }; + + wmac: wifi@18100000 { + compatible = "qca,ar9330-wmac"; + 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"; }; + +&wmac { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts +4 -0
@@ -98,3 +98,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wmac { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_omega.dts +4 -0
@@ -74,3 +74,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wmac { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts +4 -0
@@ -106,3 +106,7 @@ &phy_port2 { &phy_port4 { status = "okay"; }; + +&wmac { + status = "okay"; +};
arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts +4 -0
@@ -114,3 +114,7 @@ spiflash: s25sl032p@0 { reg = <0>; }; }; + +&wmac { + status = "okay"; +};
Signature · 1 line
2.49.0
Re: [PATCHv2 4/5] dt-bindings: net: wireless: ath9k: add OF bindings
In reply to Rosen PenevQuoted 1 line · Rosen Penev
Now that support was added to the driver, document it.
That's not appropriate commit msg. Binding must be before the user (see submitting patches in DT directory). Describe the hardware, what are you adding here.
Subject: OF bindings is redundant. It duplicates dt-bindings. Instead:
"Add Atheros AR9-foo-bar on AHB bus" or something similar
Missing SoB.
Please run scripts/checkpatch.pl on the patches and fix reported warnings. After that, run also 'scripts/checkpatch.pl --strict' on the patches and (probably) fix more warnings. Some warnings can be ignored, especially from --strict run, but the code here looks like it needs a fix. Feel free to get in touch if the warning is not clear.
Quoted 31 lines
--- .../bindings/net/wireless/qca,ath9k.yaml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +7
-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 + - qca,ar9130-wmac + - qca,ar9330-wmac + - qca,ar9340-wmac + - qca,qca9530-wmac + - qca,qca9550-wmac + - qca,qca9560-wmac reg: maxItems: 1
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml examples: · line 101
Quoted 8 lines
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +5
-0@@ -88,3 +94,18 @@ examples: nvmem-cell-names = "mac-address", "calibration"; }; }; + - | + apb { + compatible = "simple-bus"; + ranges; +
Drop these two.
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml examples: · line 103
Quoted 2 lines
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +2
-0+ #address-cells = <1>; + #size-cells = <1>;
Best regards,
Krzysztof
Re: [PATCHv2 4/5] dt-bindings: net: wireless: ath9k: add OF bindings
Quoted 10 lines · Krzysztof Kozlowski
Quoted 1 line · Rosen Penev
Now that support was added to the driver, document it.
That's not appropriate commit msg. Binding must be before the user (see submitting patches in DT directory). Describe the hardware, what are you adding here.
Subject: OF bindings is redundant. It duplicates dt-bindings. Instead:
"Add Atheros AR9-foo-bar on AHB bus" or something similar
At this point I wonder if my approach is wrong. The other ath drivers use a qcom, prefix and a -wifi suffix. Might make sense to do the same here to avoid typing qca twice.
Quoted 58 lines
Missing SoB.
Please run
scripts/checkpatch.plon the patches and fix reported warnings. After that, run also 'scripts/checkpatch.pl--strict' on the patches and (probably) fix more warnings. Some warnings can be ignored, especially from --strict run, but the code here looks like it needs a fix. Feel free to get in touch if the warning is not clear.Quoted 31 lines
--- .../bindings/net/wireless/qca,ath9k.yaml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +7
-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 + - qca,ar9130-wmac + - qca,ar9330-wmac + - qca,ar9340-wmac + - qca,qca9530-wmac + - qca,qca9550-wmac + - qca,qca9560-wmac reg: maxItems: 1Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml examples: · line 101
Quoted 8 lines
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +5
-0@@ -88,3 +94,18 @@ examples: nvmem-cell-names = "mac-address", "calibration"; }; }; + - | + apb { + compatible = "simple-bus"; + ranges; +Drop these two.
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml examples: · line 103
Quoted 2 lines
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +2
-0+ #address-cells = <1>; + #size-cells = <1>;Best regards,
Krzysztof
Re: [PATCHv2 4/5] dt-bindings: net: wireless: ath9k: add OF bindings
Quoted 9 lines · Rosen Penev
Quoted 8 lines · Krzysztof Kozlowski
Quoted 1 line · Rosen Penev
Now that support was added to the driver, document it.
That's not appropriate commit msg. Binding must be before the user (see submitting patches in DT directory). Describe the hardware, what are you adding here.
Quoted 5 lines
Quoted 2 lines
Subject: OF bindings is redundant. It duplicates dt-bindings. Instead:
"Add Atheros AR9-foo-bar on AHB bus" or something similarAt this point I wonder if my approach is wrong. The other ath drivers use a qcom, prefix and a -wifi suffix. Might make sense to do the same here to avoid typing qca twice.
Yes, probably this should be qcom.
Best regards,
Krzysztof