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

Unverified Commit 558eb0bf authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ARM: OMAP2: Update for new MCBSP Kconfig option 



The MCBSP config option has been changed.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c27ace2e

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common) 
obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)



ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)

obj-y += mcbsp.o

endif

arch/arm/mach-omap2/pdata-quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ void omap_auxdata_legacy_init(struct device *dev) 
	dev->platform_data = &twl_gpio_auxdata;

}



#if IS_ENABLED(CONFIG_SND_OMAP_SOC_MCBSP)

#if IS_ENABLED(CONFIG_SND_SOC_OMAP_MCBSP)

static struct omap_mcbsp_platform_data mcbsp_pdata;

static void __init omap3_mcbsp_init(void)

{
@@ -572,7 +572,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { 
	OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",

		       &am35xx_emac_pdata),

	/* McBSP modules with sidetone core */

#if IS_ENABLED(CONFIG_SND_OMAP_SOC_MCBSP)

#if IS_ENABLED(CONFIG_SND_SOC_OMAP_MCBSP)

	OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49022000, "49022000.mcbsp", &mcbsp_pdata),

	OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49024000, "49024000.mcbsp", &mcbsp_pdata),

#endif