Merge "ARM: dts: msm: Define qcom,display heap for sun"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
e8f3adbd42
@@ -12,7 +12,7 @@
|
|||||||
interrupt-parent = <&vgic>;
|
interrupt-parent = <&vgic>;
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce";
|
bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce memhp_default_state=online_movable";
|
||||||
};
|
};
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
|
@@ -8,6 +8,14 @@
|
|||||||
&soc {
|
&soc {
|
||||||
qcom,dma-heaps {
|
qcom,dma-heaps {
|
||||||
compatible = "qcom,dma-heaps";
|
compatible = "qcom,dma-heaps";
|
||||||
|
|
||||||
|
qcom,display {
|
||||||
|
qcom,dma-heap-name = "qcom,display";
|
||||||
|
qcom,dma-heap-type = <HEAP_TYPE_CMA>;
|
||||||
|
qcom,max-align = <9>;
|
||||||
|
memory-region = <&non_secure_display_memory>;
|
||||||
|
};
|
||||||
|
|
||||||
qcom,qseecom {
|
qcom,qseecom {
|
||||||
qcom,dma-heap-name = "qcom,qseecom";
|
qcom,dma-heap-name = "qcom,qseecom";
|
||||||
qcom,dma-heap-type = <HEAP_TYPE_CMA>;
|
qcom,dma-heap-type = <HEAP_TYPE_CMA>;
|
||||||
|
@@ -13,7 +13,7 @@
|
|||||||
interrupt-parent = <&vgic>;
|
interrupt-parent = <&vgic>;
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce";
|
bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce memhp_default_state=online_movable";
|
||||||
};
|
};
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
|
@@ -3392,6 +3392,14 @@
|
|||||||
size = <0x0 0xC00000>;
|
size = <0x0 0xC00000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
non_secure_display_memory: non_secure_display_region {
|
||||||
|
compatible = "shared-dma-pool";
|
||||||
|
reusable;
|
||||||
|
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
|
||||||
|
size = <0x0 0xa400000>;
|
||||||
|
alignment = <0x0 0x400000>;
|
||||||
|
};
|
||||||
|
|
||||||
kinfo_mem: debug_kinfo_region {
|
kinfo_mem: debug_kinfo_region {
|
||||||
alloc-ranges = <0x0 0x00000000 0xffffffff 0xffffffff>;
|
alloc-ranges = <0x0 0x00000000 0xffffffff 0xffffffff>;
|
||||||
size = <0x0 0x1000>;
|
size = <0x0 0x1000>;
|
||||||
|
Reference in New Issue
Block a user