From: Xindong Xu Date: Mon, 6 Jan 2020 10:07:42 +0000 (+0800) Subject: deadpool: enable new mailbox routine for G12A [1/1] X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=97162508c524da49252900163b6f4bc9e1425603;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git deadpool: enable new mailbox routine for G12A [1/1] PD#SWPL-19014 Problem: BL30 enable new mailbox routine for SM1 So G12A also need use the same mailbox routine Solution: Enable new mailbox routine in dts Verify: deadpool Change-Id: I17ff88facb1763b22735d46e83bac493bbaec368 Signed-off-by: Xindong Xu --- diff --git a/arch/arm64/boot/dts/amlogic/mesong12a_deadpool.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a_deadpool.dtsi index 10dee90b34f7..81aa7ebd6040 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a_deadpool.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a_deadpool.dtsi @@ -223,10 +223,16 @@ reg = <0x0 0xff63c400 0x0 0x4c>, /* MHU registers */ <0x0 0xfffe7000 0x0 0x800>; /* Payload area */ interrupts = <0 209 1>, /* low priority interrupt */ - <0 210 1>; /* high priority interrupt */ + <0 210 1>, /* bl4 receive interrupt */ + <0 213 1>; /* bl4 send interrupt */ #mbox-cells = <1>; - mbox-names = "cpu_to_scp_low", "cpu_to_scp_high"; - mboxes = <&mailbox 0 &mailbox 1>; + mbox-names = "cpu_to_scp_low", "bl4_to_cpu", "cpu_to_bl4"; + mboxes = <&mailbox 0 &mailbox 1 &mailbox 2>; + num-chans-to-scp = <1>; /*number of chans to send m3*/ + send-isr-bits = <5>; /*BIT(idx) of isr listen when ap send*/ + ack-isr-bits = <4>; /*BIT(idx) of ack isr*/ + m4-isr-bits = <6>; /*BIT(idx) of m4 isr*/ + mbox-chans = <3>; /*chan number*/ }; cpu_iomap { diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi index 710483f30f73..bf65c1de91e6 100644 --- a/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi @@ -223,10 +223,16 @@ reg = <0x0 0xff63c400 0x0 0x4c>, /* MHU registers */ <0x0 0xfffe7000 0x0 0x800>; /* Payload area */ interrupts = <0 209 1>, /* low priority interrupt */ - <0 210 1>; /* high priority interrupt */ + <0 210 1>, /* bl4 receive interrupt */ + <0 213 1>; /* bl4 send interrupt */ #mbox-cells = <1>; - mbox-names = "cpu_to_scp_low", "cpu_to_scp_high"; - mboxes = <&mailbox 0 &mailbox 1>; + mbox-names = "cpu_to_scp_low", "bl4_to_cpu", "cpu_to_bl4"; + mboxes = <&mailbox 0 &mailbox 1 &mailbox 2>; + num-chans-to-scp = <1>; /*number of chans to send m3*/ + send-isr-bits = <5>; /*BIT(idx) of isr listen when ap send*/ + ack-isr-bits = <4>; /*BIT(idx) of ack isr*/ + m4-isr-bits = <6>; /*BIT(idx) of m4 isr*/ + mbox-chans = <3>; /*chan number*/ }; cpu_iomap {