Merge branch 'omap-for-v3.17/mailbox' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 29 Jul 2014 15:31:33 +0000 (17:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 29 Jul 2014 15:31:33 +0000 (17:31 +0200)
This is a dependency for the mailbox driver code and gets
merged through the soc branch

* branch 'omap-for-v3.17/mailbox':
  ARM: AM33xx: hwmod_data: Remove legacy mailbox addrs
  ARM: OMAP4: hwmod_data: Remove legacy mailbox addrs
  ARM: OMAP2: hwmod_data: Remove legacy mailbox data and addrs
  ARM: OMAP2+: Avoid mailbox legacy device creation for DT-boot
  ARM: DRA7: hwmod_data: Add mailbox hwmod data
  ARM: dts: DRA7: Add mailbox nodes
  ARM: dts: AM4372: Correct mailbox node data
  ARM: dts: AM33xx: Add mailbox node
  ARM: dts: OMAP4: Add mailbox node
  ARM: dts: OMAP2+: Add mailbox fifo and user information

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
16 files changed:
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap2420.dtsi
arch/arm/boot/dts/omap2430.dtsi
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
arch/arm/mach-omap2/omap_hwmod_common_data.h

index 4a4e02d0ce9e408b16b3c1bb57222fad963a2766..3a0a161342bafb7299b08ca9a80391f0edb47382 100644 (file)
                        status = "disabled";
                };
 
+               mailbox: mailbox@480C8000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x480C8000 0x200>;
+                       interrupts = <77>;
+                       ti,hwmods = "mailbox";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <8>;
+               };
+
                timer1: timer@44e31000 {
                        compatible = "ti,am335x-timer-1ms";
                        reg = <0x44e31000 0x400>;
index 49fa596222547d646c79a031b260097cf9a8bf8e..c9aee0e799bb6518f17507f576735f1347f76f61 100644 (file)
                        ti,hwmods = "mailbox";
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <8>;
-                       ti,mbox-names = "wkup_m3";
-                       ti,mbox-data = <0 0 0 0>;
-                       status = "disabled";
                };
 
                timer1: timer@44e31000 {
index c29945e07c5aa949011f6944d4db7e5b826e933c..99c40d4761861148005d9fa04c5ad56b12871f31 100644 (file)
                        status = "disabled";
                };
 
+               mailbox1: mailbox@4a0f4000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x4a0f4000 0x200>;
+                       ti,hwmods = "mailbox1";
+                       ti,mbox-num-users = <3>;
+                       ti,mbox-num-fifos = <8>;
+                       status = "disabled";
+               };
+
+               mailbox2: mailbox@4883a000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x4883a000 0x200>;
+                       ti,hwmods = "mailbox2";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox3: mailbox@4883c000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x4883c000 0x200>;
+                       ti,hwmods = "mailbox3";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox4: mailbox@4883e000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x4883e000 0x200>;
+                       ti,hwmods = "mailbox4";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox5: mailbox@48840000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48840000 0x200>;
+                       ti,hwmods = "mailbox5";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox6: mailbox@48842000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48842000 0x200>;
+                       ti,hwmods = "mailbox6";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox7: mailbox@48844000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48844000 0x200>;
+                       ti,hwmods = "mailbox7";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox8: mailbox@48846000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48846000 0x200>;
+                       ti,hwmods = "mailbox8";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox9: mailbox@4885e000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x4885e000 0x200>;
+                       ti,hwmods = "mailbox9";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox10: mailbox@48860000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48860000 0x200>;
+                       ti,hwmods = "mailbox10";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox11: mailbox@48862000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48862000 0x200>;
+                       ti,hwmods = "mailbox11";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox12: mailbox@48864000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48864000 0x200>;
+                       ti,hwmods = "mailbox12";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
+               mailbox13: mailbox@48802000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x48802000 0x200>;
+                       ti,hwmods = "mailbox13";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <12>;
+                       status = "disabled";
+               };
+
                timer1: timer@4ae18000 {
                        compatible = "ti,omap5430-timer";
                        reg = <0x4ae18000 0x80>;
index e83b0468080cb7c918e307166b38a57ab576f35a..6d21994d824b584195a2eba814281468d16a4573 100644 (file)
                        interrupts = <26>, <34>;
                        interrupt-names = "dsp", "iva";
                        ti,hwmods = "mailbox";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <6>;
                };
 
                timer1: timer@48028000 {
index c4e8013801ee031b78c13657b660304da4a5c54f..aa6a354e236f06164b642c5f4a3fd57d74ba454b 100644 (file)
                        reg = <0x48094000 0x200>;
                        interrupts = <26>;
                        ti,hwmods = "mailbox";
+                       ti,mbox-num-users = <4>;
+                       ti,mbox-num-fifos = <6>;
                };
 
                timer1: timer@49018000 {
index b2891a9a69751a3a359b768104fcfc6fa538d46c..575a49bf968d8c4be70abafa0009d1a7c3563661 100644 (file)
                        ti,hwmods = "mailbox";
                        reg = <0x48094000 0x200>;
                        interrupts = <26>;
+                       ti,mbox-num-users = <2>;
+                       ti,mbox-num-fifos = <2>;
                };
 
                mcspi1: spi@48098000 {
index 7e26d222bfe30903ed2cacd1f867b753137faf57..69408b53200d5aa88a603962452190ea43e02858 100644 (file)
                        };
                };
 
+               mailbox: mailbox@4a0f4000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x4a0f4000 0x200>;
+                       interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                       ti,hwmods = "mailbox";
+                       ti,mbox-num-users = <3>;
+                       ti,mbox-num-fifos = <8>;
+               };
+
                timer1: timer@4a318000 {
                        compatible = "ti,omap3430-timer";
                        reg = <0x4a318000 0x80>;
index 3bfda16c8b52671d4da890d47c5f44eaa7b0ac79..0e8336ed1a79746918ba6b486e3d54d86ea4fd9d 100644 (file)
                        reg = <0x4a0f4000 0x200>;
                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "mailbox";
+                       ti,mbox-num-users = <3>;
+                       ti,mbox-num-fifos = <8>;
                };
 
                timer1: timer@4ae18000 {
index 592ba0a0ecf32ae884b545581df4f3453da831c7..708eb7db630c94dfc0f5520b080675db5f99c883 100644 (file)
@@ -460,9 +460,9 @@ static int __init omap2_init_devices(void)
        omap_init_audio();
        omap_init_camera();
        omap_init_hdmi_audio();
-       omap_init_mbox();
        /* If dtb is there, the devices will be created dynamically */
        if (!of_have_populated_dt()) {
+               omap_init_mbox();
                omap_init_mcspi();
                omap_init_sham();
                omap_init_aes();
index 2f15979c2e9c410ed6c8ee42b7deb4a17c8d85ca..65b1647092bd541419b5c192565de2451415015c 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/i2c-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/omap-dma.h>
-#include <linux/platform_data/mailbox-omap.h>
 #include <plat/dmtimer.h>
 
 #include "omap_hwmod.h"
@@ -163,18 +162,6 @@ static struct omap_hwmod omap2420_dma_system_hwmod = {
 };
 
 /* mailbox */
-static struct omap_mbox_dev_info omap2420_mailbox_info[] = {
-       { .name = "dsp", .tx_id = 0, .rx_id = 1, .irq_id = 0, .usr_id = 0 },
-       { .name = "iva", .tx_id = 2, .rx_id = 3, .irq_id = 1, .usr_id = 3 },
-};
-
-static struct omap_mbox_pdata omap2420_mailbox_attrs = {
-       .num_users      = 4,
-       .num_fifos      = 6,
-       .info_cnt       = ARRAY_SIZE(omap2420_mailbox_info),
-       .info           = omap2420_mailbox_info,
-};
-
 static struct omap_hwmod omap2420_mailbox_hwmod = {
        .name           = "mailbox",
        .class          = &omap2xxx_mailbox_hwmod_class,
@@ -188,7 +175,6 @@ static struct omap_hwmod omap2420_mailbox_hwmod = {
                        .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
                },
        },
-       .dev_attr       = &omap2420_mailbox_attrs,
 };
 
 /*
index 6d1b60902179d12e707f5b1f7564080072eea371..c2555cb95e7116765f2132bf711d1f959723765d 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/omap-dma.h>
-#include <linux/platform_data/mailbox-omap.h>
 #include <plat/dmtimer.h>
 
 #include "omap_hwmod.h"
@@ -161,17 +160,6 @@ static struct omap_hwmod omap2430_dma_system_hwmod = {
 };
 
 /* mailbox */
-static struct omap_mbox_dev_info omap2430_mailbox_info[] = {
-       { .name = "dsp", .tx_id = 0, .rx_id = 1 },
-};
-
-static struct omap_mbox_pdata omap2430_mailbox_attrs = {
-       .num_users      = 4,
-       .num_fifos      = 6,
-       .info_cnt       = ARRAY_SIZE(omap2430_mailbox_info),
-       .info           = omap2430_mailbox_info,
-};
-
 static struct omap_hwmod omap2430_mailbox_hwmod = {
        .name           = "mailbox",
        .class          = &omap2xxx_mailbox_hwmod_class,
@@ -185,7 +173,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = {
                        .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
                },
        },
-       .dev_attr       = &omap2430_mailbox_attrs,
 };
 
 /* mcspi3 */
index 0413daba2dba1bdc88e4522cf9c6c04bf76acca0..c1e98d5891006ce8a62b9014af251a03a14c82df 100644 (file)
@@ -152,15 +152,6 @@ struct omap_hwmod_addr_space omap2_dma_system_addrs[] = {
        { }
 };
 
-struct omap_hwmod_addr_space omap2_mailbox_addrs[] = {
-       {
-               .pa_start       = 0x48094000,
-               .pa_end         = 0x48094000 + SZ_512 - 1,
-               .flags          = ADDR_TYPE_RT,
-       },
-       { }
-};
-
 struct omap_hwmod_addr_space omap2_mcbsp1_addrs[] = {
        {
                .name           = "mpu",
index e2db378b849e398126100306367b10f8c2178993..8f5989d48a801306224f94ad73dcf21345e4b84b 100644 (file)
@@ -317,21 +317,11 @@ struct omap_hwmod_ocp_if am33xx_l4_per__i2c3 = {
        .user           = OCP_USER_MPU,
 };
 
-static struct omap_hwmod_addr_space am33xx_mailbox_addrs[] = {
-       {
-               .pa_start       = 0x480C8000,
-               .pa_end         = 0x480C8000 + (SZ_4K - 1),
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
 /* l4 ls -> mailbox */
 struct omap_hwmod_ocp_if am33xx_l4_per__mailbox = {
        .master         = &am33xx_l4_ls_hwmod,
        .slave          = &am33xx_mailbox_hwmod,
        .clk            = "l4ls_gclk",
-       .addr           = am33xx_mailbox_addrs,
        .user           = OCP_USER_MPU,
 };
 
index 41e54f7599347d08829335ae6f1be1bb945ee364..5e61b8c0944bcd047ae0d36e378d377620488fcf 100644 (file)
@@ -4142,21 +4142,11 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__kbd = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_addr_space omap44xx_mailbox_addrs[] = {
-       {
-               .pa_start       = 0x4a0f4000,
-               .pa_end         = 0x4a0f41ff,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
 /* l4_cfg -> mailbox */
 static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mailbox = {
        .master         = &omap44xx_l4_cfg_hwmod,
        .slave          = &omap44xx_mailbox_hwmod,
        .clk            = "l4_div_ck",
-       .addr           = omap44xx_mailbox_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
index 20b4398cec05ce63dea1a1cece300800c975060c..e35f5b18de6df9f7b1d26aceb22d237d3288c5d0 100644 (file)
@@ -938,6 +938,194 @@ static struct omap_hwmod dra7xx_i2c5_hwmod = {
        .dev_attr       = &i2c_dev_attr,
 };
 
+/*
+ * 'mailbox' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_mailbox_sysc = {
+       .rev_offs       = 0x0000,
+       .sysc_offs      = 0x0010,
+       .sysc_flags     = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
+                          SYSC_HAS_SOFTRESET),
+       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+       .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_mailbox_hwmod_class = {
+       .name   = "mailbox",
+       .sysc   = &dra7xx_mailbox_sysc,
+};
+
+/* mailbox1 */
+static struct omap_hwmod dra7xx_mailbox1_hwmod = {
+       .name           = "mailbox1",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX1_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX1_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox2 */
+static struct omap_hwmod dra7xx_mailbox2_hwmod = {
+       .name           = "mailbox2",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX2_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX2_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox3 */
+static struct omap_hwmod dra7xx_mailbox3_hwmod = {
+       .name           = "mailbox3",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX3_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX3_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox4 */
+static struct omap_hwmod dra7xx_mailbox4_hwmod = {
+       .name           = "mailbox4",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX4_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX4_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox5 */
+static struct omap_hwmod dra7xx_mailbox5_hwmod = {
+       .name           = "mailbox5",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX5_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX5_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox6 */
+static struct omap_hwmod dra7xx_mailbox6_hwmod = {
+       .name           = "mailbox6",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX6_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX6_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox7 */
+static struct omap_hwmod dra7xx_mailbox7_hwmod = {
+       .name           = "mailbox7",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX7_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX7_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox8 */
+static struct omap_hwmod dra7xx_mailbox8_hwmod = {
+       .name           = "mailbox8",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX8_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX8_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox9 */
+static struct omap_hwmod dra7xx_mailbox9_hwmod = {
+       .name           = "mailbox9",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX9_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX9_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox10 */
+static struct omap_hwmod dra7xx_mailbox10_hwmod = {
+       .name           = "mailbox10",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX10_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX10_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox11 */
+static struct omap_hwmod dra7xx_mailbox11_hwmod = {
+       .name           = "mailbox11",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX11_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX11_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox12 */
+static struct omap_hwmod dra7xx_mailbox12_hwmod = {
+       .name           = "mailbox12",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX12_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX12_CONTEXT_OFFSET,
+               },
+       },
+};
+
+/* mailbox13 */
+static struct omap_hwmod dra7xx_mailbox13_hwmod = {
+       .name           = "mailbox13",
+       .class          = &dra7xx_mailbox_hwmod_class,
+       .clkdm_name     = "l4cfg_clkdm",
+       .prcm = {
+               .omap4 = {
+                       .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX13_CLKCTRL_OFFSET,
+                       .context_offs = DRA7XX_RM_L4CFG_MAILBOX13_CONTEXT_OFFSET,
+               },
+       },
+};
+
 /*
  * 'mcspi' class
  *
@@ -2246,6 +2434,110 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c5 = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l4_cfg -> mailbox1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mailbox1 = {
+       .master         = &dra7xx_l4_cfg_hwmod,
+       .slave          = &dra7xx_mailbox1_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox2 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox2_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox3 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox3_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox4 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox4_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox5 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox5 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox5_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox6 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox6 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox6_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox7 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox7 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox7_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox8 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox8 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox8_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox9 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox9 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox9_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox10 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox10 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox10_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox11 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox11 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox11_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox12 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox12 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox12_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox13 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox13 = {
+       .master         = &dra7xx_l4_per3_hwmod,
+       .slave          = &dra7xx_mailbox13_hwmod,
+       .clk            = "l3_iclk_div",
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* l4_per1 -> mcspi1 */
 static struct omap_hwmod_ocp_if dra7xx_l4_per1__mcspi1 = {
        .master         = &dra7xx_l4_per1_hwmod,
@@ -2662,6 +2954,19 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
        &dra7xx_l4_per1__i2c3,
        &dra7xx_l4_per1__i2c4,
        &dra7xx_l4_per1__i2c5,
+       &dra7xx_l4_cfg__mailbox1,
+       &dra7xx_l4_per3__mailbox2,
+       &dra7xx_l4_per3__mailbox3,
+       &dra7xx_l4_per3__mailbox4,
+       &dra7xx_l4_per3__mailbox5,
+       &dra7xx_l4_per3__mailbox6,
+       &dra7xx_l4_per3__mailbox7,
+       &dra7xx_l4_per3__mailbox8,
+       &dra7xx_l4_per3__mailbox9,
+       &dra7xx_l4_per3__mailbox10,
+       &dra7xx_l4_per3__mailbox11,
+       &dra7xx_l4_per3__mailbox12,
+       &dra7xx_l4_per3__mailbox13,
        &dra7xx_l4_per1__mcspi1,
        &dra7xx_l4_per1__mcspi2,
        &dra7xx_l4_per1__mcspi3,
index 2c38c6b0ee034691faf75c1205be0bb6edcbb4e0..11ed5a17dd77976370028341990d3490fcf3bae0 100644 (file)
@@ -33,7 +33,6 @@ extern struct omap_hwmod_addr_space omap2_mcspi1_addr_space[];
 extern struct omap_hwmod_addr_space omap2_mcspi2_addr_space[];
 extern struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[];
 extern struct omap_hwmod_addr_space omap2_dma_system_addrs[];
-extern struct omap_hwmod_addr_space omap2_mailbox_addrs[];
 extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[];
 extern struct omap_hwmod_addr_space omap2_hdq1w_addr_space[];