aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorOder Chiou <oder_chiou@realtek.com>2014-11-05 00:42:52 -0500
committerMark Brown <broonie@kernel.org>2014-11-05 09:56:43 -0500
commitd65fd3a42e00d322448f2518db6a3f0eb12ce1bd (patch)
tree20f4f6501e1f3436c50f4cc21f1f2fd7a9c7be87 /sound
parente6f6ebc1f8f60d6d44f6be22c6386c238d6a9d97 (diff)
ASoC: rt5677: Minor coding style and typo fix
Minor coding style and typo fix Signed-off-by: Oder Chiou <oder_chiou@realtek.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/rt5677-spi.h4
-rw-r--r--sound/soc/codecs/rt5677.c14
2 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/codecs/rt5677-spi.h b/sound/soc/codecs/rt5677-spi.h
index 7528bfd0b596..ec41b2b3b2ca 100644
--- a/sound/soc/codecs/rt5677-spi.h
+++ b/sound/soc/codecs/rt5677-spi.h
@@ -9,8 +9,8 @@
9 * published by the Free Software Foundation. 9 * published by the Free Software Foundation.
10 */ 10 */
11 11
12#ifndef __RT5671_SPI_H__ 12#ifndef __RT5677_SPI_H__
13#define __RT5671_SPI_H__ 13#define __RT5677_SPI_H__
14 14
15#define RT5677_SPI_BUF_LEN 240 15#define RT5677_SPI_BUF_LEN 240
16#define RT5677_SPI_CMD_BURST_WRITE 0x05 16#define RT5677_SPI_CMD_BURST_WRITE 0x05
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index ca264f885195..0d24dc45dfe4 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -1353,7 +1353,7 @@ static SOC_ENUM_SINGLE_DECL(
1353static const struct snd_kcontrol_new rt5677_ib45_bypass_src_mux = 1353static const struct snd_kcontrol_new rt5677_ib45_bypass_src_mux =
1354 SOC_DAPM_ENUM("IB45 Bypass Source", rt5677_ib45_bypass_src_enum); 1354 SOC_DAPM_ENUM("IB45 Bypass Source", rt5677_ib45_bypass_src_enum);
1355 1355
1356/* Stereo ADC Source 2 */ /* MX-27 MX26 MX25 [11:10] */ 1356/* Stereo ADC Source 2 */ /* MX-27 MX26 MX25 [11:10] */
1357static const char * const rt5677_stereo_adc2_src[] = { 1357static const char * const rt5677_stereo_adc2_src[] = {
1358 "DD MIX1", "DMIC", "Stereo DAC MIX" 1358 "DD MIX1", "DMIC", "Stereo DAC MIX"
1359}; 1359};
@@ -1438,7 +1438,7 @@ static SOC_ENUM_SINGLE_DECL(
1438static const struct snd_kcontrol_new rt5677_sto2_adc_lr_mux = 1438static const struct snd_kcontrol_new rt5677_sto2_adc_lr_mux =
1439 SOC_DAPM_ENUM("Stereo2 ADC LR Source", rt5677_stereo2_adc_lr_enum); 1439 SOC_DAPM_ENUM("Stereo2 ADC LR Source", rt5677_stereo2_adc_lr_enum);
1440 1440
1441/* Stereo1 ADC Source 1 */ /* MX-27 MX26 MX25 [13:12] */ 1441/* Stereo1 ADC Source 1 */ /* MX-27 MX26 MX25 [13:12] */
1442static const char * const rt5677_stereo_adc1_src[] = { 1442static const char * const rt5677_stereo_adc1_src[] = {
1443 "DD MIX1", "ADC1/2", "Stereo DAC MIX" 1443 "DD MIX1", "ADC1/2", "Stereo DAC MIX"
1444}; 1444};
@@ -1710,7 +1710,7 @@ static SOC_ENUM_SINGLE_DECL(
1710static const struct snd_kcontrol_new rt5677_pdm2_r_mux = 1710static const struct snd_kcontrol_new rt5677_pdm2_r_mux =
1711 SOC_DAPM_ENUM("PDM2 Source", rt5677_pdm2_r_enum); 1711 SOC_DAPM_ENUM("PDM2 Source", rt5677_pdm2_r_enum);
1712 1712
1713/* TDM IF1/2 SLB ADC1 Data Selection */ /* MX-3C MX-41 [5:4] MX-08 [1:0]*/ 1713/* TDM IF1/2 SLB ADC1 Data Selection */ /* MX-3C MX-41 [5:4] MX-08 [1:0] */
1714static const char * const rt5677_if12_adc1_src[] = { 1714static const char * const rt5677_if12_adc1_src[] = {
1715 "STO1 ADC MIX", "OB01", "VAD ADC" 1715 "STO1 ADC MIX", "OB01", "VAD ADC"
1716}; 1716};
@@ -1788,7 +1788,7 @@ static SOC_ENUM_SINGLE_DECL(
1788static const struct snd_kcontrol_new rt5677_slb_adc3_mux = 1788static const struct snd_kcontrol_new rt5677_slb_adc3_mux =
1789 SOC_DAPM_ENUM("SLB ADC3 Source", rt5677_slb_adc3_enum); 1789 SOC_DAPM_ENUM("SLB ADC3 Source", rt5677_slb_adc3_enum);
1790 1790
1791/* TDM IF1/2 SLB ADC4 Data Selection */ /* MX-3C MX-41 [11:10] MX-08 [7:6] */ 1791/* TDM IF1/2 SLB ADC4 Data Selection */ /* MX-3C MX-41 [11:10] MX-08 [7:6] */
1792static const char * const rt5677_if12_adc4_src[] = { 1792static const char * const rt5677_if12_adc4_src[] = {
1793 "STO4 ADC MIX", "OB67", "OB01" 1793 "STO4 ADC MIX", "OB67", "OB01"
1794}; 1794};
@@ -1814,7 +1814,7 @@ static SOC_ENUM_SINGLE_DECL(
1814static const struct snd_kcontrol_new rt5677_slb_adc4_mux = 1814static const struct snd_kcontrol_new rt5677_slb_adc4_mux =
1815 SOC_DAPM_ENUM("SLB ADC4 Source", rt5677_slb_adc4_enum); 1815 SOC_DAPM_ENUM("SLB ADC4 Source", rt5677_slb_adc4_enum);
1816 1816
1817/* Interface3/4 ADC Data Input */ /* MX-2F [3:0] MX-30 [7:4]*/ 1817/* Interface3/4 ADC Data Input */ /* MX-2F [3:0] MX-30 [7:4] */
1818static const char * const rt5677_if34_adc_src[] = { 1818static const char * const rt5677_if34_adc_src[] = {
1819 "STO1 ADC MIX", "STO2 ADC MIX", "STO3 ADC MIX", "STO4 ADC MIX", 1819 "STO1 ADC MIX", "STO2 ADC MIX", "STO3 ADC MIX", "STO4 ADC MIX",
1820 "MONO ADC MIX", "OB01", "OB23", "VAD ADC" 1820 "MONO ADC MIX", "OB01", "OB23", "VAD ADC"
@@ -1895,7 +1895,7 @@ static SOC_ENUM_SINGLE_DECL(
1895static const struct snd_kcontrol_new rt5677_if2_adc4_swap_mux = 1895static const struct snd_kcontrol_new rt5677_if2_adc4_swap_mux =
1896 SOC_DAPM_ENUM("IF2 ADC4 Swap Source", rt5677_if2_adc4_swap_enum); 1896 SOC_DAPM_ENUM("IF2 ADC4 Swap Source", rt5677_if2_adc4_swap_enum);
1897 1897
1898/* TDM IF1 ADC Data Selection */ /* MX-3C [2:0] */ 1898/* TDM IF1 ADC Data Selection */ /* MX-3C [2:0] */
1899static const char * const rt5677_if1_adc_tdm_swap_src[] = { 1899static const char * const rt5677_if1_adc_tdm_swap_src[] = {
1900 "1/2/3/4", "2/1/3/4", "2/3/1/4", "4/1/2/3", "1/3/2/4", "1/4/2/3", 1900 "1/2/3/4", "2/1/3/4", "2/3/1/4", "4/1/2/3", "1/3/2/4", "1/4/2/3",
1901 "3/1/2/4", "3/4/1/2" 1901 "3/1/2/4", "3/4/1/2"
@@ -2442,7 +2442,7 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
2442 rt5677_ob_7_mix, ARRAY_SIZE(rt5677_ob_7_mix)), 2442 rt5677_ob_7_mix, ARRAY_SIZE(rt5677_ob_7_mix)),
2443 2443
2444 /* Output Side */ 2444 /* Output Side */
2445 /* DAC mixer before sound effect */ 2445 /* DAC mixer before sound effect */
2446 SND_SOC_DAPM_MIXER("DAC1 MIXL", SND_SOC_NOPM, 0, 0, 2446 SND_SOC_DAPM_MIXER("DAC1 MIXL", SND_SOC_NOPM, 0, 0,
2447 rt5677_dac_l_mix, ARRAY_SIZE(rt5677_dac_l_mix)), 2447 rt5677_dac_l_mix, ARRAY_SIZE(rt5677_dac_l_mix)),
2448 SND_SOC_DAPM_MIXER("DAC1 MIXR", SND_SOC_NOPM, 0, 0, 2448 SND_SOC_DAPM_MIXER("DAC1 MIXR", SND_SOC_NOPM, 0, 0,