From 9aa22f3e2f3137f27445d9db38f92b6b90c10f5c Mon Sep 17 00:00:00 2001 From: wenbiao zhang Date: Fri, 20 Apr 2018 16:26:10 +0800 Subject: [PATCH] dts: txlx add unify key for panel ini param PD#163711: dts: txlx add unify key for panel ini param Change-Id: If1ee0c9ed2cc68db9c2b518aba1f019e1c67f7ec Signed-off-by: wenbiao zhang --- .../dts/amlogic/mesontxlx_r311-panel.dtsi | 6 +++--- .../boot/dts/amlogic/txlx_t962x_r311_2g.dts | 20 ++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesontxlx_r311-panel.dtsi b/arch/arm64/boot/dts/amlogic/mesontxlx_r311-panel.dtsi index 36be2a9df734..e99988a35abc 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxlx_r311-panel.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxlx_r311-panel.dtsi @@ -22,7 +22,7 @@ mode = "tv"; status = "okay"; fr_auto_policy = <1>; /* 0=disable, 1=60/50hz, 2=60/50/48hz */ - key_valid = <0>; + key_valid = <1>; clocks = <&clkc CLKID_VCLK2_ENCL &clkc CLKID_VCLK2_VENCL>; clock-names = "encl_top_gate", @@ -455,7 +455,7 @@ compatible = "amlogic, lcd_extern"; dev_name = "lcd_extern"; status = "okay"; - key_valid = <0>; + key_valid = <1>; i2c_bus = "i2c_bus_c"; /*pinctrl-names="extern_pins";*/ /*pinctrl_names_uboot = "i2c_c";*/ /* i2c_a, i2c_b, i2c_c */ @@ -517,7 +517,7 @@ compatible = "amlogic, backlight-txlx"; dev_name = "backlight"; status = "okay"; - key_valid = <0>; + key_valid = <1>; pinctrl-names = "pwm_on","pwm_vs_on", "pwm_combo_0_1_on", "pwm_combo_0_vs_1_on", diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts index 89ef64803322..c9a8171b4924 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -767,7 +767,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <16>; + unifykey-num = <19>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -784,6 +784,9 @@ unifykey-index-13 = <&keysn_13>; unifykey-index-14 = <&keysn_14>; unifykey-index-15 = <&keysn_15>; + unifykey-index-16 = <&keysn_16>; + unifykey-index-17 = <&keysn_17>; + unifykey-index-18 = <&keysn_18>; keysn_0: key_0{ key-name = "usid"; @@ -870,6 +873,21 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "lcd"; + key-device = "normal"; + key-permit = "read","write","del"; + }; + keysn_17:key_17{ + key-name = "lcd_extern"; + key-device = "normal"; + key-permit = "read","write","del"; + }; + keysn_18:key_18{ + key-name = "backlight"; + key-device = "normal"; + key-permit = "read","write","del"; + }; }; /* End unifykey */ vdac {