From eee44c7cf2e7e1c7913b8829c0c34cc60a057ff3 Mon Sep 17 00:00:00 2001 From: Hrishabh Rajput Date: Tue, 12 Nov 2024 15:17:07 +0530 Subject: [PATCH] ARM: dts: qcom: Add platform support for VMs on Kera Add support for platforms like ATP, CDP, MTP, QRD and RCM for TUIVM and OEMVM on Kera. Also, add support for additional Kera variant. Change-Id: I872c5a535c7bf79c5c9923f383796f7f70de5897 Signed-off-by: Hrishabh Rajput --- qcom/Makefile | 12 +++++++++++- qcom/kera-oemvm-atp.dts | 17 +++++++++++++++++ qcom/kera-oemvm-atp.dtsi | 7 +++++++ qcom/kera-oemvm-cdp.dts | 17 +++++++++++++++++ qcom/kera-oemvm-cdp.dtsi | 7 +++++++ qcom/kera-oemvm-mtp.dts | 16 ++++++++++++++++ qcom/kera-oemvm-mtp.dtsi | 7 +++++++ qcom/kera-oemvm-qrd.dts | 16 ++++++++++++++++ qcom/kera-oemvm-qrd.dtsi | 7 +++++++ qcom/kera-oemvm-rcm.dts | 16 ++++++++++++++++ qcom/kera-oemvm-rcm.dtsi | 7 +++++++ qcom/kera-oemvm.dtsi | 2 +- qcom/kera-vm-atp.dts | 17 +++++++++++++++++ qcom/kera-vm-atp.dtsi | 7 +++++++ qcom/kera-vm-cdp.dts | 17 +++++++++++++++++ qcom/kera-vm-cdp.dtsi | 7 +++++++ qcom/kera-vm-mtp.dts | 16 ++++++++++++++++ qcom/kera-vm-mtp.dtsi | 7 +++++++ qcom/kera-vm-qrd.dts | 16 ++++++++++++++++ qcom/kera-vm-qrd.dtsi | 7 +++++++ qcom/kera-vm-rcm.dts | 16 ++++++++++++++++ qcom/kera-vm-rcm.dtsi | 7 +++++++ qcom/kera-vm.dtsi | 2 +- qcom/platform_map.bzl | 20 ++++++++++++++++++++ 24 files changed, 267 insertions(+), 3 deletions(-) create mode 100644 qcom/kera-oemvm-atp.dts create mode 100644 qcom/kera-oemvm-atp.dtsi create mode 100644 qcom/kera-oemvm-cdp.dts create mode 100644 qcom/kera-oemvm-cdp.dtsi create mode 100644 qcom/kera-oemvm-mtp.dts create mode 100644 qcom/kera-oemvm-mtp.dtsi create mode 100644 qcom/kera-oemvm-qrd.dts create mode 100644 qcom/kera-oemvm-qrd.dtsi create mode 100644 qcom/kera-oemvm-rcm.dts create mode 100644 qcom/kera-oemvm-rcm.dtsi create mode 100644 qcom/kera-vm-atp.dts create mode 100644 qcom/kera-vm-atp.dtsi create mode 100644 qcom/kera-vm-cdp.dts create mode 100644 qcom/kera-vm-cdp.dtsi create mode 100644 qcom/kera-vm-mtp.dts create mode 100644 qcom/kera-vm-mtp.dtsi create mode 100644 qcom/kera-vm-qrd.dts create mode 100644 qcom/kera-vm-qrd.dtsi create mode 100644 qcom/kera-vm-rcm.dts create mode 100644 qcom/kera-vm-rcm.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index a6bcf83a..770c72d8 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -269,7 +269,17 @@ endif ifeq ($(CONFIG_ARCH_KERA), y) ifeq ($(CONFIG_ARCH_QTI_VM), y) kera_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += kera-vm-rumi.dtb \ - kera-oemvm-rumi.dtb + kera-vm-atp.dtb \ + kera-vm-cdp.dtb \ + kera-vm-mtp.dtb \ + kera-vm-qrd.dtb \ + kera-vm-rcm.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 dtb-y += $(kera_tuivm-dtb-y) endif endif diff --git a/qcom/kera-oemvm-atp.dts b/qcom/kera-oemvm-atp.dts new file mode 100644 index 00000000..6413e8f3 --- /dev/null +++ b/qcom/kera-oemvm-atp.dts @@ -0,0 +1,17 @@ +// 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-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera OEMVM ATP"; + compatible = "qcom,kera-atp", "qcom,kera", "qcom,kerap-atp", "qcom,kerap", + "qcom,atp"; + + qcom,board-id = <33 0>; +}; diff --git a/qcom/kera-oemvm-atp.dtsi b/qcom/kera-oemvm-atp.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-oemvm-atp.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-oemvm-cdp.dts b/qcom/kera-oemvm-cdp.dts new file mode 100644 index 00000000..0120d39e --- /dev/null +++ b/qcom/kera-oemvm-cdp.dts @@ -0,0 +1,17 @@ +// 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-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera OEMVM CDP"; + compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap", + "qcom,cdp"; + + qcom,board-id = <0x10001 0>, <0x20001 0>, <0x30001 0>, <0x40001 0>; +}; diff --git a/qcom/kera-oemvm-cdp.dtsi b/qcom/kera-oemvm-cdp.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-oemvm-cdp.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-oemvm-mtp.dts b/qcom/kera-oemvm-mtp.dts new file mode 100644 index 00000000..8c35e062 --- /dev/null +++ b/qcom/kera-oemvm-mtp.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.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera OEMVM MTP"; + 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>; +}; diff --git a/qcom/kera-oemvm-mtp.dtsi b/qcom/kera-oemvm-mtp.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-oemvm-mtp.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-oemvm-qrd.dts b/qcom/kera-oemvm-qrd.dts new file mode 100644 index 00000000..bbc32acd --- /dev/null +++ b/qcom/kera-oemvm-qrd.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-qrd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera OEMVM QRD"; + 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-qrd.dtsi b/qcom/kera-oemvm-qrd.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-oemvm-qrd.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-oemvm-rcm.dts b/qcom/kera-oemvm-rcm.dts new file mode 100644 index 00000000..e9e5cb10 --- /dev/null +++ b/qcom/kera-oemvm-rcm.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.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera OEMVM RCM"; + 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>; +}; diff --git a/qcom/kera-oemvm-rcm.dtsi b/qcom/kera-oemvm-rcm.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-oemvm-rcm.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-oemvm.dtsi b/qcom/kera-oemvm.dtsi index cd6f0bf4..7d38fc56 100644 --- a/qcom/kera-oemvm.dtsi +++ b/qcom/kera-oemvm.dtsi @@ -8,7 +8,7 @@ / { #address-cells = <0x2>; #size-cells = <0x2>; - qcom,msm-id = <659 0x10000>; + qcom,msm-id = <659 0x10000>, <686 0x10000>; interrupt-parent = <&vgic>; chosen { diff --git a/qcom/kera-vm-atp.dts b/qcom/kera-vm-atp.dts new file mode 100644 index 00000000..fe18d1e8 --- /dev/null +++ b/qcom/kera-vm-atp.dts @@ -0,0 +1,17 @@ +// 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-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera SVM ATP"; + compatible = "qcom,kera-atp", "qcom,kera", "qcom,kerap-atp", "qcom,kerap", + "qcom,atp"; + + qcom,board-id = <33 0>; +}; diff --git a/qcom/kera-vm-atp.dtsi b/qcom/kera-vm-atp.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-atp.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-cdp.dts b/qcom/kera-vm-cdp.dts new file mode 100644 index 00000000..2505df90 --- /dev/null +++ b/qcom/kera-vm-cdp.dts @@ -0,0 +1,17 @@ +// 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-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera SVM CDP"; + compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap", + "qcom,cdp"; + + qcom,board-id = <0x10001 0>, <0x20001 0>, <0x30001 0>, <0x40001 0>; +}; diff --git a/qcom/kera-vm-cdp.dtsi b/qcom/kera-vm-cdp.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-cdp.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-mtp.dts b/qcom/kera-vm-mtp.dts new file mode 100644 index 00000000..3a17f7fd --- /dev/null +++ b/qcom/kera-vm-mtp.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.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera SVM MTP"; + 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>; +}; diff --git a/qcom/kera-vm-mtp.dtsi b/qcom/kera-vm-mtp.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-mtp.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-qrd.dts b/qcom/kera-vm-qrd.dts new file mode 100644 index 00000000..2ec17d3a --- /dev/null +++ b/qcom/kera-vm-qrd.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-qrd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera SVM QRD"; + 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.dtsi b/qcom/kera-vm-qrd.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-qrd.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.dts new file mode 100644 index 00000000..44db195e --- /dev/null +++ b/qcom/kera-vm-rcm.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.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera SVM RCM"; + 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>; +}; diff --git a/qcom/kera-vm-rcm.dtsi b/qcom/kera-vm-rcm.dtsi new file mode 100644 index 00000000..1510613d --- /dev/null +++ b/qcom/kera-vm-rcm.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.dtsi b/qcom/kera-vm.dtsi index a4836d26..43e1addd 100644 --- a/qcom/kera-vm.dtsi +++ b/qcom/kera-vm.dtsi @@ -9,7 +9,7 @@ / { #address-cells = <0x2>; #size-cells = <0x2>; - qcom,msm-id = <659 0x10000>; + qcom,msm-id = <659 0x10000>, <686 0x10000>; interrupt-parent = <&vgic>; chosen { diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index f9058814..be9a3aae 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -244,14 +244,34 @@ _platform_map = { "kera-tuivm": { "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-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-rumi.dtb"}, ], }, "kera-oemvm": { "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-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-rumi.dtb"}, ], },