Skip to content

L
linux-davinci-2.6.23
Commit 1a130cb0 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

aic23 audio chip: silence debugging

parent 20ae6a07
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
drivers/i2c/chips/tlv320aic23.c
View file @ 1a130cb0
...@@ -124,7 +124,7 @@ int tlv320aic32_write_value(u8 reg, u16 value) ...@@ -124,7 +124,7 @@ int tlv320aic32_write_value(u8 reg, u16 value)
{ {
ret = i2c_smbus_write_byte_data(client, reg, val); ret = i2c_smbus_write_byte_data(client, reg, val);
if (-1 != ret) break; if (-1 != ret) break;
printk("!!!! sil9034_write retry [%d]\n", retry); printk(KERN_ERR "!!!! sil9034_write retry [%d]\n", retry);
mdelay(I2C_RETRY_SLEEP); mdelay(I2C_RETRY_SLEEP);
} }
return ret; return ret;
...@@ -180,7 +180,7 @@ static int aic23_detach_client(struct i2c_client *client) ...@@ -180,7 +180,7 @@ static int aic23_detach_client(struct i2c_client *client)
int err; int err;
if ((err = i2c_detach_client(client))) { if ((err = i2c_detach_client(client))) {
printk("aic23.o: Client deregistration failed, \ printk(KERN_ERR "aic23.o: Client deregistration failed, \
client not detached.\n"); client not detached.\n");
return err; return err;
} }
...@@ -234,7 +234,7 @@ static int omap_mcbsp3_aic23_clock_init(void) ...@@ -234,7 +234,7 @@ static int omap_mcbsp3_aic23_clock_init(void)
/* enable sample rate generator */ /* enable sample rate generator */
w = OMAP_MCBSP_READ(OMAP1610_MCBSP3_BASE, SPCR2); w = OMAP_MCBSP_READ(OMAP1610_MCBSP3_BASE, SPCR2);
OMAP_MCBSP_WRITE(OMAP1610_MCBSP3_BASE, SPCR2, (w | FREE | GRST)); OMAP_MCBSP_WRITE(OMAP1610_MCBSP3_BASE, SPCR2, (w | FREE | GRST));
printk("Clock enabled to MCBSP1 & 3 \n"); printk(KERN_ERR "Clock enabled to MCBSP1 & 3 \n");
return 0; return 0;
} }
...@@ -316,7 +316,7 @@ static void aic23_init_power(void) ...@@ -316,7 +316,7 @@ static void aic23_init_power(void)
void aic23_power_down(void) void aic23_power_down(void)
{ {
if (aic23_info_l.initialized) { if (aic23_info_l.initialized) {
printk("aic23 powering down\n"); printk(KERN_INFO "aic23 powering down\n");
aic23_write_value(POWER_DOWN_CONTROL_ADDR, 0xff); aic23_write_value(POWER_DOWN_CONTROL_ADDR, 0xff);
} }
aic23_info_l.power_down = 1; aic23_info_l.power_down = 1;
...@@ -325,7 +325,7 @@ void aic23_power_down(void) ...@@ -325,7 +325,7 @@ void aic23_power_down(void)
void aic23_power_up(void) void aic23_power_up(void)
{ {
if (aic23_info_l.initialized) { if (aic23_info_l.initialized) {
printk("aic23 powering up\n"); printk(KERN_INFO "aic23 powering up\n");
aic23_init_power(); aic23_init_power();
} }
aic23_info_l.power_down = 0; aic23_info_l.power_down = 0;
...@@ -667,7 +667,7 @@ static int __init aic23_init(void) ...@@ -667,7 +667,7 @@ static int __init aic23_init(void)
aic23_info_l.initialized = 0; aic23_info_l.initialized = 0;
if (i2c_add_driver(&aic23_driver)) { if (i2c_add_driver(&aic23_driver)) {
printk("aic23 i2c: Driver registration failed, \ printk(KERN_ERR "aic23 i2c: Driver registration failed, \
module not inserted.\n"); module not inserted.\n");
selftest = -ENODEV; selftest = -ENODEV;
return selftest; return selftest;
...@@ -692,7 +692,7 @@ static int __init aic23_init(void) ...@@ -692,7 +692,7 @@ static int __init aic23_init(void)
aic23_power_up(); aic23_power_up();
#endif #endif
aic23_info_l.initialized = 1; aic23_info_l.initialized = 1;
printk("TLV320AIC23 I2C version %s (%s)\n", printk(KERN_INFO "TLV320AIC23 I2C version %s (%s)\n",
TLV320AIC23_VERSION, TLV320AIC23_DATE); TLV320AIC23_VERSION, TLV320AIC23_DATE);
return selftest; return selftest;
......
sound/oss/davinci-audio-aic32.c
View file @ 1a130cb0
...@@ -292,31 +292,31 @@ void aic32_show_registers(void) ...@@ -292,31 +292,31 @@ void aic32_show_registers(void)
d = (audio_aic32_read(PLL_C_REG) << 6) | (audio_aic32_read(PLL_D_REG) >> 2); d = (audio_aic32_read(PLL_C_REG) << 6) | (audio_aic32_read(PLL_D_REG) >> 2);
codec_clk_src = audio_aic32_read(CODEC_CLKIN_CTRL_REG)&1; codec_clk_src = audio_aic32_read(CODEC_CLKIN_CTRL_REG)&1;
printk("debug:\n"); printk(KERN_INFO "debug:\n");
if(codec_clk_src == 0) if(codec_clk_src == 0)
{ {
external_clk_src = (audio_aic32_read(CLOCK_GENERATION_CTRL_REG) << 2) >> 4; external_clk_src = (audio_aic32_read(CLOCK_GENERATION_CTRL_REG) << 2) >> 4;
if(external_clk_src == 0) if(external_clk_src == 0)
printk("aic32 external clock source is MCLK\n"); printk(KERN_INFO "aic32 external clock source is MCLK\n");
else if(external_clk_src == 2) else if(external_clk_src == 2)
printk("aic32 external clock source is BCLK\n"); printk(KERN_INFO "aic32 external clock source is BCLK\n");
printk("Codec Clock source: PLLDIV_OUT\n"); printk(KERN_INFO "Codec Clock source: PLLDIV_OUT\n");
} }
else if(codec_clk_src == 1) else if(codec_clk_src == 1)
{ {
external_clk_src = audio_aic32_read(CLOCK_GENERATION_CTRL_REG) >> 6; external_clk_src = audio_aic32_read(CLOCK_GENERATION_CTRL_REG) >> 6;
if(external_clk_src == 0) if(external_clk_src == 0)
printk("aic32 external clock source is MCLK\n"); printk(KERN_INFO "aic32 external clock source is MCLK\n");
else if(external_clk_src == 2) else if(external_clk_src == 2)
printk("aic32 external clock source is BCLK\n"); printk(KERN_INFO "aic32 external clock source is BCLK\n");
printk("Codec Clock source: CLKDIV_OUT\n"); printk(KERN_INFO "Codec Clock source: CLKDIV_OUT\n");
} }
printk("PLL enable = %d\n", pll); printk(KERN_INFO "PLL enable = %d\n", pll);
printk("P-value: %d\n", p); printk(KERN_INFO "P-value: %d\n", p);
printk("J-value: %d\n", j); printk(KERN_INFO "J-value: %d\n", j);
printk("D-value: %d\n", d); printk(KERN_INFO "D-value: %d\n", d);
printk("Fsref = (MCLK * %d.%d * R)/(2048 * %d);\n", j, d, p); printk(KERN_INFO "Fsref = (MCLK * %d.%d * R)/(2048 * %d);\n", j, d, p);
} }
static void enable_adc(void) static void enable_adc(void)
...@@ -610,7 +610,7 @@ static int mixer_set_recroute(ulong arg) ...@@ -610,7 +610,7 @@ static int mixer_set_recroute(ulong arg)
switch(val) switch(val)
{ {
case 0: case 0:
printk("LINE1 audio input selected\n"); printk(KERN_INFO "LINE1 audio input selected\n");
enable_line1_input(); enable_line1_input();
disable_line2_input(); disable_line2_input();
disable_mic_input(); disable_mic_input();
...@@ -618,7 +618,7 @@ static int mixer_set_recroute(ulong arg) ...@@ -618,7 +618,7 @@ static int mixer_set_recroute(ulong arg)
ret = 0; ret = 0;
break; break;
case 1: case 1:
printk("LINE2 audio input selected\n"); printk(KERN_INFO "LINE2 audio input selected\n");
disable_line1_input(); disable_line1_input();
enable_line2_input(); enable_line2_input();
disable_mic_input(); disable_mic_input();
...@@ -626,7 +626,7 @@ static int mixer_set_recroute(ulong arg) ...@@ -626,7 +626,7 @@ static int mixer_set_recroute(ulong arg)
ret = 0; ret = 0;
break; break;
case 2: case 2:
printk("LINE3 audio input selected\n"); printk(KERN_INFO "LINE3 audio input selected\n");
disable_line1_input(); disable_line1_input();
disable_line2_input(); disable_line2_input();
enable_mic_input(); enable_mic_input();
...@@ -634,7 +634,7 @@ static int mixer_set_recroute(ulong arg) ...@@ -634,7 +634,7 @@ static int mixer_set_recroute(ulong arg)
ret = 0; ret = 0;
break; break;
default: default:
printk("Invalid Record Source\n"); printk(KERN_INFO "Invalid Record Source\n");
ret = -ENOTTY; ret = -ENOTTY;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment