Merge "ARM: dts: msm: Add wakeup-source property to virtio-vsock"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
b3e70e4cbd
@@ -2173,16 +2173,23 @@
|
||||
gunyah-label = <0x10>;
|
||||
};
|
||||
|
||||
|
||||
trust_ui_vm_vsock_ring: trust_ui_vm_vsock_ring {
|
||||
size = <0xc000>;
|
||||
gunyah-label = <0x15>;
|
||||
};
|
||||
|
||||
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb {
|
||||
size = <0x100000>;
|
||||
size = <0x400000>;
|
||||
gunyah-label = <0x12>;
|
||||
};
|
||||
|
||||
trust_ui_vm: qcom,trust_ui_vm {
|
||||
vm_name = "trustedvm";
|
||||
shared-buffers-size = <0x108000>;
|
||||
shared-buffers-size = <0x414000>;
|
||||
shared-buffers = <&trust_ui_vm_vblk0_ring
|
||||
&trust_ui_vm_vblk1_ring
|
||||
&trust_ui_vm_vsock_ring
|
||||
&trust_ui_vm_swiotlb>;
|
||||
};
|
||||
|
||||
@@ -2196,6 +2203,11 @@
|
||||
qcom,label = <0x10>;
|
||||
};
|
||||
|
||||
trust_ui_vm_virt_be2: trust_ui_vm_virt_be2@15 {
|
||||
qcom,vm = <&trust_ui_vm>;
|
||||
qcom,label = <0x15>;
|
||||
};
|
||||
|
||||
gh-rm-booster {
|
||||
compatible = "qcom,gh-rm-booster";
|
||||
qcom,rm-vmid = <255>;
|
||||
@@ -2209,7 +2221,9 @@
|
||||
qcom,firmware-name = "trustedvm";
|
||||
qcom,keep-running;
|
||||
memory-region = <&trust_ui_vm_mem &vm_comm_mem>;
|
||||
virtio-backends = <&trust_ui_vm_virt_be0 &trust_ui_vm_virt_be1>;
|
||||
virtio-backends = <&trust_ui_vm_virt_be0
|
||||
&trust_ui_vm_virt_be1
|
||||
&trust_ui_vm_virt_be2>;
|
||||
};
|
||||
|
||||
oem_vm_vblk0_ring: oem_vm_vblk0_ring {
|
||||
@@ -3770,7 +3784,7 @@
|
||||
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
|
||||
reusable;
|
||||
alignment = <0x0 0x400000>;
|
||||
size = <0x0 0x400000>;
|
||||
size = <0x0 0x800000>;
|
||||
};
|
||||
|
||||
llcc_lpi_mem: llcc_lpi_region@ff800000 {
|
||||
|
Reference in New Issue
Block a user