Skip to contentSkip to conversation

ASoC: Fix wrong include for McPDM

PATCH Tony Lindgren 2 participants 2 messages Oct 3, 2012 – Oct 4, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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.

---

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 ;)

sound/soc/omap/omap-mcpdm.c +1 -1
@@ -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"
 
#1 lore raw

Hi Tony,

Quoted 13 lines · Tony Lindgren

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.

---

Quoted 7 lines

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 ;)

I can remove it for 3.7 as well since there is no need for the revision check at all.
Will send the omap-mcpdm update series for 3.7 in couple of minutes (including this patch).

Quoted 13 lines
sound/soc/omap/omap-mcpdm.c +1 -1
@@ -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"
 
Signature · 5 lines
Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html