diff --git a/boards/arm/qemu_raspi3/qemu_raspi3.dts b/boards/arm/qemu_raspi3/qemu_raspi3.dts
index 02ec7da5d86a5999d2dbc2136561733740b6b702..287b6ba74fd9980799051002d0f1f9b44356a91a 100644
--- a/boards/arm/qemu_raspi3/qemu_raspi3.dts
+++ b/boards/arm/qemu_raspi3/qemu_raspi3.dts
@@ -43,16 +43,17 @@
 		};
 	};
 
-	soc {
-        /* TODO: Remove. */
-		interrupt-parent = <&gic>;
+    /* TODO: Fix '... lacks binding' warning. Add .yaml and something else? Grep
+    for arm_arch_timer to see how it is done. */
 
+	soc {
         /* https://github.com/s-matyukevich/raspberry-pi-os/blob/master/docs/lesson03/rpi-os.md#configuring-interrupt-controller */
         intc: interrupt-controller@3f00b200 {
 			compatible = "brcm,bcm2835-armctrl-ic";
 			reg = <0x3f00b200 0x200>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
+            label = "intc";
 		};
 
         local_intc: local_intc@40000000 {
@@ -75,17 +76,6 @@
 			clock-frequency = <1000000>;
 		};
 
-        /* TODO: Remove. */
-		gic: interrupt-controller@8000000 {
-			compatible = "arm,gic";
-			reg = <0x8000000 0x010000>,
-			      <0x80a0000 0xf60000>;
-			interrupt-controller;
-			#interrupt-cells = <4>;
-			label = "GIC";
-			status = "okay";
-		};
-
 		uart0: uart {
 			compatible = "arm,raspi3_mini";
 		};
diff --git a/dts/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.yaml b/dts/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7fa1421fe508fe0a56e5027c6aa1781d88c0752d
--- /dev/null
+++ b/dts/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2018 Marvell
+# SPDX-License-Identifier: Apache-2.0
+
+description: Interrupt Controller
+
+compatible: "brcm,bcm2835-armctrl-ic"
+
+include: base.yaml
+
+properties:
+    reg:
+      required: true
+
+    label:
+      required: true
+
+interrupt-cells:
+  - number
+  - irq
diff --git a/soc/arm/qemu_raspi3/Kconfig.soc b/soc/arm/qemu_raspi3/Kconfig.soc
index 951eb3b79be5cd2c713bd4527f7249e69871199c..9f33437e72662d3c5cdaa2b2de8e604d91c5822e 100644
--- a/soc/arm/qemu_raspi3/Kconfig.soc
+++ b/soc/arm/qemu_raspi3/Kconfig.soc
@@ -5,4 +5,3 @@ config SOC_QEMU_RASPI3
 	bool "QEMU virt platform (raspi3)"
 	select ARM
 	select CPU_CORTEX_A53
-	select GIC_V3