From d83e1aef94f9482bf8c0b2b2ef0fff10d1dec6f3 Mon Sep 17 00:00:00 2001 From: Yahui Wang Date: Tue, 17 Jan 2017 20:29:59 +0800 Subject: ARM: dts: msm: move display panel settings for sdm660 QRD We need to move panel settings from sdm660-qrd.dtsi to sdm660-qrd.dts to separate LCD & AMOLED panel as they use sdm660-qrd.dtsi for some common settings for sdm660 QRD. Change-Id: I447f70c4953e5ba0ee30bb76fa08a5f640360d9c Signed-off-by: Yahui Wang --- arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi | 2 ++ arch/arm/boot/dts/qcom/sdm660-qrd.dts | 37 ++++++++++++++++++++++++++ arch/arm/boot/dts/qcom/sdm660-qrd.dtsi | 37 -------------------------- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi b/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi index 25337fefcdb1..142246cb3d12 100644 --- a/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi @@ -89,4 +89,6 @@ 24 1f 08 09 05 03 04 a0 24 1f 08 09 05 03 04 a0 24 1c 08 09 05 03 04 a0]; + qcom,mdss-dsi-t-clk-post = <0x0e>; + qcom,mdss-dsi-t-clk-pre = <0x31>; }; diff --git a/arch/arm/boot/dts/qcom/sdm660-qrd.dts b/arch/arm/boot/dts/qcom/sdm660-qrd.dts index c78d3cbad731..5d888c9d039f 100644 --- a/arch/arm/boot/dts/qcom/sdm660-qrd.dts +++ b/arch/arm/boot/dts/qcom/sdm660-qrd.dts @@ -24,6 +24,43 @@ <0x0001001b 0x0201011a 0x0 0x0>; }; +&mdss_mdp { + qcom,mdss-pref-prim-intf = "dsi"; +}; + +&mdss_fb0 { + qcom,mdss-mixer-swap; +}; + +&mdss_dsi { + hw-config = "split_dsi"; +}; + +&mdss_dsi0 { + qcom,dsi-pref-prim-pan = <&dsi_dual_nt36850_truly_cmd>; + pinctrl-names = "mdss_default", "mdss_sleep"; + pinctrl-0 = <&mdss_dsi_active &mdss_te_active>; + pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>; + qcom,platform-reset-gpio = <&tlmm 53 0>; + qcom,platform-te-gpio = <&tlmm 59 0>; +}; + +&mdss_dsi1 { + qcom,dsi-pref-prim-pan = <&dsi_dual_nt36850_truly_cmd>; + pinctrl-names = "mdss_default", "mdss_sleep"; + pinctrl-0 = <&mdss_dsi_active &mdss_te_active>; + pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>; + qcom,platform-reset-gpio = <&tlmm 53 0>; + qcom,platform-te-gpio = <&tlmm 59 0>; +}; + +&dsi_dual_nt36850_truly_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; +}; + &pm660l_wled { qcom,led-strings-list = [00 01]; }; diff --git a/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi b/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi index 6037bfd97fef..1f6344db68e1 100644 --- a/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi @@ -150,40 +150,3 @@ qcom,fg-jeita-thresholds = <0 5 55 55>; qcom,fg-cutoff-voltage = <3700>; }; - -&mdss_mdp { - qcom,mdss-pref-prim-intf = "dsi"; -}; - -&mdss_fb0 { - qcom,mdss-mixer-swap; -}; - -&mdss_dsi { - hw-config = "split_dsi"; -}; - -&mdss_dsi0 { - qcom,dsi-pref-prim-pan = <&dsi_dual_nt36850_truly_cmd>; - pinctrl-names = "mdss_default", "mdss_sleep"; - pinctrl-0 = <&mdss_dsi_active &mdss_te_active>; - pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>; - qcom,platform-reset-gpio = <&tlmm 53 0>; - qcom,platform-te-gpio = <&tlmm 59 0>; -}; - -&mdss_dsi1 { - qcom,dsi-pref-prim-pan = <&dsi_dual_nt36850_truly_cmd>; - pinctrl-names = "mdss_default", "mdss_sleep"; - pinctrl-0 = <&mdss_dsi_active &mdss_te_active>; - pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>; - qcom,platform-reset-gpio = <&tlmm 53 0>; - qcom,platform-te-gpio = <&tlmm 59 0>; -}; - -&dsi_dual_nt36850_truly_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; -}; -- cgit v1.2.3