Merge remote-tracking branch 'quic/display-kernel-dev.lnx.1.0' into display-kernel.lnx.11.0
CRs SHA_ID Commit Message ---------------------------------------------------------------------- 3679053 Ia60a1265 ARM: dts: msm: enable touch panel on sun QRD platform 3686710 I040bece2 ARM: dts: msm: dsi: support secondary display for nt37801 panel 3674590 I3cd60571 ARM: dts: msm: add all supported platform variants for sun target 3683267 I323099ab ARM: dts: msm: add RCM device tree files CRs-Included: 3679053,3674590,3683267,3686710 Change-Id: Ib4da377fc9b3e8a0410e1d1abeaf9e0f8f2ed248 Signed-off-by: Linux Display <lnxdisplay@localhost>
This commit is contained in:
11
Kbuild
11
Kbuild
@@ -2,9 +2,18 @@ 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
|
||||
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)
|
||||
|
@@ -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";
|
||||
|
@@ -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;
|
||||
|
16
display/sun-sde-display-cdp-kiwi-overlay.dts
Normal file
16
display/sun-sde-display-cdp-kiwi-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
17
display/sun-sde-display-cdp-kiwi-v8-overlay.dts
Normal file
17
display/sun-sde-display-cdp-kiwi-v8-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
16
display/sun-sde-display-cdp-nfc-overlay.dts
Normal file
16
display/sun-sde-display-cdp-nfc-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
17
display/sun-sde-display-cdp-v8-overlay.dts
Normal file
17
display/sun-sde-display-cdp-v8-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
@@ -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 {
|
||||
|
@@ -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 {
|
||||
|
16
display/sun-sde-display-mtp-kiwi-overlay.dts
Normal file
16
display/sun-sde-display-mtp-kiwi-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
17
display/sun-sde-display-mtp-kiwi-v8-overlay.dts
Normal file
17
display/sun-sde-display-mtp-kiwi-v8-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
16
display/sun-sde-display-mtp-nfc-overlay.dts
Normal file
16
display/sun-sde-display-mtp-nfc-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
17
display/sun-sde-display-mtp-v8-overlay.dts
Normal file
17
display/sun-sde-display-mtp-v8-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
@@ -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>;
|
||||
};
|
||||
};
|
||||
|
16
display/sun-sde-display-rcm-overlay.dts
Normal file
16
display/sun-sde-display-rcm-overlay.dts
Normal file
@@ -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>;
|
||||
};
|
6
display/sun-sde-display-rcm.dtsi
Normal file
6
display/sun-sde-display-rcm.dtsi
Normal file
@@ -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"
|
Reference in New Issue
Block a user