diff options
| -rw-r--r-- | bindings/clock/qcom,aop-qmp.txt | 2 | ||||
| -rw-r--r-- | bindings/clock/qcom,rpmh-clk.txt | 1 | ||||
| -rw-r--r-- | qcom/Makefile | 5 | ||||
| -rw-r--r-- | qcom/bengal.dtsi | 3 | ||||
| -rw-r--r-- | qcom/kona-mtp-sa.dts | 14 | ||||
| -rw-r--r-- | qcom/kona-sa-mtp-overlay.dts | 20 | ||||
| -rw-r--r-- | qcom/kona-v2-gpu.dtsi | 114 | ||||
| -rw-r--r-- | qcom/kona-v2-mtp-sa.dts | 14 | ||||
| -rw-r--r-- | qcom/kona-v2.1-mtp-sa.dts | 14 | ||||
| -rw-r--r-- | qcom/kona-xrfusion-ult.dtsi | 14 | ||||
| -rw-r--r-- | qcom/kona.dtsi | 1 | ||||
| -rw-r--r-- | qcom/lagoon.dtsi | 1 | ||||
| -rw-r--r-- | qcom/litomagnus-cdp.dtsi | 8 | ||||
| -rw-r--r-- | qcom/litomagnus-mtp.dtsi | 8 | ||||
| -rw-r--r-- | qcom/litomagnus.dtsi | 10 | ||||
| -rw-r--r-- | qcom/msm-audio.dtsi | 2 | ||||
| -rw-r--r-- | qcom/orchid-cdp-overlay.dts | 8 | ||||
| -rw-r--r-- | qcom/orchid-cdp.dtsi | 67 | ||||
| -rw-r--r-- | qcom/orchid-mtp-overlay.dts | 8 | ||||
| -rw-r--r-- | qcom/orchid-mtp.dtsi | 68 | ||||
| -rw-r--r-- | qcom/orchid.dtsi | 5 | ||||
| -rw-r--r-- | qcom/scuba.dtsi | 1 | ||||
| -rw-r--r-- | qcom/scubap-idp.dts | 10 | ||||
| -rw-r--r-- | qcom/scubap.dts | 10 | ||||
| -rw-r--r-- | qcom/sdm660-audio.dtsi | 6 | ||||
| -rw-r--r-- | qcom/sdm660.dtsi | 2 |
26 files changed, 408 insertions, 8 deletions
diff --git a/bindings/clock/qcom,aop-qmp.txt b/bindings/clock/qcom,aop-qmp.txt index 231b8a36..38a1b6db 100644 --- a/bindings/clock/qcom,aop-qmp.txt +++ b/bindings/clock/qcom,aop-qmp.txt @@ -7,6 +7,8 @@ Required properties : - mboxes : list of QMP mailbox phandle and channel identifier tuples. - mbox-names: List of identifier strings for each mailbox channel. Must contain "qdss_clk". +- qcom,clk-stop-bimc-log: Presence indicates a BIMC logging request will + be sent to AOP during kernel panic. Example : clock_qdss: qcom,aopclk { diff --git a/bindings/clock/qcom,rpmh-clk.txt b/bindings/clock/qcom,rpmh-clk.txt index ee15fbe0..ffce1989 100644 --- a/bindings/clock/qcom,rpmh-clk.txt +++ b/bindings/clock/qcom,rpmh-clk.txt @@ -11,6 +11,7 @@ Required properties : "qcom,sdm845-rpmh-clk" "qcom,lito-rpmh-clk" "qcom,lagoon-rpmh-clk" + "qcom,litomagnus-rpmh-clk" - #clock-cells : must contain 1 diff --git a/qcom/Makefile b/qcom/Makefile index da283242..1edebd29 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -4,6 +4,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) kona-cdp-lcd-overlay.dtbo \ kona-mtp-overlay.dtbo \ kona-mtp-ws-overlay.dtbo \ + kona-sa-mtp-overlay.dtbo \ kona-xr-overlay.dtbo \ kona-rumi-overlay.dtbo \ kona-qrd-overlay.dtbo \ @@ -15,6 +16,7 @@ kona-cdp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb kona-cdp-lcd-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb kona-mtp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb kona-mtp-ws-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb +kona-sa-mtp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb kona-xr-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb kona-rumi-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb kona-qrd-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb @@ -25,6 +27,7 @@ else dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ kona-mtp.dtb \ kona-mtp-ws.dtb \ + kona-mtp-sa.dtb \ kona-xr.dtb \ kona-xrfusion.dtb \ kona-xrfusion-ult.dtb \ @@ -34,6 +37,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ kona-v2-rumi.dtb \ kona-v2-mtp.dtb \ kona-v2-mtp-ws.dtb \ + kona-v2-mtp-sa.dtb \ kona-v2-cdp.dtb \ kona-v2-qrd.dtb \ kona-v2-xrfusion.dtb \ @@ -41,6 +45,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ kona-hdk.dtb \ kona-v2.1-mtp.dtb \ kona-v2.1-mtp-ws.dtb \ + kona-v2.1-mtp-sa.dtb \ kona-v2.1-cdp.dtb \ kona-v2.1-qrd.dtb \ kona-v2.1-hdk.dtb \ diff --git a/qcom/bengal.dtsi b/qcom/bengal.dtsi index 8ca1a988..45041632 100644 --- a/qcom/bengal.dtsi +++ b/qcom/bengal.dtsi @@ -630,6 +630,7 @@ bluetooth: bt_wcn3990 { compatible = "qca,wcn3990"; + qca,bt-sw-ctrl-gpio = <&tlmm 87 0>; /* SW_CTRL */ qca,bt-vdd-io-supply = <&L9A>; /* IO */ qca,bt-vdd-core-supply = <&L17A>; /* RFA */ qca,bt-vdd-pa-supply = <&L23A>; /* CH0 */ @@ -1317,7 +1318,7 @@ }; pmic { - qcom,dump-size = <0x10000>; + qcom,dump-size = <0x40000>; qcom,dump-id = <0xe4>; }; diff --git a/qcom/kona-mtp-sa.dts b/qcom/kona-mtp-sa.dts new file mode 100644 index 00000000..8eb1117e --- /dev/null +++ b/qcom/kona-mtp-sa.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +#include "kona.dtsi" +#include "kona-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. kona standalone MTP"; + compatible = "qcom,kona-mtp", "qcom,kona", "qcom,mtp"; + qcom,board-id = <0x02010008 0>; +}; + +&mdm0 { + status = "disabled"; +}; diff --git a/qcom/kona-sa-mtp-overlay.dts b/qcom/kona-sa-mtp-overlay.dts new file mode 100644 index 00000000..8ef8c788 --- /dev/null +++ b/qcom/kona-sa-mtp-overlay.dts @@ -0,0 +1,20 @@ +/dts-v1/; +/plugin/; + +#include <dt-bindings/clock/qcom,gcc-kona.h> +#include <dt-bindings/clock/qcom,camcc-kona.h> +#include <dt-bindings/clock/qcom,rpmh.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> + +#include "kona-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. kona standalone MTP"; + compatible = "qcom,kona-mtp", "qcom,kona", "qcom,mtp"; + qcom,board-id = <0x02010008 0>; +}; + +&mdm0 { + status = "disabled"; +}; + diff --git a/qcom/kona-v2-gpu.dtsi b/qcom/kona-v2-gpu.dtsi index 889d2532..3565dfdd 100644 --- a/qcom/kona-v2-gpu.dtsi +++ b/qcom/kona-v2-gpu.dtsi @@ -359,5 +359,119 @@ qcom,bus-max = <0>; }; }; + + qcom,gpu-pwrlevels-3 { + #address-cells = <1>; + #size-cells = <0>; + qcom,speed-bin = <2>; + qcom,initial-pwrlevel = <6>; + qcom,throttle-pwrlevel = <1>; + + qcom,gpu-pwrlevel@0 { + reg = <0>; + qcom,gpu-freq = <670000000>; + qcom,bus-freq-ddr7 = <11>; + qcom,bus-min-ddr7 = <11>; + qcom,bus-max-ddr7 = <11>; + + qcom,bus-freq-ddr8 = <11>; + qcom,bus-min-ddr8 = <11>; + qcom,bus-max-ddr8 = <11>; + + qcom,acd-level = <0x802b5ffd>; + }; + + qcom,gpu-pwrlevel@1 { + reg = <1>; + qcom,gpu-freq = <587000000>; + qcom,bus-freq-ddr7 = <11>; + qcom,bus-min-ddr7 = <11>; + qcom,bus-max-ddr7 = <11>; + + qcom,bus-freq-ddr8 = <11>; + qcom,bus-min-ddr8 = <11>; + qcom,bus-max-ddr8 = <11>; + + qcom,acd-level = <0x802b5ffd>; + }; + + qcom,gpu-pwrlevel@2 { + reg = <2>; + qcom,gpu-freq = <525000000>; + qcom,bus-freq-ddr7 = <9>; + qcom,bus-min-ddr7 = <9>; + qcom,bus-max-ddr7 = <11>; + + qcom,bus-freq-ddr8 = <8>; + qcom,bus-min-ddr8 = <8>; + qcom,bus-max-ddr8 = <11>; + + qcom,acd-level = <0x802b5ffd>; + }; + + qcom,gpu-pwrlevel@3 { + reg = <3>; + qcom,gpu-freq = <490000000>; + qcom,bus-freq-ddr7 = <9>; + qcom,bus-min-ddr7 = <6>; + qcom,bus-max-ddr7 = <9>; + + qcom,bus-freq-ddr8 = <8>; + qcom,bus-min-ddr8 = <7>; + qcom,bus-max-ddr8 = <9>; + + qcom,acd-level = <0xa02b5ffd>; + }; + + qcom,gpu-pwrlevel@4 { + reg = <4>; + qcom,gpu-freq = <441600000>; + qcom,bus-freq-ddr7 = <9>; + qcom,bus-min-ddr7 = <6>; + qcom,bus-max-ddr7 = <9>; + + qcom,bus-freq-ddr8 = <8>; + qcom,bus-min-ddr8 = <7>; + qcom,bus-max-ddr8 = <9>; + + qcom,acd-level = <0xa02b5ffd>; + }; + + qcom,gpu-pwrlevel@5 { + reg = <5>; + qcom,gpu-freq = <400000000>; + qcom,bus-freq-ddr7 = <7>; + qcom,bus-min-ddr7 = <6>; + qcom,bus-max-ddr7 = <9>; + + qcom,bus-freq-ddr8 = <8>; + qcom,bus-min-ddr8 = <6>; + qcom,bus-max-ddr8 = <9>; + + qcom,acd-level = <0xa02b5ffd>; + }; + + qcom,gpu-pwrlevel@6 { + reg = <6>; + qcom,gpu-freq = <305000000>; + qcom,bus-freq-ddr7 = <3>; + qcom,bus-min-ddr7 = <2>; + qcom,bus-max-ddr7 = <9>; + + qcom,bus-freq-ddr8 = <3>; + qcom,bus-min-ddr8 = <2>; + qcom,bus-max-ddr8 = <9>; + + qcom,acd-level = <0xa02b5ffd>; + }; + + qcom,gpu-pwrlevel@7 { + reg = <7>; + qcom,gpu-freq = <0>; + qcom,bus-freq = <0>; + qcom,bus-min = <0>; + qcom,bus-max = <0>; + }; + }; }; }; diff --git a/qcom/kona-v2-mtp-sa.dts b/qcom/kona-v2-mtp-sa.dts new file mode 100644 index 00000000..413f5b0b --- /dev/null +++ b/qcom/kona-v2-mtp-sa.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +#include "kona-v2.dtsi" +#include "kona-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. kona standalone MTP"; + compatible = "qcom,kona-mtp", "qcom,kona", "qcom,mtp"; + qcom,board-id = <0x02010008 0>; +}; + +&mdm0 { + status = "disabled"; +}; diff --git a/qcom/kona-v2.1-mtp-sa.dts b/qcom/kona-v2.1-mtp-sa.dts new file mode 100644 index 00000000..daaf65a9 --- /dev/null +++ b/qcom/kona-v2.1-mtp-sa.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +#include "kona-v2.1.dtsi" +#include "kona-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. kona v2.1 standalone MTP"; + compatible = "qcom,kona-mtp", "qcom,kona", "qcom,mtp"; + qcom,board-id = <0x02010008 0>; +}; + +&mdm0 { + status = "disabled"; +}; diff --git a/qcom/kona-xrfusion-ult.dtsi b/qcom/kona-xrfusion-ult.dtsi index 02388db3..13cdd3ce 100644 --- a/qcom/kona-xrfusion-ult.dtsi +++ b/qcom/kona-xrfusion-ult.dtsi @@ -257,14 +257,16 @@ "MIC BIAS1", "Digital Mic2", "DMIC3", "MIC BIAS1", "MIC BIAS1", "Digital Mic3", - "DMIC4", "MIC BIAS3", - "MIC BIAS3", "Digital Mic4", + "DMIC4", "MIC BIAS1", + "MIC BIAS1", "Digital Mic4", "DMIC5", "MIC BIAS3", "MIC BIAS3", "Digital Mic5", - "DMIC6", "MIC BIAS4", - "MIC BIAS4", "Digital Mic6", + "DMIC6", "MIC BIAS3", + "MIC BIAS3", "Digital Mic6", "DMIC7", "MIC BIAS4", "MIC BIAS4", "Digital Mic7", + "DMIC8", "MIC BIAS4", + "MIC BIAS4", "Digital Mic8", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "IN3_AUX", "AUX_OUT", @@ -1143,3 +1145,7 @@ }; }; }; + +&pcie0 { + qcom,target-link-speed = <0x2>; +}; diff --git a/qcom/kona.dtsi b/qcom/kona.dtsi index 1adc0969..6aeb3660 100644 --- a/qcom/kona.dtsi +++ b/qcom/kona.dtsi @@ -2445,6 +2445,7 @@ #clock-cells = <1>; mboxes = <&qmp_aop 0>; mbox-names = "qdss_clk"; + qcom,clk-stop-bimc-log; }; clock_gcc: qcom,gcc@100000 { diff --git a/qcom/lagoon.dtsi b/qcom/lagoon.dtsi index 7c2b7e38..b13324d1 100644 --- a/qcom/lagoon.dtsi +++ b/qcom/lagoon.dtsi @@ -536,6 +536,7 @@ bluetooth: bt_wcn3990 { compatible = "qca,wcn3990"; + qca,bt-sw-ctrl-gpio = <&tlmm 69 0>; /* SW_CTRL */ qca,bt-vdd-io-supply = <&L11A>; /* IO */ qca,bt-vdd-core-supply = <&L2E>; /* RFA */ qca,bt-vdd-pa-supply = <&L10E>; /* CH0 */ diff --git a/qcom/litomagnus-cdp.dtsi b/qcom/litomagnus-cdp.dtsi index f8657a3d..de3dcd32 100644 --- a/qcom/litomagnus-cdp.dtsi +++ b/qcom/litomagnus-cdp.dtsi @@ -3,3 +3,11 @@ &soc { }; + +&pm8150_rtc { + status = "disabled"; +}; + +&pmk8350_adc_tm { + status = "disabled"; +}; diff --git a/qcom/litomagnus-mtp.dtsi b/qcom/litomagnus-mtp.dtsi index 17bffaf7..f7fe249c 100644 --- a/qcom/litomagnus-mtp.dtsi +++ b/qcom/litomagnus-mtp.dtsi @@ -3,3 +3,11 @@ &soc { }; + +&pm8150_rtc { + status = "disabled"; +}; + +&pmk8350_adc_tm { + status = "disabled"; +}; diff --git a/qcom/litomagnus.dtsi b/qcom/litomagnus.dtsi index 14a56234..ee279efa 100644 --- a/qcom/litomagnus.dtsi +++ b/qcom/litomagnus.dtsi @@ -1,6 +1,16 @@ #include "lito-v2.dtsi" +#include "pmk8350.dtsi" / { model = "Qualcomm Technologies, Inc. Litomagnus"; compatible = "qcom,lito"; }; + +&pm8008_regulators { + vdd_l6-supply = <&BOB>; +}; + +&rpmhcc { + compatible = "qcom,litomagnus-rpmh-clk"; + #clock-cells = <1>; +}; diff --git a/qcom/msm-audio.dtsi b/qcom/msm-audio.dtsi index 4499da5a..2d6b7050 100644 --- a/qcom/msm-audio.dtsi +++ b/qcom/msm-audio.dtsi @@ -95,7 +95,7 @@ dai_dp: qcom,msm-dai-q6-dp { compatible = "qcom,msm-dai-q6-hdmi"; - qcom,msm-dai-q6-dev-id = <24608>; + qcom,msm-dai-q6-dev-id = <0>; }; loopback: qcom,msm-pcm-loopback { diff --git a/qcom/orchid-cdp-overlay.dts b/qcom/orchid-cdp-overlay.dts index eb598351..3c54ecab 100644 --- a/qcom/orchid-cdp-overlay.dts +++ b/qcom/orchid-cdp-overlay.dts @@ -11,3 +11,11 @@ qcom,msm-id = <476 0x10000>; qcom,board-id = <1 0>; }; + +/* + * overriding adsp-fw-names with empty string + * to allow default adsp img load + */ +&adsp_loader { + adsp-fw-names=""; +}; diff --git a/qcom/orchid-cdp.dtsi b/qcom/orchid-cdp.dtsi index f8657a3d..e782c342 100644 --- a/qcom/orchid-cdp.dtsi +++ b/qcom/orchid-cdp.dtsi @@ -3,3 +3,70 @@ &soc { }; + +&usb_qmp_dp_phy { + /delete-property/vdd-supply; + vdd-supply = <&L11A>; +}; + +&sde_dp { + vdda-0p9-supply = <&L11A>; +}; + +&wsa_macro { + wsa883x_0221: wsa883x@02170221 { + compatible = "qcom,wsa883x"; + reg = <0x02 0x02170221>; + qcom,spkr-sd-n-node = <&wsa_spkr_en1>; + qcom,bolero-handle = <&bolero>; + cdc-vdd-1p8-supply = <&L11A>; + qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; + qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; + qcom,cdc-static-supplies = "cdc-vdd-1p8"; + }; + + wsa883x_0222: wsa883x@02170222 { + compatible = "qcom,wsa883x"; + reg = <0x02 0x02170222>; + qcom,spkr-sd-n-node = <&wsa_spkr_en2>; + qcom,bolero-handle = <&bolero>; + + cdc-vdd-1p8-supply = <&L11A>; + qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; + qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; + qcom,cdc-static-supplies = "cdc-vdd-1p8"; + }; +}; + +&wsa881x_0211 { + status = "disabled"; +}; + +&wsa881x_0212 { + status = "disabled"; +}; + +&wsa881x_0213 { + status = "disabled"; +}; + +&wsa881x_0214 { + status = "disabled"; +}; + +&lito_snd { + qcom,model = "lito-orchidmtp-snd-card"; + qcom,wsa-max-devs = <2>; + qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>; + qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight"; +}; + +&pm8150_rtc { + status = "disabled"; +}; + +&pmk8350_adc_tm { + status = "disabled"; +}; diff --git a/qcom/orchid-mtp-overlay.dts b/qcom/orchid-mtp-overlay.dts index 4f3d0c84..ed8a1124 100644 --- a/qcom/orchid-mtp-overlay.dts +++ b/qcom/orchid-mtp-overlay.dts @@ -11,3 +11,11 @@ qcom,msm-id = <476 0x10000>; qcom,board-id = <8 0>; }; + +/* + * overriding adsp-fw-names with empty string + * to allow default adsp img load + */ +&adsp_loader { + adsp-fw-names=""; +}; diff --git a/qcom/orchid-mtp.dtsi b/qcom/orchid-mtp.dtsi index 17bffaf7..cc7e1936 100644 --- a/qcom/orchid-mtp.dtsi +++ b/qcom/orchid-mtp.dtsi @@ -3,3 +3,71 @@ &soc { }; + +&usb_qmp_dp_phy { + /delete-property/vdd-supply; + vdd-supply = <&L11A>; +}; + +&sde_dp { + vdda-0p9-supply = <&L11A>; +}; + +&wsa_macro { + wsa883x_0221: wsa883x@02170221 { + compatible = "qcom,wsa883x"; + reg = <0x02 0x02170221>; + qcom,spkr-sd-n-node = <&wsa_spkr_en1>; + qcom,bolero-handle = <&bolero>; + cdc-vdd-1p8-supply = <&L11A>; + qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; + qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; + qcom,cdc-static-supplies = "cdc-vdd-1p8"; + }; + + wsa883x_0222: wsa883x@02170222 { + compatible = "qcom,wsa883x"; + reg = <0x02 0x02170222>; + qcom,spkr-sd-n-node = <&wsa_spkr_en2>; + qcom,bolero-handle = <&bolero>; + + cdc-vdd-1p8-supply = <&L11A>; + qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; + qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; + qcom,cdc-static-supplies = "cdc-vdd-1p8"; + }; +}; + +&wsa881x_0211 { + status = "disabled"; +}; + +&wsa881x_0212 { + status = "disabled"; +}; + +&wsa881x_0213 { + status = "disabled"; +}; + +&wsa881x_0214 { + status = "disabled"; +}; + +&lito_snd { + qcom,model = "lito-orchidmtp-snd-card"; + qcom,wsa-max-devs = <2>; + qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>; + qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight"; +}; + + +&pm8150_rtc { + status = "disabled"; +}; + +&pmk8350_adc_tm { + status = "disabled"; +}; diff --git a/qcom/orchid.dtsi b/qcom/orchid.dtsi index d0d72d33..524f94b0 100644 --- a/qcom/orchid.dtsi +++ b/qcom/orchid.dtsi @@ -1,7 +1,12 @@ #include "lito-v2.dtsi" +#include "pmk8350.dtsi" / { model = "Qualcomm Technologies, Inc. Orchid"; compatible = "qcom,orchid"; qcom,msm-id = <476 0x10000>; }; + +&pm8008_regulators { + vdd_l6-supply = <&BOB>; +}; diff --git a/qcom/scuba.dtsi b/qcom/scuba.dtsi index 0167a7ac..f1857653 100644 --- a/qcom/scuba.dtsi +++ b/qcom/scuba.dtsi @@ -2222,6 +2222,7 @@ bluetooth: bt_wcn3990 { compatible = "qca,wcn3990"; + qca,bt-sw-ctrl-gpio = <&tlmm 87 0>; /* SW_CTRL */ qca,bt-vdd-io-supply = <&L15A>; /* IO */ qca,bt-vdd-core-supply = <&L10A>; /* RFA */ qca,bt-vdd-pa-supply = <&L22A>; /* CH0 */ diff --git a/qcom/scubap-idp.dts b/qcom/scubap-idp.dts index 98f61ac7..03b75e86 100644 --- a/qcom/scubap-idp.dts +++ b/qcom/scubap-idp.dts @@ -9,3 +9,13 @@ qcom,msm-id = <471 0x10000>; qcom,board-id = <34 0>; }; + +&soc { + qcom,rmnet-ipa { + status = "disabled"; + }; +}; + +&ipa_hw { + status = "disabled"; +}; diff --git a/qcom/scubap.dts b/qcom/scubap.dts index 16ebe792..04a46706 100644 --- a/qcom/scubap.dts +++ b/qcom/scubap.dts @@ -8,3 +8,13 @@ qcom,msm-id = <471 0x10000>; qcom,board-id = <0 0>; }; + +&soc { + qcom,rmnet-ipa { + status = "disabled"; + }; +}; + +&ipa_hw { + status = "disabled"; +}; diff --git a/qcom/sdm660-audio.dtsi b/qcom/sdm660-audio.dtsi index ff8a0a48..204fb148 100644 --- a/qcom/sdm660-audio.dtsi +++ b/qcom/sdm660-audio.dtsi @@ -15,6 +15,7 @@ qcom,mi2s-audio-intf; qcom,auxpcm-audio-intf; qcom,wcn-btfm; + qcom,ext-disp-audio-rx; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>; qcom,msm-mclk-freq = <9600000>; qcom,msm-mbhc-hphl-swh = <1>; @@ -87,7 +88,7 @@ <&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>, <&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>, <&proxy_rx>, <&proxy_tx>; - asoc-cpu-names = "msm-dai-q6-dp.24608", + asoc-cpu-names = "msm-dai-q6-dp.0", "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.7", @@ -129,6 +130,7 @@ qcom,mi2s-audio-intf; qcom,auxpcm-audio-intf; qcom,wcn-btfm; + qcom,ext-disp-audio-rx; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>; qcom,audio-routing = "AIF4 VI", "MCLK", @@ -197,7 +199,7 @@ <&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>, <&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>, <&proxy_rx>, <&proxy_tx>; - asoc-cpu-names = "msm-dai-q6-dp.24608", "msm-dai-q6-mi2s.0", + asoc-cpu-names = "msm-dai-q6-dp.0", "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2", diff --git a/qcom/sdm660.dtsi b/qcom/sdm660.dtsi index 4deeb160..f851f2cf 100644 --- a/qcom/sdm660.dtsi +++ b/qcom/sdm660.dtsi @@ -1105,6 +1105,7 @@ compatible = "qcom,arm-memlat-mon"; qcom,cpulist = <&CPU0 &CPU1 &CPU2 &CPU3>; qcom,target-dev = <&cpu0_cpu_ddr_lat>; + qcom,cachemiss-ev = <0x17>; qcom,core-dev-table = < 902400 MHZ_TO_MBPS(200, 4) >, < 1401600 MHZ_TO_MBPS(547, 4) >, @@ -1130,6 +1131,7 @@ compatible = "qcom,arm-memlat-mon"; qcom,cpulist = <&CPU4 &CPU5 &CPU6 &CPU7>; qcom,target-dev = <&cpu4_cpu_ddr_lat>; + qcom,cachemiss-ev = <0x17>; qcom,core-dev-table = < 1113600 MHZ_TO_MBPS(200, 4) >, < 1401600 MHZ_TO_MBPS(1017, 4) >, |