diff --git a/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi b/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi index 87761e6c0..dc5c79b04 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi @@ -1525,6 +1525,11 @@ &ion_fb_reserved>; }; + gpu_protected_memory_allocator: protected-memory-allocator { + compatible = "arm,protected-memory-allocator"; + memory-region = <&mali_protected>; + }; + meson_uvm { compatible = "amlogic, meson_uvm"; status = "okay"; @@ -2537,11 +2542,6 @@ }; }; - gpu_protected_memory_allocator: protected-memory-allocator { - compatible = "arm,protected-memory-allocator"; - memory-region = <&mali_protected>; - }; - eth_pins: eth { mux { groups = "eth_mdio", @@ -2585,7 +2585,8 @@ ; interrupt-names = "GPU", "MMU", "JOB"; - protected-memory-allocator = <&gpu_protected_memory_allocator>; + /* Protected memory allocator default not available*/ + //protected-memory-allocator = <&gpu_protected_memory_allocator>; num_of_pp = <1>; system-coherency = <31>; diff --git a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts index 9973410dd..06d4d5239 100644 --- a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts +++ b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts @@ -106,7 +106,14 @@ size = <0x0 0x3800000>; alignment = <0x0 0x400000>; }; - mali_protected: mali_protected@c0000000 { + dmaheap_secure_reserved:heap-secure { + compatible = "amlogic, heap-secure-mem"; + no-map; + /* advice heap-secure size 208M */ + size = <0x0 0x0>; + alignment = <0x0 0x400000>; + }; + mali_protected:mali_protected@c0000000 { compatible = "mali-reserved"; no-map; /* 16M with high version than valhall-r41p0,