Skip to content

Commit

Permalink
Merge tag 'LA.UM.6.2.r1-10900-sdm660.0' into whyred-oss
Browse files Browse the repository at this point in the history
"LA.UM.6.2.r1-10900-sdm660.0"

Signed-off-by: Nidhun Balaji T.R <nidhunbalaji@gmail.com>
  • Loading branch information
nibaji committed Sep 22, 2018
2 parents 7b078a6 + 52a2ce8 commit b0269da
Show file tree
Hide file tree
Showing 343 changed files with 9,628 additions and 3,130 deletions.
13 changes: 0 additions & 13 deletions Documentation/devicetree/bindings/platform/msm/ssm.txt

This file was deleted.

132 changes: 132 additions & 0 deletions arch/arm/boot/dts/qcom/dsi-panel-hx8399c-fhd-plus-video.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/

&mdss_mdp {
dsi_hx8399c_truly_vid: qcom,mdss_dsi_hx8399_truly_fhd_video {
qcom,mdss-dsi-panel-name =
"hx8399c video mode dsi truly panel";
qcom,mdss-dsi-panel-type = "dsi_video_mode";
qcom,mdss-dsi-panel-framerate = <60>;
qcom,mdss-dsi-virtual-channel-id = <0>;
qcom,mdss-dsi-stream = <0>;
qcom,mdss-dsi-panel-width = <1080>;
qcom,mdss-dsi-panel-height = <2160>;
qcom,mdss-dsi-h-front-porch = <42>;
qcom,mdss-dsi-h-back-porch = <42>;
qcom,mdss-dsi-h-pulse-width = <10>;
qcom,mdss-dsi-h-sync-skew = <0>;
qcom,mdss-dsi-v-back-porch = <15>;
qcom,mdss-dsi-v-front-porch = <10>;
qcom,mdss-dsi-v-pulse-width = <3>;
qcom,mdss-dsi-h-left-border = <0>;
qcom,mdss-dsi-h-right-border = <0>;
qcom,mdss-dsi-v-top-border = <0>;
qcom,mdss-dsi-v-bottom-border = <0>;
qcom,mdss-pan-physical-width-dimension = <65>;
qcom,mdss-pan-physical-height-dimension = <129>;
qcom,mdss-dsi-bpp = <24>;
qcom,mdss-dsi-color-order = "rgb_swap_rgb";
qcom,mdss-dsi-underflow-color = <0xff>;
qcom,mdss-dsi-border-color = <0>;
qcom,mdss-dsi-on-command = [
39 01 00 00 00 00 04
b9 ff 83 99
39 01 00 00 00 00 02
d2 88
39 01 00 00 00 00 0c
b1 02 04 72 92 01
32 aa 11 11 52 57
39 01 00 00 00 00 10
b2 00 80 80 cc 05 07 5a
11 10 10 00 1e 70 03 d4
39 01 00 00 00 00 2d
b4 00 ff 59 59 01 ab 00
00 09 00 03 05 00 28 03
0b 0d 21 03 02 00 0c a3
80 59 59 02 ab 00 00 09
00 03 05 00 28 03 0b 0d
02 00 0c a3 01
39 01 00 00 05 00 22
d3 00 0c 03 03 00 00 10
10 00 00 03 00 03 00 08
78 08 78 00 00 00 00 00
24 02 05 05 03 00 00 00
05 40
39 01 00 00 05 00 21
d5 20 20 19 19 18 18 02
03 00 01 24 24 18 18 18
18 24 24 00 00 00 00 00
00 00 00 2f 2f 30 30 31
31
39 01 00 00 05 00 21
d6 24 24 18 18 19 19 01
00 03 02 24 24 18 18 18
18 20 20 40 40 40 40 40
40 40 40 2f 2f 30 30 31
31
39 01 00 00 00 00 02
bd 00
39 01 00 00 00 00 11
d8 aa aa aa aa aa aa aa
aa aa ba aa aa aa ba aa
aa
39 01 00 00 00 00 02
bd 01
39 01 00 00 00 00 11
d8 00 00 00 00 00 00 00
00 82 ea aa aa 82 ea aa
aa
39 01 00 00 00 00 02
bd 02
39 01 00 00 00 00 09
d8 ff ff c0 3f ff ff c0
3f
39 01 00 00 00 00 02
bd 00
39 01 00 00 05 00 37
e0 01 21 31 2d 66 6f 7b
75 7a 81 86 89 8c 90 95
97 9a a1 a2 aa 9e ad b0
5b 57 63 7a 01 21 31 2d
66 6f 7b 75 7a 81 86 89
8c 90 95 97 9a a1 a2 aa
9e ad b0 5b 57 63 7a
39 01 00 00 00 00 03
b6 7e 7e
39 01 00 00 00 00 02
cc 08
05 01 00 00 96 00 02 11 00
05 01 00 00 32 00 02 29 00];
qcom,mdss-dsi-off-command = [
05 01 00 00 32 00 02 28 00
05 01 00 00 96 00 02 10 00];
qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
qcom,mdss-dsi-h-sync-pulse = <0>;
qcom,mdss-dsi-traffic-mode = "non_burst_sync_event";
qcom,mdss-dsi-lane-map = "lane_map_0123";
qcom,mdss-dsi-bllp-eof-power-mode;
qcom,mdss-dsi-bllp-power-mode;
qcom,mdss-dsi-tx-eot-append;
qcom,mdss-dsi-lane-0-state;
qcom,mdss-dsi-lane-1-state;
qcom,mdss-dsi-lane-2-state;
qcom,mdss-dsi-lane-3-state;
qcom,mdss-dsi-t-clk-post = <0x0e>;
qcom,mdss-dsi-t-clk-pre = <0x31>;
qcom,mdss-dsi-dma-trigger = "trigger_sw";
qcom,mdss-dsi-mdp-trigger = "none";
qcom,mdss-dsi-lp11-init;
qcom,mdss-dsi-reset-sequence = <1 10>, <0 10>, <1 10>;
};
};

4 changes: 2 additions & 2 deletions arch/arm/boot/dts/qcom/sdm630.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -1677,7 +1677,7 @@
vdd-1.8-xo-supply = <&pm660_l9_pin_ctrl>;
vdd-1.3-rfa-supply = <&pm660_l6_pin_ctrl>;
vdd-3.3-ch0-supply = <&pm660_l19_pin_ctrl>;
qcom,vdd-0.8-cx-mx-config = <525000 950000>;
qcom,vdd-0.8-cx-mx-config = <848000 848000>;
qcom,vdd-1.8-xo-config = <1750000 1900000>;
qcom,vdd-1.3-rfa-config = <1200000 1370000>;
qcom,vdd-3.3-ch0-config = <3200000 3400000>;
Expand Down
8 changes: 7 additions & 1 deletion arch/arm/boot/dts/qcom/sdm636.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -71,3 +71,9 @@
};
};
};

/* GPU overrides */
&msm_gpu {
/* Update GPU chip ID*/
qcom,chipid = <0x05000900>;
};
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/qcom/sdm660-cdp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,13 @@
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};

&dsi_hx8399c_truly_vid {
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>;
};

&mdss_dp_ctrl {
pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";
pinctrl-0 = <&mdss_dp_aux_active &mdss_dp_usbplug_cc_active>;
Expand Down
53 changes: 53 additions & 0 deletions arch/arm/boot/dts/qcom/sdm660-fhd-cdp.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/


/dts-v1/;

#include "sdm660.dtsi"
#include "sdm660-cdp.dtsi"
#include "sdm660-internal-codec.dtsi"

/ {
model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660L Int. FHD Display";
compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";
qcom,board-id = <1 3>;
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};

&mdss_mdp {
qcom,mdss-pref-prim-intf = "dsi";
};

&mdss_dsi {
hw-config = "single_dsi";
};

&mdss_dsi0 {
qcom,dsi-pref-prim-pan = <&dsi_nt35695b_truly_fhd_video>;
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 {
status = "disabled";
qcom,dsi-pref-prim-pan = <&dsi_dual_nt35597_truly_video>;
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>;
};
79 changes: 71 additions & 8 deletions arch/arm/boot/dts/qcom/sdm660-gpu.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -465,27 +465,27 @@
qcom,gpu-pwrlevel@2 {
reg = <2>;
qcom,gpu-freq = <465000000>;
qcom,bus-freq = <9>;
qcom,bus-min = <8>;
qcom,bus-freq = <10>;
qcom,bus-min = <9>;
qcom,bus-max = <11>;
};

/* SVS */
qcom,gpu-pwrlevel@3 {
reg = <3>;
qcom,gpu-freq = <370000000>;
qcom,bus-freq = <8>;
qcom,bus-min = <6>;
qcom,bus-max = <9>;
qcom,bus-freq = <9>;
qcom,bus-min = <9>;
qcom,bus-max = <11>;
};

/* Low SVS */
qcom,gpu-pwrlevel@4 {
reg = <4>;
qcom,gpu-freq = <266000000>;
qcom,bus-freq = <3>;
qcom,bus-freq = <4>;
qcom,bus-min = <3>;
qcom,bus-max = <6>;
qcom,bus-max = <8>;
};

/* Min SVS */
Expand Down Expand Up @@ -605,6 +605,69 @@
qcom,bus-max = <0>;
};
};

qcom,gpu-pwrlevels-6 {
#address-cells = <1>;
#size-cells = <0>;

qcom,speed-bin = <122>;

qcom,initial-pwrlevel = <3>;

/* NOM */
qcom,gpu-pwrlevel@0 {
reg = <0>;
qcom,gpu-freq = <585000000>;
qcom,bus-freq = <12>;
qcom,bus-min = <11>;
qcom,bus-max = <12>;
};

/* SVS_L1 */
qcom,gpu-pwrlevel@1 {
reg = <1>;
qcom,gpu-freq = <465000000>;
qcom,bus-freq = <9>;
qcom,bus-min = <8>;
qcom,bus-max = <11>;
};

/* SVS */
qcom,gpu-pwrlevel@2 {
reg = <2>;
qcom,gpu-freq = <370000000>;
qcom,bus-freq = <8>;
qcom,bus-min = <6>;
qcom,bus-max = <9>;
};

/* Low SVS */
qcom,gpu-pwrlevel@3 {
reg = <3>;
qcom,gpu-freq = <266000000>;
qcom,bus-freq = <3>;
qcom,bus-min = <3>;
qcom,bus-max = <6>;
};

/* Min SVS */
qcom,gpu-pwrlevel@4 {
reg = <4>;
qcom,gpu-freq = <160000000>;
qcom,bus-freq = <3>;
qcom,bus-min = <3>;
qcom,bus-max = <5>;
};

/* XO */
qcom,gpu-pwrlevel@5 {
reg = <5>;
qcom,gpu-freq = <19200000>;
qcom,bus-freq = <0>;
qcom,bus-min = <0>;
qcom,bus-max = <0>;
};
};
};
};

Expand Down
22 changes: 22 additions & 0 deletions arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "dsi-panel-shenchao-td4310-1080p-video.dtsi"
#include "dsi-panel-huaxing-nt36672-1080p-video.dtsi"
#include "dsi-panel-lgd-incell-sw49106-fhd-video.dtsi"
#include "dsi-panel-hx8399c-fhd-plus-video.dtsi"

&soc {
dsi_panel_pwr_supply: dsi_panel_pwr_supply {
Expand Down Expand Up @@ -395,3 +396,24 @@
qcom,mdss-dsi-t-clk-post = <0x0d>;
qcom,mdss-dsi-t-clk-pre = <0x30>;
};

&dsi_hx8399c_truly_vid {
qcom,mdss-dsi-panel-timings-phy-v2 = [24 1f 08 09 05 03 04 a0
24 1f 08 09 05 03 04 a0
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,esd-check-enabled;
qcom,mdss-dsi-panel-status-check-mode = "reg_read";
qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a];
qcom,mdss-dsi-panel-status-command-state = "dsi_lp_mode";
qcom,mdss-dsi-panel-status-value = <0x9d 0x9d 0x9d 0x9d>;
qcom,mdss-dsi-panel-on-check-value = <0x9d 0x9d 0x9d 0x9d>;
qcom,mdss-dsi-panel-status-read-length = <4>;
qcom,mdss-dsi-panel-max-error-count = <3>;
qcom,mdss-dsi-min-refresh-rate = <48>;
qcom,mdss-dsi-max-refresh-rate = <60>;
qcom,mdss-dsi-pan-enable-dynamic-fps;
qcom,mdss-dsi-pan-fps-update =
"dfps_immediate_porch_mode_vfp";
};
Loading

0 comments on commit b0269da

Please sign in to comment.