Commit 927dbbb2 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tony Lindgren

ARM: OMAP2+: devices: Fixes for McPDM

Commit f718e2c0 (ARM: OMAP2+: devices:
Remove all omap_device_pm_latency structures) removed these structures.
Commit 3528c58e (OMAP: omap_device:
when building return platform_device instead of omap_device) now
returns platform_device instead of omap_device.

Fix up the omap-mcpdm init function since this part comes via sound
tree, and there has been changes regarding to hwmod/omap_device_build.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
CC: Benoit Cousson <b-cousson@ti.com>
CC: Kevin Hilman <khilman@ti.com>
[tony@atomide.com: updated comments]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c4e2d245
...@@ -318,18 +318,10 @@ static inline void omap_init_audio(void) {} ...@@ -318,18 +318,10 @@ static inline void omap_init_audio(void) {}
#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \ #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE) defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
static struct omap_device_pm_latency omap_mcpdm_latency[] = {
{
.deactivate_func = omap_device_idle_hwmods,
.activate_func = omap_device_enable_hwmods,
.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
},
};
static void omap_init_mcpdm(void) static void omap_init_mcpdm(void)
{ {
struct omap_hwmod *oh; struct omap_hwmod *oh;
struct omap_device *od; struct platform_device *pdev;
oh = omap_hwmod_lookup("mcpdm"); oh = omap_hwmod_lookup("mcpdm");
if (!oh) { if (!oh) {
...@@ -337,11 +329,8 @@ static void omap_init_mcpdm(void) ...@@ -337,11 +329,8 @@ static void omap_init_mcpdm(void)
return; return;
} }
od = omap_device_build("omap-mcpdm", -1, oh, NULL, 0, pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0, NULL, 0, 0);
omap_mcpdm_latency, WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n");
ARRAY_SIZE(omap_mcpdm_latency), 0);
if (IS_ERR(od))
printk(KERN_ERR "Could not build omap_device for omap-mcpdm-dai\n");
} }
#else #else
static inline void omap_init_mcpdm(void) {} static inline void omap_init_mcpdm(void) {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment