Skip to content

Commit 6cd2a30

Browse files
macpaul-lin-mtkarndb
authored andcommitted
arm64: dts: mediatek: mt8195-demo: update and reorder reserved memory regions
The dts file of the MediaTek MT8195 demo board has been updated to include new reserved memory regions. These reserved memory regions are: - SCP - VPU, - Sound DMA - APU. These regions are defined with the "shared-dma-pool" compatible property. In addition, the existing reserved memory regions have been reordered by their addresses to improve readability and maintainability of the DTS file. Cc: stable@vger.kernel.org # 6.1, 6.4, 6.5 Fixes: e4a4175 ("arm64: dts: mediatek: mt8195-demo: fix the memory size of node secmon") Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20230905034511.11232-2-macpaul.lin@mediatek.com Link: https://lore.kernel.org/r/20231003-mediatek-fixes-v6-7-v1-3-dad7cd62a8ff@collabora.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 25389c0 commit 6cd2a30

1 file changed

Lines changed: 30 additions & 7 deletions

File tree

arch/arm64/boot/dts/mediatek/mt8195-demo.dts

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,8 @@
5656
#size-cells = <2>;
5757
ranges;
5858

59-
/* 2 MiB reserved for ARM Trusted Firmware (BL31) */
60-
bl31_secmon_reserved: secmon@54600000 {
61-
no-map;
62-
reg = <0 0x54600000 0x0 0x200000>;
63-
};
64-
65-
/* 12 MiB reserved for OP-TEE (BL32)
59+
/*
60+
* 12 MiB reserved for OP-TEE (BL32)
6661
* +-----------------------+ 0x43e0_0000
6762
* | SHMEM 2MiB |
6863
* +-----------------------+ 0x43c0_0000
@@ -75,6 +70,34 @@
7570
no-map;
7671
reg = <0 0x43200000 0 0x00c00000>;
7772
};
73+
74+
scp_mem: memory@50000000 {
75+
compatible = "shared-dma-pool";
76+
reg = <0 0x50000000 0 0x2900000>;
77+
no-map;
78+
};
79+
80+
vpu_mem: memory@53000000 {
81+
compatible = "shared-dma-pool";
82+
reg = <0 0x53000000 0 0x1400000>; /* 20 MB */
83+
};
84+
85+
/* 2 MiB reserved for ARM Trusted Firmware (BL31) */
86+
bl31_secmon_mem: memory@54600000 {
87+
no-map;
88+
reg = <0 0x54600000 0x0 0x200000>;
89+
};
90+
91+
snd_dma_mem: memory@60000000 {
92+
compatible = "shared-dma-pool";
93+
reg = <0 0x60000000 0 0x1100000>;
94+
no-map;
95+
};
96+
97+
apu_mem: memory@62000000 {
98+
compatible = "shared-dma-pool";
99+
reg = <0 0x62000000 0 0x1400000>; /* 20 MB */
100+
};
78101
};
79102
};
80103

0 commit comments

Comments
 (0)