| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-11-09 18:48:29 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-11-09 18:48:29 (GMT) |
| commit | daee9f72df669b798c18487d28530483cdd2f996 (patch) | |
| tree | c642dace11105f3ee9d402e00e8385d3f4413b35 | |
| parent | 235c04c63a364fad4264091eb550db7a2d76ae56 (diff) | |
| parent | f2f5aebb3d2b7e5242366ea8ffd948d7f53cb3b4 (diff) | |
| download | common-daee9f72df669b798c18487d28530483cdd2f996.zip common-daee9f72df669b798c18487d28530483cdd2f996.tar.gz common-daee9f72df669b798c18487d28530483cdd2f996.tar.bz2 | |
Merge "vlock: disable vlock for hdmitx [1/1]" into p-amlogic
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/atom.dts | 12 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts | 2 |
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 |