* ASoC: Fix wrong include for McPDM
@ 2012-10-03 16:52 Tony Lindgren
2012-10-04 8:03 ` Peter Ujfalusi
0 siblings, 1 reply; 2+ messages in thread
From: Tony Lindgren @ 2012-10-03 16:52 UTC (permalink / raw)
To: alsa-devel
Cc: Peter Ujfalusi, Jarkko Nikula, Liam Girdwood, Mark Brown,
linux-omap
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@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"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: ASoC: Fix wrong include for McPDM
2012-10-03 16:52 ASoC: Fix wrong include for McPDM Tony Lindgren
@ 2012-10-04 8:03 ` Peter Ujfalusi
0 siblings, 0 replies; 2+ messages in thread
From: Peter Ujfalusi @ 2012-10-04 8:03 UTC (permalink / raw)
To: Tony Lindgren
Cc: alsa-devel, Jarkko Nikula, Liam Girdwood, Mark Brown, linux-omap
Hi Tony,
On 10/03/2012 07:52 PM, Tony Lindgren wrote:
> 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@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 ;)
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).
>
> --- 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"
>
>
--
Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-04 8:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-03 16:52 ASoC: Fix wrong include for McPDM Tony Lindgren
2012-10-04 8:03 ` Peter Ujfalusi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).