kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into asoc-linus

Browse source
This commit is contained in:
Mark Brown 2016-04-26 19:25:18 +01:00
commit 8c0f551004
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/codecs/rt5640.c
View file

@ -359,7 +359,7 @@ static const DECLARE_TLV_DB_RANGE(bst_tlv,
/* Interface data select */ /* Interface data select */
static const char * const rt5640_data_select[] = { static const char * const rt5640_data_select[] = {
"Normal", "left copy to right", "right copy to left", "Swap"}; "Normal", "Swap", "left copy to right", "right copy to left"};
static SOC_ENUM_SINGLE_DECL(rt5640_if1_dac_enum, RT5640_DIG_INF_DATA, static SOC_ENUM_SINGLE_DECL(rt5640_if1_dac_enum, RT5640_DIG_INF_DATA,
RT5640_IF1_DAC_SEL_SFT, rt5640_data_select); RT5640_IF1_DAC_SEL_SFT, rt5640_data_select);

36
sound/soc/codecs/rt5640.h
View file

@ -443,39 +443,39 @@
#define RT5640_IF1_DAC_SEL_MASK (0x3 << 14) #define RT5640_IF1_DAC_SEL_MASK (0x3 << 14)
#define RT5640_IF1_DAC_SEL_SFT 14 #define RT5640_IF1_DAC_SEL_SFT 14
#define RT5640_IF1_DAC_SEL_NOR (0x0 << 14) #define RT5640_IF1_DAC_SEL_NOR (0x0 << 14)
#define RT5640_IF1_DAC_SEL_L2R (0x1 << 14) #define RT5640_IF1_DAC_SEL_SWAP (0x1 << 14)
#define RT5640_IF1_DAC_SEL_R2L (0x2 << 14) #define RT5640_IF1_DAC_SEL_L2R (0x2 << 14)
#define RT5640_IF1_DAC_SEL_SWAP (0x3 << 14) #define RT5640_IF1_DAC_SEL_R2L (0x3 << 14)
#define RT5640_IF1_ADC_SEL_MASK (0x3 << 12) #define RT5640_IF1_ADC_SEL_MASK (0x3 << 12)
#define RT5640_IF1_ADC_SEL_SFT 12 #define RT5640_IF1_ADC_SEL_SFT 12
#define RT5640_IF1_ADC_SEL_NOR (0x0 << 12) #define RT5640_IF1_ADC_SEL_NOR (0x0 << 12)
#define RT5640_IF1_ADC_SEL_L2R (0x1 << 12) #define RT5640_IF1_ADC_SEL_SWAP (0x1 << 12)
#define RT5640_IF1_ADC_SEL_R2L (0x2 << 12) #define RT5640_IF1_ADC_SEL_L2R (0x2 << 12)
#define RT5640_IF1_ADC_SEL_SWAP (0x3 << 12) #define RT5640_IF1_ADC_SEL_R2L (0x3 << 12)
#define RT5640_IF2_DAC_SEL_MASK (0x3 << 10) #define RT5640_IF2_DAC_SEL_MASK (0x3 << 10)
#define RT5640_IF2_DAC_SEL_SFT 10 #define RT5640_IF2_DAC_SEL_SFT 10
#define RT5640_IF2_DAC_SEL_NOR (0x0 << 10) #define RT5640_IF2_DAC_SEL_NOR (0x0 << 10)
#define RT5640_IF2_DAC_SEL_L2R (0x1 << 10) #define RT5640_IF2_DAC_SEL_SWAP (0x1 << 10)
#define RT5640_IF2_DAC_SEL_R2L (0x2 << 10) #define RT5640_IF2_DAC_SEL_L2R (0x2 << 10)
#define RT5640_IF2_DAC_SEL_SWAP (0x3 << 10) #define RT5640_IF2_DAC_SEL_R2L (0x3 << 10)
#define RT5640_IF2_ADC_SEL_MASK (0x3 << 8) #define RT5640_IF2_ADC_SEL_MASK (0x3 << 8)
#define RT5640_IF2_ADC_SEL_SFT 8 #define RT5640_IF2_ADC_SEL_SFT 8
#define RT5640_IF2_ADC_SEL_NOR (0x0 << 8) #define RT5640_IF2_ADC_SEL_NOR (0x0 << 8)
#define RT5640_IF2_ADC_SEL_L2R (0x1 << 8) #define RT5640_IF2_ADC_SEL_SWAP (0x1 << 8)
#define RT5640_IF2_ADC_SEL_R2L (0x2 << 8) #define RT5640_IF2_ADC_SEL_L2R (0x2 << 8)
#define RT5640_IF2_ADC_SEL_SWAP (0x3 << 8) #define RT5640_IF2_ADC_SEL_R2L (0x3 << 8)
#define RT5640_IF3_DAC_SEL_MASK (0x3 << 6) #define RT5640_IF3_DAC_SEL_MASK (0x3 << 6)
#define RT5640_IF3_DAC_SEL_SFT 6 #define RT5640_IF3_DAC_SEL_SFT 6
#define RT5640_IF3_DAC_SEL_NOR (0x0 << 6) #define RT5640_IF3_DAC_SEL_NOR (0x0 << 6)
#define RT5640_IF3_DAC_SEL_L2R (0x1 << 6) #define RT5640_IF3_DAC_SEL_SWAP (0x1 << 6)
#define RT5640_IF3_DAC_SEL_R2L (0x2 << 6) #define RT5640_IF3_DAC_SEL_L2R (0x2 << 6)
#define RT5640_IF3_DAC_SEL_SWAP (0x3 << 6) #define RT5640_IF3_DAC_SEL_R2L (0x3 << 6)
#define RT5640_IF3_ADC_SEL_MASK (0x3 << 4) #define RT5640_IF3_ADC_SEL_MASK (0x3 << 4)
#define RT5640_IF3_ADC_SEL_SFT 4 #define RT5640_IF3_ADC_SEL_SFT 4
#define RT5640_IF3_ADC_SEL_NOR (0x0 << 4) #define RT5640_IF3_ADC_SEL_NOR (0x0 << 4)
#define RT5640_IF3_ADC_SEL_L2R (0x1 << 4) #define RT5640_IF3_ADC_SEL_SWAP (0x1 << 4)
#define RT5640_IF3_ADC_SEL_R2L (0x2 << 4) #define RT5640_IF3_ADC_SEL_L2R (0x2 << 4)
#define RT5640_IF3_ADC_SEL_SWAP (0x3 << 4) #define RT5640_IF3_ADC_SEL_R2L (0x3 << 4)
/* REC Left Mixer Control 1 (0x3b) */ /* REC Left Mixer Control 1 (0x3b) */
#define RT5640_G_HP_L_RM_L_MASK (0x7 << 13) #define RT5640_G_HP_L_RM_L_MASK (0x7 << 13)

2
sound/soc/codecs/wm8962.c
View file

@ -2471,7 +2471,7 @@ static void wm8962_configure_bclk(struct snd_soc_codec *codec)
break; break;
default: default:
dev_warn(codec->dev, "Unknown DSPCLK divisor read back\n"); dev_warn(codec->dev, "Unknown DSPCLK divisor read back\n");
dspclk = wm8962->sysclk; dspclk = wm8962->sysclk_rate;
} }
dev_dbg(codec->dev, "DSPCLK is %dHz, BCLK %d\n", dspclk, wm8962->bclk); dev_dbg(codec->dev, "DSPCLK is %dHz, BCLK %d\n", dspclk, wm8962->bclk);