diff --git a/qcom/bengal-pinctrl.dtsi b/qcom/bengal-pinctrl.dtsi
index 70e9945d..ebbf6e67 100644
--- a/qcom/bengal-pinctrl.dtsi
+++ b/qcom/bengal-pinctrl.dtsi
@@ -7,66 +7,6 @@
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
-		irqdomain-map = <0 0 &wakegpio 84 0>,
-				<3 0 &wakegpio 75 0>,
-				<4 0 &wakegpio 16 0>,
-				<6 0 &wakegpio 59 0>,
-				<8 0 &wakegpio 63 0>,
-				<11 0 &wakegpio 17 0>,
-				<13 0 &wakegpio 18 0>,
-				<14 0 &wakegpio 51 0>,
-				<17 0 &wakegpio 20 0>,
-				<18 0 &wakegpio 52 0>,
-				<19 0 &wakegpio 53 0>,
-				<24 0 &wakegpio 6 0>,
-				<25 0 &wakegpio 71 0>,
-				<27 0 &wakegpio 73 0>,
-				<28 0 &wakegpio 41 0>,
-				<31 0 &wakegpio 27 0>,
-				<32 0 &wakegpio 54 0>,
-				<33 0 &wakegpio 55 0>,
-				<34 0 &wakegpio 56 0>,
-				<35 0 &wakegpio 57 0>,
-				<36 0 &wakegpio 58 0>,
-				<39 0 &wakegpio 28 0>,
-				<46 0 &wakegpio 29 0>,
-				<62 0 &wakegpio 60 0>,
-				<63 0 &wakegpio 61 0>,
-				<64 0 &wakegpio 62 0>,
-				<65 0 &wakegpio 30 0>,
-				<66 0 &wakegpio 31 0>,
-				<67 0 &wakegpio 32 0>,
-				<69 0 &wakegpio 33 0>,
-				<70 0 &wakegpio 34 0>,
-				<72 0 &wakegpio 72 0>,
-				<75 0 &wakegpio 35 0>,
-				<79 0 &wakegpio 36 0>,
-				<80 0 &wakegpio 21 0>,
-				<81 0 &wakegpio 38 0>,
-				<83 0 &wakegpio 9 0>,
-				<84 0 &wakegpio 39 0>,
-				<85 0 &wakegpio 40 0>,
-				<86 0 &wakegpio 19 0>,
-				<87 0 &wakegpio 42 0>,
-				<88 0 &wakegpio 43 0>,
-				<89 0 &wakegpio 45 0>,
-				<91 0 &wakegpio 74 0>,
-				<93 0 &wakegpio 46 0>,
-				<94 0 &wakegpio 47 0>,
-				<95 0 &wakegpio 48 0>,
-				<96 0 &wakegpio 49 0>,
-				<97 0 &wakegpio 50 0>,
-				<99 0 &wakegpio 64 0>,	/* LPI_GPIO 7 */
-				<102 0 &wakegpio 65 0>,	/* LPI_GPIO 10 */
-				<103 0 &wakegpio 66 0>,	/* LPI_GPIO 11 */
-				<104 0 &wakegpio 67 0>,	/* LPI_GPIO 12 */
-				<105 0 &wakegpio 69 0>,	/* LPI_GPIO 17 */
-				<106 0 &wakegpio 14 0>,	/* LPI_GPIO 16 */
-				<107 0 &wakegpio 7 0>,	/* LPI_GPIO 17 */
-				<109 0 &wakegpio 37 0>,	/* LPI_GPIO 19 */
-				<112 0 &wakegpio 25 0>;	/* LPI_GPIO 24 */
-		irqdomain-map-pass-thru = <0 0xff>;
-		irqdomain-map-mask = <0xff 0>;
 
 		/* SDC pin type */
 		sdc1_clk_on: sdc1_clk_on {
diff --git a/qcom/bengal-thermal.dtsi b/qcom/bengal-thermal.dtsi
index fa93b903..03c6d496 100644
--- a/qcom/bengal-thermal.dtsi
+++ b/qcom/bengal-thermal.dtsi
@@ -116,8 +116,8 @@
 			<0x04411000  0x1ff>;
 		reg-names = "tsens_srot_physical",
 			"tsens_tm_physical";
-		interrupts = <GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>,
-				<GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts-extended = <&intc GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>,
+				      <&mpm 2 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "tsens-upper-lower", "tsens-critical";
 		tsens-reinit-wa;
 		#thermal-sensor-cells = <1>;
diff --git a/qcom/khaje-pinctrl.dtsi b/qcom/khaje-pinctrl.dtsi
index e67e9e51..63db2ef4 100644
--- a/qcom/khaje-pinctrl.dtsi
+++ b/qcom/khaje-pinctrl.dtsi
@@ -2,6 +2,7 @@
 
 &tlmm {
 		compatible = "qcom,khaje-pinctrl";
+		wakeup-parent = <&mpm>;
 
 		cam_flash_torch_active: cam_flash_torch_active {
 			/* TORCH */
diff --git a/qcom/khaje-usb.dtsi b/qcom/khaje-usb.dtsi
index 603890d1..1fd1d219 100644
--- a/qcom/khaje-usb.dtsi
+++ b/qcom/khaje-usb.dtsi
@@ -11,10 +11,10 @@
 		#size-cells = <1>;
 		ranges;
 
-		interrupts = <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 184 IRQ_TYPE_EDGE_RISING>,
-			     <GIC_SPI 188 IRQ_TYPE_EDGE_RISING>;
+		interrupts-extended = <&intc GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>,
+			     <&mpm 12 IRQ_TYPE_LEVEL_HIGH>,
+			     <&mpm 91 IRQ_TYPE_EDGE_RISING>,
+			     <&mpm 90 IRQ_TYPE_EDGE_RISING>;
 		interrupt-names = "pwr_event_irq", "ss_phy_irq",
 				  "dp_hs_phy_irq", "dm_hs_phy_irq";
 
diff --git a/qcom/khaje.dtsi b/qcom/khaje.dtsi
index 517fa80f..e0984a0f 100644
--- a/qcom/khaje.dtsi
+++ b/qcom/khaje.dtsi
@@ -786,19 +786,14 @@
 		};
 	};
 
-	wakegic: wake-gic {
-		interrupts-extended = <&wakegic GIC_SPI 197
-						IRQ_TYPE_EDGE_RISING>;
+	mpm: interrupt-controller@45f01b8 {
+		compatible = "qcom,mpm-khaje", "qcom,mpm";
 		reg = <0x45f01b8 0x1000>,
-			<0xf011008 0x4>;  /* MSM_APCS_GCC_BASE 4K */
-		reg-names = "vmpm", "ipc";
+		      <0xf111008 0x4>,  /* MSM_APCS_GCC_BASE 4K */
+		      <0xf121000 0x1000>;
+		reg-names = "vmpm", "ipc", "timer";
+		interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
 		qcom,num-mpm-irqs = <96>;
-		interrupt-controller;
-		interrupt-parent = <&intc>;
-		#interrupt-cells = <3>;
-	};
-
-	wakegpio: wake-gpio {
 		interrupt-controller;
 		interrupt-parent = <&intc>;
 		#interrupt-cells = <2>;
@@ -3271,7 +3266,7 @@
 			<0x1c0a000 0x26000>;
 		reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
 		interrupt-names = "periph_irq";
-		interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts-extended = <&mpm 86 IRQ_TYPE_LEVEL_HIGH>;
 		qcom,ee = <0>;
 		qcom,channel = <0>;
 		#address-cells = <1>;