diff options
author | Suman Anna <s-anna@ti.com> | 2015-09-14 19:37:13 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2015-10-23 15:01:25 -0400 |
commit | c4384a97af852121f66e52ba96e98d6f13ad19eb (patch) | |
tree | 9d090204d9e7d01558881105ea089f62f6fadf87 | |
parent | deb9f54ef380e06fb840a49f184b4d7014366992 (diff) |
ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs
Remove the mailbox attribute data, irq info and hwmod addr space
data that are used for creating the legacy-style mailbox devices,
there is no need for these as the support for legacy-mode for this
IP is being dropped.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index dc55f8dedf2c..aff78d5198d2 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/platform_data/asoc-ti-mcbsp.h> | 26 | #include <linux/platform_data/asoc-ti-mcbsp.h> |
27 | #include <linux/platform_data/spi-omap2-mcspi.h> | 27 | #include <linux/platform_data/spi-omap2-mcspi.h> |
28 | #include <linux/platform_data/iommu-omap.h> | 28 | #include <linux/platform_data/iommu-omap.h> |
29 | #include <linux/platform_data/mailbox-omap.h> | ||
30 | #include <plat/dmtimer.h> | 29 | #include <plat/dmtimer.h> |
31 | 30 | ||
32 | #include "soc.h" | 31 | #include "soc.h" |
@@ -1506,26 +1505,9 @@ static struct omap_hwmod_class omap3xxx_mailbox_hwmod_class = { | |||
1506 | .sysc = &omap3xxx_mailbox_sysc, | 1505 | .sysc = &omap3xxx_mailbox_sysc, |
1507 | }; | 1506 | }; |
1508 | 1507 | ||
1509 | static struct omap_mbox_dev_info omap3xxx_mailbox_info[] = { | ||
1510 | { .name = "dsp", .tx_id = 0, .rx_id = 1 }, | ||
1511 | }; | ||
1512 | |||
1513 | static struct omap_mbox_pdata omap3xxx_mailbox_attrs = { | ||
1514 | .num_users = 2, | ||
1515 | .num_fifos = 2, | ||
1516 | .info_cnt = ARRAY_SIZE(omap3xxx_mailbox_info), | ||
1517 | .info = omap3xxx_mailbox_info, | ||
1518 | }; | ||
1519 | |||
1520 | static struct omap_hwmod_irq_info omap3xxx_mailbox_irqs[] = { | ||
1521 | { .irq = 26 + OMAP_INTC_START, }, | ||
1522 | { .irq = -1 }, | ||
1523 | }; | ||
1524 | |||
1525 | static struct omap_hwmod omap3xxx_mailbox_hwmod = { | 1508 | static struct omap_hwmod omap3xxx_mailbox_hwmod = { |
1526 | .name = "mailbox", | 1509 | .name = "mailbox", |
1527 | .class = &omap3xxx_mailbox_hwmod_class, | 1510 | .class = &omap3xxx_mailbox_hwmod_class, |
1528 | .mpu_irqs = omap3xxx_mailbox_irqs, | ||
1529 | .main_clk = "mailboxes_ick", | 1511 | .main_clk = "mailboxes_ick", |
1530 | .prcm = { | 1512 | .prcm = { |
1531 | .omap2 = { | 1513 | .omap2 = { |
@@ -1536,7 +1518,6 @@ static struct omap_hwmod omap3xxx_mailbox_hwmod = { | |||
1536 | .idlest_idle_bit = OMAP3430_ST_MAILBOXES_SHIFT, | 1518 | .idlest_idle_bit = OMAP3430_ST_MAILBOXES_SHIFT, |
1537 | }, | 1519 | }, |
1538 | }, | 1520 | }, |
1539 | .dev_attr = &omap3xxx_mailbox_attrs, | ||
1540 | }; | 1521 | }; |
1541 | 1522 | ||
1542 | /* | 1523 | /* |
@@ -3276,20 +3257,10 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp3_sidetone = { | |||
3276 | .user = OCP_USER_MPU, | 3257 | .user = OCP_USER_MPU, |
3277 | }; | 3258 | }; |
3278 | 3259 | ||
3279 | static struct omap_hwmod_addr_space omap3xxx_mailbox_addrs[] = { | ||
3280 | { | ||
3281 | .pa_start = 0x48094000, | ||
3282 | .pa_end = 0x480941ff, | ||
3283 | .flags = ADDR_TYPE_RT, | ||
3284 | }, | ||
3285 | { } | ||
3286 | }; | ||
3287 | |||
3288 | /* l4_core -> mailbox */ | 3260 | /* l4_core -> mailbox */ |
3289 | static struct omap_hwmod_ocp_if omap3xxx_l4_core__mailbox = { | 3261 | static struct omap_hwmod_ocp_if omap3xxx_l4_core__mailbox = { |
3290 | .master = &omap3xxx_l4_core_hwmod, | 3262 | .master = &omap3xxx_l4_core_hwmod, |
3291 | .slave = &omap3xxx_mailbox_hwmod, | 3263 | .slave = &omap3xxx_mailbox_hwmod, |
3292 | .addr = omap3xxx_mailbox_addrs, | ||
3293 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 3264 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
3294 | }; | 3265 | }; |
3295 | 3266 | ||