diff --git a/bindings/soc/qcom/qcom,pcie-pdc.yaml b/bindings/soc/qcom/qcom,pcie-pdc.yaml index 37a32c9f..62a9f3fe 100644 --- a/bindings/soc/qcom/qcom,pcie-pdc.yaml +++ b/bindings/soc/qcom/qcom,pcie-pdc.yaml @@ -22,6 +22,7 @@ properties: - qcom,pineapple-pcie-pdc - qcom,cliffs-pcie-pdc - qcom,tuna-pcie-pdc + - qcom,kera-pcie-pdc - qcom,pcie-pdc reg: diff --git a/qcom/Makefile b/qcom/Makefile index 51ca4378..4da30b34 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -89,9 +89,12 @@ KERA_BOARDS += \ kera-cdp-qca6750-ufs2-overlay.dtbo \ kera-cdp-qca6750-ufs3-overlay.dtbo \ kera-cdp-qca6750-ufs4-overlay.dtbo \ + kera-iot-cdp-qca6750-ufs4-overlay.dtbo \ + kera-cdp-qca6750-ufs4-slt-overlay.dtbo \ kera-qrd-wcn7750-ufs4-overlay.dtbo \ kera-qrd-wcn7750-ufs2-overlay.dtbo \ kera-qrd-wcn7750-ufs3-overlay.dtbo \ + kera-qrd-qca6750-ufs2-overlay.dtbo \ kera-rcm-qca6750-ufs4-overlay.dtbo \ kera-rcm-qca6750-ufs2-overlay.dtbo \ kera-rcm-qca6750-ufs3-overlay.dtbo \ diff --git a/qcom/kera-cdp-qca6750-ufs4-overlay.dts b/qcom/kera-cdp-qca6750-ufs4-overlay.dts index 747e5c50..58e1fefb 100644 --- a/qcom/kera-cdp-qca6750-ufs4-overlay.dts +++ b/qcom/kera-cdp-qca6750-ufs4-overlay.dts @@ -15,5 +15,5 @@ "qcom,cdp"; qcom,msm-id = <686 0x10000>, <659 0x10000>; - qcom,board-id = <0x10001 0>, <0x40001 0>; + qcom,board-id = <0x10001 0>; }; diff --git a/qcom/kera-cdp-qca6750-ufs4-slt-overlay.dts b/qcom/kera-cdp-qca6750-ufs4-slt-overlay.dts new file mode 100644 index 00000000..e021fe36 --- /dev/null +++ b/qcom/kera-cdp-qca6750-ufs4-slt-overlay.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-cdp-qca6750-ufs4.dtsi" +#include "kera-pmiv0102.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS4 + SLT"; + compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap", + "qcom,cdp"; + + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x40001 0>; +}; diff --git a/qcom/kera-coresight.dtsi b/qcom/kera-coresight.dtsi index b8bf474c..4f0a45ca 100644 --- a/qcom/kera-coresight.dtsi +++ b/qcom/kera-coresight.dtsi @@ -1033,7 +1033,7 @@ }; }; - funnel_vide0: funnel@10832000 { + funnel_video: funnel@10832000 { compatible = "arm,primecell"; arm,primecell-periphid = <0x000bb908>; reg = <0x10832000 0x1000>; @@ -1345,6 +1345,14 @@ <&tpdm_wpss_cmb_out_funnel_wpss>; }; }; + + port@2 { + reg = <2>; + funnel_wpss_in_wpss_etm0: endpoint { + remote-endpoint = + <&wpss_etm0_out_funnel_wpss>; + }; + }; }; out-ports { @@ -1365,6 +1373,15 @@ source = <&tpdm_wpss_cmb>; }; }; + + port@2 { + reg = <2>; + funnel_wpss_out_funnel_dlct: endpoint { + remote-endpoint = + <&funnel_dlct_in_funnel_wpss>; + source = <&wpss_etm>; + }; + }; }; }; @@ -1378,7 +1395,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1391,19 +1407,9 @@ }; tpdm_turing_llm: tpdm@10981000 { - compatible = "arm,primecell"; - arm,primecell-periphid = <0x000bb968>; - reg = <0x10981000 0x1000>; - reg-names = "tpdm-base"; - + compatible = "qcom,coresight-static-tpdm"; coresight-name = "coresight-tpdm-turing-llm"; - clocks = <&aoss_qmp>; - clock-names = "apb_pclk"; - status = "disabled"; - - atid = <78>; - out-ports { port { tpdm_turing_llm_out_funnel_turing: endpoint { @@ -1444,6 +1450,14 @@ <&tpdm_turing_llm_out_funnel_turing>; }; }; + + port@4 { + reg = <4>; + funnel_turing_in_funnel_turing_dup: endpoint { + remote-endpoint = + <&funnel_turing_dup_out_funnel_turing>; + }; + }; }; out-ports { @@ -1468,6 +1482,15 @@ }; }; + port@2 { + reg = <2>; + funnel_turing_out_funnel_dlct: endpoint { + remote-endpoint = + <&funnel_dlct_in_funnel_turing>; + source = <&turing_etm0>; + }; + }; + }; }; @@ -2266,6 +2289,128 @@ }; }; + turing-qmi { + compatible = "qcom,coresight-qmi"; + + coresight-name = "coresight-qmi-turing"; + qcom,inst-id = <13>; + + in-ports { + port { + qmi_in_turing_etm0: endpoint { + remote-endpoint = + <&turing_etm0_out_qmi>; + }; + }; + }; + }; + + turing_etm0: turing-etm0 { + compatible = "qcom,coresight-remote-etm"; + + coresight-name = "coresight-turing-etm0"; + + qcom,atid-num = <2>; + atid = <38 39>; + trace-name = "turing-etm0"; + + + out-ports { + port@0 { + reg = <0>; + turing_etm0_out_funnel_turing_dup: endpoint { + remote-endpoint = + <&funnel_turing_dup_in_turing_etm0>; + }; + }; + + port@1 { + reg = <1>; + turing_etm0_out_qmi: endpoint { + remote-endpoint = + <&qmi_in_turing_etm0>; + }; + }; + }; + }; + + wpss_etm: wpss_etm0 { + compatible = "qcom,coresight-remote-etm"; + + coresight-name = "coresight-wpss-etm0"; + qcom,inst-id = <3>; + atid = <44>; + + out-ports { + port@0 { + reg = <0>; + wpss_etm0_out_funnel_wpss: endpoint { + remote-endpoint = + <&funnel_wpss_in_wpss_etm0>; + }; + }; + + port@1 { + reg = <1>; + wpss_etm0_out_qmi: endpoint { + remote-endpoint = + <&qmi_in_wpss_etm0>; + }; + }; + }; + }; + + wpss-qmi { + compatible = "qcom,coresight-qmi"; + + coresight-name = "coresight-qmi-wpss"; + qcom,inst-id = <3>; + + in-ports { + port { + qmi_in_wpss_etm0: endpoint { + remote-endpoint = + <&wpss_etm0_out_qmi>; + }; + }; + }; + }; + + funnel_turing_dup: funnel@10940000 { + compatible = "arm,primecell"; + arm,primecell-periphid = <0x000bb908>; + reg = <0x10940000 0x1000>, + <0x10983000 0x1000>; + reg-names = "funnel-base-dummy", "funnel-base-real"; + + coresight-name = "coresight-funnel-turing_dup"; + + qcom,duplicate-funnel; + clocks = <&aoss_qmp>; + clock-names = "apb_pclk"; + + in-ports { + #address-cells = <1>; + #size-cells = <0>; + port@5 { + reg = <5>; + funnel_turing_dup_in_turing_etm0: endpoint { + remote-endpoint = + <&turing_etm0_out_funnel_turing_dup>; + }; + }; + }; + + out-ports { + port { + funnel_turing_dup_out_funnel_turing: endpoint { + remote-endpoint = + <&funnel_turing_in_funnel_turing_dup>; + }; + }; + }; + }; + modem-etm0 { compatible = "qcom,coresight-remote-etm"; @@ -3068,6 +3213,14 @@ }; }; + port@4 { + reg = <4>; + funnel_dlct_in_funnel_wpss: endpoint { + remote-endpoint = + <&funnel_wpss_out_funnel_dlct>; + }; + }; + port@6 { reg = <6>; funnel_dlct_6_in_funnel_gfx_dl: endpoint { @@ -3076,6 +3229,13 @@ }; }; + port@7 { + reg = <7>; + funnel_dlct_in_funnel_turing: endpoint { + remote-endpoint = + <&funnel_turing_out_funnel_dlct>; + }; + }; }; out-ports { diff --git a/qcom/kera-iot-cdp-qca6750-ufs4-overlay.dts b/qcom/kera-iot-cdp-qca6750-ufs4-overlay.dts new file mode 100644 index 00000000..aaca3064 --- /dev/null +++ b/qcom/kera-iot-cdp-qca6750-ufs4-overlay.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-cdp-qca6750-ufs4-overlay.dts" + +/ { + model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS4 for IoT"; + compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap", + "qcom,cdp"; + + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x50001 0>; +}; diff --git a/qcom/kera-iot-cdp-qca6750-ufs4.dtsi b/qcom/kera-iot-cdp-qca6750-ufs4.dtsi new file mode 100644 index 00000000..b732b80b --- /dev/null +++ b/qcom/kera-iot-cdp-qca6750-ufs4.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "kera-cdp-qca6750-ufs4.dtsi" diff --git a/qcom/kera-pinctrl.dtsi b/qcom/kera-pinctrl.dtsi index 3eef2cd5..d50dca92 100644 --- a/qcom/kera-pinctrl.dtsi +++ b/qcom/kera-pinctrl.dtsi @@ -1860,6 +1860,36 @@ }; }; }; + + usb_phy_ps: usb_phy_ps { + usb3phy_portselect_default: usb3phy_portselect_default { + mux { + pins = "gpio122"; + function = "usb0_phy_ps"; + }; + + config { + pins = "gpio122"; + bias-pull-down; + drive-strength = <2>; + }; + }; + + usb3phy_portselect_gpio: usb3phy_portselect_gpio { + mux { + pins = "gpio122"; + function = "gpio"; + }; + + config { + pins = "gpio122"; + drive-strength = <2>; + bias-pull-down; + input-enable; + }; + }; + }; + /* touchscreen pins */ pmx_ts_active { ts_active: ts_active { diff --git a/qcom/kera-qrd-qca6750-ufs2-overlay.dts b/qcom/kera-qrd-qca6750-ufs2-overlay.dts new file mode 100644 index 00000000..d0e3b143 --- /dev/null +++ b/qcom/kera-qrd-qca6750-ufs2-overlay.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-qrd-qca6750-ufs2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera QRD + QCA6750 + UFS2"; + compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap", + "qcom,qrd"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x3000B 1>; +}; diff --git a/qcom/kera-qrd-qca6750-ufs2.dtsi b/qcom/kera-qrd-qca6750-ufs2.dtsi new file mode 100644 index 00000000..5743706b --- /dev/null +++ b/qcom/kera-qrd-qca6750-ufs2.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "kera-qrd.dtsi" +#include "kera_ufs2.dtsi" diff --git a/qcom/kera-rcm.dtsi b/qcom/kera-rcm.dtsi index fccccc16..f9d8f28b 100644 --- a/qcom/kera-rcm.dtsi +++ b/qcom/kera-rcm.dtsi @@ -23,3 +23,44 @@ status = "ok"; }; + +&qupv3_se8_spi { + #address-cells = <1>; + #size-cells = <0>; + + status = "ok"; + qcom,touch-active = "goodix,gt9916S"; + qcom,la-vm; + + goodix-berlin@0 { + compatible = "goodix,gt9916S"; + reg = <0>; + spi-max-frequency = <1000000>; + interrupt-parent = <&tlmm>; + interrupts = <13 0x2008>; + goodix,reset-gpio = <&tlmm 16 0x00>; + goodix,irq-gpio = <&tlmm 13 0x2008>; + goodix,irq-flags = <2>; + goodix,panel-max-x = <1080>; + goodix,panel-max-y = <2400>; + goodix,panel-max-w = <255>; + goodix,panel-max-p = <4096>; + goodix,firmware-name = "goodix_firmware_spi.bin"; + goodix,config-name = "goodix_cfg_group_spi.bin"; + goodix,avdd-name = "avdd"; + goodix,iovdd-name = "iovdd"; + avdd-supply = <&L22B>; + iovdd-supply = <&L8B>; + goodix,touch-type = "primary"; + goodix,qts_en; + + qts,trusted-touch-mode = "vm_mode"; + qts,touch-environment = "pvm"; + qts,trusted-touch-type = "primary"; + qts,trusted-touch-spi-irq = <653>; + qts,trusted-touch-io-bases = <0xa90000>; + qts,trusted-touch-io-sizes = <0x1000>; + qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0 + &tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>; + }; +}; diff --git a/qcom/kera-usb.dtsi b/qcom/kera-usb.dtsi index 8e6f20b2..557550c0 100644 --- a/qcom/kera-usb.dtsi +++ b/qcom/kera-usb.dtsi @@ -147,6 +147,9 @@ <&gcc GCC_USB3_PHY_PRIM_BCR>; reset-names = "global_phy_reset", "phy_reset"; + pinctrl-names = "default"; + pinctrl-0 = <&usb3phy_portselect_default>; + qcom,qmp-phy-reg-offset = ; + queue-depth = <0x00000008>; + peer-default; + qcom,label = <0xA>; + }; + msgqsock-msgq { vdevice-type = "message-queue-pair"; generate = "/hypervisor/msgqsock-msgq-pair"; diff --git a/qcom/kera.dtsi b/qcom/kera.dtsi index 47d2aa3b..4bbe6ab9 100644 --- a/qcom/kera.dtsi +++ b/qcom/kera.dtsi @@ -705,6 +705,11 @@ qcom,rproc-handle = <&adsp_pas>; }; + pcie_pdc: pdc@b360000 { + compatible = "qcom,kera-pcie-pdc", "qcom,pcie-pdc"; + reg = <0xb360000 0x10000>; + }; + adsp_pas: remoteproc-adsp@03000000 { compatible = "qcom,kera-adsp-pas"; reg = <0x03000000 0x10000>; @@ -1953,7 +1958,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; cnoc_main: interconnect@1500000 { @@ -1962,7 +1966,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; system_noc: interconnect@1680000 { @@ -1971,7 +1974,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; pcie_noc: interconnect@16c0000 { @@ -1980,7 +1982,8 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; + clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>, + <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>; }; aggre1_noc: interconnect@16e0000 { @@ -1989,7 +1992,7 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; + clocks = <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>; }; aggre2_noc: interconnect@1700000 { @@ -1998,7 +2001,7 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; + clocks = <&rpmhcc RPMH_IPA_CLK>; }; mmss_noc: interconnect@1780000 { @@ -2007,7 +2010,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; gem_noc: interconnect@24100000 { @@ -2016,7 +2018,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; nsp_noc: interconnect@320c0000 { @@ -2025,7 +2026,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; lpass_ag_noc: interconnect@7e40000 { @@ -2034,7 +2034,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; lpass_lpiaon_noc: interconnect@7400000 { @@ -2043,7 +2042,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; lpass_lpicx_noc: interconnect@7420000 { @@ -2052,7 +2050,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring { @@ -2529,6 +2526,7 @@ 0x090106C0 0x80040868>; iommus = <&apps_smmu 0x540 0x0>; + qcom,iommu-geometry = <0x40000000 0x10000000>; qcom,iommu-dma = "fastmap"; dma-coherent; memory-region = <&sdhc_2_dma_resv>; @@ -3362,3 +3360,4 @@ vdd-usb-cp-supply = <&L7B>; }; }; +#include "tuna-thermal-overlay.dtsi" diff --git a/qcom/parrot-qupv3.dtsi b/qcom/parrot-qupv3.dtsi index 1163c5e5..615c34a8 100644 --- a/qcom/parrot-qupv3.dtsi +++ b/qcom/parrot-qupv3.dtsi @@ -19,7 +19,7 @@ * Qup1 5: SE 11 */ - qup_iommu_region0: qup_iommu_region { + qup_iommu_region0: qup_iommu_region0 { iommu-addresses = <&gpi_dma0 0x0 0x100000>, <&gpi_dma0 0x200000 0xffe00000>, <&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>; }; @@ -325,7 +325,7 @@ }; }; - qup_iommu_region1: qup_iommu_region { + qup_iommu_region1: qup_iommu_region1 { iommu-addresses = <&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>, <&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>; }; diff --git a/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts b/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts index 8cd3d4fb..8afb5c3e 100644 --- a/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts +++ b/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts @@ -11,5 +11,5 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN6750 VM IDP + AMOLED + RCM"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,board-id = <34 2>; + qcom,board-id = <34 2>, <34 6>; }; diff --git a/qcom/parrot-vm-idp.dts b/qcom/parrot-vm-idp.dts index d50413d5..cc44b70a 100644 --- a/qcom/parrot-vm-idp.dts +++ b/qcom/parrot-vm-idp.dts @@ -11,5 +11,5 @@ / { model = "Qualcomm Technologies, Inc. Parrot SVM IDP"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,board-id = <34 0>; + qcom,board-id = <34 0>, <34 5>; }; diff --git a/qcom/parrot-vm-qrd-wcn6750.dts b/qcom/parrot-vm-qrd-wcn6750.dts index e773ce4b..7a595897 100644 --- a/qcom/parrot-vm-qrd-wcn6750.dts +++ b/qcom/parrot-vm-qrd-wcn6750.dts @@ -11,5 +11,5 @@ / { model = "Qualcomm Technologies, Inc. Parrot SVM QRD + WCN6750"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; - qcom,board-id = <0x1000B 1>; + qcom,board-id = <0x1000B 1>, <0x1000B 2>; }; diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index 57b2524b..41162b2f 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -123,9 +123,12 @@ _platform_map = { {"name": "kera-cdp-qca6750-ufs2-overlay.dtbo"}, {"name": "kera-cdp-qca6750-ufs3-overlay.dtbo"}, {"name": "kera-cdp-qca6750-ufs4-overlay.dtbo"}, + {"name": "kera-iot-cdp-qca6750-ufs4-overlay.dtbo"}, + {"name": "kera-cdp-qca6750-ufs4-slt-overlay.dtbo"}, {"name": "kera-qrd-wcn7750-ufs4-overlay.dtbo"}, {"name": "kera-qrd-wcn7750-ufs2-overlay.dtbo"}, {"name": "kera-qrd-wcn7750-ufs3-overlay.dtbo"}, + {"name": "kera-qrd-qca6750-ufs2-overlay.dtbo"}, {"name": "kera-rcm-qca6750-ufs4-overlay.dtbo"}, {"name": "kera-rcm-qca6750-ufs2-overlay.dtbo"}, {"name": "kera-rcm-qca6750-ufs3-overlay.dtbo"}, diff --git a/qcom/ravelin-qupv3.dtsi b/qcom/ravelin-qupv3.dtsi index 1fa9123b..f4a57d86 100644 --- a/qcom/ravelin-qupv3.dtsi +++ b/qcom/ravelin-qupv3.dtsi @@ -17,7 +17,7 @@ * Qup1 4: SE 9 */ - qup_iommu_region0: qup_iommu_region { + qup_iommu_region0: qup_iommu_region0 { iommu-addresses = <&gpi_dma0 0x0 0x100000>, <&gpi_dma0 0x200000 0xffe00000>, <&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>; }; @@ -279,7 +279,7 @@ }; }; - qup_iommu_region1: qup_iommu_region { + qup_iommu_region1: qup_iommu_region1 { iommu-addresses = <&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>, <&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>; }; diff --git a/qcom/sdxkova.dtsi b/qcom/sdxkova.dtsi index bf3ad21f..fc542c6e 100644 --- a/qcom/sdxkova.dtsi +++ b/qcom/sdxkova.dtsi @@ -1245,6 +1245,10 @@ qtee_shmbridge { compatible = "qcom,tee-shared-memory-bridge"; }; + qcom_smcinvoke { + compatible = "qcom,smcinvoke"; + }; + }; #include "sdxkova-regulators.dtsi" @@ -1577,6 +1581,41 @@ }; }; +qcom_cedev: qcedev@1de0000 { + compatible = "qcom,qcedev"; + reg = <0x1de0000 0x20000>, + <0x1dc4000 0x28000>; + reg-names = "crypto-base","crypto-bam-base"; + interrupts = ; + qcom,bam-pipe-pair = <2>; + qcom,ce-hw-instance = <0>; + qcom,ce-device = <0>; + qcom,ce-hw-shared; + qcom,bam-ee = <0>; + qcom,smmu-s1-enable; + qcom,no-clock-support; + interconnect-names = "data_path"; + interconnects = <&system_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>; + iommus = <&apps_smmu 0x0020 0x0>, + <&apps_smmu 0x0021 0x0>; + qcom,iommu-dma = "atomic"; + dma-coherent; + + qcom_cedev_ns_cb { + compatible = "qcom,qcedev,context-bank"; + label = "ns_context"; + iommus = <&apps_smmu 0x0021 0x0>; + dma-coherent; + }; + }; + + qcom_rng: qrng@10c3000 { + compatible = "qcom,msm-rng"; + reg = <0x10c3000 0x1000>; + qcom,no-qrng-config; + qcom,no-clock-support; + }; + aoss_qmp: power-controller@c300000 { compatible = "qcom,aoss-qmp"; reg = <0x0 0xc310000 0x0 0x1000>; diff --git a/qcom/sun-coresight.dtsi b/qcom/sun-coresight.dtsi index 46a3d97a..cdfcda39 100644 --- a/qcom/sun-coresight.dtsi +++ b/qcom/sun-coresight.dtsi @@ -4199,8 +4199,10 @@ coresight-name = "coresight-stm"; atid = <16>; - clocks = <&aoss_qmp>; - clock-names = "apb_pclk"; + clocks = <&aoss_qmp>, + <&scmi_clk 0>; + clock-names = "apb_pclk", + "atclk"; out-ports { port { diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi index 40e2f55a..c55f2555 100644 --- a/qcom/sun.dtsi +++ b/qcom/sun.dtsi @@ -2429,6 +2429,7 @@ qcom,ice-use-hwkm; qcom,prime-mask = <0xc0>; qcom,silver-mask = <0x3f>; + qcom,cluster-mask = <0x3F 0xC0>; /* affine cpu for each CQ starting from CQ:0 to CQ:max_cqs */ qcom,esi-affinity-mask = <2 3 4 2 3 4 7 7>; @@ -2481,25 +2482,19 @@ qcom,bypass-pbl-rst-wa; qcom,max-cpus = <8>; + qcom,storage-boost; msi-parent = <&gic_its 0x60>; status = "disabled"; qos0 { - mask = <0xc0>; vote = <44>; perf; - /* Set CPU6 to fmax, and CPU[6-7] will run at fmax */ - cpu_freq_vote = <6>; }; qos1 { - mask = <0x3f>; vote = <44>; - perf; - /* Set CPU0 to fmax, and CPU[0-5] will run at fmax */ - cpu_freq_vote = <0>; }; }; diff --git a/qcom/tuna-cdp.dtsi b/qcom/tuna-cdp.dtsi index fbfb524a..d608afe7 100644 --- a/qcom/tuna-cdp.dtsi +++ b/qcom/tuna-cdp.dtsi @@ -4,7 +4,6 @@ */ #include -#include "tuna-thermal-overlay.dtsi" &qupv3_se4_i2c { #address-cells = <1>; diff --git a/qcom/tuna-coresight.dtsi b/qcom/tuna-coresight.dtsi index 00778ee5..c1a91f0a 100644 --- a/qcom/tuna-coresight.dtsi +++ b/qcom/tuna-coresight.dtsi @@ -400,7 +400,6 @@ coresight-name = "coresight-tpdm-eva"; - status = "disabled"; clocks = <&aoss_qmp>; clock-names = "apb_pclk"; @@ -424,7 +423,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; in-ports { #address-cells = <1>; @@ -796,10 +794,8 @@ coresight-name = "coresight-tpda-dl4"; - qcom,cmb-elem-size = <0 32>, - <1 32>, - <2 32>, - <3 32>; + qcom,dsb-elem-size = <16 32>; + qcom,cmb-elem-size = <17 32>; clocks = <&aoss_qmp>; clock-names = "apb_pclk"; @@ -1672,7 +1668,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1694,7 +1689,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1716,7 +1710,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1738,7 +1731,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1760,7 +1752,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1782,7 +1773,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1804,7 +1794,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1826,7 +1815,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -2058,8 +2046,15 @@ coresight-name = "coresight-tpda-apss"; + qcom,dsb-elem-size = <2 32>, + <5 32>, + <8 32>; + qcom,cmb-elem-size = <0 32>, - <1 32>; + <1 32>, + <3 32>, + <6 64>, + <7 64>; clocks = <&aoss_qmp>; clock-names = "apb_pclk"; diff --git a/qcom/tuna-mtp.dtsi b/qcom/tuna-mtp.dtsi index 163aa0e4..558f8679 100644 --- a/qcom/tuna-mtp.dtsi +++ b/qcom/tuna-mtp.dtsi @@ -5,7 +5,6 @@ #include #include -#include "tuna-thermal-overlay.dtsi" &qupv3_se4_i2c { #address-cells = <1>; diff --git a/qcom/tuna-pcie.dtsi b/qcom/tuna-pcie.dtsi index 1080a5ca..336c5867 100644 --- a/qcom/tuna-pcie.dtsi +++ b/qcom/tuna-pcie.dtsi @@ -186,12 +186,12 @@ 0x1174 0x5c 0x0 0x1178 0x9c 0x0 0x117c 0x1a 0x0 - 0x1180 0x89 0x0 + 0x1180 0x8f 0x0 0x1170 0xdc 0x0 0x1188 0x94 0x0 0x118c 0x5b 0x0 0x1190 0x1a 0x0 - 0x1194 0x89 0x0 + 0x1194 0x8f 0x0 0x10cc 0x00 0x0 0x1008 0x09 0x0 0x1014 0x05 0x0 @@ -217,12 +217,12 @@ 0x1974 0x5c 0x0 0x1978 0x9c 0x0 0x197c 0x1a 0x0 - 0x1980 0x89 0x0 + 0x1980 0x8f 0x0 0x1970 0xdc 0x0 0x1988 0x94 0x0 0x198c 0x5b 0x0 0x1990 0x1a 0x0 - 0x1994 0x89 0x0 + 0x1994 0x8f 0x0 0x18cc 0x00 0x0 0x1808 0x09 0x0 0x1814 0x05 0x0 diff --git a/qcom/tuna-pm7550ba-pmd802x.dtsi b/qcom/tuna-pm7550ba-pmd802x.dtsi index e93d1138..72f84c98 100644 --- a/qcom/tuna-pm7550ba-pmd802x.dtsi +++ b/qcom/tuna-pm7550ba-pmd802x.dtsi @@ -29,27 +29,26 @@ }; }; -&pmic_glink_debug { - /delete-node/ i2c@104; - /delete-node/ spmi@200; - i2c@104 { - reg = <0x104>; /* I2C instance 4 in ADSP for SE5 */ - #address-cells = <1>; - #size-cells = <0>; - qcom,bus-type = "i2c"; +&i2c_pmic_smb1398 { + status = "disabled"; +}; - qcom,smb1500@69 { - compatible = "qcom,i2c-pmic"; - reg = <0x69>; - qcom,can-sleep; - }; +&spmi_pmic_smb1510 { + status = "disabled"; +}; - qcom,smb1500@68 { - compatible = "qcom,i2c-pmic"; - reg = <0x68>; - qcom,can-sleep; - }; +&i2c_pmic { + qcom,smb1500@69 { + compatible = "qcom,i2c-pmic"; + reg = <0x69>; + qcom,can-sleep; + }; + + qcom,smb1500@68 { + compatible = "qcom,i2c-pmic"; + reg = <0x68>; + qcom,can-sleep; }; }; @@ -60,32 +59,32 @@ /delete-node/ smb1398_1_die_temp; smb1500_1_iin { - reg = <0x1046901>; - label = "smb1393_1_iin"; + reg = <0x1066901>; + label = "smb1500_1_iin"; }; smb1500_1_ichg { - reg = <0x1046902>; - label = "smb1393_1_ichg"; + reg = <0x1066902>; + label = "smb1500_1_ichg"; }; smb1500_1_die_temp { - reg = <0x1046903>; - label = "smb1393_1_die_temp"; + reg = <0x1066903>; + label = "smb1500_1_die_temp"; }; smb1500_2_iin { - reg = <0x1046801>; - label = "smb1393_2_iin"; + reg = <0x1066801>; + label = "smb1500_2_iin"; }; smb1500_2_ichg { - reg = <0x1046802>; - label = "smb1393_2_ichg"; + reg = <0x1066802>; + label = "smb1500_2_ichg"; }; smb1500_2_die_temp { - reg = <0x1046803>; - label = "smb1393_2_die_temp"; + reg = <0x1066803>; + label = "smb1500_2_die_temp"; }; }; diff --git a/qcom/tuna-pm7550ba.dtsi b/qcom/tuna-pm7550ba.dtsi index bb7acad2..0a21d8d1 100644 --- a/qcom/tuna-pm7550ba.dtsi +++ b/qcom/tuna-pm7550ba.dtsi @@ -37,13 +37,13 @@ }; }; - i2c@104 { - reg = <0x104>; /* I2C instance 4 in ADSP for SE5 */ + i2c_pmic:i2c@106 { + reg = <0x106>; /* I2C instance 6 in ADSP for SE5 */ #address-cells = <1>; #size-cells = <0>; qcom,bus-type = "i2c"; - qcom,smb1398@34 { + i2c_pmic_smb1398: qcom,smb1398@34 { compatible = "qcom,i2c-pmic"; reg = <0x34>; qcom,can-sleep; @@ -51,13 +51,13 @@ }; /* SPMI bridge bus 1 with SMB1510 device */ - spmi@200 { + spmi_pmic:spmi@200 { reg = <0x200>; #address-cells = <2>; #size-cells = <0>; qcom,bus-type = "spmi"; - qcom,smb1510@d { + spmi_pmic_smb1510: qcom,smb1510@d { compatible = "qcom,spmi-pmic"; reg = <13 SPMI_USID>; qcom,can-sleep; @@ -69,17 +69,17 @@ status = "ok"; smb1398_1_iin { - reg = <0x1043401>; + reg = <0x1063401>; label = "smb1393_1_iin"; }; smb1398_1_ichg { - reg = <0x1043402>; + reg = <0x1063402>; label = "smb1393_1_ichg"; }; smb1398_1_die_temp { - reg = <0x1043403>; + reg = <0x1063403>; label = "smb1393_1_die_temp"; }; }; @@ -315,6 +315,25 @@ }; }; }; + + socd { + cooling-maps { + socd_apc1 { + trip = <&socd_trip>; + cooling-device = <&APC1_MX_CX_PAUSE 1 1>; + }; + + socd_cdsp1 { + trip = <&socd_trip>; + cooling-device = <&cdsp_sw 4 4>; + }; + + socd_gpu0 { + trip = <&socd_trip>; + cooling-device = <&msm_gpu 4 4>; + }; + }; + }; }; &pm7550ba_eusb2_repeater { diff --git a/qcom/tuna-pmic-overlay.dtsi b/qcom/tuna-pmic-overlay.dtsi index f81e83c8..a934e553 100644 --- a/qcom/tuna-pmic-overlay.dtsi +++ b/qcom/tuna-pmic-overlay.dtsi @@ -9,7 +9,7 @@ #include "pmk8550.dtsi" #include "pmxr2230.dtsi" #include "pm8550vs.dtsi" -#include "pmr735b.dtsi" +#include "pmr735d.dtsi" #include "pm8550ve.dtsi" #include "pm8010.dtsi" diff --git a/qcom/tuna-pmih010x.dtsi b/qcom/tuna-pmih010x.dtsi index f2ac1b7d..0e68b9ea 100644 --- a/qcom/tuna-pmih010x.dtsi +++ b/qcom/tuna-pmih010x.dtsi @@ -20,15 +20,15 @@ }; }; - i2c@104 { - reg = <0x104>; /* I2C instance 4 in ADSP for SE5 */ + i2c_pmic:i2c@106 { + reg = <0x106>; /* I2C instance 6 in ADSP for SE5 */ #address-cells = <1>; #size-cells = <0>; qcom,bus-type = "i2c"; - qcom,smb1500@69 { + qcom,smb1500@68 { compatible = "qcom,i2c-pmic"; - reg = <0x69>; + reg = <0x68>; qcom,can-sleep; }; }; @@ -48,18 +48,18 @@ status = "ok"; smb1500_1_iin { - reg = <0x1046901>; - label = "smb1393_1_iin"; + reg = <0x1066801>; + label = "smb1500_1_iin"; }; smb1500_1_ichg { - reg = <0x1046902>; - label = "smb1393_1_ichg"; + reg = <0x1066802>; + label = "smb1500_1_ichg"; }; smb1500_1_die_temp { - reg = <0x1046903>; - label = "smb1393_1_die_temp"; + reg = <0x1066803>; + label = "smb1500_1_die_temp"; }; }; @@ -298,6 +298,25 @@ }; }; }; + + socd { + cooling-maps { + socd_apc1 { + trip = <&socd_trip>; + cooling-device = <&APC1_MX_CX_PAUSE 1 1>; + }; + + socd_cdsp1 { + trip = <&socd_trip>; + cooling-device = <&cdsp_sw 4 4>; + }; + + socd_gpu0 { + trip = <&socd_trip>; + cooling-device = <&msm_gpu 4 4>; + }; + }; + }; }; &pmih010x_eusb2_repeater { diff --git a/qcom/tuna-pmiv0108.dtsi b/qcom/tuna-pmiv0108.dtsi index 15c2767c..1cfe6696 100644 --- a/qcom/tuna-pmiv0108.dtsi +++ b/qcom/tuna-pmiv0108.dtsi @@ -240,6 +240,25 @@ }; }; }; + + socd { + cooling-maps { + socd_apc1 { + trip = <&socd_trip>; + cooling-device = <&APC1_MX_CX_PAUSE 1 1>; + }; + + socd_cdsp1 { + trip = <&socd_trip>; + cooling-device = <&cdsp_sw 4 4>; + }; + + socd_gpu0 { + trip = <&socd_trip>; + cooling-device = <&msm_gpu 4 4>; + }; + }; + }; }; &pmiv010x_eusb2_repeater { diff --git a/qcom/tuna-qrd.dtsi b/qcom/tuna-qrd.dtsi index dd96b54a..249e8161 100644 --- a/qcom/tuna-qrd.dtsi +++ b/qcom/tuna-qrd.dtsi @@ -4,7 +4,6 @@ */ #include #include -#include "tuna-thermal-overlay.dtsi" &qupv3_se4_spi { #address-cells = <1>; diff --git a/qcom/tuna-thermal-overlay.dtsi b/qcom/tuna-thermal-overlay.dtsi index c0f874df..e0c1e053 100644 --- a/qcom/tuna-thermal-overlay.dtsi +++ b/qcom/tuna-thermal-overlay.dtsi @@ -6,25 +6,6 @@ #include &thermal_zones { - socd { - cooling-maps { - socd_apc1 { - trip = <&socd_trip>; - cooling-device = <&APC1_MX_CX_PAUSE 1 1>; - }; - - socd_cdsp1 { - trip = <&socd_trip>; - cooling-device = <&cdsp_sw 4 4>; - }; - - socd_gpu0 { - trip = <&socd_trip>; - cooling-device = <&msm_gpu 4 4>; - }; - }; - }; - pmxr2230-bcl-lvl0 { cooling-maps { lbat_0_nr_scg { diff --git a/qcom/tuna-vm.dtsi b/qcom/tuna-vm.dtsi index 93fd4c0c..28e6007b 100644 --- a/qcom/tuna-vm.dtsi +++ b/qcom/tuna-vm.dtsi @@ -301,6 +301,15 @@ }; }; + smmu-proxy-message-queue-pair { + vdevice-type = "message-queue-pair"; + generate = "/hypervisor/smmu-proxy-msgq-pair"; + message-size = <0x000000f0>; + queue-depth = <0x00000008>; + peer-default; + qcom,label = <0xA>; + }; + msgqsock-msgq { vdevice-type = "message-queue-pair"; generate = "/hypervisor/msgqsock-msgq-pair"; diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi index b9236360..e427b26a 100644 --- a/qcom/tuna.dtsi +++ b/qcom/tuna.dtsi @@ -454,7 +454,7 @@ alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; reusable; alignment = <0x0 0x400000>; - size = <0x0 0x2000000>; + size = <0x0 0x2400000>; linux,cma-default; }; @@ -1168,6 +1168,42 @@ qcom,glinkpkt-dev-name = "at_mdm0"; }; + qcom,glinkpkt-ctrl-cdsp { + qcom,glinkpkt-edge = "cdsp"; + qcom,glinkpkt-ch-name = "LOOPBACK_CTL_CDSP"; + qcom,glinkpkt-dev-name = "glink_pkt_ctrl_cdsp"; + }; + + qcom,glinkpkt-data-cdsp { + qcom,glinkpkt-edge = "cdsp"; + qcom,glinkpkt-ch-name = "LOOPBACK_DATA_CDSP"; + qcom,glinkpkt-dev-name = "glink_pkt_data_cdsp"; + }; + + qcom,glinkpkt-ctrl-lpass { + qcom,glinkpkt-edge = "lpass"; + qcom,glinkpkt-ch-name = "LOOPBACK_CTL_LPASS"; + qcom,glinkpkt-dev-name = "glink_pkt_ctrl_lpass"; + }; + + qcom,glinkpkt-data-lpass { + qcom,glinkpkt-edge = "lpass"; + qcom,glinkpkt-ch-name = "LOOPBACK_DATA_LPASS"; + qcom,glinkpkt-dev-name = "glink_pkt_data_lpass"; + }; + + qcom,glinkpkt-ctrl-mpss { + qcom,glinkpkt-edge = "mpss"; + qcom,glinkpkt-ch-name = "LOOPBACK_CTL_MPSS"; + qcom,glinkpkt-dev-name = "glink_pkt_ctrl_mpss"; + }; + + qcom,glinkpkt-data-mpss { + qcom,glinkpkt-edge = "mpss"; + qcom,glinkpkt-ch-name = "LOOPBACK_DATA_MPSS"; + qcom,glinkpkt-dev-name = "glink_pkt_data_mpss"; + }; + qcom,glinkpkt-apr-apps2 { qcom,glinkpkt-edge = "adsp"; qcom,glinkpkt-ch-name = "apr_apps2"; @@ -1217,6 +1253,24 @@ qcom,glinkpkt-ch-name = "bt_cp_ctrl"; qcom,glinkpkt-dev-name = "bt_cp_ctrl"; }; + + qcom,glinkpkt-ims-sub-1 { + qcom,glinkpkt-edge = "mpss"; + qcom,glinkpkt-ch-name = "Ims_dc_sub1"; + qcom,glinkpkt-dev-name = "ims_dc_sub1"; + qcom,glinkpkt-enable-ch-close; + }; + + qcom,glinkpkt-ims-sub-2 { + qcom,glinkpkt-edge = "mpss"; + qcom,glinkpkt-ch-name = "Ims_dc_sub2"; + qcom,glinkpkt-dev-name = "ims_dc_sub2"; + qcom,glinkpkt-enable-ch-close; + }; + }; + + qcom,glink { + compatible = "qcom,glink"; }; sys-pm-vx@c320000 { @@ -2012,6 +2066,51 @@ }; }; + qcom,memshare { + compatible = "qcom,memshare"; + + qcom,client_1 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x0>; + qcom,client-id = <0>; + qcom,allocate-boot-time; + label = "modem"; + }; + + qcom,client_2 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x0>; + qcom,client-id = <2>; + label = "modem"; + }; + + qcom,client_3 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x500000>; + qcom,client-id = <1>; + qcom,allocate-on-request; + label = "modem"; + }; + + qcom,client_ims_1 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x100000>; + qcom,client-id = <7>; + qcom,allocate-on-request; + qcom,shared; + label = "modem"; + }; + + qcom,client_ims_2 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x100000>; + qcom,client-id = <8>; + qcom,allocate-on-request; + qcom,shared; + label = "modem"; + }; + }; + google,debug-kinfo { compatible = "google,debug-kinfo"; memory-region = <&kinfo_mem>; @@ -2146,7 +2245,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; cnoc_main: interconnect@1500000 { @@ -2155,7 +2253,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; system_noc: interconnect@1680000 { @@ -2164,7 +2261,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; pcie_noc: interconnect@16c0000 { @@ -2175,7 +2271,8 @@ "pcie_crm_hw_0"; qcom,bcm-voters = <&apps_bcm_voter>, <&pcie_crm_hw_0_bcm_voter>; - qcom,skip-qos; + clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>, + <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>; }; aggre1_noc: interconnect@16e0000 { @@ -2184,7 +2281,7 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; + clocks = <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>; }; aggre2_noc: interconnect@1700000 { @@ -2193,7 +2290,7 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; + clocks = <&rpmhcc RPMH_IPA_CLK>; }; mmss_noc: interconnect@1780000 { @@ -2222,7 +2319,6 @@ <&disp_crm_hw_4_bcm_voter>, <&disp_crm_hw_5_bcm_voter>, <&disp_crm_sw_0_bcm_voter>; - qcom,skip-qos; }; gem_noc: interconnect@24100000 { @@ -2253,7 +2349,6 @@ <&disp_crm_hw_4_bcm_voter>, <&disp_crm_hw_5_bcm_voter>, <&disp_crm_sw_0_bcm_voter>; - qcom,skip-qos; }; nsp_noc: interconnect@320c0000 { @@ -2262,7 +2357,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; lpass_ag_noc: interconnect@7e40000 { @@ -2271,7 +2365,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; lpass_lpiaon_noc: interconnect@7400000 { @@ -2280,7 +2373,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; lpass_lpicx_noc: interconnect@7420000 { @@ -2289,7 +2381,6 @@ #interconnect-cells = <1>; qcom,bcm-voter-names = "hlos"; qcom,bcm-voters = <&apps_bcm_voter>; - qcom,skip-qos; }; qcom,rmtfs_sharedmem@0 { @@ -2353,6 +2444,7 @@ 0x090106C0 0x80040868>; iommus = <&apps_smmu 0x140 0x0>; + qcom,iommu-geometry = <0x40000000 0x10000000>; qcom,iommu-dma = "fastmap"; dma-coherent; memory-region = <&sdhc_2_dma_resv>; @@ -3677,3 +3769,5 @@ vdd-usb-cp-supply = <&L7B>; }; }; + +#include "tuna-thermal-overlay.dtsi" diff --git a/qcom/tuna7.dtsi b/qcom/tuna7.dtsi index 84e58645..c1d47677 100644 --- a/qcom/tuna7.dtsi +++ b/qcom/tuna7.dtsi @@ -18,3 +18,13 @@ &llcc { compatible = "qcom,tuna7-llcc"; }; + +&wcd_usbss { + interrupt-parent = <&spmi_bus>; + interrupts = <0x0 0xb6 0x1 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "usb_wcd"; + nvmem-cells = <&usb_mode>; + nvmem-cell-names = "usb_mode"; + status = "ok"; +}; +