From 9dcb0d9f27ea3d98bfc09e6dcd750fe7092ac281 Mon Sep 17 00:00:00 2001 From: Mauro Ribeiro Date: Tue, 23 Dec 2014 01:21:35 -0200 Subject: [PATCH] AMLOGIC:sound: silence Change-Id: Ibf2ef96210e532e30567c421df5bb79caac54a58 --- sound/soc/aml/m8/aml_audio_hw.c | 4 ---- sound/soc/aml/m8/aml_m8.c | 2 -- sound/soc/aml/m8/aml_spdif_dai.c | 22 +++++++++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/sound/soc/aml/m8/aml_audio_hw.c b/sound/soc/aml/m8/aml_audio_hw.c index e16f96c27b5d..886c2ba98a38 100755 --- a/sound/soc/aml/m8/aml_audio_hw.c +++ b/sound/soc/aml/m8/aml_audio_hw.c @@ -327,8 +327,6 @@ static void spdifin_reg_set(void) u32 period_96k = (period_data / 48 + 1) >> 1; // 96k min period u32 period_192k = (period_data / 96 + 1) >> 1; // 192k min period - printk(KERN_INFO"spdifin_reg_set: clk_rate=%d\n", clk_rate); - WRITE_MPEG_REG(AUDIN_SPDIF_MODE, (READ_MPEG_REG(AUDIN_SPDIF_MODE)&0x7fffc000)|(spdif_mode_14bit<<0)); WRITE_MPEG_REG(AUDIN_SPDIF_FS_CLK_RLTN, (period_32k<<0)|(period_44k<<6)|(period_48k<<12) |(period_96k<<18)|(period_192k<<24)); //Spdif_fs_clk_rltn @@ -363,13 +361,11 @@ static void spdifin_fifo1_set_buf(u32 addr, u32 size) } void audio_in_i2s_set_buf(u32 addr, u32 size,u32 i2s_mode, u32 i2s_sync) { - printk("i2sin_fifo0_set_buf \n"); i2sin_fifo0_set_buf(addr,size,i2s_mode,i2s_sync); audio_in_buf_ready = 1; } void audio_in_spdif_set_buf(u32 addr, u32 size) { - printk("spdifin_fifo1_set_buf \n"); spdifin_fifo1_set_buf(addr,size); } diff --git a/sound/soc/aml/m8/aml_m8.c b/sound/soc/aml/m8/aml_m8.c index 1bc6ef85b4d4..27fcd698e9bb 100755 --- a/sound/soc/aml/m8/aml_m8.c +++ b/sound/soc/aml/m8/aml_m8.c @@ -354,7 +354,6 @@ static int aml_audio_set_spdif_mute(struct snd_kcontrol *kcontrol, { aml_audio_spdif_mute_flag = ucontrol->value.integer.value[0]; - printk(KERN_INFO "aml_audio_set_spdif_mute: flag=%d\n",aml_audio_spdif_mute_flag); if(aml_audio_spdif_mute_flag){ aml_spdif_pinmux_deinit(spdif_dev); }else{ @@ -376,7 +375,6 @@ static int aml_set_bias_level(struct snd_soc_card *card, struct aml_audio_private_data * p_aml_audio; int hp_state; - printk(KERN_DEBUG "enter %s level: %d\n", __func__, level); p_aml_audio = snd_soc_card_get_drvdata(card); hp_state = p_aml_audio->detect_flag; diff --git a/sound/soc/aml/m8/aml_spdif_dai.c b/sound/soc/aml/m8/aml_spdif_dai.c index ad5fd4d67f04..ad2fa78ebc85 100755 --- a/sound/soc/aml/m8/aml_spdif_dai.c +++ b/sound/soc/aml/m8/aml_spdif_dai.c @@ -30,14 +30,22 @@ #include //#define DEBUG_ALSA_SPDIF_DAI -#define ALSA_PRINT(fmt,args...) printk(KERN_INFO "[aml-spdif-dai]" fmt,##args) -#ifdef DEBUG_ALSA_SPDIF_DAI -#define ALSA_DEBUG(fmt,args...) printk(KERN_INFO "[aml-spdif-dai]" fmt,##args) -#define ALSA_TRACE() printk("[aml-spdif-dai] enter func %s,line %d\n",__FUNCTION__,__LINE__) -#else -#define ALSA_DEBUG(fmt,args...) -#define ALSA_TRACE() +//#define AML_M8_SPDIF_DEBUG +#ifdef AML_M8_SPDIF_DEBUG + #define ALSA_PRINT(fmt,args...) printk(KERN_INFO "[aml-spdif-dai]" fmt,##args) + #ifdef DEBUG_ALSA_SPDIF_DAI + #define ALSA_DEBUG(fmt,args...) printk(KERN_INFO "[aml-spdif-dai]" fmt,##args) + #define ALSA_TRACE() printk("[aml-spdif-dai] enter func %s,line %d\n",__FUNCTION__,__LINE__) + #else + #define ALSA_DEBUG(fmt,args...) + #define ALSA_TRACE() + #endif +#else + #define ALSA_PRINT(fmt,args...) + #define ALSA_DEBUG(fmt,args...) + #define ALSA_TRACE() #endif + static unsigned last_iec_clock = -1; extern int aout_notifier_call_chain(unsigned long val, void *v); //static unsigned playback_substream_handle = 0 ;