From 1e62b303bf561dfff786a06403931f90862c0c19 Mon Sep 17 00:00:00 2001 From: Anand Tarakh Date: Fri, 3 Jan 2025 12:34:28 +0530 Subject: [PATCH 1/3] ARM: dts: msm: update touch io base address to spi qup node for kera Update trusted touch io base address to spi qup node address for kera. Change-Id: Ice0a8e82b62f3f44b5ceb12d89744c1c11681da1 Signed-off-by: Anand Tarakh --- qcom/kera-cdp.dtsi | 4 ++-- qcom/kera-mtp.dtsi | 4 ++-- qcom/kera-qrd.dtsi | 4 ++-- qcom/kera-rcm.dtsi | 4 ++-- qcom/kera-vm-cdp-qca6750.dtsi | 4 ++-- qcom/kera-vm-mtp-qca6750.dtsi | 4 ++-- qcom/kera-vm-mtp-wcn7750.dtsi | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qcom/kera-cdp.dtsi b/qcom/kera-cdp.dtsi index 6c89c76e..592b3175 100644 --- a/qcom/kera-cdp.dtsi +++ b/qcom/kera-cdp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -58,7 +58,7 @@ 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-bases = <0x880000>; 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-mtp.dtsi b/qcom/kera-mtp.dtsi index b5b73f13..8188e797 100644 --- a/qcom/kera-mtp.dtsi +++ b/qcom/kera-mtp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -70,7 +70,7 @@ 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-bases = <0x880000>; 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-qrd.dtsi b/qcom/kera-qrd.dtsi index 0167d656..97e04abe 100644 --- a/qcom/kera-qrd.dtsi +++ b/qcom/kera-qrd.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -66,7 +66,7 @@ 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-bases = <0x880000>; 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-rcm.dtsi b/qcom/kera-rcm.dtsi index 6c89c76e..592b3175 100644 --- a/qcom/kera-rcm.dtsi +++ b/qcom/kera-rcm.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -58,7 +58,7 @@ 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-bases = <0x880000>; 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-vm-cdp-qca6750.dtsi b/qcom/kera-vm-cdp-qca6750.dtsi index 10bb9113..805e6850 100644 --- a/qcom/kera-vm-cdp-qca6750.dtsi +++ b/qcom/kera-vm-cdp-qca6750.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ &soc { @@ -22,7 +22,7 @@ qts,touch-environment = "tvm"; qts,trusted-touch-type = "primary"; qts,trusted-touch-spi-irq = <653>; - qts,trusted-touch-io-bases = <0xa90000>; + qts,trusted-touch-io-bases = <0x880000>; 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-vm-mtp-qca6750.dtsi b/qcom/kera-vm-mtp-qca6750.dtsi index 10bb9113..805e6850 100644 --- a/qcom/kera-vm-mtp-qca6750.dtsi +++ b/qcom/kera-vm-mtp-qca6750.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ &soc { @@ -22,7 +22,7 @@ qts,touch-environment = "tvm"; qts,trusted-touch-type = "primary"; qts,trusted-touch-spi-irq = <653>; - qts,trusted-touch-io-bases = <0xa90000>; + qts,trusted-touch-io-bases = <0x880000>; 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-vm-mtp-wcn7750.dtsi b/qcom/kera-vm-mtp-wcn7750.dtsi index 10bb9113..805e6850 100644 --- a/qcom/kera-vm-mtp-wcn7750.dtsi +++ b/qcom/kera-vm-mtp-wcn7750.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ &soc { @@ -22,7 +22,7 @@ qts,touch-environment = "tvm"; qts,trusted-touch-type = "primary"; qts,trusted-touch-spi-irq = <653>; - qts,trusted-touch-io-bases = <0xa90000>; + qts,trusted-touch-io-bases = <0x880000>; 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>; From 9196840974643999e20b5c86275057d34cce0349 Mon Sep 17 00:00:00 2001 From: Uttkarsh Aggarwal Date: Fri, 20 Dec 2024 14:20:02 +0530 Subject: [PATCH 2/3] ARM: dts: msm: Define maximum number of USB XHCI interrupters DWC3 host and XHCI plat now communicates the maximum number of interrupters the XHCI HCD will allocate. Since platforms only require a limited number of interrupters (i.e. 3) make sure XHCI doesn't allocate more than is required. Change-Id: I466748df07aba6d7bdc79c7b2b17b3a57c58d3d4 Signed-off-by: Uttkarsh Aggarwal --- qcom/kera-usb.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/qcom/kera-usb.dtsi b/qcom/kera-usb.dtsi index 557550c0..2b9a0899 100644 --- a/qcom/kera-usb.dtsi +++ b/qcom/kera-usb.dtsi @@ -83,6 +83,7 @@ snps,dis_u2_susphy_quirk; snps,ssp-u3-u0-quirk; tx-fifo-resize; + num-hc-interrupters = /bits/ 16 <3>; dr_mode = "peripheral"; maximum-speed = "super-speed-plus"; usb-role-switch; From 2a3ee4d3e1ce50edfa3d2aeed33659ef2f0a4cd2 Mon Sep 17 00:00:00 2001 From: Uttkarsh Aggarwal Date: Fri, 20 Dec 2024 14:17:52 +0530 Subject: [PATCH 3/3] ARM: dts: msm: Add usb-role-switch and eud on kera This change will add usb-role-switch and eud in Kera. Change-Id: I74ca8c0e19b45d925bcecc78e993439441339e20 Signed-off-by: Uttkarsh Aggarwal --- qcom/kera-usb.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcom/kera-usb.dtsi b/qcom/kera-usb.dtsi index 2b9a0899..114c7381 100644 --- a/qcom/kera-usb.dtsi +++ b/qcom/kera-usb.dtsi @@ -45,6 +45,9 @@ qcom,use-pdc-interrupts; qcom,use-eusb2-phy; + extcon = <&eud>; + usb-role-switch; + interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb"; interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>, <&aggre1_noc MASTER_USB3_0 &config_noc SLAVE_IPA_CFG>, @@ -84,7 +87,7 @@ snps,ssp-u3-u0-quirk; tx-fifo-resize; num-hc-interrupters = /bits/ 16 <3>; - dr_mode = "peripheral"; + dr_mode = "otg"; maximum-speed = "super-speed-plus"; usb-role-switch; };