diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts index 774a8a952c..99dbafa0fc 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-cmiot.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-cmiot.dtsi index c7c0ad21ff..b9ce0b7c6f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-cmiot.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-cmiot.dtsi @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-eap610-outdoor.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-eap610-outdoor.dts index bb4333f290..be42f4cd74 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-eap610-outdoor.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-eap610-outdoor.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-fap650.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-fap650.dts index 0308640f84..b24c4faea8 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-fap650.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-fap650.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi index e30968b1e4..f6738ab30c 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-link.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-link.dtsi index ecfeec2771..79c66d6286 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-link.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-link.dtsi @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts index c28be0cb45..fe9669e0a6 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts index 7b1d3e3bf2..a4e96abb8f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi index 1165e1da29..8893c1632b 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts index 36d691153e..b9afcbe762 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mr7500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mr7500.dts index b1ae234f6e..fc15b663f8 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mr7500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mr7500.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts index 90bca85f74..9a45de74e8 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-07.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-07.dts index f1e2cf9852..92605c74a6 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-07.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-07.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts index c8c5323785..fc77d12922 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-cp-cpu.dtsi" #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts index f45f353b32..8ebec3b035 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts @@ -3,9 +3,9 @@ /dts-v1/; #include "ipq6018.dtsi" -#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" #include "ipq6018-nss.dtsi" +#include "ipq6018-common.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi index f45ddd3675..48972d31a6 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "ipq6018-mp5496.dtsi" #include "ipq6018-cpr-regulator.dtsi" &rpm { diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cpr-regulator.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cpr-regulator.dtsi index a3a623d984..05034006c7 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cpr-regulator.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cpr-regulator.dtsi @@ -14,6 +14,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "ipq6018-mp5496.dtsi" + &soc { apc_apm: apm@b111000 { compatible = "qcom,ipq807x-apm"; @@ -56,7 +58,7 @@ apc_vreg: regulator { regulator-name = "apc_corner"; regulator-min-microvolt = <1>; - regulator-max-microvolt = <6>; + regulator-max-microvolt = <8>; qcom,cpr-fuse-corners = <4>; qcom,cpr-fuse-combos = <8>; qcom,cpr-corners = <8>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts index eca6fe32fa..e211e0939e 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-ac-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-ac-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts index 88dc601b41..876d2d90c9 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-ac-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-ac-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-edgecore.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-edgecore.dtsi index 8bbd74a60a..3689bf8253 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-edgecore.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-edgecore.dtsi @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq8074.dtsi" -#include "ipq8074-ac-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-ac-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts index cac72c78fb..7ad1c8987b 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-ac-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-ac-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-xiaomi.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-xiaomi.dtsi index 8b2724a9ca..2d6dcc5630 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-xiaomi.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-xiaomi.dtsi @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq8074.dtsi" -#include "ipq8074-ac-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-ac-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts index 3c4cde9f4e..b5e249f72f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts index b22966de71..938882fe4f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts index 1b17622e45..e69283cc0e 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts index 91a10078ef..d5e39095b6 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-cr1000a.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-cr1000a.dts index 82d74eca90..6d24272479 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-cr1000a.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-cr1000a.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts index 387c0295b6..db135c0670 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts index 979237ad4d..74daeec89b 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts index 3b99dff442..9c55f82235 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts index 341082d38e..f016da1e4c 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts index 25c8c55476..00a8d36354 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-tplink.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-tplink.dtsi index 4026f20ca8..bf511a1fcf 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-tplink.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-tplink.dtsi @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts index 5777c4dc27..ec78cf3839 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts index b2d33769f1..15643250c3 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts index 13b32e7f80..c407eeed1f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts index 196b079448..2353c55607 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts index 90cd4b913c..da6ace2e1f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-netgear.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-netgear.dtsi index fe3792fe8b..51ca496595 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-netgear.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-netgear.dtsi @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts index ae2b19a3af..dddf534907 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts index e42d807e78..a21a8c69ff 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts index 49087385df..d7d5629588 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts index 2d733fc5e3..ffaec27317 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts @@ -3,10 +3,10 @@ /dts-v1/; #include "ipq8074.dtsi" -#include "ipq8074-hk-cpu.dtsi" -#include "ipq8074-common.dtsi" #include "ipq8074-ess.dtsi" #include "ipq8074-nss.dtsi" +#include "ipq8074-common.dtsi" +#include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/patches-6.6/0087-v6.15-arm64-dts-qcom-ipq6018-move-mp5496-regulator-out-of-.patch b/target/linux/qualcommax/patches-6.6/0087-v6.15-arm64-dts-qcom-ipq6018-move-mp5496-regulator-out-of-.patch index 505a027c2e..8b7b008dcf 100644 --- a/target/linux/qualcommax/patches-6.6/0087-v6.15-arm64-dts-qcom-ipq6018-move-mp5496-regulator-out-of-.patch +++ b/target/linux/qualcommax/patches-6.6/0087-v6.15-arm64-dts-qcom-ipq6018-move-mp5496-regulator-out-of-.patch @@ -18,28 +18,15 @@ Signed-off-by: Bjorn Andersson 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi ---- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts -+++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts -@@ -7,7 +7,7 @@ - - /dts-v1/; - --#include "ipq6018.dtsi" -+#include "ipq6018-mp5496.dtsi" - - / { - model = "Qualcomm Technologies, Inc. IPQ6018/AP-CP01-C1"; --- /dev/null +++ b/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi -@@ -0,0 +1,35 @@ +@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * ipq6018-mp5496.dtsi describes common properties (e.g. regulators) that + * apply to most devices that make use of the IPQ6018 SoC and MP5496 PMIC. + */ + -+#include "ipq6018.dtsi" -+ +&cpu0 { + cpu-supply = <&ipq6018_s2>; +}; diff --git a/target/linux/qualcommax/patches-6.6/0088-v6.15-arm64-dts-qcom-ipq6018-rename-labels-of-mp5496-regul.patch b/target/linux/qualcommax/patches-6.6/0088-v6.15-arm64-dts-qcom-ipq6018-rename-labels-of-mp5496-regul.patch index 120ce53f8c..f451feb448 100644 --- a/target/linux/qualcommax/patches-6.6/0088-v6.15-arm64-dts-qcom-ipq6018-rename-labels-of-mp5496-regul.patch +++ b/target/linux/qualcommax/patches-6.6/0088-v6.15-arm64-dts-qcom-ipq6018-rename-labels-of-mp5496-regul.patch @@ -16,8 +16,8 @@ Signed-off-by: Bjorn Andersson --- a/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi -@@ -7,26 +7,26 @@ - #include "ipq6018.dtsi" +@@ -5,26 +5,26 @@ + */ &cpu0 { - cpu-supply = <&ipq6018_s2>; diff --git a/target/linux/qualcommax/patches-6.6/0089-v6.15-arm64-dts-qcom-ipq6018-add-LDOA2-regulator.patch b/target/linux/qualcommax/patches-6.6/0089-v6.15-arm64-dts-qcom-ipq6018-add-LDOA2-regulator.patch index ce98c62f83..2e61d38865 100644 --- a/target/linux/qualcommax/patches-6.6/0089-v6.15-arm64-dts-qcom-ipq6018-add-LDOA2-regulator.patch +++ b/target/linux/qualcommax/patches-6.6/0089-v6.15-arm64-dts-qcom-ipq6018-add-LDOA2-regulator.patch @@ -16,7 +16,7 @@ Signed-off-by: Bjorn Andersson --- a/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi -@@ -31,5 +31,14 @@ +@@ -29,5 +29,14 @@ regulator-max-microvolt = <1062500>; regulator-always-on; };