Commit cd8967ea authored by Quentin Schulz's avatar Quentin Schulz Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: fix unit-address for RK3588 NPU's core1 and core2's IOMMU 

The Device Tree specification specifies[1] that

"""
Each node in the devicetree is named according to the following
convention:
	node-name@unit-address
[...]
The unit-address must match the first address specified in the reg
property of the node.
"""

The first address in the reg property is fdaXa000 and not fdaX9000. This
is likely a copy-paste error as the IOMMU for core0 has two entries in
the reg property, the first one being fdab9000 and the second fdaba000.

Let's fix this oversight to match what the spec is expecting.

[1] https://github.com/devicetree-org/devicetree-specification/releases/download/v0.4/devicetree-specification-v0.4.pdf

 2.2.1 Node Names

Fixes: a31dfc06 ("arm64: dts: rockchip: Add nodes for NPU and its MMU to rk3588-base")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarQuentin Schulz <quentin.schulz@cherry.de>
Link: https://patch.msgid.link/20251215-npu-dt-node-address-v1-1-840093e8a2bf@cherry.de


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 7c6bbcb0

arch/arm64/boot/dts/rockchip/rk3588-base.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ rknn_core_1: npu@fdac0000 { 
		status = "disabled";

	};



	rknn_mmu_1: iommu@fdac9000 {

	rknn_mmu_1: iommu@fdaca000 {

		compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";

		reg = <0x0 0xfdaca000 0x0 0x100>;

		interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1230,7 +1230,7 @@ rknn_core_2: npu@fdad0000 { 
		status = "disabled";

	};



	rknn_mmu_2: iommu@fdad9000 {

	rknn_mmu_2: iommu@fdada000 {

		compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";

		reg = <0x0 0xfdada000 0x0 0x100>;

		interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH 0>;