Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: codecs: ES8326 : Add Kcontrol

Merge series from Zhang Yi <zhangyi@everest-semi.com>:

Add some Kcontrols for ES8326

+18 -3
+15 -3
sound/soc/codecs/es8326.c
··· 194 194 static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(softramp_rate, 0, 100, 0); 195 195 static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(drc_target_tlv, -3200, 200, 0); 196 196 static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(drc_recovery_tlv, -125, 250, 0); 197 + static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dre_gain_tlv, -9550, 400, 0); 198 + static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dre_gate_tlv, -9600, 600, 0); 197 199 198 200 static const char *const winsize[] = { 199 201 "0.25db/2 LRCK", ··· 228 226 229 227 static const struct soc_enum dacpol = 230 228 SOC_ENUM_SINGLE(ES8326_DAC_DSM, 4, 4, dacpol_txt); 229 + static const struct soc_enum dre_winsize = 230 + SOC_ENUM_SINGLE(ES8326_ADC_DRE, 0, 16, winsize); 231 231 static const struct soc_enum alc_winsize = 232 232 SOC_ENUM_SINGLE(ES8326_ADC_RAMPRATE, 4, 16, winsize); 233 233 static const struct soc_enum drc_winsize = ··· 249 245 adc_vol_tlv), 250 246 SOC_DOUBLE_TLV("ADC PGA Volume", ES8326_ADC_SCALE, 4, 0, 5, 0, adc_pga_tlv), 251 247 SOC_SINGLE_TLV("ADC PGA Gain Volume", ES8326_PGAGAIN, 0, 10, 0, adc_analog_pga_tlv), 248 + SOC_SINGLE("ADC PGA SE Switch", ES8326_PGAGAIN, 7, 1, 0), 252 249 SOC_SINGLE_TLV("ADC Ramp Rate", ES8326_ADC_RAMPRATE, 0, 0x0f, 0, softramp_rate), 250 + SOC_SINGLE("ADC4 DRE Switch", ES8326_ADC_DRE, 4, 1, 0), 251 + SOC_SINGLE("ADC3 DRE Switch", ES8326_ADC_DRE, 5, 1, 0), 252 + SOC_SINGLE("ADC2 DRE Switch", ES8326_ADC_DRE, 6, 1, 0), 253 + SOC_SINGLE("ADC1 DRE Switch", ES8326_ADC_DRE, 7, 1, 0), 254 + SOC_ENUM("DRE Winsize", dre_winsize), 255 + SOC_SINGLE("DRE Gain Switch", ES8326_ADC_DRE_GAIN, 5, 1, 0), 256 + SOC_SINGLE_TLV("DRE Gain Volume", ES8326_ADC_DRE_GAIN, 257 + 0, 0x1F, 0, dre_gain_tlv), 258 + SOC_SINGLE_TLV("DRE Gate Volume", ES8326_ADC_DRE_GATE, 259 + 4, 0x07, 0, dre_gate_tlv), 253 260 SOC_SINGLE("ALC Capture Switch", ES8326_ALC_RECOVERY, 3, 1, 0), 254 261 SOC_SINGLE_TLV("ALC Capture Recovery Level", ES8326_ALC_LEVEL, 255 262 0, 4, 0, drc_recovery_tlv), ··· 949 934 dev_dbg(comp->dev, "Headset detected\n"); 950 935 snd_soc_jack_report(es8326->jack, 951 936 SND_JACK_HEADSET, SND_JACK_HEADSET); 952 - 953 937 regmap_update_bits(es8326->regmap, ES8326_PGA_PDN, 954 938 0x08, 0x08); 955 - regmap_update_bits(es8326->regmap, ES8326_PGAGAIN, 956 - 0x80, 0x80); 957 939 regmap_write(es8326->regmap, ES8326_ADC1_SRC, 0x00); 958 940 regmap_write(es8326->regmap, ES8326_ADC2_SRC, 0x00); 959 941 regmap_update_bits(es8326->regmap, ES8326_PGA_PDN,
+3
sound/soc/codecs/es8326.h
··· 58 58 #define ES8326_ADC1_VOL 0x2c 59 59 #define ES8326_ADC2_VOL 0x2d 60 60 #define ES8326_ADC_RAMPRATE 0x2e 61 + #define ES8326_ADC_DRE 0x2f 62 + #define ES8326_ADC_DRE_GAIN 0x30 63 + #define ES8326_ADC_DRE_GATE 0x31 61 64 #define ES8326_ALC_RECOVERY 0x32 62 65 #define ES8326_ALC_LEVEL 0x33 63 66 #define ES8326_ADC_HPFS1 0x34