diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-re-cs-03.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-re-cs-03.dts index 8681a8205e..90b2574adc 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-re-cs-03.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-re-cs-03.dts @@ -1,10 +1,12 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; + #include "ipq5018.dtsi" #include "ipq5018-ess.dtsi" #include #include + / { model = "JDCloud RE-CS-03"; compatible = "jdcloud,re-cs-03", "qcom,ipq5018"; 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 bee4741d62..774a8a952c 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 @@ -208,8 +208,3 @@ qcom,ath11k-fw-memory-mode = <1>; qcom,ath11k-calibration-variant = "Qihoo-360V6"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 774b98b9e8..c7c0ad21ff 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 @@ -166,8 +166,3 @@ &edma { status = "okay"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 9982374eb5..bb4333f290 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 @@ -141,8 +141,3 @@ ieee80211-freq-limit = <2402000 5835000>; qcom,ath11k-calibration-variant = "TP-Link-EAP610-Outdoor"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 27f8d408d4..0308640f84 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 @@ -327,8 +327,3 @@ qcom,ath11k-fw-memory-mode = <1>; qcom,ath11k-calibration-variant = "Yuncore-FAP650"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 d168567941..e30968b1e4 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 @@ -292,8 +292,3 @@ &edma { status = "okay"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 4bda27c5e3..ecfeec2771 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 @@ -96,8 +96,3 @@ &edma { status = "okay"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 e7505bb93a..c28be0cb45 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 @@ -327,8 +327,3 @@ qcom,ath11k-fw-memory-mode = <1>; qcom,ath11k-calibration-variant = "Linksys-MR7350"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 d25ec2010a..7b1d3e3bf2 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 @@ -195,8 +195,3 @@ &edma { status = "okay"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; 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 b66baca532..1165e1da29 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 @@ -192,8 +192,3 @@ &edma { status = "okay"; }; - -&cpu_opp_table { - /delete-node/ opp-1608000000; - /delete-node/ opp-1800000000; -}; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nowifi.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nowifi.dtsi index 41b737ad58..b9f172f541 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nowifi.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nowifi.dtsi @@ -4,5 +4,16 @@ &q6_region { reg = <0x0 0x4ab00000 0x0 0x1000000>; - no-map; +}; + +&q6_etr_region { + reg = <0x0 0x4bb00000 0x0 0x100000>; +}; + +&m3_dump_region { + reg = <0x0 0x4bc00000 0x0 0x100000>; +}; + +&ramoops_region { + reg = <0x0 0x4bd00000 0x0 0x100000>; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nowifi.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nowifi.dtsi index c132a66e57..36bc8a7c54 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nowifi.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nowifi.dtsi @@ -5,3 +5,15 @@ &q6_region { reg = <0x0 0x4b000000 0x0 0x1000000>; }; + +&q6_etr_region { + reg = <0x0 0x4c000000 0x0 0x100000>; +}; + +&m3_dump_region { + reg = <0x0 0x4c100000 0x0 0x100000>; +}; + +&ramoops_region { + reg = <0x0 0x4c200000 0x0 0x100000>; +}; diff --git a/target/linux/qualcommax/image/ipq60xx.mk b/target/linux/qualcommax/image/ipq60xx.mk index 9c3033843d..c3bbecfeb9 100644 --- a/target/linux/qualcommax/image/ipq60xx.mk +++ b/target/linux/qualcommax/image/ipq60xx.mk @@ -124,6 +124,8 @@ define Device/yuncore_fap650 DEVICE_DTS_CONFIG := config@cp03-c1 SOC := ipq6000 DEVICE_PACKAGES := ipq-wifi-yuncore_fap650 + IMAGES := factory.ubi factory.ubin sysupgrade.bin + IMAGE/factory.ubin := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += yuncore_fap650 diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index da27a35373..dba794f50f 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -108,6 +108,8 @@ define Device/cmcc_rm2-6 PAGESIZE := 2048 DEVICE_DTS_CONFIG := config@ac02 SOC := ipq8070 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand DEVICE_PACKAGES := ipq-wifi-cmcc_rm2-6 kmod-hwmon-gpiofan endef TARGET_DEVICES += cmcc_rm2-6 @@ -122,6 +124,7 @@ define Device/compex_wpq873 DEVICE_DTS_CONFIG := config@hk09.wpq873 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-compex_wpq873 + IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += compex_wpq873 @@ -148,6 +151,7 @@ define Device/edgecore_eap102 DEVICE_DTS_CONFIG := config@ac02 SOC := ipq8071 DEVICE_PACKAGES := ipq-wifi-edgecore_eap102 + IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += edgecore_eap102 @@ -382,6 +386,7 @@ define Device/spectrum_sax1v1k DEVICE_MODEL := SAX1V1K DEVICE_DTS_CONFIG := config@rt5010w-d187-rev6 SOC := ipq8072 + IMAGES := sysupgrade.bin DEVICE_PACKAGES := ipq-wifi-spectrum_sax1v1k endef TARGET_DEVICES += spectrum_sax1v1k @@ -477,6 +482,8 @@ define Device/yuncore_ax880 DEVICE_DTS_CONFIG := config@hk09 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-yuncore_ax880 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += yuncore_ax880 @@ -490,6 +497,8 @@ define Device/zbtlink_zbt-z800ax DEVICE_DTS_CONFIG := config@hk09 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-zbtlink_zbt-z800ax + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += zbtlink_zbt-z800ax diff --git a/target/linux/qualcommax/patches-6.6/0054-v6.8-arm64-dts-qcom-ipq6018-use-CPUFreq-NVMEM.patch b/target/linux/qualcommax/patches-6.6/0054-v6.8-arm64-dts-qcom-ipq6018-use-CPUFreq-NVMEM.patch index fa73672c34..3d75b041bb 100644 --- a/target/linux/qualcommax/patches-6.6/0054-v6.8-arm64-dts-qcom-ipq6018-use-CPUFreq-NVMEM.patch +++ b/target/linux/qualcommax/patches-6.6/0054-v6.8-arm64-dts-qcom-ipq6018-use-CPUFreq-NVMEM.patch @@ -60,14 +60,14 @@ Signed-off-by: Bjorn Andersson opp-1608000000 { opp-hz = /bits/ 64 <1608000000>; opp-microvolt = <987500>; -+ opp-supported-hw = <0xf>; ++ opp-supported-hw = <0x1>; clock-latency-ns = <200000>; }; opp-1800000000 { opp-hz = /bits/ 64 <1800000000>; opp-microvolt = <1062500>; -+ opp-supported-hw = <0xf>; ++ opp-supported-hw = <0x1>; clock-latency-ns = <200000>; }; }; diff --git a/target/linux/qualcommax/patches-6.6/0060-v6.9-clk-qcom-gcc-ipq6018-add-qdss_at-clock-needed-for-wi.patch b/target/linux/qualcommax/patches-6.6/0060-v6.9-clk-qcom-gcc-ipq6018-add-qdss_at-clock-needed-for-wi.patch index f798fffb28..5f0af1352a 100644 --- a/target/linux/qualcommax/patches-6.6/0060-v6.9-clk-qcom-gcc-ipq6018-add-qdss_at-clock-needed-for-wi.patch +++ b/target/linux/qualcommax/patches-6.6/0060-v6.9-clk-qcom-gcc-ipq6018-add-qdss_at-clock-needed-for-wi.patch @@ -31,7 +31,7 @@ Signed-off-by: Bjorn Andersson + .parent_hws = (const struct clk_hw *[]){ + &qdss_at_clk_src.clkr.hw }, + .num_parents = 1, -+ .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, ++ .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + },