diff options
author | Suman Anna <s-anna@ti.com> | 2015-09-14 19:37:12 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-01-21 16:57:24 -0500 |
commit | 4850d43143e72563556b9ba371e26b2b48599321 (patch) | |
tree | 258420c4fec0f0d8f0fbc5cf116a52a89c7b9b45 /arch/arm/mach-omap2 | |
parent | cf19f3ab89de1c088387ce744b0d4723be35b068 (diff) |
ARM: OMAP2+: Remove legacy mailbox device instantiation
The legacy-style mailbox device creation is supported currently
only for OMAP3, as all other SoCs are DT-boot only. Even on this
SoC, there are no client drivers that utilize these mailbox devices.
So, clean up the legacy-style mailbox device instantiation logic.
The mailbox devices are already present and supported for the DT
boot on OMAP3.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 9374da313e8e..f0f9901d90b0 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
20 | #include <linux/pinctrl/machine.h> | 20 | #include <linux/pinctrl/machine.h> |
21 | #include <linux/platform_data/mailbox-omap.h> | ||
22 | 21 | ||
23 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
24 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
@@ -66,32 +65,6 @@ static int __init omap3_l3_init(void) | |||
66 | } | 65 | } |
67 | omap_postcore_initcall(omap3_l3_init); | 66 | omap_postcore_initcall(omap3_l3_init); |
68 | 67 | ||
69 | #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE) | ||
70 | static inline void __init omap_init_mbox(void) | ||
71 | { | ||
72 | struct omap_hwmod *oh; | ||
73 | struct platform_device *pdev; | ||
74 | struct omap_mbox_pdata *pdata; | ||
75 | |||
76 | oh = omap_hwmod_lookup("mailbox"); | ||
77 | if (!oh) { | ||
78 | pr_err("%s: unable to find hwmod\n", __func__); | ||
79 | return; | ||
80 | } | ||
81 | if (!oh->dev_attr) { | ||
82 | pr_err("%s: hwmod doesn't have valid attrs\n", __func__); | ||
83 | return; | ||
84 | } | ||
85 | |||
86 | pdata = (struct omap_mbox_pdata *)oh->dev_attr; | ||
87 | pdev = omap_device_build("omap-mailbox", -1, oh, pdata, sizeof(*pdata)); | ||
88 | WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n", | ||
89 | __func__, PTR_ERR(pdev)); | ||
90 | } | ||
91 | #else | ||
92 | static inline void omap_init_mbox(void) { } | ||
93 | #endif /* CONFIG_OMAP2PLUS_MBOX */ | ||
94 | |||
95 | static inline void omap_init_sti(void) {} | 68 | static inline void omap_init_sti(void) {} |
96 | 69 | ||
97 | #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) | 70 | #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) |
@@ -246,7 +219,6 @@ static int __init omap2_init_devices(void) | |||
246 | omap_init_audio(); | 219 | omap_init_audio(); |
247 | /* If dtb is there, the devices will be created dynamically */ | 220 | /* If dtb is there, the devices will be created dynamically */ |
248 | if (!of_have_populated_dt()) { | 221 | if (!of_have_populated_dt()) { |
249 | omap_init_mbox(); | ||
250 | omap_init_mcspi(); | 222 | omap_init_mcspi(); |
251 | omap_init_sham(); | 223 | omap_init_sham(); |
252 | omap_init_aes(); | 224 | omap_init_aes(); |