ARM: dts: qcom: Remove unwanted virtio block device

As it is not required now, remove it to save memory.

This also move virtio ring and swiotlb shared memory by 972KB to avoid
a gap between the previous device.

Change-Id: I9db2debe3019418de3ffce70e86625534ec15957
This commit is contained in:
Sreenad Menon
2021-06-01 16:42:58 +05:30
parent 75c0f7c226
commit 415431bfa3
2 changed files with 10 additions and 37 deletions

View File

@@ -149,25 +149,10 @@
push-compatible = "virtio,mmio";
dma-coherent;
dma_base = <0x0 0x0>;
memory {
qcom,label = <0x10>;
#address-cells = <0x2>;
base = <0x0 0xFFDFC000>;
};
};
virtio-mmio@1 {
vdevice-type = "virtio-mmio";
generate = "/virtio-mmio";
peer-default;
vqs-num = <0x1>;
push-compatible = "virtio,mmio";
dma-coherent;
dma_base = <0x0 0x4000>;
memory {
qcom,label = <0x11>;
#address-cells = <0x2>;
base = <0x0 0xFFE00000>;
base = <0x0 0xFFEFC000>;
};
};
@@ -176,11 +161,11 @@
generate = "/swiotlb";
push-compatible = "swiotlb";
peer-default;
dma_base = <0x0 0x8000>;
dma_base = <0x0 0x4000>;
memory {
qcom,label = <0x12>;
#address-cells = <0x2>;
base = <0x0 0xFFE04000>;
base = <0x0 0xFFF00000>;
};
};

View File

@@ -515,21 +515,15 @@
reg = <0x0 0xe0b00000 0x0 0x7a00000>;
};
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@e85fc000 {
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@e8509000 {
no-map;
reg = <0x0 0xe85fc000 0x0 0x4000>;
gunyah-label = <0x10>;
};
trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@e8600000 {
no-map;
reg = <0x0 0xe8600000 0x0 0x4000>;
reg = <0x0 0xe8509000 0x0 0x4000>;
gunyah-label = <0x11>;
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@e8604000 {
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@e850d000 {
no-map;
reg = <0x0 0xe8604000 0x0 0x1fc000>;
reg = <0x0 0xe850d000 0x0 0x100000>;
gunyah-label = <0x12>;
};
@@ -3302,19 +3296,13 @@
qcom,target-dev = <&qcom_ddr_dcvs_hw>;
};
trust_ui_vm: qcom,trust_ui_vm@e85fc000 {
reg = <0xe85fc000 0x204000>;
trust_ui_vm: qcom,trust_ui_vm@e8509000 {
reg = <0xe8509000 0x104000>;
vm_name = "trustedvm";
shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_vblk1_ring &trust_ui_vm_swiotlb>;
shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_swiotlb>;
};
qcom,virtio_backend@0 {
compatible = "qcom,virtio_backend";
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x10>;
};
qcom,virtio_backend@1 {
compatible = "qcom,virtio_backend";
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x11>;