From 1de63d93b01e5c737e97610c21b8536eab1a8134 Mon Sep 17 00:00:00 2001 From: songchai Date: Mon, 30 Dec 2024 21:45:33 -0800 Subject: [PATCH 1/6] ARM: dts: msm: enable some tpdms for kera Enable some tpdms for kera. Change-Id: I008a3e5d820c080c7d1ffeb8dec65595c2f781e7 Signed-off-by: Yingchao Deng Signed-off-by: songchai --- qcom/kera-coresight.dtsi | 55 ++++++++++------------------------------ 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/qcom/kera-coresight.dtsi b/qcom/kera-coresight.dtsi index 7119bb99..9bb66498 100644 --- a/qcom/kera-coresight.dtsi +++ b/qcom/kera-coresight.dtsi @@ -814,7 +814,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -836,7 +835,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -858,7 +856,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -880,7 +877,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -902,7 +898,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -931,7 +926,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; in-ports { #address-cells = <1>; @@ -999,7 +993,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1021,7 +1014,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1181,7 +1173,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1280,7 +1271,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1302,7 +1292,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1528,7 +1517,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1550,7 +1538,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -1616,7 +1603,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -2169,7 +2155,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; qcom,hw-enable-check; @@ -2191,14 +2176,13 @@ coresight-name = "coresight-tpda-tmess"; - qcom,dsb-elem-size = <0 32>; + qcom,dsb-elem-size = <2 64>; qcom,cmb-elem-size = <0 32>, <1 32>, <2 64>; clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; in-ports { #address-cells = <1>; @@ -2655,7 +2639,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -2680,7 +2663,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; in-ports { #address-cells = <1>; @@ -2788,7 +2770,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -2845,7 +2826,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -2867,7 +2847,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3077,14 +3056,21 @@ coresight-name = "coresight-tpda-dlct"; - qcom,cmb-elem-size = <0 32>, - <1 32>, + qcom,dsb-elem-size = <0 32>, <2 32>, - <3 32>; + <5 32>, + <15 32>, + <17 32>, + <26 32>; + qcom,cmb-elem-size = <2 32>, + <3 32>, + <6 32>, + <18 32>, + <23 32>, + <27 64>; clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; in-ports { #address-cells = <1>; @@ -3275,8 +3261,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; - out-ports { port { tpdm_mm_dsb_out_tn_ag: endpoint { @@ -3320,7 +3304,7 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; + out-ports { port { tpdm_south_dsb_out_tn_ag: endpoint { @@ -3341,7 +3325,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3363,7 +3346,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3451,7 +3433,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3473,7 +3454,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3812,7 +3792,6 @@ qcom,hw-enable-check; clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3834,7 +3813,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3859,7 +3837,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; in-ports { #address-cells = <1>; @@ -3903,7 +3880,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3925,7 +3901,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3947,7 +3922,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3969,7 +3943,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -3991,7 +3964,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; out-ports { port { @@ -4020,7 +3992,6 @@ clocks = <&aoss_qmp>; clock-names = "apb_pclk"; - status = "disabled"; in-ports { #address-cells = <1>; From 8a3443db2a0f9a6c0b136d99a4764f1d0c1148cc Mon Sep 17 00:00:00 2001 From: songchai Date: Fri, 27 Dec 2024 13:40:06 +0800 Subject: [PATCH 2/6] ARM: dts: msm: enable dcc for kera Enable dcc for kera. Change-Id: I81a206ed0c0869839e1bca7cf349b6a66ab047d4 Signed-off-by: songchai --- qcom/kera-debug.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/qcom/kera-debug.dtsi b/qcom/kera-debug.dtsi index da91ef64..008e38e9 100644 --- a/qcom/kera-debug.dtsi +++ b/qcom/kera-debug.dtsi @@ -22,7 +22,6 @@ reg = <0x100ff000 0x1000>, <0x10084000 0x4000>; - status = "disabled"; qcom,transaction_timeout = <0>; reg-names = "dcc-base", "dcc-ram-base"; From 888d601177b54b22c7d9dd6c061420777d0e2c4f Mon Sep 17 00:00:00 2001 From: songchai Date: Thu, 26 Dec 2024 18:44:01 +0800 Subject: [PATCH 3/6] ARM: dts: msm: Correct etr interrupts for kera Correct etr interrupts for kera. Change-Id: Id47f2a0765ca43755a19f2627269a6241692262c Signed-off-by: songchai --- qcom/kera-coresight.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcom/kera-coresight.dtsi b/qcom/kera-coresight.dtsi index 9bb66498..4bc74ecd 100644 --- a/qcom/kera-coresight.dtsi +++ b/qcom/kera-coresight.dtsi @@ -4326,7 +4326,7 @@ csr-irqctrl-offset = <0x6c>; byte-cntr-name = "byte-cntr"; byte-cntr-class-name = "coresight-tmc-etr-stream"; - interrupts = ; + interrupts = ; interrupt-names = "byte-cntr-irq"; clocks = <&aoss_qmp>; @@ -4359,7 +4359,7 @@ csr-irqctrl-offset = <0x70>; byte-cntr-name = "byte-cntr1"; byte-cntr-class-name = "coresight-tmc-etr1-stream"; - interrupts = ; + interrupts = ; interrupt-names = "byte-cntr-irq"; clocks = <&aoss_qmp>; From e750b9f8ee71d76cd60f1f8e53723debe0f23235 Mon Sep 17 00:00:00 2001 From: Hrishabh Rajput Date: Mon, 30 Dec 2024 15:52:05 +0530 Subject: [PATCH 4/6] ARM: dts: msm: Split platform related VM DTs for Kera Split platform specific devicetree files for Kera TUIVM and OEMVM. Change-Id: I687bc081579cd1545a5f560127417cde6c5e9790 Signed-off-by: Hrishabh Rajput --- qcom/Makefile | 20 ++++++---- ...mvm-cdp.dts => kera-oemvm-cdp-qca6750.dts} | 4 +- ...m-cdp.dtsi => kera-oemvm-cdp-qca6750.dtsi} | 0 qcom/kera-oemvm-mtp-qca6750.dts | 16 ++++++++ ...m-mtp.dtsi => kera-oemvm-mtp-qca6750.dtsi} | 0 ...mvm-mtp.dts => kera-oemvm-mtp-wcn7750.dts} | 6 +-- ...m-qrd.dtsi => kera-oemvm-mtp-wcn7750.dtsi} | 0 ...mvm-qrd.dts => kera-oemvm-qrd-wcn7750.dts} | 4 +- ...m-rcm.dtsi => kera-oemvm-qrd-wcn7750.dtsi} | 0 ...mvm-rcm.dts => kera-oemvm-rcm-qca6750.dts} | 6 +-- ...m-qrd.dtsi => kera-oemvm-rcm-qca6750.dtsi} | 0 qcom/kera-oemvm-rcm-wcn7750.dts | 16 ++++++++ ...m-rcm.dtsi => kera-oemvm-rcm-wcn7750.dtsi} | 0 ...era-vm-cdp.dts => kera-vm-cdp-qca6750.dts} | 4 +- ...a-vm-cdp.dtsi => kera-vm-cdp-qca6750.dtsi} | 0 qcom/kera-vm-mtp-qca6750.dts | 16 ++++++++ ...a-vm-mtp.dtsi => kera-vm-mtp-qca6750.dtsi} | 0 ...era-vm-mtp.dts => kera-vm-mtp-wcn7750.dts} | 6 +-- qcom/kera-vm-mtp-wcn7750.dtsi | 30 ++++++++++++++ ...era-vm-qrd.dts => kera-vm-qrd-wcn7750.dts} | 4 +- qcom/kera-vm-qrd-wcn7750.dtsi | 7 ++++ ...era-vm-rcm.dts => kera-vm-rcm-qca6750.dts} | 6 +-- qcom/kera-vm-rcm-qca6750.dtsi | 7 ++++ qcom/kera-vm-rcm-wcn7750.dts | 16 ++++++++ qcom/kera-vm-rcm-wcn7750.dtsi | 7 ++++ qcom/platform_map.bzl | 40 +++++++++++-------- 26 files changed, 171 insertions(+), 44 deletions(-) rename qcom/{kera-oemvm-cdp.dts => kera-oemvm-cdp-qca6750.dts} (76%) rename qcom/{kera-oemvm-cdp.dtsi => kera-oemvm-cdp-qca6750.dtsi} (100%) create mode 100644 qcom/kera-oemvm-mtp-qca6750.dts rename qcom/{kera-oemvm-mtp.dtsi => kera-oemvm-mtp-qca6750.dtsi} (100%) rename qcom/{kera-oemvm-mtp.dts => kera-oemvm-mtp-wcn7750.dts} (59%) rename qcom/{kera-oemvm-qrd.dtsi => kera-oemvm-mtp-wcn7750.dtsi} (100%) rename qcom/{kera-oemvm-qrd.dts => kera-oemvm-qrd-wcn7750.dts} (75%) rename qcom/{kera-oemvm-rcm.dtsi => kera-oemvm-qrd-wcn7750.dtsi} (100%) rename qcom/{kera-oemvm-rcm.dts => kera-oemvm-rcm-qca6750.dts} (59%) rename qcom/{kera-vm-qrd.dtsi => kera-oemvm-rcm-qca6750.dtsi} (100%) create mode 100644 qcom/kera-oemvm-rcm-wcn7750.dts rename qcom/{kera-vm-rcm.dtsi => kera-oemvm-rcm-wcn7750.dtsi} (100%) rename qcom/{kera-vm-cdp.dts => kera-vm-cdp-qca6750.dts} (76%) rename qcom/{kera-vm-cdp.dtsi => kera-vm-cdp-qca6750.dtsi} (100%) create mode 100644 qcom/kera-vm-mtp-qca6750.dts rename qcom/{kera-vm-mtp.dtsi => kera-vm-mtp-qca6750.dtsi} (100%) rename qcom/{kera-vm-mtp.dts => kera-vm-mtp-wcn7750.dts} (59%) create mode 100644 qcom/kera-vm-mtp-wcn7750.dtsi rename qcom/{kera-vm-qrd.dts => kera-vm-qrd-wcn7750.dts} (76%) create mode 100644 qcom/kera-vm-qrd-wcn7750.dtsi rename qcom/{kera-vm-rcm.dts => kera-vm-rcm-qca6750.dts} (59%) create mode 100644 qcom/kera-vm-rcm-qca6750.dtsi create mode 100644 qcom/kera-vm-rcm-wcn7750.dts create mode 100644 qcom/kera-vm-rcm-wcn7750.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 4da30b34..a20c41b7 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -272,16 +272,20 @@ ifeq ($(CONFIG_ARCH_KERA), y) ifeq ($(CONFIG_ARCH_QTI_VM), y) kera_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += kera-vm-rumi.dtb \ kera-vm-atp.dtb \ - kera-vm-cdp.dtb \ - kera-vm-mtp.dtb \ - kera-vm-qrd.dtb \ - kera-vm-rcm.dtb \ + kera-vm-cdp-qca6750.dtb \ + kera-vm-mtp-qca6750.dtb \ + kera-vm-mtp-wcn7750.dtb \ + kera-vm-qrd-wcn7750.dtb \ + kera-vm-rcm-qca6750.dtb \ + kera-vm-rcm-wcn7750.dtb \ kera-oemvm-rumi.dtb \ kera-oemvm-atp.dtb \ - kera-oemvm-cdp.dtb \ - kera-oemvm-mtp.dtb \ - kera-oemvm-qrd.dtb \ - kera-oemvm-rcm.dtb + kera-oemvm-cdp-qca6750.dtb \ + kera-oemvm-mtp-qca6750.dtb \ + kera-oemvm-mtp-wcn7750.dtb \ + kera-oemvm-qrd-wcn7750.dtb \ + kera-oemvm-rcm-qca6750.dtb \ + kera-oemvm-rcm-wcn7750.dtb dtb-y += $(kera_tuivm-dtb-y) endif endif diff --git a/qcom/kera-oemvm-cdp.dts b/qcom/kera-oemvm-cdp-qca6750.dts similarity index 76% rename from qcom/kera-oemvm-cdp.dts rename to qcom/kera-oemvm-cdp-qca6750.dts index 0120d39e..df596081 100644 --- a/qcom/kera-oemvm-cdp.dts +++ b/qcom/kera-oemvm-cdp-qca6750.dts @@ -6,10 +6,10 @@ /dts-v1/; #include "kera-oemvm.dtsi" -#include "kera-oemvm-cdp.dtsi" +#include "kera-oemvm-cdp-qca6750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera OEMVM CDP"; + model = "Qualcomm Technologies, Inc. Kera OEMVM CDP + QCA6750"; compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap", "qcom,cdp"; diff --git a/qcom/kera-oemvm-cdp.dtsi b/qcom/kera-oemvm-cdp-qca6750.dtsi similarity index 100% rename from qcom/kera-oemvm-cdp.dtsi rename to qcom/kera-oemvm-cdp-qca6750.dtsi diff --git a/qcom/kera-oemvm-mtp-qca6750.dts b/qcom/kera-oemvm-mtp-qca6750.dts new file mode 100644 index 00000000..ddb014c0 --- /dev/null +++ b/qcom/kera-oemvm-mtp-qca6750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; + +#include "kera-oemvm.dtsi" +#include "kera-oemvm-mtp-qca6750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera OEMVM MTP + QCA6750"; + compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap", + "qcom,mtp"; + qcom,board-id = <0x10008 0>, <0x20008 0>, <0x30008 0>; +}; diff --git a/qcom/kera-oemvm-mtp.dtsi b/qcom/kera-oemvm-mtp-qca6750.dtsi similarity index 100% rename from qcom/kera-oemvm-mtp.dtsi rename to qcom/kera-oemvm-mtp-qca6750.dtsi diff --git a/qcom/kera-oemvm-mtp.dts b/qcom/kera-oemvm-mtp-wcn7750.dts similarity index 59% rename from qcom/kera-oemvm-mtp.dts rename to qcom/kera-oemvm-mtp-wcn7750.dts index 8c35e062..06d8713d 100644 --- a/qcom/kera-oemvm-mtp.dts +++ b/qcom/kera-oemvm-mtp-wcn7750.dts @@ -6,11 +6,11 @@ /dts-v1/; #include "kera-oemvm.dtsi" -#include "kera-oemvm-mtp.dtsi" +#include "kera-oemvm-mtp-wcn7750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera OEMVM MTP"; + model = "Qualcomm Technologies, Inc. Kera OEMVM MTP + WCN7750"; compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap", "qcom,mtp"; - qcom,board-id = <0x10008 0>, <0x10008 1>, <0x20008 0>, <0x20008 1>, <0x30008 0>, <0x30008 1>; + qcom,board-id = <0x10008 1>, <0x20008 1>, <0x30008 1>; }; diff --git a/qcom/kera-oemvm-qrd.dtsi b/qcom/kera-oemvm-mtp-wcn7750.dtsi similarity index 100% rename from qcom/kera-oemvm-qrd.dtsi rename to qcom/kera-oemvm-mtp-wcn7750.dtsi diff --git a/qcom/kera-oemvm-qrd.dts b/qcom/kera-oemvm-qrd-wcn7750.dts similarity index 75% rename from qcom/kera-oemvm-qrd.dts rename to qcom/kera-oemvm-qrd-wcn7750.dts index bbc32acd..a7d76ac8 100644 --- a/qcom/kera-oemvm-qrd.dts +++ b/qcom/kera-oemvm-qrd-wcn7750.dts @@ -6,10 +6,10 @@ /dts-v1/; #include "kera-oemvm.dtsi" -#include "kera-oemvm-qrd.dtsi" +#include "kera-oemvm-qrd-wcn7750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera OEMVM QRD"; + model = "Qualcomm Technologies, Inc. Kera OEMVM QRD + WCN7750"; compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap", "qcom,qrd"; qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; diff --git a/qcom/kera-oemvm-rcm.dtsi b/qcom/kera-oemvm-qrd-wcn7750.dtsi similarity index 100% rename from qcom/kera-oemvm-rcm.dtsi rename to qcom/kera-oemvm-qrd-wcn7750.dtsi diff --git a/qcom/kera-oemvm-rcm.dts b/qcom/kera-oemvm-rcm-qca6750.dts similarity index 59% rename from qcom/kera-oemvm-rcm.dts rename to qcom/kera-oemvm-rcm-qca6750.dts index e9e5cb10..4dd58893 100644 --- a/qcom/kera-oemvm-rcm.dts +++ b/qcom/kera-oemvm-rcm-qca6750.dts @@ -6,11 +6,11 @@ /dts-v1/; #include "kera-oemvm.dtsi" -#include "kera-oemvm-rcm.dtsi" +#include "kera-oemvm-rcm-qca6750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera OEMVM RCM"; + model = "Qualcomm Technologies, Inc. Kera OEMVM RCM + QCA6750"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap", "qcom,rcm"; - qcom,board-id = <0x10015 0>, <0x10015 1>, <0x20015 0>, <0x20015 1>, <0x30015 0>, <0x30015 1>; + qcom,board-id = <0x10015 0>, <0x20015 0>, <0x30015 0>; }; diff --git a/qcom/kera-vm-qrd.dtsi b/qcom/kera-oemvm-rcm-qca6750.dtsi similarity index 100% rename from qcom/kera-vm-qrd.dtsi rename to qcom/kera-oemvm-rcm-qca6750.dtsi diff --git a/qcom/kera-oemvm-rcm-wcn7750.dts b/qcom/kera-oemvm-rcm-wcn7750.dts new file mode 100644 index 00000000..fa68c4f6 --- /dev/null +++ b/qcom/kera-oemvm-rcm-wcn7750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; + +#include "kera-oemvm.dtsi" +#include "kera-oemvm-rcm-wcn7750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera OEMVM RCM + WCN7750"; + compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap", + "qcom,rcm"; + qcom,board-id = <0x10015 1>, <0x20015 1>, <0x30015 1>; +}; diff --git a/qcom/kera-vm-rcm.dtsi b/qcom/kera-oemvm-rcm-wcn7750.dtsi similarity index 100% rename from qcom/kera-vm-rcm.dtsi rename to qcom/kera-oemvm-rcm-wcn7750.dtsi diff --git a/qcom/kera-vm-cdp.dts b/qcom/kera-vm-cdp-qca6750.dts similarity index 76% rename from qcom/kera-vm-cdp.dts rename to qcom/kera-vm-cdp-qca6750.dts index 2505df90..09a2d95a 100644 --- a/qcom/kera-vm-cdp.dts +++ b/qcom/kera-vm-cdp-qca6750.dts @@ -6,10 +6,10 @@ /dts-v1/; #include "kera-vm.dtsi" -#include "kera-vm-cdp.dtsi" +#include "kera-vm-cdp-qca6750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera SVM CDP"; + model = "Qualcomm Technologies, Inc. Kera SVM CDP + QCA6750"; compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap", "qcom,cdp"; diff --git a/qcom/kera-vm-cdp.dtsi b/qcom/kera-vm-cdp-qca6750.dtsi similarity index 100% rename from qcom/kera-vm-cdp.dtsi rename to qcom/kera-vm-cdp-qca6750.dtsi diff --git a/qcom/kera-vm-mtp-qca6750.dts b/qcom/kera-vm-mtp-qca6750.dts new file mode 100644 index 00000000..e1f06d69 --- /dev/null +++ b/qcom/kera-vm-mtp-qca6750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; + +#include "kera-vm.dtsi" +#include "kera-vm-mtp-qca6750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera SVM MTP + QCA6750"; + compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap", + "qcom,mtp"; + qcom,board-id = <0x10008 0>, <0x20008 0>, <0x30008 0>; +}; diff --git a/qcom/kera-vm-mtp.dtsi b/qcom/kera-vm-mtp-qca6750.dtsi similarity index 100% rename from qcom/kera-vm-mtp.dtsi rename to qcom/kera-vm-mtp-qca6750.dtsi diff --git a/qcom/kera-vm-mtp.dts b/qcom/kera-vm-mtp-wcn7750.dts similarity index 59% rename from qcom/kera-vm-mtp.dts rename to qcom/kera-vm-mtp-wcn7750.dts index 3a17f7fd..69ea7b6f 100644 --- a/qcom/kera-vm-mtp.dts +++ b/qcom/kera-vm-mtp-wcn7750.dts @@ -6,11 +6,11 @@ /dts-v1/; #include "kera-vm.dtsi" -#include "kera-vm-mtp.dtsi" +#include "kera-vm-mtp-wcn7750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera SVM MTP"; + model = "Qualcomm Technologies, Inc. Kera SVM MTP + WCN7750"; compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap", "qcom,mtp"; - qcom,board-id = <0x10008 0>, <0x10008 1>, <0x20008 0>, <0x20008 1>, <0x30008 0>, <0x30008 1>; + qcom,board-id = <0x10008 1>, <0x20008 1>, <0x30008 1>; }; diff --git a/qcom/kera-vm-mtp-wcn7750.dtsi b/qcom/kera-vm-mtp-wcn7750.dtsi new file mode 100644 index 00000000..10bb9113 --- /dev/null +++ b/qcom/kera-vm-mtp-wcn7750.dtsi @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +&soc { +}; + +&qupv3_se8_spi { + status = "ok"; + goodix-berlin@0 { + compatible = "goodix,gt9916S"; + reg = <0>; + spi-max-frequency = <1000000>; + goodix,panel-max-x = <1080>; + goodix,panel-max-y = <2400>; + goodix,panel-max-w = <255>; + goodix,panel-max-p = <4096>; + goodix,touch-type = "primary"; + goodix,qts_en; + qts,trusted-touch-mode = "vm_mode"; + 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-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-qrd.dts b/qcom/kera-vm-qrd-wcn7750.dts similarity index 76% rename from qcom/kera-vm-qrd.dts rename to qcom/kera-vm-qrd-wcn7750.dts index 2ec17d3a..a44f5697 100644 --- a/qcom/kera-vm-qrd.dts +++ b/qcom/kera-vm-qrd-wcn7750.dts @@ -6,10 +6,10 @@ /dts-v1/; #include "kera-vm.dtsi" -#include "kera-vm-qrd.dtsi" +#include "kera-vm-qrd-wcn7750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera SVM QRD"; + model = "Qualcomm Technologies, Inc. Kera SVM QRD + WCN7750"; compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap", "qcom,qrd"; qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; diff --git a/qcom/kera-vm-qrd-wcn7750.dtsi b/qcom/kera-vm-qrd-wcn7750.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-qrd-wcn7750.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +&soc { +}; diff --git a/qcom/kera-vm-rcm.dts b/qcom/kera-vm-rcm-qca6750.dts similarity index 59% rename from qcom/kera-vm-rcm.dts rename to qcom/kera-vm-rcm-qca6750.dts index 44db195e..984404c3 100644 --- a/qcom/kera-vm-rcm.dts +++ b/qcom/kera-vm-rcm-qca6750.dts @@ -6,11 +6,11 @@ /dts-v1/; #include "kera-vm.dtsi" -#include "kera-vm-rcm.dtsi" +#include "kera-vm-rcm-qca6750.dtsi" / { - model = "Qualcomm Technologies, Inc. Kera SVM RCM"; + model = "Qualcomm Technologies, Inc. Kera SVM RCM + QCA6750"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap", "qcom,rcm"; - qcom,board-id = <0x10015 0>, <0x10015 1>, <0x20015 0>, <0x20015 1>, <0x30015 0>, <0x30015 1>; + qcom,board-id = <0x10015 0>, <0x20015 0>, <0x30015 0>; }; diff --git a/qcom/kera-vm-rcm-qca6750.dtsi b/qcom/kera-vm-rcm-qca6750.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-rcm-qca6750.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +&soc { +}; diff --git a/qcom/kera-vm-rcm-wcn7750.dts b/qcom/kera-vm-rcm-wcn7750.dts new file mode 100644 index 00000000..774638fc --- /dev/null +++ b/qcom/kera-vm-rcm-wcn7750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; + +#include "kera-vm.dtsi" +#include "kera-vm-rcm-wcn7750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera SVM RCM + WCN7750"; + compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap", + "qcom,rcm"; + qcom,board-id = <0x10015 1>, <0x20015 1>, <0x30015 1>; +}; diff --git a/qcom/kera-vm-rcm-wcn7750.dtsi b/qcom/kera-vm-rcm-wcn7750.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-rcm-wcn7750.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +&soc { +}; diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index 41162b2f..2e9155e2 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -247,16 +247,20 @@ _platform_map = { "dtb_list": [ # keep sorted {"name": "kera-oemvm-atp.dtb"}, - {"name": "kera-oemvm-cdp.dtb"}, - {"name": "kera-oemvm-mtp.dtb"}, - {"name": "kera-oemvm-qrd.dtb"}, - {"name": "kera-oemvm-rcm.dtb"}, + {"name": "kera-oemvm-cdp-qca6750.dtb"}, + {"name": "kera-oemvm-mtp-qca6750.dtb"}, + {"name": "kera-oemvm-mtp-wcn7750.dtb"}, + {"name": "kera-oemvm-qrd-wcn7750.dtb"}, + {"name": "kera-oemvm-rcm-qca6750.dtb"}, + {"name": "kera-oemvm-rcm-wcn7750.dtb"}, {"name": "kera-oemvm-rumi.dtb"}, {"name": "kera-vm-atp.dtb"}, - {"name": "kera-vm-cdp.dtb"}, - {"name": "kera-vm-mtp.dtb"}, - {"name": "kera-vm-qrd.dtb"}, - {"name": "kera-vm-rcm.dtb"}, + {"name": "kera-vm-cdp-qca6750.dtb"}, + {"name": "kera-vm-mtp-qca6750.dtb"}, + {"name": "kera-vm-mtp-wcn7750.dtb"}, + {"name": "kera-vm-qrd-wcn7750.dtb"}, + {"name": "kera-vm-rcm-qca6750.dtb"}, + {"name": "kera-vm-rcm-wcn7750.dtb"}, {"name": "kera-vm-rumi.dtb"}, ], }, @@ -264,16 +268,20 @@ _platform_map = { "dtb_list": [ # keep sorted {"name": "kera-oemvm-atp.dtb"}, - {"name": "kera-oemvm-cdp.dtb"}, - {"name": "kera-oemvm-mtp.dtb"}, - {"name": "kera-oemvm-qrd.dtb"}, - {"name": "kera-oemvm-rcm.dtb"}, + {"name": "kera-oemvm-cdp-qca6750.dtb"}, + {"name": "kera-oemvm-mtp-qca6750.dtb"}, + {"name": "kera-oemvm-mtp-wcn7750.dtb"}, + {"name": "kera-oemvm-qrd-wcn7750.dtb"}, + {"name": "kera-oemvm-rcm-qca6750.dtb"}, + {"name": "kera-oemvm-rcm-wcn7750.dtb"}, {"name": "kera-oemvm-rumi.dtb"}, {"name": "kera-vm-atp.dtb"}, - {"name": "kera-vm-cdp.dtb"}, - {"name": "kera-vm-mtp.dtb"}, - {"name": "kera-vm-qrd.dtb"}, - {"name": "kera-vm-rcm.dtb"}, + {"name": "kera-vm-cdp-qca6750.dtb"}, + {"name": "kera-vm-mtp-qca6750.dtb"}, + {"name": "kera-vm-mtp-wcn7750.dtb"}, + {"name": "kera-vm-qrd-wcn7750.dtb"}, + {"name": "kera-vm-rcm-qca6750.dtb"}, + {"name": "kera-vm-rcm-wcn7750.dtb"}, {"name": "kera-vm-rumi.dtb"}, ], }, From a562b45dd44a0b5759a5f80be024935c37f9840d Mon Sep 17 00:00:00 2001 From: Manish Pandey Date: Fri, 3 Jan 2025 11:15:48 +0530 Subject: [PATCH 5/6] ARM: dts: msm: Add UFS support for kera-atp platform Add UFS support for kera atp platform. Change-Id: Idd02434cd3186a0de96d8b3212646cfe09873778 Signed-off-by: Manish Pandey --- qcom/kera-atp.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qcom/kera-atp.dtsi b/qcom/kera-atp.dtsi index 5b09937c..1d35a3f7 100644 --- a/qcom/kera-atp.dtsi +++ b/qcom/kera-atp.dtsi @@ -1,8 +1,9 @@ // 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 "kera_ufs4.dtsi" &sdhc_2 { vdd-supply = <&L13B>; From 7840d1a03b07276dcf1f1e0ac5a88ed936df2ed4 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Tue, 31 Dec 2024 07:59:35 +0530 Subject: [PATCH 6/6] ARM: dts: qcom: Correct gpio pins for i2s0_sd0 -Update of correct gpio pin for i2s_ds0. Change-Id: I6716bdd61c90909cbbc646638ea97d98ae5b50ba Signed-off-by: Ravulapati Vishnu Vardhan Rao --- qcom/kera-pinctrl.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qcom/kera-pinctrl.dtsi b/qcom/kera-pinctrl.dtsi index 489976e9..fa5cab6a 100644 --- a/qcom/kera-pinctrl.dtsi +++ b/qcom/kera-pinctrl.dtsi @@ -67,12 +67,12 @@ i2s0_sd0 { i2s0_sd0_sleep: i2s0_sd0_sleep { mux { - pins = "gpio62"; + pins = "gpio64"; function = "gpio"; }; config { - pins = "gpio62"; + pins = "gpio64"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ input-enable; @@ -81,12 +81,12 @@ i2s0_sd0_active: i2s0_sd0_active { mux { - pins = "gpio62"; + pins = "gpio64"; function = "i2s0_data0"; }; config { - pins = "gpio62"; + pins = "gpio64"; drive-strength = <8>; /* 8 mA */ bias-disable; /* NO PULL */ output-high;