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

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

[Peter Ujfalusi]

Hello Mark, Tony,

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 | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

-- 
1.7.12

[PATCH 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

[PATCH 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 | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index fdf655e..8f5edc8 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,14 +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_open_streams(mcpdm);
+		omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
 	}
 	mutex_unlock(&mcpdm->mutex);
 
-- 
1.7.12

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

[Peter Ujfalusi]

On 10/04/2012 11:15 AM, Peter Ujfalusi wrote:
> 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 | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
> index fdf655e..8f5edc8 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,14 +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_open_streams(mcpdm);
> +		omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);

Oops. I have removed the omap_mcpdm_open_streams() as well...
Will resend :(

>  	}
>  	mutex_unlock(&mcpdm->mutex);
>  
> 


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