diff options
author | Tim Niemeyer <reddog@mastersword.de> | 2008-04-22 12:26:59 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:42 -0400 |
commit | 409203074e9f3c423cdc7c38f984ce24ae261556 (patch) | |
tree | 50591066938459f7fd983c3d9bf900a825a1da47 /sound/soc | |
parent | ebf029da38829ede6b53ac8a5ad45b149064ea16 (diff) |
[ALSA] soc - s3c24xx - Improve diagnostic output
Add some debug messages for suspend/resume and to add a clear prefix to
s3c24xx-i2s and s3c24xx-pcm.
Signed-off-by: Tim Niemeyer <reddog@mastersword.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 5 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 301002cd3fc8..cb68b9ced601 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | #define S3C24XX_I2S_DEBUG 0 | 47 | #define S3C24XX_I2S_DEBUG 0 |
48 | #if S3C24XX_I2S_DEBUG | 48 | #if S3C24XX_I2S_DEBUG |
49 | #define DBG(x...) printk(KERN_DEBUG x) | 49 | #define DBG(x...) printk(KERN_DEBUG "s3c24xx-i2s: " x) |
50 | #else | 50 | #else |
51 | #define DBG(x...) | 51 | #define DBG(x...) |
52 | #endif | 52 | #endif |
@@ -414,6 +414,8 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev) | |||
414 | int s3c24xx_i2s_suspend(struct platform_device *pdev, | 414 | int s3c24xx_i2s_suspend(struct platform_device *pdev, |
415 | struct snd_soc_cpu_dai *cpu_dai) | 415 | struct snd_soc_cpu_dai *cpu_dai) |
416 | { | 416 | { |
417 | DBG("Entered %s\n", __func__); | ||
418 | |||
417 | s3c24xx_i2s.iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); | 419 | s3c24xx_i2s.iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); |
418 | s3c24xx_i2s.iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); | 420 | s3c24xx_i2s.iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); |
419 | s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); | 421 | s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); |
@@ -427,6 +429,7 @@ int s3c24xx_i2s_suspend(struct platform_device *pdev, | |||
427 | int s3c24xx_i2s_resume(struct platform_device *pdev, | 429 | int s3c24xx_i2s_resume(struct platform_device *pdev, |
428 | struct snd_soc_cpu_dai *cpu_dai) | 430 | struct snd_soc_cpu_dai *cpu_dai) |
429 | { | 431 | { |
432 | DBG("Entered %s\n", __func__); | ||
430 | clk_enable(s3c24xx_i2s.iis_clk); | 433 | clk_enable(s3c24xx_i2s.iis_clk); |
431 | 434 | ||
432 | writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); | 435 | writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); |
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 40112e2b1ecb..49580fb481d5 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | #define S3C24XX_PCM_DEBUG 0 | 40 | #define S3C24XX_PCM_DEBUG 0 |
41 | #if S3C24XX_PCM_DEBUG | 41 | #if S3C24XX_PCM_DEBUG |
42 | #define DBG(x...) printk(KERN_DEBUG x) | 42 | #define DBG(x...) printk(KERN_DEBUG "s3c24xx-pcm: " x) |
43 | #else | 43 | #else |
44 | #define DBG(x...) | 44 | #define DBG(x...) |
45 | #endif | 45 | #endif |