summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJohn Hsu <supercraig0719@gmail.com>2017-04-27 11:15:37 +0800
committerMark Brown <broonie@kernel.org>2017-04-30 21:52:33 +0900
commit25535f7e0b418fe8b2251008cfcb05d272c2e8e0 (patch)
treea64a7d337768ad8e2d6e69f2a2016ddf4ee306d2 /sound
parentdfeabded04962ed2de9dca489de228801df25de6 (diff)
downloadlinux-25535f7e0b418fe8b2251008cfcb05d272c2e8e0.tar.bz2
ASoC: nau8824: rename controls to match DAPM controls
Rename the name of kcontrols to match up the DAPM widget controls. Signed-off-by: John Hsu <KCHSU0@nuvoton.com> Signed-off-by: John Hsu <supercraig0719@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/nau8824.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/codecs/nau8824.c b/sound/soc/codecs/nau8824.c
index 18552ed43924..cd358be027dd 100644
--- a/sound/soc/codecs/nau8824.c
+++ b/sound/soc/codecs/nau8824.c
@@ -362,27 +362,27 @@ static const struct snd_kcontrol_new nau8824_snd_controls[] = {
SOC_ENUM("ADC Decimation Rate", nau8824_adc_decimation_enum),
SOC_ENUM("DAC Oversampling Rate", nau8824_dac_oversampl_enum),
- SOC_SINGLE_TLV("Speaker Right from DACR Volume",
+ SOC_SINGLE_TLV("Speaker Right DACR Volume",
NAU8824_REG_CLASSD_GAIN_1, 8, 0x1f, 0, spk_vol_tlv),
- SOC_SINGLE_TLV("Speaker Left from DACL Volume",
+ SOC_SINGLE_TLV("Speaker Left DACL Volume",
NAU8824_REG_CLASSD_GAIN_2, 0, 0x1f, 0, spk_vol_tlv),
- SOC_SINGLE_TLV("Speaker Left from DACR Volume",
+ SOC_SINGLE_TLV("Speaker Left DACR Volume",
NAU8824_REG_CLASSD_GAIN_1, 0, 0x1f, 0, spk_vol_tlv),
- SOC_SINGLE_TLV("Speaker Right from DACL Volume",
+ SOC_SINGLE_TLV("Speaker Right DACL Volume",
NAU8824_REG_CLASSD_GAIN_2, 8, 0x1f, 0, spk_vol_tlv),
- SOC_SINGLE_TLV("Headphone Right from DACR Volume",
+ SOC_SINGLE_TLV("Headphone Right DACR Volume",
NAU8824_REG_ATT_PORT0, 8, 0x1f, 0, hp_vol_tlv),
- SOC_SINGLE_TLV("Headphone Left from DACL Volume",
+ SOC_SINGLE_TLV("Headphone Left DACL Volume",
NAU8824_REG_ATT_PORT0, 0, 0x1f, 0, hp_vol_tlv),
- SOC_SINGLE_TLV("Headphone Right from DACL Volume",
+ SOC_SINGLE_TLV("Headphone Right DACL Volume",
NAU8824_REG_ATT_PORT1, 8, 0x1f, 0, hp_vol_tlv),
- SOC_SINGLE_TLV("Headphone Left from DACR Volume",
+ SOC_SINGLE_TLV("Headphone Left DACR Volume",
NAU8824_REG_ATT_PORT1, 0, 0x1f, 0, hp_vol_tlv),
- SOC_SINGLE_TLV("Mic1 Volume", NAU8824_REG_FEPGA_II,
+ SOC_SINGLE_TLV("MIC1 Volume", NAU8824_REG_FEPGA_II,
NAU8824_FEPGA_GAINL_SFT, 0x12, 0, mic_vol_tlv),
- SOC_SINGLE_TLV("Mic2 Volume", NAU8824_REG_FEPGA_II,
+ SOC_SINGLE_TLV("MIC2 Volume", NAU8824_REG_FEPGA_II,
NAU8824_FEPGA_GAINR_SFT, 0x12, 0, mic_vol_tlv),
SOC_SINGLE_TLV("DMIC1 Volume", NAU8824_REG_ADC_CH0_DGAIN_CTRL,