summaryrefslogtreecommitdiff
authorDezhi Kong <dezhi.kong@amlogic.com>2018-11-02 10:01:03 (GMT)
committer Dezhi Kong <dezhi.kong@amlogic.com>2018-11-05 06:34:02 (GMT)
commitf2f5aebb3d2b7e5242366ea8ffd948d7f53cb3b4 (patch)
tree49f5253671f190228e198a80c5382a2ec5466229
parentb1d0d24848288b20c7ded9f2572b9cc8bde25f1f (diff)
downloadcommon-f2f5aebb3d2b7e5242366ea8ffd948d7f53cb3b4.zip
common-f2f5aebb3d2b7e5242366ea8ffd948d7f53cb3b4.tar.gz
common-f2f5aebb3d2b7e5242366ea8ffd948d7f53cb3b4.tar.bz2
vlock: disable vlock for hdmitx [1/1]
PD#OTT-224 Problem: It have black screen 1s when switch between "atom home" and "atom -HDMI1-Blu-ray machine" Solution: disable vlock for hdmitx chip Verify: T962E-R321 Change-Id: I3e20a780a48e2272e84511ef8a6facfe0d9db86d Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
Diffstat
-rw-r--r--arch/arm64/boot/dts/amlogic/atom.dts12
-rw-r--r--arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts2
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/atom.dts b/arch/arm64/boot/dts/amlogic/atom.dts
index cc86812..84adad3 100644
--- a/arch/arm64/boot/dts/amlogic/atom.dts
+++ b/arch/arm64/boot/dts/amlogic/atom.dts
@@ -604,6 +604,18 @@
tx_op_color_primary = <1>;
/*1:enabel osd lut 100 table;0:disable*/
cfg_en_osd_100 = <1>;
+ vlock_en = <0>;/*1:enable;0:disable*/
+ vlock_mode = <0x4>;
+ /* vlock work mode:
+ *bit0:auto ENC
+ *bit1:auto PLL
+ *bit2:manual PLL
+ *bit3:manual ENC
+ *bit4:manual soft ENC
+ *bit5:manual MIX PLL ENC
+ */
+ vlock_pll_m_limit = <1>;
+ vlock_line_limit = <3>;
};
amdolby_vision {
compatible = "amlogic, dolby_vision_txlx";
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index 66c58c0..9fa6a51 100644
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -595,7 +595,7 @@
tx_op_color_primary = <0>;
/*1:enabel osd lut 100 table;0:disable*/
cfg_en_osd_100 = <1>;
- vlock_en = <1>;/*1:enable;0:disable*/
+ vlock_en = <0>;/*1:enable;0:disable*/
vlock_mode = <0x4>;
/* vlock work mode:
*bit0:auto ENC