Merge remote-tracking branch 'mailbox/mailbox-for-next'

diff --combined arch/arm64/boot/dts/apm/apm-storm.dtsi
index cafb2c2715fbae02551ffe32bc2693463d665423,d91338a7e28c75abaf6f9cb0c6dcbb4e61c30de3..b9b9d278985edd9531ad7fded78e27e2df9af29b
--- 1/arch/arm64/boot/dts/apm/apm-storm.dtsi
--- 2/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@@ -691,6 -691,20 +691,20 @@@
                        msi-parent = <&msi>;
                };
  
+               mailbox: mailbox@10540000 {
+                       compatible = "apm,xgene-slimpro-mbox";
+                       reg = <0x0 0x10540000 0x0 0xa000>;
+                       #mbox-cells = <1>;
+                       interrupts =    <0x0 0x0 0x4>,
+                                       <0x0 0x1 0x4>,
+                                       <0x0 0x2 0x4>,
+                                       <0x0 0x3 0x4>,
+                                       <0x0 0x4 0x4>,
+                                       <0x0 0x5 0x4>,
+                                       <0x0 0x6 0x4>,
+                                       <0x0 0x7 0x4>;
+               };
+ 
                serial0: serial@1c020000 {
                        status = "disabled";
                        device_type = "serial";
@@@ -958,13 -972,7 +972,13 @@@
                              <0x0 0x18000000 0x0 0X200>;
                        reg-names = "enet_csr", "ring_csr", "ring_cmd";
                        interrupts = <0x0 0x60 0x4>,
 -                                   <0x0 0x61 0x4>;
 +                                   <0x0 0x61 0x4>,
 +                                   <0x0 0x62 0x4>,
 +                                   <0x0 0x63 0x4>,
 +                                   <0x0 0x64 0x4>,
 +                                   <0x0 0x65 0x4>,
 +                                   <0x0 0x66 0x4>,
 +                                   <0x0 0x67 0x4>;
                        dma-coherent;
                        clocks = <&xge0clk 0>;
                        /* mac address will be overwritten by the bootloader */