From 50d7658c22471dd8a987c27289c5d80c5e2716a2 Mon Sep 17 00:00:00 2001 From: Sandy Luo Date: Thu, 31 Oct 2019 14:43:16 +0800 Subject: [PATCH] tm2: dts: clean lcd config [1/1] PD#SWPL-15948 Problem: T962e2 hasn't lcd out Solution: delete lcd config in dts Verify: T962e2 platform Change-Id: Ibc090f948c9cba2073e17b17ccbf706d154445ef Signed-off-by: Sandy Luo --- arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts | 96 +--------------------- arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts | 96 +--------------------- arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts | 65 ++------------- arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts | 96 +--------------------- .../boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts | 96 +--------------------- arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts | 60 +------------- arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts | 2 +- 10 files changed, 30 insertions(+), 487 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts index 1e7f851..d45be81 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -77,14 +77,6 @@ alloc-ranges = <0x7f800000 0x800000>; }; - lcd_tcon_reserved:linux,lcd_tcon { - compatible = "shared-dma-pool"; - reusable; - size = <0xc00000>; - alignment = <0x400000>; - alloc-ranges = <0x7ec00000 0xc00000>; - }; - codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -696,7 +688,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <24>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -717,10 +709,6 @@ unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; unifykey-index-19 = <&keysn_19>; - unifykey-index-20 = <&keysn_20>; - unifykey-index-21 = <&keysn_21>; - unifykey-index-22 = <&keysn_22>; - unifykey-index-23 = <&keysn_23>; keysn_0: key_0{ key-name = "usid"; @@ -808,41 +796,21 @@ 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"; - }; - keysn_19:key_19{ - key-name = "lcd_tcon"; - key-device = "normal"; - key-permit = "read","write","del"; - }; - keysn_20:key_20{ key-name = "attestationkeybox";// attestation key key-device = "secure"; key-permit = "read","write","del"; }; - keysn_21:key_21{ + keysn_17:key_17{ key-name = "hdcp22_rprx_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_22:key_22{ + keysn_18:key_18{ key-name = "hdcp22_rprp_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_23:key_23{ + keysn_19:key_19{ key-name = "hdcp22_rp_private"; key-device = "secure"; key-permit = "read","write","del"; @@ -1895,41 +1863,6 @@ }; }; - /*backlight*/ - bl_pwm_vs_on_pins:bl_pwm_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_off_pins:bl_pwm_off_pin { - mux { - groups = "GPIOZ_5"; - function = "gpio_periphs"; - output-low; - }; - }; - bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin { - mux { - groups = "pwm_vs_z6"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_off_pins:bl_pwm_combo_off_pin { - mux { - groups = "GPIOZ_5", - "GPIOZ_6"; - function = "gpio_periphs"; - output-low; - }; - }; - }; /* end of pinctrl_periphs */ &audio_data{ @@ -2146,27 +2079,6 @@ clock-frequency = <300000>; pinctrl-names="default"; pinctrl-0=<&i2c1_h_pins>; - - lcd_extern_i2c0: lcd_extern_i2c@0 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_T5800Q"; - reg = <0x1c>; - status = "okay"; - }; - - lcd_extern_i2c1: lcd_extern_i2c@1 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX6862"; - reg = <0x20>; - status = "okay"; - }; - - lcd_extern_i2c2: lcd_extern_i2c@2 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX7911"; - reg = <0x74>; - status = "okay"; - }; }; &pwm_ab { diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts index 8f8354f..0dc7a4f 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts @@ -77,14 +77,6 @@ alloc-ranges = <0x7f800000 0x800000>; }; - lcd_tcon_reserved:linux,lcd_tcon { - compatible = "shared-dma-pool"; - reusable; - size = <0xc00000>; - alignment = <0x400000>; - alloc-ranges = <0x7ec00000 0xc00000>; - }; - codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -697,7 +689,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <24>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -718,10 +710,6 @@ unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; unifykey-index-19 = <&keysn_19>; - unifykey-index-20 = <&keysn_20>; - unifykey-index-21 = <&keysn_21>; - unifykey-index-22 = <&keysn_22>; - unifykey-index-23 = <&keysn_23>; keysn_0: key_0{ key-name = "usid"; @@ -809,41 +797,21 @@ 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"; - }; - keysn_19:key_19{ - key-name = "lcd_tcon"; - key-device = "normal"; - key-permit = "read","write","del"; - }; - keysn_20:key_20{ key-name = "attestationkeybox";// attestation key key-device = "secure"; key-permit = "read","write","del"; }; - keysn_21:key_21{ + keysn_17:key_17{ key-name = "hdcp22_rprx_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_22:key_22{ + keysn_18:key_18{ key-name = "hdcp22_rprp_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_23:key_23{ + keysn_19:key_19{ key-name = "hdcp22_rp_private"; key-device = "secure"; key-permit = "read","write","del"; @@ -1870,41 +1838,6 @@ }; }; - /*backlight*/ - bl_pwm_vs_on_pins:bl_pwm_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_off_pins:bl_pwm_off_pin { - mux { - groups = "GPIOZ_5"; - function = "gpio_periphs"; - output-low; - }; - }; - bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin { - mux { - groups = "pwm_vs_z6"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_off_pins:bl_pwm_combo_off_pin { - mux { - groups = "GPIOZ_5", - "GPIOZ_6"; - function = "gpio_periphs"; - output-low; - }; - }; - }; /* end of pinctrl_periphs */ &audio_data{ @@ -2162,27 +2095,6 @@ clock-frequency = <300000>; pinctrl-names="default"; pinctrl-0=<&i2c1_h_pins>; - - lcd_extern_i2c0: lcd_extern_i2c@0 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_T5800Q"; - reg = <0x1c>; - status = "okay"; - }; - - lcd_extern_i2c1: lcd_extern_i2c@1 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX6862"; - reg = <0x20>; - status = "okay"; - }; - - lcd_extern_i2c2: lcd_extern_i2c@2 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX7911"; - reg = <0x74>; - status = "okay"; - }; }; &pwm_ab { diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts index 20a918c..d09b98e 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -75,14 +75,6 @@ alloc-ranges = <0x7f800000 0x800000>; }; - lcd_tcon_reserved:linux,lcd_tcon { - compatible = "shared-dma-pool"; - reusable; - size = <0xc00000>; - alignment = <0x400000>; - alloc-ranges = <0x7ec00000 0xc00000>; - }; - codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -90,6 +82,7 @@ size = <0x13400000>; alignment = <0x400000>; linux,contiguous-region; + alloc-ranges = <0x30000000 0x50000000>; }; /* codec shared reserved */ @@ -103,7 +96,7 @@ ion_cma_reserved:linux,ion-dev { compatible = "shared-dma-pool"; reusable; - size = <0x8000000>; + size = <0x2000000>; alignment = <0x400000>; }; @@ -283,7 +276,6 @@ 0xffd01000 0x1000 /*reset*/ >; - /*move from dvbfe*/ dtv_demod0_mem = <0>; // need move to aml_dtv_demod ? spectrum = <1>; cma_flag = <1>; @@ -716,7 +708,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <24>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -737,10 +729,6 @@ unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; unifykey-index-19 = <&keysn_19>; - unifykey-index-20 = <&keysn_20>; - unifykey-index-21 = <&keysn_21>; - unifykey-index-22 = <&keysn_22>; - unifykey-index-23 = <&keysn_23>; keysn_0: key_0{ key-name = "usid"; @@ -828,41 +816,21 @@ 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"; - }; - keysn_19:key_19{ - key-name = "lcd_tcon"; - key-device = "normal"; - key-permit = "read","write","del"; - }; - keysn_20:key_20{ key-name = "attestationkeybox";// attestation key key-device = "secure"; key-permit = "read","write","del"; }; - keysn_21:key_21{ + keysn_17:key_17{ key-name = "hdcp22_rprx_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_22:key_22{ + keysn_18:key_18{ key-name = "hdcp22_rprp_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_23:key_23{ + keysn_19:key_19{ key-name = "hdcp22_rp_private"; key-device = "secure"; key-permit = "read","write","del"; @@ -2036,27 +2004,6 @@ clock-frequency = <300000>; pinctrl-names="default"; pinctrl-0=<&i2c1_h_pins>; - - lcd_extern_i2c0: lcd_extern_i2c@0 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_T5800Q"; - reg = <0x1c>; - status = "okay"; - }; - - lcd_extern_i2c1: lcd_extern_i2c@1 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX6862"; - reg = <0x20>; - status = "okay"; - }; - - lcd_extern_i2c2: lcd_extern_i2c@2 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX7911"; - reg = <0x74>; - status = "okay"; - }; }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts index 5dc35cd..2662c20 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts @@ -81,7 +81,7 @@ lcd_tcon_reserved:linux,lcd_tcon { compatible = "shared-dma-pool"; reusable; - size = <0xc00000>; + size = <0x0>; alignment = <0x400000>; alloc-ranges = <0x7ec00000 0xc00000>; }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts index eb2942b..e453678 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -79,7 +79,7 @@ lcd_tcon_reserved:linux,lcd_tcon { compatible = "shared-dma-pool"; reusable; - size = <0xc00000>; + size = <0x0>; alignment = <0x400000>; alloc-ranges = <0x7ec00000 0xc00000>; }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts index e68490a..49cf6d0 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -75,14 +75,6 @@ alloc-ranges = <0x0 0x7f800000 0x0 0x800000>; }; - lcd_tcon_reserved:linux,lcd_tcon { - compatible = "shared-dma-pool"; - reusable; - size = <0x0 0xc00000>; - alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x7ec00000 0x0 0xc00000>; - }; - codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -692,7 +684,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <24>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -713,10 +705,6 @@ unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; unifykey-index-19 = <&keysn_19>; - unifykey-index-20 = <&keysn_20>; - unifykey-index-21 = <&keysn_21>; - unifykey-index-22 = <&keysn_22>; - unifykey-index-23 = <&keysn_23>; keysn_0: key_0{ key-name = "usid"; @@ -804,41 +792,21 @@ 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"; - }; - keysn_19:key_19{ - key-name = "lcd_tcon"; - key-device = "normal"; - key-permit = "read","write","del"; - }; - keysn_20:key_20{ key-name = "attestationkeybox";// attestation key key-device = "secure"; key-permit = "read","write","del"; }; - keysn_21:key_21{ + keysn_17:key_17{ key-name = "hdcp22_rprx_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_22:key_22{ + keysn_18:key_18{ key-name = "hdcp22_rprp_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_23:key_23{ + keysn_19:key_19{ key-name = "hdcp22_rp_private"; key-device = "secure"; key-permit = "read","write","del"; @@ -1890,41 +1858,6 @@ }; }; - /*backlight*/ - bl_pwm_vs_on_pins:bl_pwm_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_off_pins:bl_pwm_off_pin { - mux { - groups = "GPIOZ_5"; - function = "gpio_periphs"; - output-low; - }; - }; - bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin { - mux { - groups = "pwm_vs_z6"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_off_pins:bl_pwm_combo_off_pin { - mux { - groups = "GPIOZ_5", - "GPIOZ_6"; - function = "gpio_periphs"; - output-low; - }; - }; - }; /* end of pinctrl_periphs */ &audio_data{ @@ -2143,27 +2076,6 @@ clock-frequency = <300000>; pinctrl-names="default"; pinctrl-0=<&i2c1_h_pins>; - - lcd_extern_i2c0: lcd_extern_i2c@0 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_T5800Q"; - reg = <0x1c>; - status = "okay"; - }; - - lcd_extern_i2c1: lcd_extern_i2c@1 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX6862"; - reg = <0x20>; - status = "okay"; - }; - - lcd_extern_i2c2: lcd_extern_i2c@2 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX7911"; - reg = <0x74>; - status = "okay"; - }; }; &pwm_ab { diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts index 3e56454..da16f70 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts @@ -75,14 +75,6 @@ alloc-ranges = <0x0 0x7f800000 0x0 0x800000>; }; - lcd_tcon_reserved:linux,lcd_tcon { - compatible = "shared-dma-pool"; - reusable; - size = <0x0 0xc00000>; - alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x7ec00000 0x0 0xc00000>; - }; - codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -693,7 +685,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <24>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -714,10 +706,6 @@ unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; unifykey-index-19 = <&keysn_19>; - unifykey-index-20 = <&keysn_20>; - unifykey-index-21 = <&keysn_21>; - unifykey-index-22 = <&keysn_22>; - unifykey-index-23 = <&keysn_23>; keysn_0: key_0{ key-name = "usid"; @@ -805,41 +793,21 @@ 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"; - }; - keysn_19:key_19{ - key-name = "lcd_tcon"; - key-device = "normal"; - key-permit = "read","write","del"; - }; - keysn_20:key_20{ key-name = "attestationkeybox";// attestation key key-device = "secure"; key-permit = "read","write","del"; }; - keysn_21:key_21{ + keysn_17:key_17{ key-name = "hdcp22_rprx_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_22:key_22{ + keysn_18:key_18{ key-name = "hdcp22_rprp_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_23:key_23{ + keysn_19:key_19{ key-name = "hdcp22_rp_private"; key-device = "secure"; key-permit = "read","write","del"; @@ -1865,41 +1833,6 @@ }; }; - /*backlight*/ - bl_pwm_vs_on_pins:bl_pwm_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_off_pins:bl_pwm_off_pin { - mux { - groups = "GPIOZ_5"; - function = "gpio_periphs"; - output-low; - }; - }; - bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin { - mux { - groups = "pwm_vs_z5"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin { - mux { - groups = "pwm_vs_z6"; - function = "pwm_vs"; - }; - }; - bl_pwm_combo_off_pins:bl_pwm_combo_off_pin { - mux { - groups = "GPIOZ_5", - "GPIOZ_6"; - function = "gpio_periphs"; - output-low; - }; - }; - }; /* end of pinctrl_periphs */ &audio_data{ @@ -2158,27 +2091,6 @@ clock-frequency = <300000>; pinctrl-names="default"; pinctrl-0=<&i2c1_h_pins>; - - lcd_extern_i2c0: lcd_extern_i2c@0 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_T5800Q"; - reg = <0x1c>; - status = "okay"; - }; - - lcd_extern_i2c1: lcd_extern_i2c@1 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX6862"; - reg = <0x20>; - status = "okay"; - }; - - lcd_extern_i2c2: lcd_extern_i2c@2 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX7911"; - reg = <0x74>; - status = "okay"; - }; }; &pwm_ab { diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts index 3b789b3..f434e18 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -75,14 +75,6 @@ alloc-ranges = <0x0 0x7f800000 0x0 0x800000>; }; - lcd_tcon_reserved:linux,lcd_tcon { - compatible = "shared-dma-pool"; - reusable; - size = <0x0 0xc00000>; - alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x7ec00000 0x0 0xc00000>; - }; - codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -716,7 +708,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <24>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -737,10 +729,6 @@ unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; unifykey-index-19 = <&keysn_19>; - unifykey-index-20 = <&keysn_20>; - unifykey-index-21 = <&keysn_21>; - unifykey-index-22 = <&keysn_22>; - unifykey-index-23 = <&keysn_23>; keysn_0: key_0{ key-name = "usid"; @@ -828,41 +816,21 @@ 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"; - }; - keysn_19:key_19{ - key-name = "lcd_tcon"; - key-device = "normal"; - key-permit = "read","write","del"; - }; - keysn_20:key_20{ key-name = "attestationkeybox";// attestation key key-device = "secure"; key-permit = "read","write","del"; }; - keysn_21:key_21{ + keysn_17:key_17{ key-name = "hdcp22_rprx_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_22:key_22{ + keysn_18:key_18{ key-name = "hdcp22_rprp_fw"; key-device = "normal"; key-permit = "read","write","del"; }; - keysn_23:key_23{ + keysn_19:key_19{ key-name = "hdcp22_rp_private"; key-device = "secure"; key-permit = "read","write","del"; @@ -2038,26 +2006,6 @@ pinctrl-names="default"; pinctrl-0=<&i2c1_h_pins>; - lcd_extern_i2c0: lcd_extern_i2c@0 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_T5800Q"; - reg = <0x0 0x1c>; - status = "okay"; - }; - - lcd_extern_i2c1: lcd_extern_i2c@1 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX6862"; - reg = <0x0 0x20>; - status = "okay"; - }; - - lcd_extern_i2c2: lcd_extern_i2c@2 { - compatible = "lcd_ext, i2c"; - dev_name = "i2c_ANX7911"; - reg = <0x0 0x74>; - status = "okay"; - }; }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts index fdde59f..764db88 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts @@ -79,7 +79,7 @@ lcd_tcon_reserved:linux,lcd_tcon { compatible = "shared-dma-pool"; reusable; - size = <0x0 0xc00000>; + size = <0x0 0x0>; alignment = <0x0 0x400000>; alloc-ranges = <0x0 0x7ec00000 0x0 0xc00000>; }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts index 4225703..c87929a 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -79,7 +79,7 @@ lcd_tcon_reserved:linux,lcd_tcon { compatible = "shared-dma-pool"; reusable; - size = <0x0 0xc00000>; + size = <0x0 0x0>; alignment = <0x0 0x400000>; alloc-ranges = <0x0 0x7ec00000 0x0 0xc00000>; }; -- 2.7.4