|
@@ -219,6 +219,22 @@ static const struct snd_kcontrol_new sun8i_codec_mixer_controls[] = {
|
|
|
SUN8I_ADDA_LOMIXSC_MIC2, 1, 0),
|
|
|
};
|
|
|
|
|
|
+/* mixer controls */
|
|
|
+static const struct snd_kcontrol_new sun8i_v3s_codec_mixer_controls[] = {
|
|
|
+ SOC_DAPM_DOUBLE_R("DAC Playback Switch",
|
|
|
+ SUN8I_ADDA_LOMIXSC,
|
|
|
+ SUN8I_ADDA_ROMIXSC,
|
|
|
+ SUN8I_ADDA_LOMIXSC_DACL, 1, 0),
|
|
|
+ SOC_DAPM_DOUBLE_R("DAC Reversed Playback Switch",
|
|
|
+ SUN8I_ADDA_LOMIXSC,
|
|
|
+ SUN8I_ADDA_ROMIXSC,
|
|
|
+ SUN8I_ADDA_LOMIXSC_DACR, 1, 0),
|
|
|
+ SOC_DAPM_DOUBLE_R("Mic1 Playback Switch",
|
|
|
+ SUN8I_ADDA_LOMIXSC,
|
|
|
+ SUN8I_ADDA_ROMIXSC,
|
|
|
+ SUN8I_ADDA_LOMIXSC_MIC1, 1, 0),
|
|
|
+};
|
|
|
+
|
|
|
/* ADC mixer controls */
|
|
|
static const struct snd_kcontrol_new sun8i_codec_adc_mixer_controls[] = {
|
|
|
SOC_DAPM_DOUBLE_R("Mixer Capture Switch",
|
|
@@ -243,6 +259,22 @@ static const struct snd_kcontrol_new sun8i_codec_adc_mixer_controls[] = {
|
|
|
SUN8I_ADDA_LADCMIXSC_MIC2, 1, 0),
|
|
|
};
|
|
|
|
|
|
+/* ADC mixer controls */
|
|
|
+static const struct snd_kcontrol_new sun8i_v3s_codec_adc_mixer_controls[] = {
|
|
|
+ SOC_DAPM_DOUBLE_R("Mixer Capture Switch",
|
|
|
+ SUN8I_ADDA_LADCMIXSC,
|
|
|
+ SUN8I_ADDA_RADCMIXSC,
|
|
|
+ SUN8I_ADDA_LADCMIXSC_OMIXRL, 1, 0),
|
|
|
+ SOC_DAPM_DOUBLE_R("Mixer Reversed Capture Switch",
|
|
|
+ SUN8I_ADDA_LADCMIXSC,
|
|
|
+ SUN8I_ADDA_RADCMIXSC,
|
|
|
+ SUN8I_ADDA_LADCMIXSC_OMIXRR, 1, 0),
|
|
|
+ SOC_DAPM_DOUBLE_R("Mic1 Capture Switch",
|
|
|
+ SUN8I_ADDA_LADCMIXSC,
|
|
|
+ SUN8I_ADDA_RADCMIXSC,
|
|
|
+ SUN8I_ADDA_LADCMIXSC_MIC1, 1, 0),
|
|
|
+};
|
|
|
+
|
|
|
/* volume / mute controls */
|
|
|
static const DECLARE_TLV_DB_SCALE(sun8i_codec_out_mixer_pregain_scale,
|
|
|
-450, 150, 0);
|
|
@@ -292,8 +324,9 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = {
|
|
|
/* Mic input path */
|
|
|
SND_SOC_DAPM_PGA("Mic1 Amplifier", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
|
|
|
SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1AMPEN, 0, NULL, 0),
|
|
|
+};
|
|
|
|
|
|
- /* Mixers */
|
|
|
+static const struct snd_soc_dapm_widget sun8i_codec_mixer_widgets[] = {
|
|
|
SND_SOC_DAPM_MIXER("Left Mixer", SUN8I_ADDA_DAC_PA_SRC,
|
|
|
SUN8I_ADDA_DAC_PA_SRC_LMIXEN, 0,
|
|
|
sun8i_codec_mixer_controls,
|
|
@@ -312,10 +345,31 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = {
|
|
|
ARRAY_SIZE(sun8i_codec_adc_mixer_controls)),
|
|
|
};
|
|
|
|
|
|
+static const struct snd_soc_dapm_widget sun8i_v3s_codec_mixer_widgets[] = {
|
|
|
+ SND_SOC_DAPM_MIXER("Left Mixer", SUN8I_ADDA_DAC_PA_SRC,
|
|
|
+ SUN8I_ADDA_DAC_PA_SRC_LMIXEN, 0,
|
|
|
+ sun8i_v3s_codec_mixer_controls,
|
|
|
+ ARRAY_SIZE(sun8i_v3s_codec_mixer_controls)),
|
|
|
+ SND_SOC_DAPM_MIXER("Right Mixer", SUN8I_ADDA_DAC_PA_SRC,
|
|
|
+ SUN8I_ADDA_DAC_PA_SRC_RMIXEN, 0,
|
|
|
+ sun8i_v3s_codec_mixer_controls,
|
|
|
+ ARRAY_SIZE(sun8i_v3s_codec_mixer_controls)),
|
|
|
+ SND_SOC_DAPM_MIXER("Left ADC Mixer", SUN8I_ADDA_ADC_AP_EN,
|
|
|
+ SUN8I_ADDA_ADC_AP_EN_ADCLEN, 0,
|
|
|
+ sun8i_v3s_codec_adc_mixer_controls,
|
|
|
+ ARRAY_SIZE(sun8i_v3s_codec_adc_mixer_controls)),
|
|
|
+ SND_SOC_DAPM_MIXER("Right ADC Mixer", SUN8I_ADDA_ADC_AP_EN,
|
|
|
+ SUN8I_ADDA_ADC_AP_EN_ADCREN, 0,
|
|
|
+ sun8i_v3s_codec_adc_mixer_controls,
|
|
|
+ ARRAY_SIZE(sun8i_v3s_codec_adc_mixer_controls)),
|
|
|
+};
|
|
|
+
|
|
|
static const struct snd_soc_dapm_route sun8i_codec_common_routes[] = {
|
|
|
/* Microphone Routes */
|
|
|
{ "Mic1 Amplifier", NULL, "MIC1"},
|
|
|
+};
|
|
|
|
|
|
+static const struct snd_soc_dapm_route sun8i_codec_mixer_routes[] = {
|
|
|
/* Left Mixer Routes */
|
|
|
{ "Left Mixer", "DAC Playback Switch", "Left DAC" },
|
|
|
{ "Left Mixer", "DAC Reversed Playback Switch", "Right DAC" },
|
|
@@ -714,6 +768,48 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {
|
|
|
.has_mic2 = true,
|
|
|
};
|
|
|
|
|
|
+static int sun8i_codec_analog_add_mixer(struct snd_soc_component *cmpnt,
|
|
|
+ const struct sun8i_codec_analog_quirks *quirks)
|
|
|
+{
|
|
|
+ struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
|
|
|
+ struct device *dev = cmpnt->dev;
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ if (!quirks->has_mic2 && !quirks->has_linein) {
|
|
|
+ /*
|
|
|
+ * Apply the special widget set which has uses a control
|
|
|
+ * without MIC2 and Line In, for SoCs without these.
|
|
|
+ * TODO: not all special cases are supported now, this case
|
|
|
+ * is present because it's the case of V3s.
|
|
|
+ */
|
|
|
+ ret = snd_soc_dapm_new_controls(dapm,
|
|
|
+ sun8i_v3s_codec_mixer_widgets,
|
|
|
+ ARRAY_SIZE(sun8i_v3s_codec_mixer_widgets));
|
|
|
+ if (ret) {
|
|
|
+ dev_err(dev, "Failed to add V3s Mixer DAPM widgets: %d\n", ret);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ /* Apply the generic mixer widget set. */
|
|
|
+ ret = snd_soc_dapm_new_controls(dapm,
|
|
|
+ sun8i_codec_mixer_widgets,
|
|
|
+ ARRAY_SIZE(sun8i_codec_mixer_widgets));
|
|
|
+ if (ret) {
|
|
|
+ dev_err(dev, "Failed to add Mixer DAPM widgets: %d\n", ret);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ ret = snd_soc_dapm_add_routes(dapm, sun8i_codec_mixer_routes,
|
|
|
+ ARRAY_SIZE(sun8i_codec_mixer_routes));
|
|
|
+ if (ret) {
|
|
|
+ dev_err(dev, "Failed to add Mixer DAPM routes: %d\n", ret);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)
|
|
|
{
|
|
|
struct device *dev = cmpnt->dev;
|
|
@@ -728,6 +824,9 @@ static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)
|
|
|
quirks = of_device_get_match_data(dev);
|
|
|
|
|
|
/* Add controls, widgets, and routes for individual features */
|
|
|
+ ret = sun8i_codec_analog_add_mixer(cmpnt, quirks);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
if (quirks->has_headphone) {
|
|
|
ret = sun8i_codec_add_headphone(cmpnt);
|