From 9e5057ad5b8d9c3b54b62e4d4fde2e33a35f5d2e Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Mon, 22 Jan 2024 22:43:57 -0800 Subject: [PATCH 1/2] ARM: dts: msm: add ATP variant DT support on sun target Add DT support for ATP variant on sun target. Change-Id: I3860457c497e311e625884dad6972496cc3729c0 Signed-off-by: Veera Sundaram Sankaran --- Kbuild | 3 ++- display/sun-sde-display-atp-overlay.dts | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 display/sun-sde-display-atp-overlay.dts diff --git a/Kbuild b/Kbuild index a824c4d7..3060fd20 100644 --- a/Kbuild +++ b/Kbuild @@ -14,7 +14,8 @@ dtbo-$(CONFIG_ARCH_SUN) += display/sun-sde.dtbo \ display/sun-sde-display-cdp-nfc-overlay.dtbo \ display/sun-sde-display-mtp-nfc-overlay.dtbo \ display/sun-sde-display-cdp-v8-overlay.dtbo \ - display/sun-sde-display-mtp-v8-overlay.dtbo + display/sun-sde-display-mtp-v8-overlay.dtbo \ + display/sun-sde-display-atp-overlay.dtbo else dtbo-$(CONFIG_ARCH_SUN) += display/trustedvm-sun-sde-display-cdp-overlay.dtbo \ display/trustedvm-sun-sde-display-mtp-overlay.dtbo diff --git a/display/sun-sde-display-atp-overlay.dts b/display/sun-sde-display-atp-overlay.dts new file mode 100644 index 00000000..d3b24f2d --- /dev/null +++ b/display/sun-sde-display-atp-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun ATP"; + compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp", "qcom,atp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x10021 0>; +}; From 8cc1a7778de16a5d92b167bb526cf676e3092817 Mon Sep 17 00:00:00 2001 From: Jayasri Sampath Kumaran Date: Wed, 31 Jan 2024 15:26:17 -0500 Subject: [PATCH 2/2] ARM: dts: msm: add supported platform variants for sun target Add Kiwi, v8 Power Grid, v8 Power Grid with Kiwi on RCM platform and 3.5mm on MTP platform for sun target. Add APQ SOC id and add more models for compatible property on Kiwi CDP and MTP platforms for sun target. Change-Id: I443e45414ba663cbb0672e686e9757e861379f5c Signed-off-by: Jayasri Sampath Kumaran --- Kbuild | 6 +++++- display/sun-sde-display-cdp-kiwi-overlay.dts | 6 +++--- display/sun-sde-display-mtp-3-5mm-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-mtp-kiwi-overlay.dts | 6 +++--- display/sun-sde-display-mtp-overlay.dts | 4 ++-- display/sun-sde-display-rcm-kiwi-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-rcm-kiwi-v8-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-rcm-v8-overlay.dts | 16 ++++++++++++++++ 8 files changed, 77 insertions(+), 9 deletions(-) create mode 100644 display/sun-sde-display-mtp-3-5mm-overlay.dts create mode 100644 display/sun-sde-display-rcm-kiwi-overlay.dts create mode 100644 display/sun-sde-display-rcm-kiwi-v8-overlay.dts create mode 100644 display/sun-sde-display-rcm-v8-overlay.dts diff --git a/Kbuild b/Kbuild index 3060fd20..56042b05 100644 --- a/Kbuild +++ b/Kbuild @@ -15,7 +15,11 @@ dtbo-$(CONFIG_ARCH_SUN) += display/sun-sde.dtbo \ display/sun-sde-display-mtp-nfc-overlay.dtbo \ display/sun-sde-display-cdp-v8-overlay.dtbo \ display/sun-sde-display-mtp-v8-overlay.dtbo \ - display/sun-sde-display-atp-overlay.dtbo + display/sun-sde-display-atp-overlay.dtbo \ + display/sun-sde-display-mtp-3-5mm-overlay.dtbo \ + display/sun-sde-display-rcm-kiwi-overlay.dtbo \ + display/sun-sde-display-rcm-kiwi-v8-overlay.dtbo \ + display/sun-sde-display-rcm-v8-overlay.dtbo else dtbo-$(CONFIG_ARCH_SUN) += display/trustedvm-sun-sde-display-cdp-overlay.dtbo \ display/trustedvm-sun-sde-display-mtp-overlay.dtbo diff --git a/display/sun-sde-display-cdp-kiwi-overlay.dts b/display/sun-sde-display-cdp-kiwi-overlay.dts index acfc23ea..4ba523d6 100644 --- a/display/sun-sde-display-cdp-kiwi-overlay.dts +++ b/display/sun-sde-display-cdp-kiwi-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -10,7 +10,7 @@ / { 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/display/sun-sde-display-mtp-3-5mm-overlay.dts b/display/sun-sde-display-mtp-3-5mm-overlay.dts new file mode 100644 index 00000000..e7b19c30 --- /dev/null +++ b/display/sun-sde-display-mtp-3-5mm-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun MTP with 3.5mm"; + 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 = <0x60008 0>; +}; diff --git a/display/sun-sde-display-mtp-kiwi-overlay.dts b/display/sun-sde-display-mtp-kiwi-overlay.dts index 6d755f25..7dd3d0f1 100644 --- a/display/sun-sde-display-mtp-kiwi-overlay.dts +++ b/display/sun-sde-display-mtp-kiwi-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -10,7 +10,7 @@ / { 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/display/sun-sde-display-mtp-overlay.dts b/display/sun-sde-display-mtp-overlay.dts index 48ad6325..ba89d90c 100644 --- a/display/sun-sde-display-mtp-overlay.dts +++ b/display/sun-sde-display-mtp-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -10,7 +10,7 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP"; - compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp"; + 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/display/sun-sde-display-rcm-kiwi-overlay.dts b/display/sun-sde-display-rcm-kiwi-overlay.dts new file mode 100644 index 00000000..21abbbbf --- /dev/null +++ b/display/sun-sde-display-rcm-kiwi-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-rcm.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun RCM Kiwi WLAN"; + compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; + qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x40015 0>; +}; diff --git a/display/sun-sde-display-rcm-kiwi-v8-overlay.dts b/display/sun-sde-display-rcm-kiwi-v8-overlay.dts new file mode 100644 index 00000000..18bdb0e6 --- /dev/null +++ b/display/sun-sde-display-rcm-kiwi-v8-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-rcm.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun RCM Kiwi WLAN V8 Power Grid"; + compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; + qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x20015 0>; +}; diff --git a/display/sun-sde-display-rcm-v8-overlay.dts b/display/sun-sde-display-rcm-v8-overlay.dts new file mode 100644 index 00000000..1c7308f2 --- /dev/null +++ b/display/sun-sde-display-rcm-v8-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-rcm.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun RCM V8 Power Grid"; + compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; + qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x30015 0>; +};