zymon/seeed-voicecard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimize: simplify AC101 debug message

Browse source
This commit is contained in:
turmary 2018-11-07 15:29:06 -10:00
parent be0812c70b
commit 0965139ead
2 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
ac101.c
View file

@ -78,8 +78,8 @@ int ac101_read(struct snd_soc_codec *codec, unsigned reg) {
int r, v = 0; int r, v = 0;
if ((r = regmap_read(ac10x->regmap101, reg, &v)) < 0) { if ((r = regmap_read(ac10x->regmap101, reg, &v)) < 0) {
dev_err(codec->dev, "%s() L%d read reg %02X fail\n", dev_err(codec->dev, "read reg %02X fail\n",
__func__, __LINE__, reg); reg);
return r; return r;
} }
return v; return v;
@ -119,7 +119,7 @@ static void switch_hw_config(struct snd_soc_codec *codec)
{ {
int r; int r;
AC101_DBG("%s,line:%d\n",__func__,__LINE__); AC101_DBG();
/*HMIC/MMIC BIAS voltage level select:2.5v*/ /*HMIC/MMIC BIAS voltage level select:2.5v*/
ac101_update_bits(codec, OMIXER_BST1_CTRL, (0xf<<BIASVOLTAGE), (0xf<<BIASVOLTAGE)); ac101_update_bits(codec, OMIXER_BST1_CTRL, (0xf<<BIASVOLTAGE), (0xf<<BIASVOLTAGE));
@ -162,7 +162,7 @@ static void switch_hw_config(struct snd_soc_codec *codec)
*/ */
static void switch_status_update(struct ac10x_priv *ac10x) static void switch_status_update(struct ac10x_priv *ac10x)
{ {
AC101_DBG("%s,line:%d,ac10x->state:%d\n", __func__, __LINE__, ac10x->state); AC101_DBG("ac10x->state:%d\n", ac10x->state);
input_report_switch(ac10x->inpdev, SW_HEADPHONE_INSERT, ac10x->state); input_report_switch(ac10x->inpdev, SW_HEADPHONE_INSERT, ac10x->state);
input_sync(ac10x->inpdev); input_sync(ac10x->inpdev);
@ -183,7 +183,7 @@ static void work_cb_clear_irq(struct work_struct *work)
reg_val = ac101_read(codec, HMIC_STS); reg_val = ac101_read(codec, HMIC_STS);
if (BIT(HMIC_PULLOUT_PEND) & reg_val) { if (BIT(HMIC_PULLOUT_PEND) & reg_val) {
ac10x->pullout_cntr++; ac10x->pullout_cntr++;
AC101_DBG("ac10x->pullout_cntr: %d\n",ac10x->pullout_cntr); AC101_DBG("ac10x->pullout_cntr: %d\n", ac10x->pullout_cntr);
} }
reg_val |= HMIC_PEND_ALL; reg_val |= HMIC_PEND_ALL;
@ -227,9 +227,7 @@ static int __ac101_get_hmic_data(struct snd_soc_codec *codec) {
/* prevent i2c accessing too frequently */ /* prevent i2c accessing too frequently */
usleep_range(1500, 3000); usleep_range(1500, 3000);
AC101_DBG("%s,line:%d HMIC_DATA(%3ld): %02X\n", __func__, __LINE__, AC101_DBG("HMIC_DATA(%3ld): %02X\n", counter++, d);
counter++, d
);
return d; return d;
} }
@ -264,7 +262,7 @@ static void work_cb_earphone_switch(struct work_struct *work)
input_report_key(ac10x->inpdev, KEY_HEADSETHOOK, 1); input_report_key(ac10x->inpdev, KEY_HEADSETHOOK, 1);
input_sync(ac10x->inpdev); input_sync(ac10x->inpdev);
AC101_DBG("%s,line:%d KEY_HEADSETHOOK1\n", __func__, __LINE__); AC101_DBG("KEY_HEADSETHOOK1\n");
if (hook_flag1 != hook_flag2) if (hook_flag1 != hook_flag2)
hook_flag1 = hook_flag2 = 0; hook_flag1 = hook_flag2 = 0;
@ -282,7 +280,7 @@ static void work_cb_earphone_switch(struct work_struct *work)
input_report_key(ac10x->inpdev, KEY_VOLUMEUP, 0); input_report_key(ac10x->inpdev, KEY_VOLUMEUP, 0);
input_sync(ac10x->inpdev); input_sync(ac10x->inpdev);
AC101_DBG("%s,line:%d HMIC_DATA: %d KEY_VOLUMEUP\n", __func__, __LINE__, t); AC101_DBG("HMIC_DATA: %d KEY_VOLUMEUP\n", t);
} }
if (ac10x->pullout_cntr) if (ac10x->pullout_cntr)
ac10x->pullout_cntr--; ac10x->pullout_cntr--;
@ -295,7 +293,7 @@ static void work_cb_earphone_switch(struct work_struct *work)
input_sync(ac10x->inpdev); input_sync(ac10x->inpdev);
input_report_key(ac10x->inpdev, KEY_VOLUMEDOWN, 0); input_report_key(ac10x->inpdev, KEY_VOLUMEDOWN, 0);
input_sync(ac10x->inpdev); input_sync(ac10x->inpdev);
AC101_DBG("%s,line:%d KEY_VOLUMEDOWN\n", __func__, __LINE__); AC101_DBG("KEY_VOLUMEDOWN\n");
} }
if (ac10x->pullout_cntr) if (ac10x->pullout_cntr)
ac10x->pullout_cntr--; ac10x->pullout_cntr--;
@ -311,7 +309,7 @@ static void work_cb_earphone_switch(struct work_struct *work)
input_report_key(ac10x->inpdev, KEY_HEADSETHOOK, 0); input_report_key(ac10x->inpdev, KEY_HEADSETHOOK, 0);
input_sync(ac10x->inpdev); input_sync(ac10x->inpdev);
AC101_DBG("%s,line:%d KEY_HEADSETHOOK0\n", __func__, __LINE__); AC101_DBG("KEY_HEADSETHOOK0\n");
} }
} }
} else { } else {
@ -589,7 +587,7 @@ static int late_enable_dac(struct snd_soc_codec* codec, int event) {
mutex_lock(&ac10x->dac_mutex); mutex_lock(&ac10x->dac_mutex);
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
AC101_DBG("%s,line:%d\n",__func__,__LINE__); AC101_DBG();
if (ac10x->dac_enable == 0){ if (ac10x->dac_enable == 0){
/*enable dac module clk*/ /*enable dac module clk*/
ac101_update_bits(codec, MOD_CLK_ENA, (0x1<<MOD_CLK_DAC_DIG), (0x1<<MOD_CLK_DAC_DIG)); ac101_update_bits(codec, MOD_CLK_ENA, (0x1<<MOD_CLK_DAC_DIG), (0x1<<MOD_CLK_DAC_DIG));
@ -619,7 +617,7 @@ static int ac101_headphone_event(struct snd_soc_codec* codec, int event) {
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
/*open*/ /*open*/
AC101_DBG("post:open:%s,line:%d\n", __func__, __LINE__); AC101_DBG("post:open\n");
ac101_update_bits(codec, OMIXER_DACA_CTRL, (0xf<<HPOUTPUTENABLE), (0xf<<HPOUTPUTENABLE)); ac101_update_bits(codec, OMIXER_DACA_CTRL, (0xf<<HPOUTPUTENABLE), (0xf<<HPOUTPUTENABLE));
msleep(10); msleep(10);
ac101_update_bits(codec, HPOUT_CTRL, (0x1<<HPPA_EN), (0x1<<HPPA_EN)); ac101_update_bits(codec, HPOUT_CTRL, (0x1<<HPPA_EN), (0x1<<HPPA_EN));
@ -627,7 +625,7 @@ static int ac101_headphone_event(struct snd_soc_codec* codec, int event) {
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
/*close*/ /*close*/
AC101_DBG("pre:close:%s,line:%d\n", __func__, __LINE__); AC101_DBG("pre:close\n");
ac101_update_bits(codec, HPOUT_CTRL, (0x3<<LHPPA_MUTE), (0x0<<LHPPA_MUTE)); ac101_update_bits(codec, HPOUT_CTRL, (0x3<<LHPPA_MUTE), (0x0<<LHPPA_MUTE));
msleep(10); msleep(10);
ac101_update_bits(codec, OMIXER_DACA_CTRL, (0xf<<HPOUTPUTENABLE), (0x0<<HPOUTPUTENABLE)); ac101_update_bits(codec, OMIXER_DACA_CTRL, (0xf<<HPOUTPUTENABLE), (0x0<<HPOUTPUTENABLE));
@ -662,9 +660,9 @@ static int ac101_aif1clk(struct snd_soc_codec* codec, int event, int quick) {
ret = ret || ac101_update_bits(codec, SYSCLK_CTRL, (0x1<<SYSCLK_ENA), (0x1<<SYSCLK_ENA)); ret = ret || ac101_update_bits(codec, SYSCLK_CTRL, (0x1<<SYSCLK_ENA), (0x1<<SYSCLK_ENA));
if (ret) { if (ret) {
AC101_DBG("%s() L%d start sysclk failed\n", __func__, __LINE__); AC101_DBG("start sysclk failed\n");
} else { } else {
AC101_DBG("%s() L%d hw sysclk enable\n", __func__, __LINE__); AC101_DBG("hw sysclk enable\n");
ac10x->aif1_clken++; ac10x->aif1_clken++;
} }
} }
@ -678,17 +676,16 @@ static int ac101_aif1clk(struct snd_soc_codec* codec, int event, int quick) {
ret = ret || ac101_update_bits(codec, SYSCLK_CTRL, (0x1<<SYSCLK_ENA), (0x0<<SYSCLK_ENA)); ret = ret || ac101_update_bits(codec, SYSCLK_CTRL, (0x1<<SYSCLK_ENA), (0x0<<SYSCLK_ENA));
if (ret) { if (ret) {
AC101_DBG("%s() L%d stop sysclk failed\n", __func__, __LINE__); AC101_DBG("stop sysclk failed\n");
} else { } else {
AC101_DBG("%s() L%d hw sysclk disable\n", __func__, __LINE__); AC101_DBG("hw sysclk disable\n");
ac10x->aif1_clken = 0; ac10x->aif1_clken = 0;
} }
break; break;
} }
} }
AC101_DBG("%s() L%d event=%d pre_up/%d post_down/%d\n", __func__, __LINE__, AC101_DBG("event=%d pre_up/%d post_down/%d\n", event, SND_SOC_DAPM_PRE_PMU, SND_SOC_DAPM_POST_PMD);
event, SND_SOC_DAPM_PRE_PMU, SND_SOC_DAPM_POST_PMD);
return 0; return 0;
} }
@ -916,7 +913,7 @@ int ac101_aif_mute(struct snd_soc_dai *codec_dai, int mute)
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec); struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec);
AC101_DBG("%s() L%d mute=%d\n", __func__, __LINE__, mute); AC101_DBG("mute=%d\n", mute);
ac101_write(codec, DAC_VOL_CTRL, mute? 0: 0xA0A0); ac101_write(codec, DAC_VOL_CTRL, mute? 0: 0xA0A0);
@ -958,7 +955,7 @@ void ac101_aif_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec); struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec);
AC101_DBG("%s,line:%d stream = %s, play: %d, capt: %d, active: %d\n", __func__, __LINE__, AC101_DBG("stream = %s, play: %d, capt: %d, active: %d\n",
snd_pcm_stream_str(substream), snd_pcm_stream_str(substream),
codec_dai->playback_active, codec_dai->capture_active, codec_dai->playback_active, codec_dai->capture_active,
codec_dai->active); codec_dai->active);
@ -977,7 +974,7 @@ static int ac101_set_pll(struct snd_soc_dai *codec_dai, int pll_id, int source,
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
int i, m, n_i, n_f; int i, m, n_i, n_f;
AC101_DBG("%s, line:%d, pll_id:%d\n", __func__, __LINE__, pll_id); AC101_DBG("pll_id:%d\n", pll_id);
/* clear volatile reserved bits*/ /* clear volatile reserved bits*/
ac101_update_bits(codec, SYSCLK_CTRL, 0xFF & ~(0x1 << SYSCLK_ENA), 0x0); ac101_update_bits(codec, SYSCLK_CTRL, 0xFF & ~(0x1 << SYSCLK_ENA), 0x0);
@ -1049,7 +1046,7 @@ int ac101_hw_params(struct snd_pcm_substream *substream,
int reg_val, freq_out; int reg_val, freq_out;
unsigned channels; unsigned channels;
AC101_DBG("%s() L%d +++\n", __func__, __LINE__); AC101_DBG("+++\n");
if (_MASTER_MULTI_CODEC == _MASTER_AC101 && ac101_sysclk_started()) { if (_MASTER_MULTI_CODEC == _MASTER_AC101 && ac101_sysclk_started()) {
/* not configure hw_param twice if stream is playback, tell the caller it's started */ /* not configure hw_param twice if stream is playback, tell the caller it's started */
@ -1135,7 +1132,7 @@ int ac101_hw_params(struct snd_pcm_substream *substream,
AC101_DBG("rate: %d , channels: %d , samp_res: %d", AC101_DBG("rate: %d , channels: %d , samp_res: %d",
params_rate(params), channels, aif1_slot_size); params_rate(params), channels, aif1_slot_size);
AC101_DBG("%s() L%d ---\n", __func__, __LINE__); AC101_DBG("---\n");
return 0; return 0;
} }
@ -1145,7 +1142,7 @@ int ac101_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
int AIF_CLK_CTRL = AIF1_CLK_CTRL; int AIF_CLK_CTRL = AIF1_CLK_CTRL;
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
AC101_DBG("%s() L%d\n", __func__, __LINE__); AC101_DBG();
/* /*
* master or slave selection * master or slave selection
@ -1234,7 +1231,7 @@ int ac101_audio_startup(struct snd_pcm_substream *substream,
{ {
// struct snd_soc_codec *codec = codec_dai->codec; // struct snd_soc_codec *codec = codec_dai->codec;
AC101_DBG("\n\n%s,line:%d\n", __func__, __LINE__); AC101_DBG("\n\n\n");
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
} }
@ -1262,8 +1259,7 @@ int ac101_trigger(struct snd_pcm_substream *substream, int cmd,
struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec); struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec);
int ret = 0; int ret = 0;
AC101_DBG("%s() stream=%s cmd=%d\n", AC101_DBG("stream=%s cmd=%d\n",
__FUNCTION__,
snd_pcm_stream_str(substream), snd_pcm_stream_str(substream),
cmd); cmd);
@ -1300,7 +1296,7 @@ static int ac101_set_dai_sysclk(struct snd_soc_dai *codec_dai,
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec); struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec);
AC101_DBG("%s,line:%d, id=%d freq=%d, dir=%d\n", __func__, __LINE__, AC101_DBG("id=%d freq=%d, dir=%d\n",
clk_id, freq, dir); clk_id, freq, dir);
ac10x->sysclk = freq; ac10x->sysclk = freq;
@ -1349,7 +1345,7 @@ static void codec_resume_work(struct work_struct *work)
struct ac10x_priv *ac10x = container_of(work, struct ac10x_priv, codec_resume); struct ac10x_priv *ac10x = container_of(work, struct ac10x_priv, codec_resume);
struct snd_soc_codec *codec = ac10x->codec; struct snd_soc_codec *codec = ac10x->codec;
AC101_DBG("%s() L%d +++\n", __func__, __LINE__); AC101_DBG("+++\n");
set_configuration(codec); set_configuration(codec);
if (drc_used) { if (drc_used) {
@ -1358,7 +1354,7 @@ static void codec_resume_work(struct work_struct *work)
/*enable this bit to prevent leakage from ldoin*/ /*enable this bit to prevent leakage from ldoin*/
ac101_update_bits(codec, ADDA_TUNE3, (0x1<<OSCEN), (0x1<<OSCEN)); ac101_update_bits(codec, ADDA_TUNE3, (0x1<<OSCEN), (0x1<<OSCEN));
AC101_DBG("%s() L%d +++\n", __func__, __LINE__); AC101_DBG("---\n");
return; return;
} }
@ -1366,13 +1362,13 @@ int ac101_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level le
{ {
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
AC101_DBG("%s,line:%d, SND_SOC_BIAS_ON\n", __func__, __LINE__); AC101_DBG("SND_SOC_BIAS_ON\n");
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
AC101_DBG("%s,line:%d, SND_SOC_BIAS_PREPARE\n", __func__, __LINE__); AC101_DBG("SND_SOC_BIAS_PREPARE\n");
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
AC101_DBG("%s,line:%d, SND_SOC_BIAS_STANDBY\n", __func__, __LINE__); AC101_DBG("SND_SOC_BIAS_STANDBY\n");
#ifdef CONFIG_AC101_SWITCH_DETECT #ifdef CONFIG_AC101_SWITCH_DETECT
switch_hw_config(codec); switch_hw_config(codec);
#endif #endif
@ -1384,7 +1380,7 @@ int ac101_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level le
#endif #endif
ac101_update_bits(codec, OMIXER_DACA_CTRL, (0xf<<HPOUTPUTENABLE), (0<<HPOUTPUTENABLE)); ac101_update_bits(codec, OMIXER_DACA_CTRL, (0xf<<HPOUTPUTENABLE), (0<<HPOUTPUTENABLE));
ac101_update_bits(codec, ADDA_TUNE3, (0x1<<OSCEN), (0<<OSCEN)); ac101_update_bits(codec, ADDA_TUNE3, (0x1<<OSCEN), (0<<OSCEN));
AC101_DBG("%s,line:%d, SND_SOC_BIAS_OFF\n", __func__, __LINE__); AC101_DBG("SND_SOC_BIAS_OFF\n");
break; break;
} }
snd_soc_codec_get_dapm(codec)->bias_level = level; snd_soc_codec_get_dapm(codec)->bias_level = level;
@ -1398,7 +1394,7 @@ int ac101_codec_probe(struct snd_soc_codec *codec)
ac10x = dev_get_drvdata(codec->dev); ac10x = dev_get_drvdata(codec->dev);
if (ac10x == NULL) { if (ac10x == NULL) {
AC101_DBG("not set client data %s() L%d\n", __func__, __LINE__); AC101_DBG("not set client data!\n");
return -ENOMEM; return -ENOMEM;
} }
ac10x->codec = codec; ac10x->codec = codec;
@ -1608,7 +1604,7 @@ int ac101_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
int ret = 0; int ret = 0;
unsigned v = 0; unsigned v = 0;
AC101_DBG("%s,line:%d\n", __func__, __LINE__); AC101_DBG();
static_ac10x = ac10x; static_ac10x = ac10x;
@ -1660,7 +1656,7 @@ void ac101_shutdown(struct i2c_client *i2c)
int reg_val; int reg_val;
if (codec == NULL) { if (codec == NULL) {
pr_err("%s() L%d: no sound card.\n", __func__, __LINE__); pr_err(": no sound card.\n");
return; return;
} }

2
ac10x.h
View file

@ -31,7 +31,7 @@
#ifdef AC101_DEBG #ifdef AC101_DEBG
#define AC101_DBG(format,args...) printk("[AC101] "format,##args) #define AC101_DBG(format,args...) printk("[AC101] %s() L%d " format, __func__, __LINE__, ##args)
#else #else
#define AC101_DBG(...) #define AC101_DBG(...)
#endif #endif