diff --git a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301.dts b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301.dts index aee65ed77..00d4ef9cc 100644 --- a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301.dts +++ b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301.dts @@ -44,7 +44,7 @@ /* global autoconfigured region for contiguous allocations */ ramoops@0x07400000 { compatible = "ramoops"; - reg = <0x0 0x07400000 0x0 0x00100000>; + reg = <0x07400000 0x00100000>; record-size = <0x20000>; console-size = <0x40000>; ftrace-size = <0x80000>; diff --git a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts index 75f9414fb..b61700adb 100644 --- a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts +++ b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts @@ -44,7 +44,7 @@ /* global autoconfigured region for contiguous allocations */ ramoops@0x07400000 { compatible = "ramoops"; - reg = <0x0 0x07400000 0x0 0x00100000>; + reg = <0x07400000 0x00100000>; record-size = <0x20000>; console-size = <0x40000>; ftrace-size = <0x80000>; @@ -84,12 +84,12 @@ /* keep sync with fb */ /* fox example:logo_addr = "0x3f800000"*/ alignment = <0x400000>; - reg = <0x2f800000 0x800000>; + reg = <0x2ec00000 0x800000>; }; lcd_tcon_reserved:linux,lcd_tcon { compatible = "amlogic, lcd_tcon"; - reg = <0x2ec00000 0x00c00000>; + reg = <0x2f400000 0x00c00000>; no-map; }; @@ -112,7 +112,7 @@ */ size = <0x01400000>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; codec_mm_cma:linux,codec_mm_cma { @@ -189,7 +189,7 @@ reusable; size = <0x0>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; ion_fb_reserved:linux,ion-fb { @@ -197,7 +197,7 @@ reusable; size = <0x0>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; ldc_mem_reserved:linux,ldc_mem { @@ -205,7 +205,7 @@ reusable; size = <0x400000>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; }; @@ -1544,7 +1544,7 @@ status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000>; - logo_addr = "0x2f800000"; + logo_addr = "0x2ec00000"; /* display_device_cnt = <2>; */ /* for dual screen upport */ mem_alloc = <0>; pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ @@ -1552,7 +1552,7 @@ &drm_vpu { status = "okay"; - logo_addr = "0x2f800000"; + logo_addr = "0x2ec00000"; connectors_dev: port@1 { drm_to_lcd0: endpoint@0 { reg = <0>; diff --git a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g_R.dts b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g_R.dts index c50c24adc..622ca8a60 100644 --- a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g_R.dts +++ b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g_R.dts @@ -44,7 +44,7 @@ /* global autoconfigured region for contiguous allocations */ ramoops@0x07400000 { compatible = "ramoops"; - reg = <0x0 0x07400000 0x0 0x00100000>; + reg = <0x07400000 0x00100000>; record-size = <0x20000>; console-size = <0x40000>; ftrace-size = <0x80000>; diff --git a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g.dts b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g.dts index 8763a8af8..bd7abe88e 100644 --- a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g.dts +++ b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g.dts @@ -44,7 +44,7 @@ /* global autoconfigured region for contiguous allocations */ ramoops@0x07400000 { compatible = "ramoops"; - reg = <0x0 0x07400000 0x0 0x00100000>; + reg = <0x07400000 0x00100000>; record-size = <0x20000>; console-size = <0x40000>; ftrace-size = <0x80000>; @@ -84,12 +84,12 @@ /* keep sync with fb */ /* fox example:logo_addr = "0x2ec00000"*/ alignment = <0x400000>; - reg = <0x2f800000 0x800000>; + reg = <0x2ec00000 0x800000>; }; lcd_tcon_reserved:linux,lcd_tcon { compatible = "amlogic, lcd_tcon"; - reg = <0x2ec00000 0x00c00000>; + reg = <0x2f400000 0x00c00000>; no-map; }; @@ -112,7 +112,7 @@ */ size = <0x01400000>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; codec_mm_cma:linux,codec_mm_cma { @@ -189,7 +189,7 @@ reusable; size = <0x0>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; ion_fb_reserved:linux,ion-fb { @@ -197,7 +197,7 @@ reusable; size = <0x0>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; ldc_mem_reserved:linux,ldc_mem { @@ -205,7 +205,7 @@ reusable; size = <0x400000>; alignment = <0x400000>; - alloc-ranges = <0x00000000 0x30000000>; + alloc-ranges = <0x00000000 0x2ec00000>; }; }; @@ -1545,7 +1545,7 @@ status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000>; - logo_addr = "0x2f800000"; + logo_addr = "0x2ec00000"; /* display_device_cnt = <2>; */ /* for dual screen upport */ mem_alloc = <0>; pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ @@ -1553,7 +1553,7 @@ &drm_vpu { status = "okay"; - logo_addr = "0x2f800000"; + logo_addr = "0x2ec00000"; connectors_dev: port@1 { drm_to_lcd0: endpoint@0 { reg = <0>; diff --git a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g_R.dts b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g_R.dts index 80c8adbaf..6fdad94e1 100644 --- a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g_R.dts +++ b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g_R.dts @@ -44,7 +44,7 @@ /* global autoconfigured region for contiguous allocations */ ramoops@0x07400000 { compatible = "ramoops"; - reg = <0x0 0x07400000 0x0 0x00100000>; + reg = <0x07400000 0x00100000>; record-size = <0x20000>; console-size = <0x40000>; ftrace-size = <0x80000>; diff --git a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_R.dts b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_R.dts index 52dec5dcc..330d20d0c 100644 --- a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_R.dts +++ b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_R.dts @@ -44,7 +44,7 @@ /* global autoconfigured region for contiguous allocations */ ramoops@0x07400000 { compatible = "ramoops"; - reg = <0x0 0x07400000 0x0 0x00100000>; + reg = <0x07400000 0x00100000>; record-size = <0x20000>; console-size = <0x40000>; ftrace-size = <0x80000>; diff --git a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_linux.dts b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_linux.dts index eada4598a..06fae3ddb 100644 --- a/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_linux.dts +++ b/arch/arm/boot/dts/amlogic/t5w_t962d4_at301_linux.dts @@ -45,7 +45,7 @@ /* global autoconfigured region for contiguous allocations */ ramoops@0x07400000 { compatible = "ramoops"; - reg = <0x0 0x07400000 0x0 0x00100000>; + reg = <0x07400000 0x00100000>; record-size = <0x20000>; console-size = <0x40000>; ftrace-size = <0x80000>; diff --git a/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts b/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts index c321de599..8df1259d3 100644 --- a/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts +++ b/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts @@ -80,8 +80,7 @@ }; logo_reserved:linux,meson-fb { - compatible = "shared-dma-pool"; - reusable; + compatible = "amlogic, meson-fb"; /* keep sync with fb */ /* fox example:logo_addr = "0x27000000"*/ alignment = <0x0 0x400000>; diff --git a/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1g.dts b/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1g.dts index d87c84d1b..1c3a1746a 100644 --- a/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1g.dts +++ b/arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_1g.dts @@ -80,8 +80,7 @@ }; logo_reserved:linux,meson-fb { - compatible = "shared-dma-pool"; - reusable; + compatible = "amlogic, meson-fb"; /* keep sync with fb */ /* fox example:logo_addr = "0x2ec00000"*/ alignment = <0x0 0x400000>;