diff options
| author | Jeykumar Sankaran <jeykumar@quicinc.com> | 2016-12-09 12:59:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-09 12:59:21 -0800 |
| commit | 4f7d7c780e96d4ea378dcc1ce43e582155af7e43 (patch) | |
| tree | 23e772dbf36eb074aac5f4aa66ab7f0004d4425a | |
| parent | 0566f9bd1dca0ca7ea43c9de6577ffc9b07a3151 (diff) | |
| parent | a3af61badfe8e43cc2929edbc5c0ed94e91b40a7 (diff) | |
Merge "ARM: dts: msm: enable imgswap on sharp nt35597 dual panel" into dev/msm-4.4-drm_kms
| -rw-r--r-- | arch/arm/boot/dts/qcom/dsi-panel-nt35597-dualmipi-wqxga-cmd.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/dsi-panel-nt35597-dualmipi-wqxga-cmd.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-nt35597-dualmipi-wqxga-cmd.dtsi index b6f19b78ea70..b98049347024 100644 --- a/arch/arm/boot/dts/qcom/dsi-panel-nt35597-dualmipi-wqxga-cmd.dtsi +++ b/arch/arm/boot/dts/qcom/dsi-panel-nt35597-dualmipi-wqxga-cmd.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2016, 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 @@ -80,6 +80,7 @@ 15 01 00 00 10 00 02 ff 24 15 01 00 00 10 00 02 fb 01 15 01 00 00 10 00 02 c6 06 + 15 01 00 00 10 00 02 9d 30 /* Enable IMGSWAP */ 15 01 00 00 10 00 02 ff 10 05 01 00 00 a0 00 02 11 00 05 01 00 00 a0 00 02 29 00]; diff --git a/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi b/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi index 4b2446c3b8f7..3f81da7c3ebc 100644 --- a/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi @@ -222,7 +222,8 @@ label = "dsi_dual_nt35597_cmd"; qcom,display-type = "primary"; - qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>; + /* dsi1/dsi0 swapped due to IMGSWAP */ + qcom,dsi-ctrl = <&mdss_dsi1 &mdss_dsi0>; qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>; clocks = <&clock_mmss clk_ext_byte0_clk_src>, <&clock_mmss clk_ext_pclk0_clk_src>; |