From 991c8cabed6538455a7562c2aef1143b171ccff8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 1 Dec 2023 13:11:39 -0800 Subject: [PATCH] ath79: fix pci_device_reg errors Found by dtc. Wrong numbers and wrong ordering. Signed-off-by: Rosen Penev --- target/linux/ath79/dts/ar7161_aruba_ap-105.dts | 4 ++-- target/linux/ath79/dts/ar7161_aruba_ap-175.dts | 4 ++-- target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi | 4 ++-- target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts | 4 ++-- target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts | 4 ++-- target/linux/ath79/dts/ar7161_meraki_mr16.dts | 4 ++-- target/linux/ath79/dts/ar7161_netgear_wndap360.dts | 4 ++-- target/linux/ath79/dts/ar7161_netgear_wndr.dtsi | 4 ++-- target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi | 4 ++-- target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts | 4 ++-- target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts | 2 +- target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts | 2 +- target/linux/ath79/dts/ar7242_meraki_mr12.dts | 2 +- target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts | 2 +- target/linux/ath79/dts/ar9344_engenius_eap600.dts | 2 +- target/linux/ath79/dts/ar9344_engenius_ecb600.dts | 2 +- target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi | 2 +- target/linux/ath79/dts/ar9344_netgear_r6100.dts | 2 +- target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi | 2 +- target/linux/ath79/dts/ar9344_watchguard_ap100.dts | 2 +- target/linux/ath79/dts/ar9344_watchguard_ap200.dts | 2 +- target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts | 1 - .../linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts | 2 +- target/linux/ath79/dts/qca9558_engenius_esr900.dts | 2 +- target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi | 2 +- target/linux/ath79/dts/qca955x_senao_loader.dtsi | 6 +++--- target/linux/ath79/dts/qca955x_senao_router-dual.dtsi | 2 +- 27 files changed, 38 insertions(+), 39 deletions(-) diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts index c8510a89441..dd110fc1859 100644 --- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts +++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts @@ -94,7 +94,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { /* 2.4 GHz */ + ath9k0: wifi@11,0 { /* 2.4 GHz */ compatible = "pci168c,0029"; nvmem-cells = <&macaddr_hwinfo_1c 1>; nvmem-cell-names = "mac-address"; @@ -103,7 +103,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { /* 5 GHz */ + ath9k1: wifi@12,0 { /* 5 GHz */ compatible = "pci168c,0029"; nvmem-cells = <&macaddr_hwinfo_1c 2>; nvmem-cell-names = "mac-address"; diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts index 96a76a3cfc6..62a2083d20c 100644 --- a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts +++ b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts @@ -120,7 +120,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { + ath9k0: wifi@11,0 { compatible = "pci168c,0029"; nvmem-cells = <&macaddr_hwinfo_1c 1>; nvmem-cell-names = "mac-address"; @@ -129,7 +129,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { + ath9k1: wifi@12,0 { compatible = "pci168c,0029"; nvmem-cells = <&macaddr_hwinfo_1c 2>; nvmem-cell-names = "mac-address"; diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi index e3f48fee852..50c0748a384 100644 --- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi +++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi @@ -196,7 +196,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { + ath9k0: wifi@11,0 { compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; qca,no-eeprom; @@ -204,7 +204,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { + ath9k1: wifi@12,0 { compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; qca,no-eeprom; diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts index b62111c110e..639736d9c45 100644 --- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts +++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts @@ -136,7 +136,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { + ath9k0: wifi@11,0 { compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; nvmem-cells = <&macaddr_lan 0>, <&cal_art_1000>; @@ -145,7 +145,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { + ath9k1: wifi@12,0 { compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>; diff --git a/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts b/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts index ddcf68970d3..e0aa5704cdd 100644 --- a/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts +++ b/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts @@ -95,7 +95,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { /* 2.4 GHz */ + ath9k0: wifi@11,0 { /* 2.4 GHz */ compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; ieee80211-freq-limit = <2402000 2482000>; @@ -105,7 +105,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { /* 5 GHz */ + ath9k1: wifi@12,0 { /* 5 GHz */ compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; ieee80211-freq-limit = <2402000 2482000 4900000 5990000>; diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts index 6b8574e880f..b732010446f 100644 --- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts +++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts @@ -70,7 +70,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { /* 2.4 GHz */ + ath9k0: wifi@11,0 { /* 2.4 GHz */ compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; qca,no-eeprom; @@ -80,7 +80,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { /* 5 GHz */ + ath9k1: wifi@12,0 { /* 5 GHz */ compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; qca,no-eeprom; diff --git a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts index 9761234714c..020b45d9e1d 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts +++ b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts @@ -147,7 +147,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { + ath9k0: wifi@11,0 { compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; nvmem-cells = <&macaddr_art_120c>, <&calibration_art_1000>; @@ -156,7 +156,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { + ath9k1: wifi@12,0 { compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; nvmem-cells = <&macaddr_art_520c 1>, <&calibration_art_5000>; diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi index 296ecc8c4e0..d30b4dad308 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi @@ -126,7 +126,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { + ath9k0: wifi@11,0 { compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; @@ -153,7 +153,7 @@ }; }; - ath9k1: wifi@0,12 { + ath9k1: wifi@12,0 { compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; diff --git a/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi b/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi index 065068571cd..54a15c49c1b 100644 --- a/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi +++ b/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi @@ -131,7 +131,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@0,11 { /* 2.4 GHz */ + ath9k0: wifi@11,0 { /* 2.4 GHz */ compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; nvmem-cells = <&macaddr_bdata_60>; @@ -140,7 +140,7 @@ gpio-controller; }; - ath9k1: wifi@0,12 { /* 5 GHz */ + ath9k1: wifi@12,0 { /* 5 GHz */ compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; nvmem-cells = <&macaddr_bdata_76>; diff --git a/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts b/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts index a770ca04a87..7508be1df1d 100644 --- a/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts +++ b/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts @@ -92,13 +92,13 @@ &pcie0 { status = "okay"; - wifi@0,11 { + wifi@11,0 { compatible = "pci168c,0029"; reg = <0x8800 0 0 0 0>; qca,no-eeprom; }; - wifi@0,12 { + wifi@12,0 { compatible = "pci168c,0029"; reg = <0x9000 0 0 0 0>; qca,no-eeprom; diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts index 8e8deba9337..861964fdfcd 100644 --- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts +++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts @@ -75,7 +75,7 @@ &pcie { status = "okay"; - ath9k: wifi@0,0,0 { + ath9k: wifi@0,0 { compatible = "pci168c,002a"; reg = <0x0 0 0 0 0>; nvmem-cells = <&macaddr_art_0 1>; diff --git a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts index 69629335b3c..a7def14c738 100644 --- a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts +++ b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts @@ -75,7 +75,7 @@ &pcie { status = "okay"; - ath9k: wifi@0,0,0 { + ath9k: wifi@0,0 { compatible = "pci168c,002a"; reg = <0x0 0 0 0 0>; nvmem-cells = <&macaddr_art_0 (-1)>; diff --git a/target/linux/ath79/dts/ar7242_meraki_mr12.dts b/target/linux/ath79/dts/ar7242_meraki_mr12.dts index adea2778eac..5218a5ce276 100644 --- a/target/linux/ath79/dts/ar7242_meraki_mr12.dts +++ b/target/linux/ath79/dts/ar7242_meraki_mr12.dts @@ -70,7 +70,7 @@ &pcie { status = "okay"; - wifi@0,0,0 { + wifi@0,0 { compatible = "pci168c,002a"; reg = <0x0000 0 0 0 0>; qca,no-eeprom; diff --git a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts index a45aa444de4..c2c7cbb960c 100644 --- a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts +++ b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts @@ -84,7 +84,7 @@ &pcie { status = "okay"; - ath9k: wifi@0,0,0 { + ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0 0 0 0 0>; nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_5000>; diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts index 888e3f82ada..4d3a149e3ee 100644 --- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts +++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts @@ -34,7 +34,7 @@ }; &pcie { - wifi@0,0,0 { + wifi@0,0 { nvmem-cells = <&macaddr_art_0 0>, <&calibration_art_5000>; nvmem-cell-names = "mac-address", "calibration"; }; diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts index ac9bbea5d4d..e7b8b9c3ce2 100644 --- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts +++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts @@ -29,7 +29,7 @@ }; &pcie { - wifi@0,0,0 { + wifi@0,0 { nvmem-cells = <&macaddr_art_0 (-2)>, <&calibration_art_5000>; nvmem-cell-names = "mac-address", "calibration"; }; diff --git a/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi b/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi index c8f12a1bfbd..6b1ae8ac93e 100644 --- a/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi +++ b/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi @@ -56,7 +56,7 @@ &pcie { status = "okay"; - ath9k: wifi@0,0,0 { + ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0 0 0 0 0>; }; diff --git a/target/linux/ath79/dts/ar9344_netgear_r6100.dts b/target/linux/ath79/dts/ar9344_netgear_r6100.dts index 419fa51f617..5952e0140fa 100644 --- a/target/linux/ath79/dts/ar9344_netgear_r6100.dts +++ b/target/linux/ath79/dts/ar9344_netgear_r6100.dts @@ -203,7 +203,7 @@ &pcie { status = "okay"; - wifi@0,0,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x0000 0 0 0 0>; diff --git a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi index c0e95065d5a..f1d6ffda7c5 100644 --- a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi +++ b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi @@ -59,7 +59,7 @@ &pcie { status = "okay"; - ath9k: wifi@0,0,0 { + ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0 0 0 0 0>; ieee80211-freq-limit = <2402000 2482000>; diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts index 2fd9a6e51bf..e09d539c564 100644 --- a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts +++ b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts @@ -63,7 +63,7 @@ &pcie { status = "disabled"; - wifi@0,0,0 { + wifi@0,0 { nvmem-cells = <&calibration_art_5000>; nvmem-cell-names = "calibration"; }; diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts index 9cf6819958f..c3d7c50813a 100644 --- a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts +++ b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts @@ -61,7 +61,7 @@ }; &pcie { - wifi@0,0,0 { + wifi@0,0 { nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_5000>; nvmem-cell-names = "mac-address", "calibration"; }; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts index 1c6dcee8bf8..b81485f4653 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts @@ -72,7 +72,6 @@ wifi@0,0 { compatible = "qcom,ath10k"; reg = <0 0 0 0 0>; - device_type = "pci"; }; }; diff --git a/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts b/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts index 59dd83d5f87..4a68f530751 100644 --- a/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts +++ b/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts @@ -75,7 +75,7 @@ &pcie0 { status = "okay"; - wifi@0,0,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x0 0 0 0 0>; }; diff --git a/target/linux/ath79/dts/qca9558_engenius_esr900.dts b/target/linux/ath79/dts/qca9558_engenius_esr900.dts index 269f743223c..ef0e21a3b59 100644 --- a/target/linux/ath79/dts/qca9558_engenius_esr900.dts +++ b/target/linux/ath79/dts/qca9558_engenius_esr900.dts @@ -76,7 +76,7 @@ &pcie0 { status = "okay"; - wifi@0,0,0 { + wifi@0,0 { compatible = "pci168c,0033"; reg = <0x0000 0 0 0 0>; nvmem-cells = <&calibration_art_5000>; diff --git a/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi b/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi index e448cd30122..66f2e388534 100644 --- a/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi +++ b/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi @@ -119,7 +119,7 @@ &pcie0 { status = "okay"; - wifi@0,0,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x0 0 0 0 0>; qca,no-eeprom; diff --git a/target/linux/ath79/dts/qca955x_senao_loader.dtsi b/target/linux/ath79/dts/qca955x_senao_loader.dtsi index cf82c050b6d..31e00ce0638 100644 --- a/target/linux/ath79/dts/qca955x_senao_loader.dtsi +++ b/target/linux/ath79/dts/qca955x_senao_loader.dtsi @@ -26,16 +26,16 @@ }; &pcie0 { - ath10k_0: wifi@0,0,0 { + ath10k_0: wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x0 0 0 0 0>; }; }; &pcie1 { - ath10k_1: wifi@0,1,0 { + ath10k_1: wifi@0,0 { compatible = "qcom,ath10k"; - reg = <0x0 1 0 0 0>; + reg = <0x0 0 0 0 0>; }; }; diff --git a/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi index 61446263c47..8f62cf442ce 100644 --- a/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi +++ b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi @@ -43,7 +43,7 @@ &pcie0 { status = "okay"; - ath10k_0: wifi@0,0,0 { + ath10k_0: wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x0000 0 0 0 0>; };