[PATCH] ASoC: davinci-mcasp: Do not touch 0x04 register above McASP_VERSION_2

[PATCH] ASoC: davinci-mcasp: Do not touch 0x04 register above McASP_VERSION_2

[Peter Ujfalusi]

This register is not defined in TI81xx and on AM335x/AM437x it is the
SYSCONFIG register which should not be touched by drivers since it is
related to PM and handled by the generic PM code.
This register write was there since the first time the davinci-mcasp driver
was appeared in the kernel.
The reason why it did not caused any issues on AM335x/AM437x is that it sets
bit 1 in SYSCONFIG register which in turn will enable the smart-idle mode.
This is the default mode and this is the mode McASP should be in also when
in use.
On TI81xx the register is not defined.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 sound/soc/davinci/davinci-mcasp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index ce0e55a4304c..50a824d9dbb7 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -495,7 +495,7 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream,
 	int active_serializers, numevt, n;
 	u32 reg;
 	/* Default configuration */
-	if (mcasp->version != MCASP_VERSION_4)
+	if (mcasp->version < MCASP_VERSION_3)
 		mcasp_set_bits(mcasp, DAVINCI_MCASP_PWREMUMGT_REG, MCASP_SOFT);
 
 	/* All PINS as McASP */
-- 
1.9.1

Re: [PATCH] ASoC: davinci-mcasp: Do not touch 0x04 register above McASP_VERSION_2

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 278 bytes --]

On Fri, Apr 04, 2014 at 03:56:30PM +0300, Peter Ujfalusi wrote:
> This register is not defined in TI81xx and on AM335x/AM437x it is the
> SYSCONFIG register which should not be touched by drivers since it is
> related to PM and handled by the generic PM code.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]