From a959cdec45b98fbf8aef9a2eb5307cf97be7965f Mon Sep 17 00:00:00 2001 From: Kirill Shpin Date: Wed, 6 Dec 2023 17:39:45 -0800 Subject: [PATCH 1/4] ARM: dts: msm: add RCM device tree files Adds new files for RCM CDT, which falls back on the CDP files for configuration. Change-Id: I323099abc2cab872e665d3d21bdee94d4ae9f5cf Signed-off-by: Kirill Shpin --- Kbuild | 1 + display/sun-sde-display-rcm-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-rcm.dtsi | 6 ++++++ 3 files changed, 23 insertions(+) create mode 100644 display/sun-sde-display-rcm-overlay.dts create mode 100644 display/sun-sde-display-rcm.dtsi diff --git a/Kbuild b/Kbuild index d078accc..649aa4ce 100644 --- a/Kbuild +++ b/Kbuild @@ -2,6 +2,7 @@ dtbo-$(CONFIG_ARCH_SUN) += display/sun-sde.dtbo \ display/sun-sde-display-cdp-overlay.dtbo \ display/sun-sde-display-mtp-overlay.dtbo \ display/sun-sde-display-rumi-overlay.dtbo \ + display/sun-sde-display-rcm-overlay.dtbo \ display/sun-sde-display-qrd-sku1-overlay.dtbo \ display/sun-sde-display-qrd-sku1-v8-overlay.dtbo \ display/sun-sde-display-qrd-sku2-v8-overlay.dtbo diff --git a/display/sun-sde-display-rcm-overlay.dts b/display/sun-sde-display-rcm-overlay.dts new file mode 100644 index 00000000..4236e89b --- /dev/null +++ b/display/sun-sde-display-rcm-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-rcm.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun RCM"; + compatible = "qcom,sun-rcm", "qcom,sun", "qcom,rcm"; + qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x15 0>; +}; diff --git a/display/sun-sde-display-rcm.dtsi b/display/sun-sde-display-rcm.dtsi new file mode 100644 index 00000000..4566cd46 --- /dev/null +++ b/display/sun-sde-display-rcm.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-sde-display-cdp.dtsi" From 9ab8a2cac05cb28b153186f374e36bd58aeb711c Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Wed, 29 Nov 2023 11:34:17 -0800 Subject: [PATCH 2/4] ARM: dts: msm: add all supported platform variants for sun target Add Kiwi, NFC, v8 Power Grid, v8 Power Grid with Kiwi on MTP & CDP platforms for Sun target. Change-Id: I3cd60571147aa566aa11aad4f49829b19d928983 Signed-off-by: Veera Sundaram Sankaran --- Kbuild | 10 +++++++++- display/sun-sde-display-cdp-kiwi-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-cdp-kiwi-v8-overlay.dts | 17 +++++++++++++++++ display/sun-sde-display-cdp-nfc-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-cdp-v8-overlay.dts | 17 +++++++++++++++++ display/sun-sde-display-mtp-kiwi-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-mtp-kiwi-v8-overlay.dts | 17 +++++++++++++++++ display/sun-sde-display-mtp-nfc-overlay.dts | 16 ++++++++++++++++ display/sun-sde-display-mtp-v8-overlay.dts | 17 +++++++++++++++++ 9 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 display/sun-sde-display-cdp-kiwi-overlay.dts create mode 100644 display/sun-sde-display-cdp-kiwi-v8-overlay.dts create mode 100644 display/sun-sde-display-cdp-nfc-overlay.dts create mode 100644 display/sun-sde-display-cdp-v8-overlay.dts create mode 100644 display/sun-sde-display-mtp-kiwi-overlay.dts create mode 100644 display/sun-sde-display-mtp-kiwi-v8-overlay.dts create mode 100644 display/sun-sde-display-mtp-nfc-overlay.dts create mode 100644 display/sun-sde-display-mtp-v8-overlay.dts diff --git a/Kbuild b/Kbuild index d078accc..46f59d76 100644 --- a/Kbuild +++ b/Kbuild @@ -4,7 +4,15 @@ dtbo-$(CONFIG_ARCH_SUN) += display/sun-sde.dtbo \ display/sun-sde-display-rumi-overlay.dtbo \ display/sun-sde-display-qrd-sku1-overlay.dtbo \ display/sun-sde-display-qrd-sku1-v8-overlay.dtbo \ - display/sun-sde-display-qrd-sku2-v8-overlay.dtbo + display/sun-sde-display-qrd-sku2-v8-overlay.dtbo \ + display/sun-sde-display-cdp-kiwi-overlay.dtbo \ + display/sun-sde-display-mtp-kiwi-overlay.dtbo \ + display/sun-sde-display-cdp-kiwi-v8-overlay.dtbo \ + display/sun-sde-display-mtp-kiwi-v8-overlay.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 always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) diff --git a/display/sun-sde-display-cdp-kiwi-overlay.dts b/display/sun-sde-display-cdp-kiwi-overlay.dts new file mode 100644 index 00000000..acfc23ea --- /dev/null +++ b/display/sun-sde-display-cdp-kiwi-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN"; + compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x20001 0>; +}; diff --git a/display/sun-sde-display-cdp-kiwi-v8-overlay.dts b/display/sun-sde-display-cdp-kiwi-v8-overlay.dts new file mode 100644 index 00000000..fba63430 --- /dev/null +++ b/display/sun-sde-display-cdp-kiwi-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-sde-display-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN 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 = <0x60001 0>; +}; diff --git a/display/sun-sde-display-cdp-nfc-overlay.dts b/display/sun-sde-display-cdp-nfc-overlay.dts new file mode 100644 index 00000000..f9aba3ab --- /dev/null +++ b/display/sun-sde-display-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-sde-display-cdp.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/display/sun-sde-display-cdp-v8-overlay.dts b/display/sun-sde-display-cdp-v8-overlay.dts new file mode 100644 index 00000000..dee0d9e7 --- /dev/null +++ b/display/sun-sde-display-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-sde-display-cdp.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/display/sun-sde-display-mtp-kiwi-overlay.dts b/display/sun-sde-display-mtp-kiwi-overlay.dts new file mode 100644 index 00000000..6d755f25 --- /dev/null +++ b/display/sun-sde-display-mtp-kiwi-overlay.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-sde-display-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN"; + compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x20008 0>; +}; diff --git a/display/sun-sde-display-mtp-kiwi-v8-overlay.dts b/display/sun-sde-display-mtp-kiwi-v8-overlay.dts new file mode 100644 index 00000000..c354a996 --- /dev/null +++ b/display/sun-sde-display-mtp-kiwi-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-sde-display-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN 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 = <0x50008 0>; +}; diff --git a/display/sun-sde-display-mtp-nfc-overlay.dts b/display/sun-sde-display-mtp-nfc-overlay.dts new file mode 100644 index 00000000..544c30fe --- /dev/null +++ b/display/sun-sde-display-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-sde-display-mtp.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/display/sun-sde-display-mtp-v8-overlay.dts b/display/sun-sde-display-mtp-v8-overlay.dts new file mode 100644 index 00000000..3cfae533 --- /dev/null +++ b/display/sun-sde-display-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-sde-display-mtp.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>; +}; From 5087f5eb21adc2235e4e2067eea155cf4f96b1aa Mon Sep 17 00:00:00 2001 From: Rohith Iyer Date: Wed, 29 Nov 2023 17:06:17 -0800 Subject: [PATCH 3/4] ARM: dts: msm: dsi: support secondary display for nt37801 panel Add properties to support secondary display on CDP for both command and video mode for nt37801 panel. Change-Id: I040bece2ae656606f76e13c59e67b08cd730dea2 Signed-off-by: Rohith Iyer Signed-off-by: Kirill Shpin --- display/dsi-panel-nt37801-dsc-wqhd-plus-cmd.dtsi | 2 ++ display/dsi-panel-nt37801-dsc-wqhd-plus-video.dtsi | 2 ++ display/sun-sde-display-cdp.dtsi | 6 ++++++ display/sun-sde-display-common.dtsi | 2 ++ 4 files changed, 12 insertions(+) diff --git a/display/dsi-panel-nt37801-dsc-wqhd-plus-cmd.dtsi b/display/dsi-panel-nt37801-dsc-wqhd-plus-cmd.dtsi index a9bda899..61437024 100644 --- a/display/dsi-panel-nt37801-dsc-wqhd-plus-cmd.dtsi +++ b/display/dsi-panel-nt37801-dsc-wqhd-plus-cmd.dtsi @@ -13,6 +13,8 @@ qcom,dsi-ctrl-num = <0>; qcom,dsi-phy-num = <0>; + qcom,dsi-sec-ctrl-num = <1>; + qcom,dsi-sec-phy-num = <1>; qcom,mdss-dsi-traffic-mode = "non_burst_sync_event"; qcom,mdss-dsi-lane-map = "lane_map_0123"; diff --git a/display/dsi-panel-nt37801-dsc-wqhd-plus-video.dtsi b/display/dsi-panel-nt37801-dsc-wqhd-plus-video.dtsi index 652cd619..70ba9540 100644 --- a/display/dsi-panel-nt37801-dsc-wqhd-plus-video.dtsi +++ b/display/dsi-panel-nt37801-dsc-wqhd-plus-video.dtsi @@ -10,6 +10,8 @@ qcom,mdss-dsi-border-color = <0>; qcom,dsi-ctrl-num = <0>; qcom,dsi-phy-num = <0>; + qcom,dsi-sec-ctrl-num = <1>; + qcom,dsi-sec-phy-num = <1>; qcom,mdss-dsi-traffic-mode = "burst_mode"; qcom,mdss-dsi-bllp-eof-power-mode; qcom,mdss-dsi-bllp-power-mode; diff --git a/display/sun-sde-display-cdp.dtsi b/display/sun-sde-display-cdp.dtsi index 3d9db11a..7c979c54 100644 --- a/display/sun-sde-display-cdp.dtsi +++ b/display/sun-sde-display-cdp.dtsi @@ -43,22 +43,28 @@ &dsi_nt37801_amoled_cmd { qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply>; qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_dcs"; qcom,mdss-dsi-bl-min-level = <10>; qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; qcom,platform-reset-gpio = <&tlmm 98 0>; + qcom,platform-sec-reset-gpio = <&tlmm 97 0>; }; &dsi_nt37801_amoled_video { qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply>; qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_dcs"; qcom,mdss-dsi-bl-min-level = <10>; qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; qcom,platform-reset-gpio = <&tlmm 98 0>; + qcom,platform-sec-reset-gpio = <&tlmm 97 0>; }; &dsi_vtdr6130_amoled_120hz_video { diff --git a/display/sun-sde-display-common.dtsi b/display/sun-sde-display-common.dtsi index 0f22bc80..765cc2d4 100644 --- a/display/sun-sde-display-common.dtsi +++ b/display/sun-sde-display-common.dtsi @@ -347,6 +347,7 @@ &dsi_nt37801_amoled_cmd { qcom,dsi-select-clocks = "pll_byte_clk0", "pll_dsi_clk0"; + qcom,dsi-select-sec-clocks = "pll_byte_clk1", "pll_dsi_clk1"; qcom,mdss-dsi-display-timings { timing@0 { @@ -386,6 +387,7 @@ &dsi_nt37801_amoled_video { qcom,dsi-select-clocks = "pll_byte_clk0", "pll_dsi_clk0"; + qcom,dsi-select-sec-clocks = "pll_byte_clk1", "pll_dsi_clk1"; qcom,mdss-dsi-display-timings { timing@0 { From f87233beaca71f0f68a621ba76e08e2425914433 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 12 Dec 2023 14:45:01 +0800 Subject: [PATCH 4/4] ARM: dts: msm: enable touch panel on sun QRD platform Adds touch panel dts nodes for QRD platform. Change-Id: Ia60a126574e6841bdd2c4de1dacf63d42fe93ded Signed-off-by: Rui Chen --- display/sun-sde-display-qrd.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/display/sun-sde-display-qrd.dtsi b/display/sun-sde-display-qrd.dtsi index 3d730f68..65f8e0d2 100644 --- a/display/sun-sde-display-qrd.dtsi +++ b/display/sun-sde-display-qrd.dtsi @@ -48,3 +48,12 @@ &sde_dsi { qcom,dsi-default-panel = <&dsi_nt37801_amoled_cmd_cphy>; }; + +&qupv3_se4_spi { + st_fts@0 { + panel = <&dsi_nt37801_amoled_cmd_cphy + &dsi_nt37801_amoled_video_cphy + &dsi_nt37801_amoled_cmd + &dsi_nt37801_amoled_video>; + }; +};