From ccfdbe9ae86271af5368f8f0c2ad621d577278bb Mon Sep 17 00:00:00 2001 From: Unnathi Chalicheemala Date: Tue, 31 Oct 2023 09:52:21 -0700 Subject: [PATCH 1/4] dt-bindings: msm: Add MSM bindings for SunP SoC Add compatible strings for APQ variant of Sun SoC on MTP, CDP and QRD platforms. Change-Id: I8dd8e0ec70d2c1fd6fe931cc312a114a7c1076cd Signed-off-by: Unnathi Chalicheemala --- bindings/arm/msm/msm.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/bindings/arm/msm/msm.yaml b/bindings/arm/msm/msm.yaml index 2393f880..90d6cff4 100644 --- a/bindings/arm/msm/msm.yaml +++ b/bindings/arm/msm/msm.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/arm/msm.yaml# +$id: http://devicetree.org/schemas/arm/msm/msm.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Qualcomm Technologies, Inc. MSM @@ -54,4 +54,15 @@ properties: - qcom,rumi - const: qcom,sun + - description: Qualcomm Technologies, Inc. SUNP RUMI + items: + - enum: + - qcom,sunp-cdp + - qcom,cdp + - qcom,sunp-mtp + - qcom,mtp + - qcom,sunp-qrd + - qcom,qrd + - const: qcom,sunp + additionalProperties: true From 3afa08eaed72019e2b65b0ebfde9445cf28b9c31 Mon Sep 17 00:00:00 2001 From: Unnathi Chalicheemala Date: Mon, 30 Oct 2023 09:55:32 -0700 Subject: [PATCH 2/4] ARM: dts: msm: Support for APQ variant on Sun SoC Add v1 and v2 DT support for APQ variant on MTP, CDP and QRD platforms. Change-Id: Ifb447f14db06038d537951bd9b37f279c4757c0b Signed-off-by: Unnathi Chalicheemala --- qcom/Makefile | 1 + qcom/sun-cdp-kiwi-overlay.dts | 5 +++-- qcom/sun-cdp-overlay.dts | 5 +++-- qcom/sun-mtp-kiwi-overlay.dts | 5 +++-- qcom/sun-mtp-overlay.dts | 5 +++-- qcom/sun-qrd-sku1-overlay.dts | 5 +++-- qcom/sun-qrd-sku2-overlay.dts | 5 +++-- qcom/sunp-v2.dts | 14 ++++++++++++++ qcom/sunp-v2.dtsi | 12 ++++++++++++ qcom/sunp.dts | 14 ++++++++++++++ qcom/sunp.dtsi | 12 ++++++++++++ 11 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 qcom/sunp-v2.dts create mode 100644 qcom/sunp-v2.dtsi create mode 100644 qcom/sunp.dts create mode 100644 qcom/sunp.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index af3f16e2..bf7b4de8 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -16,6 +16,7 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o ifneq ($(CONFIG_ARCH_QTI_VM), y) SUN_BASE_DTB += sun.dtb sun-v2.dtb +SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb SUN_BOARDS += \ sun-mtp-overlay.dtbo \ diff --git a/qcom/sun-cdp-kiwi-overlay.dts b/qcom/sun-cdp-kiwi-overlay.dts index 639098f3..d4e41ba8 100644 --- a/qcom/sun-cdp-kiwi-overlay.dts +++ b/qcom/sun-cdp-kiwi-overlay.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN"; - compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", + "qcom,cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x20001 0>; }; diff --git a/qcom/sun-cdp-overlay.dts b/qcom/sun-cdp-overlay.dts index 97abb08f..0c09832a 100644 --- a/qcom/sun-cdp-overlay.dts +++ b/qcom/sun-cdp-overlay.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP"; - compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", + "qcom,cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <1 0>; }; diff --git a/qcom/sun-mtp-kiwi-overlay.dts b/qcom/sun-mtp-kiwi-overlay.dts index 0919e9eb..ce7816c1 100644 --- a/qcom/sun-mtp-kiwi-overlay.dts +++ b/qcom/sun-mtp-kiwi-overlay.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN"; - compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", + "qcom,mtp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x20008 0>; }; diff --git a/qcom/sun-mtp-overlay.dts b/qcom/sun-mtp-overlay.dts index 891692f9..983d05f7 100644 --- a/qcom/sun-mtp-overlay.dts +++ b/qcom/sun-mtp-overlay.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP"; - compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", + "qcom,mtp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <8 0>; }; diff --git a/qcom/sun-qrd-sku1-overlay.dts b/qcom/sun-qrd-sku1-overlay.dts index af5ab897..15d9cb96 100644 --- a/qcom/sun-qrd-sku1-overlay.dts +++ b/qcom/sun-qrd-sku1-overlay.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun QRD SKU1"; - compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", + "qcom,qrd"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/sun-qrd-sku2-overlay.dts b/qcom/sun-qrd-sku2-overlay.dts index e63aaacd..fdafc5d7 100644 --- a/qcom/sun-qrd-sku2-overlay.dts +++ b/qcom/sun-qrd-sku2-overlay.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun QRD SKU2"; - compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", + "qcom,qrd"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x2000B 0>; }; diff --git a/qcom/sunp-v2.dts b/qcom/sunp-v2.dts new file mode 100644 index 00000000..dc47d6bb --- /dev/null +++ b/qcom/sunp-v2.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; + +#include "sunp-v2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SunP v2 SoC"; + compatible = "qcom,sunp"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/sunp-v2.dtsi b/qcom/sunp-v2.dtsi new file mode 100644 index 00000000..0809f16c --- /dev/null +++ b/qcom/sunp-v2.dtsi @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-v2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SunP v2 SoC"; + compatible = "qcom,sunp"; + qcom,msm-id = <639 0x20000>; +}; diff --git a/qcom/sunp.dts b/qcom/sunp.dts new file mode 100644 index 00000000..68324963 --- /dev/null +++ b/qcom/sunp.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; + +#include "sunp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SunP SoC"; + compatible = "qcom,sunp"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/sunp.dtsi b/qcom/sunp.dtsi new file mode 100644 index 00000000..fec5362e --- /dev/null +++ b/qcom/sunp.dtsi @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SunP SoC"; + compatible = "qcom,sunp"; + qcom,msm-id = <639 0x10000>; +}; From d19618b5c74ed2b7622fccfc8b16a4e3a69248e0 Mon Sep 17 00:00:00 2001 From: Unnathi Chalicheemala Date: Mon, 30 Oct 2023 11:06:19 -0700 Subject: [PATCH 3/4] ARM: dts: msm: Add NFC support for Sun SoC Add NFC support for MTP, CDP platforms on Sun SoC. Change-Id: I93755e3861d5d075f020ea5856caed56d57db922 Signed-off-by: Unnathi Chalicheemala --- qcom/Makefile | 2 ++ qcom/sun-cdp-nfc-overlay.dts | 16 ++++++++++++++++ qcom/sun-cdp-nfc.dtsi | 6 ++++++ qcom/sun-mtp-nfc-overlay.dts | 16 ++++++++++++++++ qcom/sun-mtp-nfc.dtsi | 6 ++++++ 5 files changed, 46 insertions(+) create mode 100644 qcom/sun-cdp-nfc-overlay.dts create mode 100644 qcom/sun-cdp-nfc.dtsi create mode 100644 qcom/sun-mtp-nfc-overlay.dts create mode 100644 qcom/sun-mtp-nfc.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index bf7b4de8..9f2eb590 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -21,8 +21,10 @@ SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb SUN_BOARDS += \ sun-mtp-overlay.dtbo \ sun-mtp-kiwi-overlay.dtbo \ + sun-mtp-nfc-overlay.dtbo \ sun-cdp-overlay.dtbo \ sun-cdp-kiwi-overlay.dtbo \ + sun-cdp-nfc-overlay.dtbo \ sun-qrd-sku1-overlay.dtbo \ sun-qrd-sku2-overlay.dtbo diff --git a/qcom/sun-cdp-nfc-overlay.dts b/qcom/sun-cdp-nfc-overlay.dts new file mode 100644 index 00000000..d5929915 --- /dev/null +++ b/qcom/sun-cdp-nfc-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-cdp-nfc.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun CDP SN300 NFC"; + compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x40001 0>; +}; diff --git a/qcom/sun-cdp-nfc.dtsi b/qcom/sun-cdp-nfc.dtsi new file mode 100644 index 00000000..75eff7ab --- /dev/null +++ b/qcom/sun-cdp-nfc.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-cdp.dtsi" diff --git a/qcom/sun-mtp-nfc-overlay.dts b/qcom/sun-mtp-nfc-overlay.dts new file mode 100644 index 00000000..6aa03e84 --- /dev/null +++ b/qcom/sun-mtp-nfc-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-mtp-nfc.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun MTP SN300 NFC"; + compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x30008 0>; +}; diff --git a/qcom/sun-mtp-nfc.dtsi b/qcom/sun-mtp-nfc.dtsi new file mode 100644 index 00000000..ed228e3c --- /dev/null +++ b/qcom/sun-mtp-nfc.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-mtp.dtsi" From fca71be3705255e6ac0ffbf8aa660180af5dd470 Mon Sep 17 00:00:00 2001 From: Unnathi Chalicheemala Date: Mon, 30 Oct 2023 11:47:54 -0700 Subject: [PATCH 4/4] ARM: dts: msm: Add v8 Power Grid DT support on Sun SoC Add device tree support for v8 Power Grid on MTP, CDP, QRD platforms for Sun SoC. Change-Id: Iceac9ff05e97fb384f1bb0e641ad6ec568d75076 Signed-off-by: Unnathi Chalicheemala --- qcom/Makefile | 3 +++ qcom/sun-cdp-v8-overlay.dts | 17 +++++++++++++++++ qcom/sun-cdp-v8.dtsi | 6 ++++++ qcom/sun-mtp-v8-overlay.dts | 17 +++++++++++++++++ qcom/sun-mtp-v8.dtsi | 6 ++++++ qcom/sun-qrd-sku1-v8-overlay.dts | 17 +++++++++++++++++ qcom/sun-qrd-sku1-v8.dtsi | 6 ++++++ 7 files changed, 72 insertions(+) create mode 100644 qcom/sun-cdp-v8-overlay.dts create mode 100644 qcom/sun-cdp-v8.dtsi create mode 100644 qcom/sun-mtp-v8-overlay.dts create mode 100644 qcom/sun-mtp-v8.dtsi create mode 100644 qcom/sun-qrd-sku1-v8-overlay.dts create mode 100644 qcom/sun-qrd-sku1-v8.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 9f2eb590..7768e3bb 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -22,10 +22,13 @@ SUN_BOARDS += \ sun-mtp-overlay.dtbo \ sun-mtp-kiwi-overlay.dtbo \ sun-mtp-nfc-overlay.dtbo \ + sun-mtp-v8-overlay.dtbo \ sun-cdp-overlay.dtbo \ sun-cdp-kiwi-overlay.dtbo \ sun-cdp-nfc-overlay.dtbo \ + sun-cdp-v8-overlay.dtbo \ sun-qrd-sku1-overlay.dtbo \ + sun-qrd-sku1-v8-overlay.dtbo \ sun-qrd-sku2-overlay.dtbo NOAPQ_SUN_BOARDS += \ diff --git a/qcom/sun-cdp-v8-overlay.dts b/qcom/sun-cdp-v8-overlay.dts new file mode 100644 index 00000000..68c3aa4f --- /dev/null +++ b/qcom/sun-cdp-v8-overlay.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-cdp-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun CDP V8 Power Grid"; + compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", + "qcom,cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x50001 0>; +}; diff --git a/qcom/sun-cdp-v8.dtsi b/qcom/sun-cdp-v8.dtsi new file mode 100644 index 00000000..75eff7ab --- /dev/null +++ b/qcom/sun-cdp-v8.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-cdp.dtsi" diff --git a/qcom/sun-mtp-v8-overlay.dts b/qcom/sun-mtp-v8-overlay.dts new file mode 100644 index 00000000..45b44f41 --- /dev/null +++ b/qcom/sun-mtp-v8-overlay.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-mtp-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun MTP V8 Power Grid"; + compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", + "qcom,mtp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x40008 0>; +}; diff --git a/qcom/sun-mtp-v8.dtsi b/qcom/sun-mtp-v8.dtsi new file mode 100644 index 00000000..ed228e3c --- /dev/null +++ b/qcom/sun-mtp-v8.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-mtp.dtsi" diff --git a/qcom/sun-qrd-sku1-v8-overlay.dts b/qcom/sun-qrd-sku1-v8-overlay.dts new file mode 100644 index 00000000..eea7ca7b --- /dev/null +++ b/qcom/sun-qrd-sku1-v8-overlay.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-qrd-sku1-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun QRD SKU1 V8 Power Grid"; + compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", + "qcom,qrd"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x3000B 0>; +}; diff --git a/qcom/sun-qrd-sku1-v8.dtsi b/qcom/sun-qrd-sku1-v8.dtsi new file mode 100644 index 00000000..2aa7c8f1 --- /dev/null +++ b/qcom/sun-qrd-sku1-v8.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-qrd-sku1.dtsi"