| From dd9e02bc963602778a8feca882ddd74666833aa7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 14 Dec 2023 14:20:00 +0100 |
| Subject: arm64: dts: imx8qxp: Add VPU subsystem file |
| |
| From: Alexander Stein <alexander.stein@ew.tq-group.com> |
| |
| [ Upstream commit 6bcd8b2fa2a9826fb6a849a9bfd7bdef145cabb6 ] |
| |
| imx8qxp re-uses imx8qm VPU subsystem file, but it has different base |
| addresses. Also imx8qxp has only two VPU cores, delete vpu_vore2 and |
| mu2_m0 accordingly. |
| |
| Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> |
| Reviewed-by: Fabio Estevam <festevam@gmail.com> |
| Signed-off-by: Shawn Guo <shawnguo@kernel.org> |
| Stable-dep-of: eed2d8e8d005 ("arm64: dts: imx8-ss-vpu: Fix imx8qm VPU IRQs") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| .../boot/dts/freescale/imx8qxp-ss-vpu.dtsi | 17 +++++++++++++++++ |
| arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 2 +- |
| 2 files changed, 18 insertions(+), 1 deletion(-) |
| create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi |
| |
| diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi |
| new file mode 100644 |
| index 0000000000000..7894a3ab26d6b |
| --- /dev/null |
| +++ b/arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi |
| @@ -0,0 +1,17 @@ |
| +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) |
| +/* |
| + * Copyright 2023 TQ-Systems GmbH <linux@ew.tq-group.com>, |
| + * D-82229 Seefeld, Germany. |
| + * Author: Alexander Stein |
| + */ |
| + |
| +&vpu_core0 { |
| + reg = <0x2d040000 0x10000>; |
| +}; |
| + |
| +&vpu_core1 { |
| + reg = <0x2d050000 0x10000>; |
| +}; |
| + |
| +/delete-node/ &mu2_m0; |
| +/delete-node/ &vpu_core2; |
| diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi |
| index c80c85a4b4059..b155180cc249b 100644 |
| --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi |
| +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi |
| @@ -48,7 +48,6 @@ |
| serial3 = &lpuart3; |
| vpu-core0 = &vpu_core0; |
| vpu-core1 = &vpu_core1; |
| - vpu-core2 = &vpu_core2; |
| }; |
| |
| cpus { |
| @@ -317,6 +316,7 @@ |
| }; |
| |
| #include "imx8qxp-ss-img.dtsi" |
| +#include "imx8qxp-ss-vpu.dtsi" |
| #include "imx8qxp-ss-adma.dtsi" |
| #include "imx8qxp-ss-conn.dtsi" |
| #include "imx8qxp-ss-lsio.dtsi" |
| -- |
| 2.43.0 |
| |
