From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Thu, 20 Mar 2025 12:51:57 +0000 (+0100)
Subject: emulation: qemu-sbsa: Move ITS node into GICv3 node
X-Git-Tag: v2025.07-rc1~113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a060b01b322231725dfc38090d8dc5e080cd33;p=pandora-u-boot.git

emulation: qemu-sbsa: Move ITS node into GICv3 node

According to the binding [1] the ITS node should be a subnode of the
GICv3 node. Thus move it now that the driver binds subnodes as well.

1: https://www.kernel.org/doc/Documentation/devicetree/bindings/interrupt-controller/arm%2Cgic-v3.txt

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
---

diff --git a/arch/arm/dts/qemu-sbsa.dts b/arch/arm/dts/qemu-sbsa.dts
index ed00e501366..099b51b927f 100644
--- a/arch/arm/dts/qemu-sbsa.dts
+++ b/arch/arm/dts/qemu-sbsa.dts
@@ -97,11 +97,13 @@
 		      /bits/ 64 <0 0>,
 		      /bits/ 64 <SBSA_GIC_HBASE_ADDR SBSA_GIC_HBASE_LENGTH>,
 		      /bits/ 64 <SBSA_GIC_VBASE_ADDR SBSA_GIC_VBASE_LENGTH>;
-	};
 
-	its {
-		compatible = "arm,gic-v3-its";
-		status = "disabled";
+		its: msi-controller {
+			compatible = "arm,gic-v3-its";
+			msi-controller;
+			#msi-cells = <1>;
+			status = "disabled";
+		};
 	};
 };
 
diff --git a/board/emulation/qemu-sbsa/qemu-sbsa.c b/board/emulation/qemu-sbsa/qemu-sbsa.c
index 3943c924320..cf1d5acf5cb 100644
--- a/board/emulation/qemu-sbsa/qemu-sbsa.c
+++ b/board/emulation/qemu-sbsa/qemu-sbsa.c
@@ -202,7 +202,7 @@ static int fdtdec_fix_gic(void *fdt)
 	smc_get_gic_its_base(&gic_its_base);
 
 	if (gic_its_base != 0) {
-		offs = fdt_path_offset(fdt, "/its");
+		offs = fdt_path_offset(fdt, "/interrupt-controller/msi-controller");
 		if (offs < 0)
 			return offs;