[PATCH v2 0/2] ASoC: omap-mcpdm updates for 3.7

[PATCH v2 0/2] ASoC: omap-mcpdm updates for 3.7

[Peter Ujfalusi]

Hello Mark, Tony,

Change since v1:
- Fixed the second patch to keep the omap_mcpdm_open_stream() - after a coffee

The mcpdm driver no longer needs to include any plat/*.h file, clearing the way
for the single kernel image.

Regards,
Peter
---
Peter Ujfalusi (1):
  ASoC: omap-mcpdm: Remove OMAP revision check

Tony Lindgren (1):
  ASoC: Fix wrong include for McPDM

 sound/soc/omap/omap-mcpdm.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

-- 
1.7.12

[PATCH v2 1/2] ASoC: Fix wrong include for McPDM

[Peter Ujfalusi]

From: Tony Lindgren <tony@atomide.com>

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>
---
 sound/soc/omap/omap-mcpdm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 7755650..fdf655e 100644
--- 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"
 
-- 
1.7.12

Re: [PATCH v2 1/2] ASoC: Fix wrong include for McPDM

[Mark Brown]

On Thu, Oct 04, 2012 at 11:27:15AM +0300, Peter Ujfalusi wrote:
> From: Tony Lindgren <tony@atomide.com>
> 
> 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.

This doesn't apply, don't know what it was generated against...

Re: [PATCH v2 1/2] ASoC: Fix wrong include for McPDM

[Mark Brown]

On Thu, Oct 04, 2012 at 11:27:15AM +0300, Peter Ujfalusi wrote:
> From: Tony Lindgren <tony@atomide.com>
> 
> 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.

Sorry, it does apply - git am got the two patches the wrong way round.
Applied both now, thanks.

Re: [PATCH v2 1/2] ASoC: Fix wrong include for McPDM

[Mark Brown]

On Thu, Oct 04, 2012 at 11:27:15AM +0300, Peter Ujfalusi wrote:

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

Peter, you should sign off any patches you forward on.  I applied this
anyway since it's so trivial and I'd seen the original posting.

[PATCH v2 2/2] ASoC: omap-mcpdm: Remove OMAP revision check

[Peter Ujfalusi]

The OMAP revision check is not needed since the watchdog bit is not in use
on 4430 ES1.0 and have no effect when we set the bit. The watchdog need to
be enabled on all other revisions.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 sound/soc/omap/omap-mcpdm.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index fdf655e..e134b27 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,7 +40,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <plat/cpu.h>
 #include "omap-mcpdm.h"
 #include "omap-pcm.h"
 
@@ -258,13 +257,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
 	mutex_lock(&mcpdm->mutex);
 
 	if (!dai->active) {
-		/* Enable watch dog for ES above ES 1.0 to avoid saturation */
-		if (omap_rev() != OMAP4430_REV_ES1_0) {
-			u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+		u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
 
-			omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL,
-					 ctrl | MCPDM_WD_EN);
-		}
+		omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
 		omap_mcpdm_open_streams(mcpdm);
 	}
 	mutex_unlock(&mcpdm->mutex);
-- 
1.7.12

Re: [PATCH v2 2/2] ASoC: omap-mcpdm: Remove OMAP revision check

[Tony Lindgren]

* Peter Ujfalusi <peter.ujfalusi@ti.com> [121004 01:27]:
> The OMAP revision check is not needed since the watchdog bit is not in use
> on 4430 ES1.0 and have no effect when we set the bit. The watchdog need to
> be enabled on all other revisions.

OK seems like you found a local solution :) Thanks for fixing it.

Regards,

Tony

Re: [PATCH v2 0/2] ASoC: omap-mcpdm updates for 3.7

[Tony Lindgren]

Hi Mark,

* Peter Ujfalusi <peter.ujfalusi@ti.com> [121004 01:27]:
> Hello Mark, Tony,
> 
> Change since v1:
> - Fixed the second patch to keep the omap_mcpdm_open_stream() - after a coffee
> 
> The mcpdm driver no longer needs to include any plat/*.h file, clearing the way
> for the single kernel image.
> 
> Regards,
> Peter
> ---
> Peter Ujfalusi (1):
>   ASoC: omap-mcpdm: Remove OMAP revision check
> 
> Tony Lindgren (1):
>   ASoC: Fix wrong include for McPDM
> 
>  sound/soc/omap/omap-mcpdm.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

Is it OK for me to merge in your ASoC for-3.7 branch at commit
68214d99 (ASoC: omap-mcpdm: Remove OMAP revision check) also
into my omap cleanup branch for v3.8?

I need that to avoid compile errors with some of my test configs.

Regards,

Tony

Re: [PATCH v2 0/2] ASoC: omap-mcpdm updates for 3.7

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [121017 13:01]:
> Hi Mark,
> 
> * Peter Ujfalusi <peter.ujfalusi@ti.com> [121004 01:27]:
> > Hello Mark, Tony,
> > 
> > Change since v1:
> > - Fixed the second patch to keep the omap_mcpdm_open_stream() - after a coffee
> > 
> > The mcpdm driver no longer needs to include any plat/*.h file, clearing the way
> > for the single kernel image.
> > 
> > Regards,
> > Peter
> > ---
> > Peter Ujfalusi (1):
> >   ASoC: omap-mcpdm: Remove OMAP revision check
> > 
> > Tony Lindgren (1):
> >   ASoC: Fix wrong include for McPDM
> > 
> >  sound/soc/omap/omap-mcpdm.c | 9 ++-------
> >  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> Is it OK for me to merge in your ASoC for-3.7 branch at commit
> 68214d99 (ASoC: omap-mcpdm: Remove OMAP revision check) also
> into my omap cleanup branch for v3.8?
> 
> I need that to avoid compile errors with some of my test configs.

Never mind, that seems to be merged now.

Thanks,

Tony

Re: [PATCH v2 0/2] ASoC: omap-mcpdm updates for 3.7

[Mark Brown]

On Thu, Oct 18, 2012 at 03:52:37PM -0700, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [121017 13:01]:

> > Is it OK for me to merge in your ASoC for-3.7 branch at commit
> > 68214d99 (ASoC: omap-mcpdm: Remove OMAP revision check) also
> > into my omap cleanup branch for v3.8?

> > I need that to avoid compile errors with some of my test configs.

> Never mind, that seems to be merged now.

That's easy :)  Sorry about the delay, OMAP stuff tends to get delayed
as there's so many large patch serieses posted in multiple versions that
I get CCed on I tend to batch process it.

FWIW signed tags are fair game for merging without asking (in this case
asoc-3.7) but please don't merge any of my branches directly, I'll make
a tag.

Re: [PATCH v2 0/2] ASoC: omap-mcpdm updates for 3.7

[Tony Lindgren]

* Mark Brown <broonie@opensource.wolfsonmicro.com> [121018 18:29]:
> On Thu, Oct 18, 2012 at 03:52:37PM -0700, Tony Lindgren wrote:
> > * Tony Lindgren <tony@atomide.com> [121017 13:01]:
> 
> > > Is it OK for me to merge in your ASoC for-3.7 branch at commit
> > > 68214d99 (ASoC: omap-mcpdm: Remove OMAP revision check) also
> > > into my omap cleanup branch for v3.8?
> 
> > > I need that to avoid compile errors with some of my test configs.
> 
> > Never mind, that seems to be merged now.
> 
> That's easy :)  Sorry about the delay, OMAP stuff tends to get delayed
> as there's so many large patch serieses posted in multiple versions that
> I get CCed on I tend to batch process it.

Sure no problem, no kidding with the large multiple revision series..
 
> FWIW signed tags are fair game for merging without asking (in this case
> asoc-3.7) but please don't merge any of my branches directly, I'll make
> a tag.

OK thanks, will do. In this case using the commit above works well
as it's in mainline and actually will only bring in only one extra
omap ASoC commit into my pull request. And I don't have to wait for
-rc2 :)

Regards,

Tony