From 7f8b013fe6610e6478bfbdb1bc45efbc281cbbb5 Mon Sep 17 00:00:00 2001 From: Shuo Liu Date: Wed, 9 Nov 2022 19:27:20 +0800 Subject: [PATCH] C3: Fallback modification secure memory config with dts file [1/1] PD#SWPL-97142 Problem: Need not modify secure memory config for C3 dts file Solution: Fallback modification from CL-266416 Verify: Linux IPC + AW419 Change-Id: Idfa1c05b18f42fdcd953c43f9dcfd4fa298eb47f Signed-off-by: Shuo Liu --- arch/arm/boot/dts/amlogic/c3_c308l_aw419.dts | 8 -------- arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi | 8 -------- arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi | 8 -------- arch/arm/boot/dts/amlogic/c3_pxp.dts | 8 -------- arch/arm/boot/dts/amlogic/meson-c3.dtsi | 8 ++++++++ 5 files changed, 8 insertions(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/c3_c308l_aw419.dts b/arch/arm/boot/dts/amlogic/c3_c308l_aw419.dts index 460f4a82f..696f59f4d 100644 --- a/arch/arm/boot/dts/amlogic/c3_c308l_aw419.dts +++ b/arch/arm/boot/dts/amlogic/c3_c308l_aw419.dts @@ -152,14 +152,6 @@ }; }; - secmon { - compatible = "amlogic, secmon"; - memory-region = <&secmon_reserved>; - reserve_mem_size = <0x00900000>; - in_base_func = <0x82000020>; - out_base_func = <0x82000021>; - }; - codec_mm { compatible = "amlogic, codec, mm"; memory-region = <&codec_mm_cma &codec_mm_reserved>; diff --git a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi index 3cf50eaff..114c4a80a 100644 --- a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi +++ b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi @@ -154,14 +154,6 @@ }; }; - secmon { - compatible = "amlogic, secmon"; - memory-region = <&secmon_reserved>; - reserve_mem_size = <0x00100000>; - in_base_func = <0x82000020>; - out_base_func = <0x82000021>; - }; - codec_mm { compatible = "amlogic, codec, mm"; memory-region = <&codec_mm_cma &codec_mm_reserved>; diff --git a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi index 6c0464921..9fade4a76 100644 --- a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi +++ b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi @@ -154,14 +154,6 @@ }; }; - secmon { - compatible = "amlogic, secmon"; - memory-region = <&secmon_reserved>; - reserve_mem_size = <0x00100000>; - in_base_func = <0x82000020>; - out_base_func = <0x82000021>; - }; - codec_mm { compatible = "amlogic, codec, mm"; memory-region = <&codec_mm_cma &codec_mm_reserved>; diff --git a/arch/arm/boot/dts/amlogic/c3_pxp.dts b/arch/arm/boot/dts/amlogic/c3_pxp.dts index d2ac8c251..a9bb6c2fe 100644 --- a/arch/arm/boot/dts/amlogic/c3_pxp.dts +++ b/arch/arm/boot/dts/amlogic/c3_pxp.dts @@ -146,14 +146,6 @@ }; }; - secmon { - compatible = "amlogic, secmon"; - memory-region = <&secmon_reserved>; - reserve_mem_size = <0x00100000>; - in_base_func = <0x82000020>; - out_base_func = <0x82000021>; - }; - codec_mm { compatible = "amlogic, codec, mm"; memory-region = <&codec_mm_cma &codec_mm_reserved>; diff --git a/arch/arm/boot/dts/amlogic/meson-c3.dtsi b/arch/arm/boot/dts/amlogic/meson-c3.dtsi index 94d14421c..db3b31794 100644 --- a/arch/arm/boot/dts/amlogic/meson-c3.dtsi +++ b/arch/arm/boot/dts/amlogic/meson-c3.dtsi @@ -1334,6 +1334,14 @@ method = "smc"; }; + secmon { + compatible = "amlogic, secmon"; + memory-region = <&secmon_reserved>; + reserve_mem_size = <0x00100000>; + in_base_func = <0x82000020>; + out_base_func = <0x82000021>; + }; + cma_shrinker: cma_shrinker { compatible = "amlogic, cma-shrinker"; status = "disabled";