Merge changes I6716bdd6,Idd02434c,I687bc081,Id47f2a07,I81a206ed, ... into kernel.lnx.6.6.r1-rel

* changes:
  ARM: dts: qcom: Correct gpio pins for i2s0_sd0
  ARM: dts: msm: Add UFS support for kera-atp platform
  ARM: dts: msm: Split platform related VM DTs for Kera
  ARM: dts: msm: Correct etr interrupts for kera
  ARM: dts: msm: enable dcc for kera
  ARM: dts: msm: enable some tpdms for kera
This commit is contained in:
Linux Build Service Account
2025-01-08 02:12:52 -08:00
committed by Gerrit - the friendly Code Review server
30 changed files with 192 additions and 94 deletions

View File

@@ -272,16 +272,20 @@ ifeq ($(CONFIG_ARCH_KERA), y)
ifeq ($(CONFIG_ARCH_QTI_VM), y) ifeq ($(CONFIG_ARCH_QTI_VM), y)
kera_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += kera-vm-rumi.dtb \ kera_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += kera-vm-rumi.dtb \
kera-vm-atp.dtb \ kera-vm-atp.dtb \
kera-vm-cdp.dtb \ kera-vm-cdp-qca6750.dtb \
kera-vm-mtp.dtb \ kera-vm-mtp-qca6750.dtb \
kera-vm-qrd.dtb \ kera-vm-mtp-wcn7750.dtb \
kera-vm-rcm.dtb \ kera-vm-qrd-wcn7750.dtb \
kera-vm-rcm-qca6750.dtb \
kera-vm-rcm-wcn7750.dtb \
kera-oemvm-rumi.dtb \ kera-oemvm-rumi.dtb \
kera-oemvm-atp.dtb \ kera-oemvm-atp.dtb \
kera-oemvm-cdp.dtb \ kera-oemvm-cdp-qca6750.dtb \
kera-oemvm-mtp.dtb \ kera-oemvm-mtp-qca6750.dtb \
kera-oemvm-qrd.dtb \ kera-oemvm-mtp-wcn7750.dtb \
kera-oemvm-rcm.dtb kera-oemvm-qrd-wcn7750.dtb \
kera-oemvm-rcm-qca6750.dtb \
kera-oemvm-rcm-wcn7750.dtb
dtb-y += $(kera_tuivm-dtb-y) dtb-y += $(kera_tuivm-dtb-y)
endif endif
endif endif

View File

@@ -1,8 +1,9 @@
// SPDX-License-Identifier: BSD-3-Clause // 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 <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "kera_ufs4.dtsi"
&sdhc_2 { &sdhc_2 {
vdd-supply = <&L13B>; vdd-supply = <&L13B>;

View File

@@ -814,7 +814,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -836,7 +835,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -858,7 +856,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -880,7 +877,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -902,7 +898,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -931,7 +926,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
@@ -999,7 +993,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -1021,7 +1014,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -1181,7 +1173,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -1280,7 +1271,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -1302,7 +1292,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -1528,7 +1517,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -1550,7 +1538,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -1616,7 +1603,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -2169,7 +2155,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
qcom,hw-enable-check; qcom,hw-enable-check;
@@ -2191,14 +2176,13 @@
coresight-name = "coresight-tpda-tmess"; coresight-name = "coresight-tpda-tmess";
qcom,dsb-elem-size = <0 32>; qcom,dsb-elem-size = <2 64>;
qcom,cmb-elem-size = <0 32>, qcom,cmb-elem-size = <0 32>,
<1 32>, <1 32>,
<2 64>; <2 64>;
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
@@ -2655,7 +2639,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -2680,7 +2663,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
@@ -2788,7 +2770,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -2845,7 +2826,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -2867,7 +2847,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3077,14 +3056,21 @@
coresight-name = "coresight-tpda-dlct"; coresight-name = "coresight-tpda-dlct";
qcom,cmb-elem-size = <0 32>, qcom,dsb-elem-size = <0 32>,
<1 32>,
<2 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>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
@@ -3275,8 +3261,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
tpdm_mm_dsb_out_tn_ag: endpoint { tpdm_mm_dsb_out_tn_ag: endpoint {
@@ -3320,7 +3304,7 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
tpdm_south_dsb_out_tn_ag: endpoint { tpdm_south_dsb_out_tn_ag: endpoint {
@@ -3341,7 +3325,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3363,7 +3346,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3451,7 +3433,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3473,7 +3454,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3812,7 +3792,6 @@
qcom,hw-enable-check; qcom,hw-enable-check;
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3834,7 +3813,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3859,7 +3837,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
@@ -3903,7 +3880,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3925,7 +3901,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3947,7 +3922,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3969,7 +3943,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -3991,7 +3964,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
out-ports { out-ports {
port { port {
@@ -4020,7 +3992,6 @@
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
@@ -4355,7 +4326,7 @@
csr-irqctrl-offset = <0x6c>; csr-irqctrl-offset = <0x6c>;
byte-cntr-name = "byte-cntr"; byte-cntr-name = "byte-cntr";
byte-cntr-class-name = "coresight-tmc-etr-stream"; byte-cntr-class-name = "coresight-tmc-etr-stream";
interrupts = <GIC_SPI 738 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 352 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "byte-cntr-irq"; interrupt-names = "byte-cntr-irq";
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;
@@ -4388,7 +4359,7 @@
csr-irqctrl-offset = <0x70>; csr-irqctrl-offset = <0x70>;
byte-cntr-name = "byte-cntr1"; byte-cntr-name = "byte-cntr1";
byte-cntr-class-name = "coresight-tmc-etr1-stream"; byte-cntr-class-name = "coresight-tmc-etr1-stream";
interrupts = <GIC_SPI 737 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 362 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "byte-cntr-irq"; interrupt-names = "byte-cntr-irq";
clocks = <&aoss_qmp>; clocks = <&aoss_qmp>;

View File

@@ -22,7 +22,6 @@
reg = <0x100ff000 0x1000>, reg = <0x100ff000 0x1000>,
<0x10080000 0x8000>; <0x10080000 0x8000>;
status = "disabled";
qcom,transaction_timeout = <0>; qcom,transaction_timeout = <0>;
reg-names = "dcc-base", "dcc-ram-base"; reg-names = "dcc-base", "dcc-ram-base";

View File

@@ -6,10 +6,10 @@
/dts-v1/; /dts-v1/;
#include "kera-oemvm.dtsi" #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", compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
"qcom,cdp"; "qcom,cdp";

View File

@@ -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>;
};

View File

@@ -6,11 +6,11 @@
/dts-v1/; /dts-v1/;
#include "kera-oemvm.dtsi" #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", compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
"qcom,mtp"; "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>;
}; };

View File

@@ -6,10 +6,10 @@
/dts-v1/; /dts-v1/;
#include "kera-oemvm.dtsi" #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", compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
"qcom,qrd"; "qcom,qrd";
qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>;

View File

@@ -6,11 +6,11 @@
/dts-v1/; /dts-v1/;
#include "kera-oemvm.dtsi" #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", compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
"qcom,rcm"; "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>;
}; };

View File

@@ -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>;
};

View File

@@ -67,12 +67,12 @@
i2s0_sd0 { i2s0_sd0 {
i2s0_sd0_sleep: i2s0_sd0_sleep { i2s0_sd0_sleep: i2s0_sd0_sleep {
mux { mux {
pins = "gpio62"; pins = "gpio64";
function = "gpio"; function = "gpio";
}; };
config { config {
pins = "gpio62"; pins = "gpio64";
drive-strength = <2>; /* 2 mA */ drive-strength = <2>; /* 2 mA */
bias-pull-down; /* PULL DOWN */ bias-pull-down; /* PULL DOWN */
input-enable; input-enable;
@@ -81,12 +81,12 @@
i2s0_sd0_active: i2s0_sd0_active { i2s0_sd0_active: i2s0_sd0_active {
mux { mux {
pins = "gpio62"; pins = "gpio64";
function = "i2s0_data0"; function = "i2s0_data0";
}; };
config { config {
pins = "gpio62"; pins = "gpio64";
drive-strength = <8>; /* 8 mA */ drive-strength = <8>; /* 8 mA */
bias-disable; /* NO PULL */ bias-disable; /* NO PULL */
output-high; output-high;

View File

@@ -6,10 +6,10 @@
/dts-v1/; /dts-v1/;
#include "kera-vm.dtsi" #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", compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
"qcom,cdp"; "qcom,cdp";

View File

@@ -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>;
};

View File

@@ -6,11 +6,11 @@
/dts-v1/; /dts-v1/;
#include "kera-vm.dtsi" #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", compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
"qcom,mtp"; "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>;
}; };

View File

@@ -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>;
};
};

View File

@@ -6,10 +6,10 @@
/dts-v1/; /dts-v1/;
#include "kera-vm.dtsi" #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", compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
"qcom,qrd"; "qcom,qrd";
qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>;

View File

@@ -0,0 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
&soc {
};

View File

@@ -6,11 +6,11 @@
/dts-v1/; /dts-v1/;
#include "kera-vm.dtsi" #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", compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
"qcom,rcm"; "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>;
}; };

View File

@@ -0,0 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
&soc {
};

View File

@@ -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>;
};

View File

@@ -0,0 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
&soc {
};

View File

@@ -247,16 +247,20 @@ _platform_map = {
"dtb_list": [ "dtb_list": [
# keep sorted # keep sorted
{"name": "kera-oemvm-atp.dtb"}, {"name": "kera-oemvm-atp.dtb"},
{"name": "kera-oemvm-cdp.dtb"}, {"name": "kera-oemvm-cdp-qca6750.dtb"},
{"name": "kera-oemvm-mtp.dtb"}, {"name": "kera-oemvm-mtp-qca6750.dtb"},
{"name": "kera-oemvm-qrd.dtb"}, {"name": "kera-oemvm-mtp-wcn7750.dtb"},
{"name": "kera-oemvm-rcm.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-oemvm-rumi.dtb"},
{"name": "kera-vm-atp.dtb"}, {"name": "kera-vm-atp.dtb"},
{"name": "kera-vm-cdp.dtb"}, {"name": "kera-vm-cdp-qca6750.dtb"},
{"name": "kera-vm-mtp.dtb"}, {"name": "kera-vm-mtp-qca6750.dtb"},
{"name": "kera-vm-qrd.dtb"}, {"name": "kera-vm-mtp-wcn7750.dtb"},
{"name": "kera-vm-rcm.dtb"}, {"name": "kera-vm-qrd-wcn7750.dtb"},
{"name": "kera-vm-rcm-qca6750.dtb"},
{"name": "kera-vm-rcm-wcn7750.dtb"},
{"name": "kera-vm-rumi.dtb"}, {"name": "kera-vm-rumi.dtb"},
], ],
}, },
@@ -264,16 +268,20 @@ _platform_map = {
"dtb_list": [ "dtb_list": [
# keep sorted # keep sorted
{"name": "kera-oemvm-atp.dtb"}, {"name": "kera-oemvm-atp.dtb"},
{"name": "kera-oemvm-cdp.dtb"}, {"name": "kera-oemvm-cdp-qca6750.dtb"},
{"name": "kera-oemvm-mtp.dtb"}, {"name": "kera-oemvm-mtp-qca6750.dtb"},
{"name": "kera-oemvm-qrd.dtb"}, {"name": "kera-oemvm-mtp-wcn7750.dtb"},
{"name": "kera-oemvm-rcm.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-oemvm-rumi.dtb"},
{"name": "kera-vm-atp.dtb"}, {"name": "kera-vm-atp.dtb"},
{"name": "kera-vm-cdp.dtb"}, {"name": "kera-vm-cdp-qca6750.dtb"},
{"name": "kera-vm-mtp.dtb"}, {"name": "kera-vm-mtp-qca6750.dtb"},
{"name": "kera-vm-qrd.dtb"}, {"name": "kera-vm-mtp-wcn7750.dtb"},
{"name": "kera-vm-rcm.dtb"}, {"name": "kera-vm-qrd-wcn7750.dtb"},
{"name": "kera-vm-rcm-qca6750.dtb"},
{"name": "kera-vm-rcm-wcn7750.dtb"},
{"name": "kera-vm-rumi.dtb"}, {"name": "kera-vm-rumi.dtb"},
], ],
}, },