|
@@ -532,7 +532,7 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mixer_controls[] = {
|
|
|
SUN4I_CODEC_DAC_ACTL_MIXPAS, 1, 0),
|
|
|
};
|
|
|
|
|
|
-static const struct snd_soc_dapm_widget sun4i_codec_dapm_widgets[] = {
|
|
|
+static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = {
|
|
|
/* Digital parts of the ADCs */
|
|
|
SND_SOC_DAPM_SUPPLY("ADC", SUN4I_CODEC_ADC_FIFOC,
|
|
|
SUN4I_CODEC_ADC_FIFOC_EN_AD, 0,
|
|
@@ -589,7 +589,7 @@ static const struct snd_soc_dapm_widget sun4i_codec_dapm_widgets[] = {
|
|
|
SND_SOC_DAPM_OUTPUT("HP Left"),
|
|
|
};
|
|
|
|
|
|
-static const struct snd_soc_dapm_route sun4i_codec_dapm_routes[] = {
|
|
|
+static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
|
|
|
/* Left ADC / DAC Routes */
|
|
|
{ "Left ADC", NULL, "ADC" },
|
|
|
{ "Left DAC", NULL, "DAC" },
|
|
@@ -628,10 +628,10 @@ static const struct snd_soc_dapm_route sun4i_codec_dapm_routes[] = {
|
|
|
static struct snd_soc_codec_driver sun4i_codec_codec = {
|
|
|
.controls = sun4i_codec_widgets,
|
|
|
.num_controls = ARRAY_SIZE(sun4i_codec_widgets),
|
|
|
- .dapm_widgets = sun4i_codec_dapm_widgets,
|
|
|
- .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_dapm_widgets),
|
|
|
- .dapm_routes = sun4i_codec_dapm_routes,
|
|
|
- .num_dapm_routes = ARRAY_SIZE(sun4i_codec_dapm_routes),
|
|
|
+ .dapm_widgets = sun4i_codec_codec_dapm_widgets,
|
|
|
+ .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets),
|
|
|
+ .dapm_routes = sun4i_codec_codec_dapm_routes,
|
|
|
+ .num_dapm_routes = ARRAY_SIZE(sun4i_codec_codec_dapm_routes),
|
|
|
};
|
|
|
|
|
|
static const struct snd_soc_component_driver sun4i_codec_component = {
|