[alsa-devel] ASoC: Fix wrong include for McPDM

Tony Lindgren tony at atomide.com
Wed Oct 3 18:52:14 CEST 2012

McPDM needs platt/cpu.h for omap_rev and not omap_hwmod.h.
Drivers must not include omap_hwmod.h at, it will be
private to mach-omap2 soon. Fix the problem before other
drivers will also start including omap_hwmod.h.

Note that also plat/cpu.h will be going away, so the
omap_rev check needs to be replaced with mcpdm-watchdog
flag from platform_data or DT.

Signed-off-by: Tony Lindgren <tony at atomide.com>


Can you guys please queue this as fix for -rc1?

This removes and unnecessary dependency for making
omap_hwmod.h local to mach-omap2.

Then I'm hoping Peter will remove the plat/cpu.h
dependency for v3.8 merge window ;)

--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,7 +40,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <plat/omap_hwmod.h>
+#include <plat/cpu.h>
 #include "omap-mcpdm.h"
 #include "omap-pcm.h"

More information about the Alsa-devel mailing list