diff --git a/qcom/monaco-pinctrl.dtsi b/qcom/monaco-pinctrl.dtsi index b727131b..58b6ad67 100644 --- a/qcom/monaco-pinctrl.dtsi +++ b/qcom/monaco-pinctrl.dtsi @@ -7,7 +7,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; - wakeup-parent = <&wakegic>; + wakeup-parent = <&mpm>; qupv3_se6_2uart_pins: qupv3_se6_2uart_pins { qupv3_se6_2uart_tx_active: qupv3_se6_2uart_tx_active { diff --git a/qcom/monaco-thermal.dtsi b/qcom/monaco-thermal.dtsi index 233a7f76..31ccb318 100644 --- a/qcom/monaco-thermal.dtsi +++ b/qcom/monaco-thermal.dtsi @@ -45,7 +45,7 @@ "tsens_tm_physical"; interrupts-extended = <&intc 0 275 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 190 IRQ_TYPE_LEVEL_HIGH>, - <&wakegic 89 IRQ_TYPE_EDGE_RISING>; + <&mpm 89 IRQ_TYPE_EDGE_RISING>; interrupt-names = "tsens-upper-lower", "tsens-critical", "tsens-0C"; diff --git a/qcom/monaco.dtsi b/qcom/monaco.dtsi index 05f2f4c4..4f5518a3 100644 --- a/qcom/monaco.dtsi +++ b/qcom/monaco.dtsi @@ -1137,7 +1137,7 @@ <0x1c0a000 0x26000>; reg-names = "core", "chnls", "obsrvr", "intr", "cnfg"; interrupt-names = "periph_irq"; - interrupts-extended = <&wakegic 86 IRQ_TYPE_LEVEL_HIGH>; + interrupts-extended = <&mpm 86 IRQ_TYPE_LEVEL_HIGH>; qcom,ee = <0>; qcom,mid = <0>; qcom,channel = <0>; @@ -1663,12 +1663,13 @@ }; }; - wakegic: wake-gic { - compatible = "qcom,mpm-gic-monaco", "qcom,mpm"; + mpm: interrupt-controller@45f01b8 { + compatible = "qcom,mpm-monaco", "qcom,mpm"; interrupts = ; reg = <0x45f01b8 0x1000>, - <0xf111008 0x4>; - reg-names = "vmpm", "ipc"; + <0xf111008 0x4>, + <0xf121000 0x1000>; + reg-names = "vmpm", "ipc", "timer"; qcom,num-mpm-irqs = <96>; interrupt-controller; interrupt-parent = <&intc>;