|
@@ -512,7 +512,7 @@ void omap_auxdata_legacy_init(struct device *dev)
|
|
|
dev->platform_data = &twl_gpio_auxdata;
|
|
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 struct omap_mcbsp_platform_data mcbsp_pdata;
|
|
|
static void __init omap3_mcbsp_init(void)
|
|
static void __init omap3_mcbsp_init(void)
|
|
|
{
|
|
{
|
|
@@ -560,7 +560,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = {
|
|
|
OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",
|
|
OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",
|
|
|
&am35xx_emac_pdata),
|
|
&am35xx_emac_pdata),
|
|
|
/* McBSP modules with sidetone core */
|
|
/* 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", 0x49022000, "49022000.mcbsp", &mcbsp_pdata),
|
|
|
OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49024000, "49024000.mcbsp", &mcbsp_pdata),
|
|
OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49024000, "49024000.mcbsp", &mcbsp_pdata),
|
|
|
#endif
|
|
#endif
|