From 0708781248a44a2a50138bf4f5a6087a9a183cc0 Mon Sep 17 00:00:00 2001
From: Shengjiu Wang <shengjiu.wang@nxp.com>
Date: Sun, 8 Aug 2021 20:07:58 +0800
Subject: [PATCH] LF-4271-3: arm64: dts: imx8x: separate dsp_reserved_heap
memory
Separate dsp_reserved_heap memory from dsp_reserved for
dsp usage.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Peng Zhang <peng.zhang_8@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8q-val.dtsi | 6 +++++-
arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts | 1 +
arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts | 1 +
arch/arm64/boot/dts/freescale/imx8x-mek.dtsi | 7 +++++--
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8q-val.dtsi b/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
index 9824f584f8e563..50f47bd091eba8 100644
--- a/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
@@ -61,7 +61,11 @@
reg = <0 0x92200000 0 0x200000>;
};
dsp_reserved: dsp@92400000 {
- reg = <0 0x92400000 0 0x1ef0000>;
+ reg = <0 0x92400000 0 0x1000000>;
+ no-map;
+ };
+ dsp_reserved_heap: dsp_reserved_heap {
+ reg = <0 0x93400000 0 0xef0000>;
no-map;
};
dsp_vdev0vring0: vdev0vring0@942f0000 {
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts
index bcc85d7901cb87..2f7675eb859c47 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts
@@ -6,6 +6,7 @@
/ {
reserved-memory {
/delete-node/ dsp_reserved;
+ /delete-node/ dsp_reserved_heap;
/delete-node/ dsp_vdev0vring0;
/delete-node/ dsp_vdev0vring1;
/delete-node/ dsp_vdev0buffer;
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
index 51c7fbf3801008..c616c6dd94774c 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
@@ -6,6 +6,7 @@
/ {
reserved-memory {
/delete-node/ dsp_reserved;
+ /delete-node/ dsp_reserved_heap;
/delete-node/ dsp_vdev0vring0;
/delete-node/ dsp_vdev0vring1;
/delete-node/ dsp_vdev0buffer;
diff --git a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
index 6e6c01f14a6250..c40ea01e8242cc 100644
--- a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
@@ -117,10 +117,13 @@
};
dsp_reserved: dsp@92400000 {
- reg = <0 0x92400000 0 0x1ef0000>;
+ reg = <0 0x92400000 0 0x1000000>;
+ no-map;
+ };
+ dsp_reserved_heap: dsp_reserved_heap {
+ reg = <0 0x93400000 0 0xef0000>;
no-map;
};
-
dsp_vdev0vring0: vdev0vring0@942f0000 {
reg = <0 0x942f0000 0 0x8000>;
no-map;
--
GitLab