Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4850d431 authored by Suman Anna's avatar Suman Anna Committed by Tony Lindgren
Browse files

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: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent cf19f3ab

arch/arm/mach-omap2/devices.c

+0 −28
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/slab.h>

#include <linux/of.h>

#include <linux/pinctrl/machine.h>

#include <linux/platform_data/mailbox-omap.h>



#include <asm/mach-types.h>

#include <asm/mach/map.h>
@@ -66,32 +65,6 @@ static int __init omap3_l3_init(void) 
}

omap_postcore_initcall(omap3_l3_init);



#if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)

static inline void __init omap_init_mbox(void)

{

	struct omap_hwmod *oh;

	struct platform_device *pdev;

	struct omap_mbox_pdata *pdata;



	oh = omap_hwmod_lookup("mailbox");

	if (!oh) {

		pr_err("%s: unable to find hwmod\n", __func__);

		return;

	}

	if (!oh->dev_attr) {

		pr_err("%s: hwmod doesn't have valid attrs\n", __func__);

		return;

	}



	pdata = (struct omap_mbox_pdata *)oh->dev_attr;

	pdev = omap_device_build("omap-mailbox", -1, oh, pdata, sizeof(*pdata));

	WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",

						__func__, PTR_ERR(pdev));

}

#else

static inline void omap_init_mbox(void) { }

#endif /* CONFIG_OMAP2PLUS_MBOX */



static inline void omap_init_sti(void) {}



#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
@@ -246,7 +219,6 @@ static int __init omap2_init_devices(void) 
	omap_init_audio();

	/* 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();