diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-04-04 15:56:30 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-04-14 20:45:33 +0100 |
| commit | 40448e5e977b59a4753fce3619f537b63fcedc02 (patch) | |
| tree | a70943c4e555b5c3b4d65f2120434b57baef683c /sound/soc/davinci | |
| parent | ASoC: davinci-mcasp: Remove excess empty lines from davinci_mcasp_set_dai_fmt() (diff) | |
| download | linux-dev-40448e5e977b59a4753fce3619f537b63fcedc02.tar.xz linux-dev-40448e5e977b59a4753fce3619f537b63fcedc02.zip | |
ASoC: davinci-mcasp: Do not touch 0x04 register above McASP_VERSION_2
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>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/davinci')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 8007fcf428d9..af92d3e8671d 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -502,7 +502,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 */ |