From 15c599c9dfa9cf5459bcc15b773e39891ca14340 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Sat, 27 Feb 2021 14:18:42 -0500 Subject: [PATCH] ath79: move pcie node to DTSI for qca955x Senao APs pcie0 is the same for this generation of Senao APs while eth0, eth1, and wmac can differ the qca,no-eeprom property has no effect for the ath10k drivers Signed-off-by: Michael Pratt --- target/linux/ath79/dts/qca9557_engenius_eap1200h.dts | 10 ---------- .../ath79/dts/qca9557_engenius_enstationac-v1.dts | 10 ---------- .../linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts | 9 --------- target/linux/ath79/dts/qca955x_senao_loader.dtsi | 9 +++++++++ 4 files changed, 9 insertions(+), 29 deletions(-) diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts index 5a86da4bb3..80298a9d82 100644 --- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts +++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts @@ -85,16 +85,6 @@ pll-data = <0x82000000 0x80000101 0x80001313>; }; -&pcie0 { - status = "okay"; - - wifi@0,0,0 { - compatible = "qcom,ath10k"; - reg = <0x0 0 0 0 0>; - qca,no-eeprom; - }; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts index 6956996866..5da50ff6d9 100644 --- a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts +++ b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts @@ -108,13 +108,3 @@ qca955x-sgmii-fixup; }; - -&pcie0 { - status = "okay"; - - wifi@0,0,0 { - compatible = "qcom,ath10k"; - reg = <0x0 0 0 0 0>; - qca,no-eeprom; - }; -}; diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts index 5c6051d6f4..973cb16efb 100644 --- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts +++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts @@ -85,15 +85,6 @@ }; }; -&pcie0 { - status = "okay"; - - wifi@0,0,0 { - compatible = "qcom,ath10k"; - reg = <0x0 0 0 0 0>; - }; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca955x_senao_loader.dtsi b/target/linux/ath79/dts/qca955x_senao_loader.dtsi index 846d3ed0af..ac9f03ec65 100644 --- a/target/linux/ath79/dts/qca955x_senao_loader.dtsi +++ b/target/linux/ath79/dts/qca955x_senao_loader.dtsi @@ -25,6 +25,15 @@ }; }; +&pcie0 { + status = "okay"; + + wifi@0,0,0 { + compatible = "qcom,ath10k"; + reg = <0x0 0 0 0 0>; + }; +}; + &spi { status = "okay"; -- 2.30.2