diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-30 14:13:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-30 14:30:35 +0200 |
| commit | 07736d48051869c37838635b41850618aa63b9a7 (patch) | |
| tree | c273de1f3c71a2808325a1502f27b2f9bef4bedc /sound/soc/s3c24xx/s3c-i2s-v2.c | |
| parent | ASoC: Fix data format configuration for S3C64xx IISv2 and add 24 bit (diff) | |
| download | linux-07736d48051869c37838635b41850618aa63b9a7.tar.xz linux-07736d48051869c37838635b41850618aa63b9a7.zip | |
ASoC: Fix boot warnings from S3C IISv2
On startup we try to make sure that the port is quiesced but if the
port is already stopped then this will generate a warning about the
RX/TX mode configuration. Configure the mode before doing the teardown
to suppress these warnings.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/s3c-i2s-v2.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 54f4119e6098..34142c859225 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -573,6 +573,7 @@ int s3c_i2sv2_probe(struct platform_device *pdev, unsigned long base) { struct device *dev = &pdev->dev; + unsigned int iismod; i2s->dev = dev; @@ -594,12 +595,16 @@ int s3c_i2sv2_probe(struct platform_device *pdev, clk_enable(i2s->iis_pclk); + /* Mark ourselves as in TXRX mode so we can run through our cleanup + * process without warnings. */ + iismod = readl(i2s->regs + S3C2412_IISMOD); + iismod |= S3C2412_IISMOD_MODE_TXRX; + writel(iismod, i2s->regs + S3C2412_IISMOD); s3c2412_snd_txctrl(i2s, 0); s3c2412_snd_rxctrl(i2s, 0); return 0; } - EXPORT_SYMBOL_GPL(s3c_i2sv2_probe); #ifdef CONFIG_PM |