aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-27 15:23:19 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-27 15:28:08 -0400
commit5c556a6e190897a0f1ff14e13722591828412031 (patch)
tree483130d45f4530117695f36626ee16a19ecad11f /sound/soc/s3c24xx
parent008db442efa542357314593c71ab9966be909855 (diff)
ASoC: s3c-i2s-v2 diagnostic improvements
Say what invalid values we're seeing when we see an invalid value and ensure that errors are displayed by default. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r--sound/soc/s3c24xx/s3c-i2s-v2.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
index ab680aac3fcb..aeea49cbe74a 100644
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -105,7 +105,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
105 break; 105 break;
106 106
107 default: 107 default:
108 dev_err(i2s->dev, "TXEN: Invalid MODE in IISMOD\n"); 108 dev_err(i2s->dev, "TXEN: Invalid MODE %x in IISMOD\n",
109 mod & S3C2412_IISMOD_MODE_MASK);
110 break;
109 } 111 }
110 112
111 writel(con, regs + S3C2412_IISCON); 113 writel(con, regs + S3C2412_IISCON);
@@ -132,7 +134,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
132 break; 134 break;
133 135
134 default: 136 default:
135 dev_err(i2s->dev, "TXDIS: Invalid MODE in IISMOD\n"); 137 dev_err(i2s->dev, "TXDIS: Invalid MODE %xin IISMOD\n",
138 mod & S3C2412_IISMOD_MODE_MASK);
139 break;
136 } 140 }
137 141
138 writel(mod, regs + S3C2412_IISMOD); 142 writel(mod, regs + S3C2412_IISMOD);
@@ -175,7 +179,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
175 break; 179 break;
176 180
177 default: 181 default:
178 dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n"); 182 dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n",
183 mod & S3C2412_IISMOD_MODE_MASK);
179 } 184 }
180 185
181 writel(mod, regs + S3C2412_IISMOD); 186 writel(mod, regs + S3C2412_IISMOD);
@@ -199,7 +204,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
199 break; 204 break;
200 205
201 default: 206 default:
202 dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n"); 207 dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n",
208 mod & S3C2412_IISMOD_MODE_MASK);
203 } 209 }
204 210
205 writel(con, regs + S3C2412_IISCON); 211 writel(con, regs + S3C2412_IISCON);
@@ -281,7 +287,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
281 iismod |= IISMOD_MASTER; 287 iismod |= IISMOD_MASTER;
282 break; 288 break;
283 default: 289 default:
284 pr_debug("unknwon master/slave format\n"); 290 pr_err("unknwon master/slave format\n");
285 return -EINVAL; 291 return -EINVAL;
286 } 292 }
287 293
@@ -298,7 +304,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
298 iismod |= S3C2412_IISMOD_SDF_IIS; 304 iismod |= S3C2412_IISMOD_SDF_IIS;
299 break; 305 break;
300 default: 306 default:
301 pr_debug("Unknown data format\n"); 307 pr_err("Unknown data format\n");
302 return -EINVAL; 308 return -EINVAL;
303 } 309 }
304 310