diff --git a/qcom/lahaina-qupv3.dtsi b/qcom/lahaina-qupv3.dtsi
index dab025c04b98..0dd01e1f6acc 100644
--- a/qcom/lahaina-qupv3.dtsi
+++ b/qcom/lahaina-qupv3.dtsi
@@ -43,9 +43,18 @@
 		#dma-cells = <5>;
 		reg = <0x900000 0x60000>;
 		reg-names = "gpi-top";
-		interrupts = <0 244 0>, <0 245 0>, <0 246 0>, <0 247 0>,
-			<0 248 0>, <0 249 0>, <0 250 0>, <0 251 0>,
-			<0 252 0>, <0 253 0>, <0 254 0>, <0 255 0>;
+		interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 252 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
 		qcom,max-num-gpii = <12>;
 		qcom,gpii-mask = <0xff>;
 		qcom,ev-factor = <2>;
@@ -421,9 +430,18 @@
 		#dma-cells = <5>;
 		reg = <0xa00000 0x60000>;
 		reg-names = "gpi-top";
-		interrupts = <0 279 0>, <0 280 0>, <0 281 0>, <0 282 0>,
-			<0 283 0>, <0 284 0>, <0 293 0>, <0 294 0>,
-			<0 295 0>, <0 296 0>, <0 297 0>, <0 298 0>;
+		interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 293 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 294 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 295 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
 		qcom,max-num-gpii = <12>;
 		qcom,gpii-mask = <0xff>;
 		qcom,ev-factor = <2>;
@@ -727,6 +745,7 @@
 		pinctrl-0 = <&qupv3_se13_i2c_active>;
 		pinctrl-1 = <&qupv3_se13_i2c_sleep>;
 		qcom,wrapper-core = <&qupv3_1>;
+		qcom,shared;
 		status = "disabled";
 	};
 
@@ -748,9 +767,18 @@
 		#dma-cells = <5>;
 		reg = <0x800000 0x60000>;
 		reg-names = "gpi-top";
-		interrupts = <0 588 0>, <0 589 0>, <0 590 0>, <0 591 0>,
-			<0 592 0>, <0 593 0>, <0 594 0>, <0 595 0>,
-			<0 596 0>, <0 597 0>, <0 598 0>, <0 599 0>;
+		interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 590 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 593 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 594 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 596 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 597 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 599 IRQ_TYPE_LEVEL_HIGH>;
 		qcom,max-num-gpii = <12>;
 		qcom,gpii-mask = <0xff>;
 		qcom,ev-factor = <2>;