shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

audio: turn some log into debug mode

Browse Source 
PD#168597: disable hdmi plugin log print

Change-Id: Ie6731ef35d17f12ad2e696d1f186350d58fda52e
Signed-off-by: weijia.zhu <weijia.zhu@amlogic.com>
This commit is contained in:
weijia.zhu
2018-06-19 19:45:13 +08:00
committed by Yixun Lan
parent aefab40d70
commit deddcbc9e5
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/amlogic/meson/audio_hw.c
View File

@@ -201,7 +201,7 @@ void audio_set_aiubuf(u32 addr, u32 size, unsigned int channel,
0 << 2);
if (channel == 8) {
pr_info("%s channel == 8\n", __func__);
pr_debug("%s channel == 8\n", __func__);
/* [31:16] IRQ block. */
aml_aiu_write(AIU_MEM_I2S_MASKS, (24 << 16) |
/* [15: 8] chan_mem_mask.
@@ -1049,7 +1049,7 @@ void audio_set_958_mode(unsigned int mode, struct _aiu_958_raw_setting_t *set)
aml_aiu_update_bits(AIU_MEM_IEC958_CONTROL,
0x7 << 3, 0x1 << 3);
pr_info("IEC958 RAW\n");
pr_debug("IEC958 RAW\n");
} else if (mode == AIU_958_MODE_PCM32) {
audio_hw_set_958_pcm24(set);
#ifdef CONFIG_AMLOGIC_SND_SPLIT_MODE
@@ -1068,7 +1068,7 @@ void audio_set_958_mode(unsigned int mode, struct _aiu_958_raw_setting_t *set)
aml_aiu_update_bits(AIU_MEM_IEC958_CONTROL,
0x7 << 3, 0);
pr_info("IEC958 PCM32\n");
pr_debug("IEC958 PCM32\n");
} else if (mode == AIU_958_MODE_PCM24) {
audio_hw_set_958_pcm24(set);
#ifdef CONFIG_AMLOGIC_SND_SPLIT_MODE
@@ -1087,7 +1087,7 @@ void audio_set_958_mode(unsigned int mode, struct _aiu_958_raw_setting_t *set)
aml_aiu_update_bits(AIU_MEM_IEC958_CONTROL,
0x7 << 3, 0);
pr_info("IEC958 24bit\n");
pr_debug("IEC958 24bit\n");
} else if (mode == AIU_958_MODE_PCM16) {
audio_hw_set_958_pcm24(set);
aml_aiu_write(AIU_958_MISC, 0x2042);
@@ -1104,7 +1104,7 @@ void audio_set_958_mode(unsigned int mode, struct _aiu_958_raw_setting_t *set)
/* endian */
aml_aiu_update_bits(AIU_MEM_IEC958_CONTROL,
0x7 << 3, 0);
pr_info("IEC958 16bit\n");
pr_debug("IEC958 16bit\n");
}
audio_hw_958_reset(0, 1);

13
sound/soc/amlogic/meson/i2s_dai.c
View File

@@ -218,11 +218,10 @@ static int aml_dai_i2s_prepare(struct snd_pcm_substream *substream,
if (IEC958_mode_codec == 0) {
aml_hw_iec958_init(substream, 1);
/* use the hw same sync for i2s/958 */
dev_info(substream->pcm->card->dev, "i2s/958 same source\n");
pr_debug("i2s/958 same source\n");
}
if (runtime->channels == 8) {
dev_info(substream->pcm->card->dev,
"8ch PCM output->notify HDMI\n");
pr_debug("8ch PCM output->notify HDMI\n");
aout_notifier_call_chain(AOUT_EVENT_IEC_60958_PCM,
substream);
}
@@ -238,10 +237,10 @@ static int aml_dai_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
dev_info(substream->pcm->card->dev, "I2S playback enable\n");
pr_debug("I2S playback enable\n");
audio_out_i2s_enable(1);
if (IEC958_mode_codec == 0) {
dev_info(substream->pcm->card->dev, "IEC958 playback enable\n");
pr_debug("IEC958 playback enable\n");
audio_hw_958_enable(1);
}
} else {
@@ -256,10 +255,10 @@ static int aml_dai_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
dev_info(substream->pcm->card->dev, "I2S playback disable\n");
pr_debug("I2S playback disable\n");
audio_out_i2s_enable(0);
if (IEC958_mode_codec == 0) {
dev_info(substream->pcm->card->dev, "IEC958 playback disable\n");
pr_debug("IEC958 playback disable\n");
audio_hw_958_enable(0);
}
} else {

12
sound/soc/amlogic/meson/spdif_dai.c
View File

@@ -120,7 +120,7 @@ void aml_spdif_play(int samesrc)
pr_info("set 4x audio clk for 958\n");
div = 1;
} else if (samesrc) {
pr_info("share the same clock\n");
pr_debug("share the same clock\n");
div = 2;
} else {
pr_info("set normal 512 fs /4 fs\n");
@@ -256,7 +256,7 @@ void aml_hw_iec958_init(struct snd_pcm_substream *substream, int samesrc)
break;
};
audio_hw_958_enable(0);
pr_info("aml_hw_iec958_init,runtime->rate=%d, same source mode(%d)\n",
pr_debug("aml_hw_iec958_init,runtime->rate=%d, same source mode(%d)\n",
runtime->rate, samesrc);
if (old_samplerate != sample_rate || samesrc != flag_samesrc) {
@@ -270,7 +270,7 @@ void aml_hw_iec958_init(struct snd_pcm_substream *substream, int samesrc)
pr_info("set 4x audio clk for 958\n");
div = 1;
} else if (samesrc) {
pr_info("share the same clock\n");
pr_debug("share the same clock\n");
div = 2;
} else {
pr_info("set normal 512 fs /4 fs\n");
@@ -299,11 +299,11 @@ void aml_hw_iec958_init(struct snd_pcm_substream *substream, int samesrc)
if (IEC958_mode_codec == 1) {
/* dts, use raw sync-word mode */
iec958_mode = AIU_958_MODE_RAW;
pr_info("iec958 mode RAW\n");
pr_debug("iec958 mode RAW\n");
} else {
/* ac3,use the same pcm mode as i2s configuration */
iec958_mode = AIU_958_MODE_PCM_RAW;
pr_info("iec958 mode %s\n",
pr_debug("iec958 mode %s\n",
(i2s_mode == AIU_I2S_MODE_PCM32) ? "PCM32_RAW"
: ((I2S_MODE == AIU_I2S_MODE_PCM24) ?
"PCM24_RAW" : "PCM16_RAW"));
@@ -315,7 +315,7 @@ void aml_hw_iec958_init(struct snd_pcm_substream *substream, int samesrc)
iec958_mode = AIU_958_MODE_PCM24;
else
iec958_mode = AIU_958_MODE_PCM16;
pr_info("iec958 mode %s\n",
pr_debug("iec958 mode %s\n",
(i2s_mode ==
AIU_I2S_MODE_PCM32) ? "PCM32" : ((i2s_mode ==
AIU_I2S_MODE_PCM24) ?