[alsa-devel] [PATCH v7 0/2] sun4i-codec: Add FM, Line and Mic inputs

newer
[alsa-devel] [PATCH v2] ASoC:...

older
[alsa-devel] [PATCH v1 1/4] ALSA:...

Danny Milosavljevic

19 Dec 2015 19 Dec '15

3:45 a.m.

Hi,

this is the seventh version of the patch set that adds inputs to sun4i-codec.

Changes compared to v6 are: - preparation for different A20, A10 controls is now in an extra patch. - all register definitions are now at the top - sun7i-specific things (A20-specific things) are now less grouped-together.

The patches are on top of the branch "sunxi-next" in git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git.

Regards, Danny --- Danny Milosavljevic (2): sun4i-codec: Add FM, Line and Mic inputs sun4i-codec: make it possible to use different codec_widgets for A10 and A20.

sound/soc/sunxi/sun4i-codec.c | 223 +++++++++++++++++++++++++++++++++++++---

Show replies by date

Danny Milosavljevic

19 Dec 19 Dec

3:57 a.m.

New subject: [alsa-devel] [linux-sunxi] [PATCH v7 1/2] sun4i-codec: Add FM, Line and Mic inputs

This is the first part:

sun4i-codec: make it possible to use different codec_widgets for A10 and A20.

Signed-off-by: Danny Milosavljevic dannym+a@scratchpost.org --- b/sound/soc/sunxi/sun4i-codec.c | 45 ++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index e6cc6a1..6628e6e 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -96,8 +96,9 @@ /* Other various ADC registers */ #define SUN4I_CODEC_DAC_TXCNT (0x30) #define SUN4I_CODEC_ADC_RXCNT (0x34) -#define SUN4I_CODEC_AC_SYS_VERI (0x38) -#define SUN4I_CODEC_AC_MIC_PHONE_CAL (0x3c) + +#define SUN7I_CODEC_AC_DAC_CAL (0x38) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL (0x3c)

struct sun4i_codec { struct device *dev; @@ -509,10 +510,13 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =

static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);

-static const struct snd_kcontrol_new sun4i_codec_widgets[] = { - SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL, - SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0, - sun4i_codec_pa_volume_scale), +#define SUN4I_COMMON_CODEC_WIDGETS \ + SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,\ + SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,\ + sun4i_codec_pa_volume_scale) + +static const struct snd_kcontrol_new sun4i_codec_widgets_a10[] = { + SUN4I_COMMON_CODEC_WIDGETS, };

static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = { @@ -627,9 +631,9 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { { "Mic1", NULL, "VMIC" }, };

-static struct snd_soc_codec_driver sun4i_codec_codec = { - .controls = sun4i_codec_widgets, - .num_controls = ARRAY_SIZE(sun4i_codec_widgets), +static struct snd_soc_codec_driver sun4i_codec_codec_a10 = { + .controls = sun4i_codec_widgets_a10, + .num_controls = ARRAY_SIZE(sun4i_codec_widgets_a10), .dapm_widgets = sun4i_codec_codec_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), .dapm_routes = sun4i_codec_codec_dapm_routes, @@ -680,7 +684,7 @@ static const struct regmap_config sun4i_codec_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = SUN4I_CODEC_AC_MIC_PHONE_CAL, + .max_register = SUN7I_CODEC_AC_MIC_PHONE_CAL, };

static const struct of_device_id sun4i_codec_of_match[] = { @@ -753,10 +757,24 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) return card; };

+static const struct snd_kcontrol_new sun7i_codec_widgets[] = { + SUN4I_COMMON_CODEC_WIDGETS, +}; + +static struct snd_soc_codec_driver sun7i_codec_codec = { + .controls = sun7i_codec_widgets, + .num_controls = ARRAY_SIZE(sun7i_codec_widgets), + .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 int sun4i_codec_probe(struct platform_device *pdev) { struct snd_soc_card *card; struct sun4i_codec *scodec; + struct snd_soc_codec_driver *codec; struct resource *res; void __iomem *base; int ret; @@ -819,7 +837,12 @@ static int sun4i_codec_probe(struct platform_device *pdev) scodec->capture_dma_data.maxburst = 4; scodec->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;

- ret = snd_soc_register_codec(&pdev->dev, &sun4i_codec_codec, + if (of_device_is_compatible(pdev->dev.of_node, + "allwinner,sun7i-a20-codec")) + codec = &sun7i_codec_codec; + else + codec = &sun4i_codec_codec_a10; + ret = snd_soc_register_codec(&pdev->dev, codec, &sun4i_codec_dai, 1); if (ret) { dev_err(&pdev->dev, "Failed to register our codec\n");

Danny Milosavljevic

3:59 a.m.

New subject: [alsa-devel] [linux-sunxi] [PATCH v7 2/2] sun4i-codec: Add FM, Line and Mic inputs

This is the second part, actually adding FM, Line and Mic inputs.

Signed-off-by: Danny Milosavljevic dannym+a@scratchpost.org --- b/sound/soc/sunxi/sun4i-codec.c | 182 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 178 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 6628e6e..9a9ad62 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -59,9 +59,20 @@ #define SUN4I_CODEC_DAC_ACTL_DACAENR (31) #define SUN4I_CODEC_DAC_ACTL_DACAENL (30) #define SUN4I_CODEC_DAC_ACTL_MIXEN (29) +#define SUN4I_CODEC_DAC_ACTL_LNG (26) +#define SUN4I_CODEC_DAC_ACTL_FMG (23) +#define SUN4I_CODEC_DAC_ACTL_MICG (20) +#define SUN4I_CODEC_DAC_ACTL_LLNS (19) +#define SUN4I_CODEC_DAC_ACTL_RLNS (18) +#define SUN4I_CODEC_DAC_ACTL_LFMS (17) +#define SUN4I_CODEC_DAC_ACTL_RFMS (16) #define SUN4I_CODEC_DAC_ACTL_LDACLMIXS (15) #define SUN4I_CODEC_DAC_ACTL_RDACRMIXS (14) #define SUN4I_CODEC_DAC_ACTL_LDACRMIXS (13) +#define SUN4I_CODEC_DAC_ACTL_MIC1LS (12) +#define SUN4I_CODEC_DAC_ACTL_MIC1RS (11) +#define SUN4I_CODEC_DAC_ACTL_MIC2LS (10) +#define SUN4I_CODEC_DAC_ACTL_MIC2RS (9) #define SUN4I_CODEC_DAC_ACTL_DACPAS (8) #define SUN4I_CODEC_DAC_ACTL_MIXPAS (7) #define SUN4I_CODEC_DAC_ACTL_PA_MUTE (6) @@ -87,8 +98,11 @@ #define SUN4I_CODEC_ADC_ACTL_PREG1EN (29) #define SUN4I_CODEC_ADC_ACTL_PREG2EN (28) #define SUN4I_CODEC_ADC_ACTL_VMICEN (27) -#define SUN4I_CODEC_ADC_ACTL_VADCG (20) +#define SUN4I_CODEC_ADC_ACTL_PREG1_A10 (25) +#define SUN4I_CODEC_ADC_ACTL_PREG2_A10 (23) +#define SUN4I_CODEC_ADC_ACTL_ADCG (20) #define SUN4I_CODEC_ADC_ACTL_ADCIS (17) +#define SUN4I_CODEC_ADC_ACTL_LNRDF (16) #define SUN4I_CODEC_ADC_ACTL_PA_EN (4) #define SUN4I_CODEC_ADC_ACTL_DDE (3) #define SUN4I_CODEC_ADC_DEBUG (0x2c) @@ -100,6 +114,16 @@ #define SUN7I_CODEC_AC_DAC_CAL (0x38) #define SUN7I_CODEC_AC_MIC_PHONE_CAL (0x3c)

+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1 (29) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2 (26) +/* note: no idea where the output pins for the following are. */ +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTG (5) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTEN (4) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS3 (3) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS2 (2) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS1 (1) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS0 (0) + struct sun4i_codec { struct device *dev; struct regmap *regmap; @@ -509,19 +533,102 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute = SUN4I_CODEC_DAC_ACTL_PA_MUTE, 1, 0);

static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1); +static DECLARE_TLV_DB_SCALE(sun4i_codec_linein_loopback_gain_scale, + -150, + 150, + 0); +static DECLARE_TLV_DB_SCALE(sun4i_codec_fmin_loopback_gain_scale, + -450, + 150, + 0); +static DECLARE_TLV_DB_SCALE(sun4i_codec_micin_loopback_gain_scale, + -450, + 150, + 0); +static DECLARE_TLV_DB_RANGE(sun4i_codec_micin_preamp_gain_scale_a10, + 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0), + 1, 7, TLV_DB_SCALE_ITEM(3500, 300, 0)); +static DECLARE_TLV_DB_SCALE(sun4i_codec_adc_gain_scale, -450, 150, 0); +/* Sources: + * A10 User Manual v1.5 20130820 + * A20 User Manual v1.4 20150510 + */ +static const char * const sun4i_codec_capture_source[] = { + "Line-In", + "FM", + "Mic1", + "Mic2", + "Mic1,Mic2", + "Mic1+Mic2", + "Output Mixer", + "Line-In,Mic1", +}; +static SOC_ENUM_SINGLE_DECL(sun4i_codec_enum_capture_source, + SUN4I_CODEC_ADC_ACTL, + SUN4I_CODEC_ADC_ACTL_ADCIS, + sun4i_codec_capture_source); + +static const struct snd_kcontrol_new sun4i_codec_capture_source_controls = + SOC_DAPM_ENUM("Route", sun4i_codec_enum_capture_source);

#define SUN4I_COMMON_CODEC_WIDGETS \ - SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,\ - SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,\ - sun4i_codec_pa_volume_scale) + SOC_SINGLE_TLV("Power Amplifier Playback Volume", SUN4I_CODEC_DAC_ACTL,\ + SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0, \ + sun4i_codec_pa_volume_scale), \ + /* Line-In, FM, Mic1, Mic2 */ \ + SOC_SINGLE_TLV("Line-In Playback Volume", \ + SUN4I_CODEC_DAC_ACTL, \ + SUN4I_CODEC_DAC_ACTL_LNG, \ + 1, \ + 0, \ + sun4i_codec_linein_loopback_gain_scale), \ + SOC_SINGLE_TLV("FM Playback Volume", \ + SUN4I_CODEC_DAC_ACTL, \ + SUN4I_CODEC_DAC_ACTL_FMG, \ + 3, \ + 0, \ + sun4i_codec_fmin_loopback_gain_scale), \ + SOC_SINGLE_TLV("Mic Playback Volume", \ + SUN4I_CODEC_DAC_ACTL, \ + SUN4I_CODEC_DAC_ACTL_MICG, \ + 7, \ + 0, \ + sun4i_codec_micin_loopback_gain_scale), \ + /* ADC */ \ + SOC_SINGLE_TLV("Capture Volume", \ + SUN4I_CODEC_ADC_ACTL, \ + SUN4I_CODEC_ADC_ACTL_ADCG, \ + 4, \ + 0, \ + sun4i_codec_adc_gain_scale)

static const struct snd_kcontrol_new sun4i_codec_widgets_a10[] = { SUN4I_COMMON_CODEC_WIDGETS, + SOC_SINGLE_TLV("Mic1 Capture Volume", + SUN4I_CODEC_ADC_ACTL, + SUN4I_CODEC_ADC_ACTL_PREG1_A10, + 3, + 0, + sun4i_codec_micin_preamp_gain_scale_a10), + SOC_SINGLE_TLV("Mic2 Capture Volume", + SUN4I_CODEC_ADC_ACTL, + SUN4I_CODEC_ADC_ACTL_PREG2_A10, + 3, + 0, + sun4i_codec_micin_preamp_gain_scale_a10), };

static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = { SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_LDACLMIXS, 1, 0), + SOC_DAPM_SINGLE("Left Line-In Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_LLNS, 1, 0), + SOC_DAPM_SINGLE("Left FM Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_LFMS, 1, 0), + SOC_DAPM_SINGLE("Mic1 Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_MIC1LS, 1, 0), + SOC_DAPM_SINGLE("Mic2 Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_MIC2LS, 1, 0), };

static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls[] = { @@ -529,6 +636,14 @@ static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls[] = { SUN4I_CODEC_DAC_ACTL_RDACRMIXS, 1, 0), SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0), + SOC_DAPM_SINGLE("Right Line-In Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_RLNS, 1, 0), + SOC_DAPM_SINGLE("Right FM Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_RFMS, 1, 0), + SOC_DAPM_SINGLE("Mic1 Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_MIC1RS, 1, 0), + SOC_DAPM_SINGLE("Mic2 Playback Switch", SUN4I_CODEC_DAC_ACTL, + SUN4I_CODEC_DAC_ACTL_MIC2RS, 1, 0), };

static const struct snd_kcontrol_new sun4i_codec_pa_mixer_controls[] = { @@ -561,6 +676,10 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = { SND_SOC_DAPM_DAC("Right DAC", "Codec Playback", SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_DACAENR, 0),

+ /* MUX */ + SND_SOC_DAPM_MUX("Capture Source", SND_SOC_NOPM, 0, 0, + &sun4i_codec_capture_source_controls), + /* Mixers */ SND_SOC_DAPM_MIXER("Left Mixer", SND_SOC_NOPM, 0, 0, sun4i_codec_left_mixer_controls, @@ -580,6 +699,8 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = { /* Mic Pre-Amplifiers */ SND_SOC_DAPM_PGA("MIC1 Pre-Amplifier", SUN4I_CODEC_ADC_ACTL, SUN4I_CODEC_ADC_ACTL_PREG1EN, 0, NULL, 0), + SND_SOC_DAPM_PGA("MIC2 Pre-Amplifier", SUN4I_CODEC_ADC_ACTL, + SUN4I_CODEC_ADC_ACTL_PREG2EN, 0, NULL, 0),

/* Power Amplifier */ SND_SOC_DAPM_MIXER("Power Amplifier", SUN4I_CODEC_ADC_ACTL, @@ -590,9 +711,15 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = { &sun4i_codec_pa_mute),

SND_SOC_DAPM_INPUT("Mic1"), + SND_SOC_DAPM_INPUT("Mic2"),

SND_SOC_DAPM_OUTPUT("HP Right"), SND_SOC_DAPM_OUTPUT("HP Left"), + + SND_SOC_DAPM_INPUT("Line-In Right"), + SND_SOC_DAPM_INPUT("Line-In Left"), + SND_SOC_DAPM_INPUT("FM Right"), + SND_SOC_DAPM_INPUT("FM Left"), };

static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { @@ -629,6 +756,36 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { { "Right ADC", NULL, "MIC1 Pre-Amplifier" }, { "MIC1 Pre-Amplifier", NULL, "Mic1"}, { "Mic1", NULL, "VMIC" }, + { "Right Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" }, + { "Left Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" }, + + /* Mic2 Routes */ + { "Left ADC", NULL, "MIC2 Pre-Amplifier" }, + { "Right ADC", NULL, "MIC2 Pre-Amplifier" }, + { "MIC2 Pre-Amplifier", NULL, "Mic2"}, + { "Mic2", NULL, "VMIC" }, + { "Right Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" }, + { "Left Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" }, + + /* Line-In, FM Routes */ + { "Right Mixer", "Right Line-In Playback Switch", "Line-In Right" }, + { "Left Mixer", "Left Line-In Playback Switch", "Line-In Left" }, + { "Right Mixer", "Right FM Playback Switch", "FM Right" }, + { "Left Mixer", "Left FM Playback Switch", "FM Left" }, + + /* ADC Capturing Sources */ + {"Capture Source", "Line-In", "Line-In"}, + {"Capture Source", "FM", "FM"}, + {"Capture Source", "Mic1", "MIC1 Pre-Amplifier"}, + {"Capture Source", "Mic2", "MIC2 Pre-Amplifier"}, + {"Capture Source", "Mic1,Mic2", "MIC1 Pre-Amplifier"}, + {"Capture Source", "Mic1,Mic2", "MIC2 Pre-Amplifier"}, + {"Capture Source", "Mic1+Mic2", "MIC1 Pre-Amplifier"}, + {"Capture Source", "Mic1+Mic2", "MIC2 Pre-Amplifier"}, + {"Capture Source", "Output Mixer", "Left Mixer"}, + {"Capture Source", "Output Mixer", "Right Mixer"}, + {"Capture Source", "Line-In,Mic1", "Line-In"}, + {"Capture Source", "Line-In,Mic1", "MIC1 Pre-Amplifier"}, };

static struct snd_soc_codec_driver sun4i_codec_codec_a10 = { @@ -757,8 +914,25 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) return card; };

+static DECLARE_TLV_DB_RANGE(sun7i_codec_micin_preamp_gain_scale, + 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0), + 1, 7, TLV_DB_SCALE_ITEM(2400, 300, 0) +); + static const struct snd_kcontrol_new sun7i_codec_widgets[] = { SUN4I_COMMON_CODEC_WIDGETS, + SOC_SINGLE_TLV("Mic1 Capture Volume", + SUN7I_CODEC_AC_MIC_PHONE_CAL, + SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1, + 7, + 0, + sun7i_codec_micin_preamp_gain_scale), + SOC_SINGLE_TLV("Mic2 Capture Volume", + SUN7I_CODEC_AC_MIC_PHONE_CAL, + SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2, + 7, + 0, + sun7i_codec_micin_preamp_gain_scale), };

static struct snd_soc_codec_driver sun7i_codec_codec = {

Yassin Jaffer

21 Dec 21 Dec

2:06 a.m.

New subject: [alsa-devel] [linux-sunxi] [PATCH v7 2/2] sun4i-codec: Add FM, Line and Mic inputs

Hi Danny

+ {"Capture Source", "Line-In", "Line-In"}, + {"Capture Source", "FM", "FM"}, The ADC Capturing Sources routing doesn't look right. There is no FM/Line-In source widgets for this routing n your patch. + {"Capture Source", "Line-In,Mic1", "Line-In"}, + {"Capture Source", "Line-In,Mic1", "MIC1 Pre-Amplifier"}, and her too.

I'm not familiar with the CODEC ADC mux but you may want to use {"Capture Source", "Line-In", "Line-In Right"}, {"Capture Source", "Line-In", "Line-In Left"}, {"Capture Source", "FM", "FM Right"}, {"Capture Source", "FM", "FM Left"},

Regards

On Sat, Dec 19, 2015 at 1:59 PM, Danny Milosavljevic <dannym@scratchpost.org

...

wrote:

...

This is the second part, actually adding FM, Line and Mic inputs.

Signed-off-by: Danny Milosavljevic dannym+a@scratchpost.org

b/sound/soc/sunxi/sun4i-codec.c | 182 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 178 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 6628e6e..9a9ad62 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -59,9 +59,20 @@ #define SUN4I_CODEC_DAC_ACTL_DACAENR (31) #define SUN4I_CODEC_DAC_ACTL_DACAENL (30) #define SUN4I_CODEC_DAC_ACTL_MIXEN (29) +#define SUN4I_CODEC_DAC_ACTL_LNG (26) +#define SUN4I_CODEC_DAC_ACTL_FMG (23) +#define SUN4I_CODEC_DAC_ACTL_MICG (20) +#define SUN4I_CODEC_DAC_ACTL_LLNS (19) +#define SUN4I_CODEC_DAC_ACTL_RLNS (18) +#define SUN4I_CODEC_DAC_ACTL_LFMS (17) +#define SUN4I_CODEC_DAC_ACTL_RFMS (16) #define SUN4I_CODEC_DAC_ACTL_LDACLMIXS (15) #define SUN4I_CODEC_DAC_ACTL_RDACRMIXS (14) #define SUN4I_CODEC_DAC_ACTL_LDACRMIXS (13) +#define SUN4I_CODEC_DAC_ACTL_MIC1LS (12) +#define SUN4I_CODEC_DAC_ACTL_MIC1RS (11) +#define SUN4I_CODEC_DAC_ACTL_MIC2LS (10) +#define SUN4I_CODEC_DAC_ACTL_MIC2RS (9) #define SUN4I_CODEC_DAC_ACTL_DACPAS (8) #define SUN4I_CODEC_DAC_ACTL_MIXPAS (7) #define SUN4I_CODEC_DAC_ACTL_PA_MUTE (6) @@ -87,8 +98,11 @@ #define SUN4I_CODEC_ADC_ACTL_PREG1EN (29) #define SUN4I_CODEC_ADC_ACTL_PREG2EN (28) #define SUN4I_CODEC_ADC_ACTL_VMICEN (27) -#define SUN4I_CODEC_ADC_ACTL_VADCG (20) +#define SUN4I_CODEC_ADC_ACTL_PREG1_A10 (25) +#define SUN4I_CODEC_ADC_ACTL_PREG2_A10 (23) +#define SUN4I_CODEC_ADC_ACTL_ADCG (20) #define SUN4I_CODEC_ADC_ACTL_ADCIS (17) +#define SUN4I_CODEC_ADC_ACTL_LNRDF (16) #define SUN4I_CODEC_ADC_ACTL_PA_EN (4) #define SUN4I_CODEC_ADC_ACTL_DDE (3) #define SUN4I_CODEC_ADC_DEBUG (0x2c) @@ -100,6 +114,16 @@ #define SUN7I_CODEC_AC_DAC_CAL (0x38) #define SUN7I_CODEC_AC_MIC_PHONE_CAL (0x3c)

+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1 (29) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2 (26) +/* note: no idea where the output pins for the following are. */ +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTG (5) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTEN (4) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS3 (3) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS2 (2) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS1 (1) +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS0 (0)

struct sun4i_codec { struct device *dev; struct regmap *regmap; @@ -509,19 +533,102 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute = SUN4I_CODEC_DAC_ACTL_PA_MUTE, 1, 0);

static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1); +static DECLARE_TLV_DB_SCALE(sun4i_codec_linein_loopback_gain_scale,
                      -150,
                      150,
                      0);
+static DECLARE_TLV_DB_SCALE(sun4i_codec_fmin_loopback_gain_scale,
                      -450,
                      150,
                      0);
+static DECLARE_TLV_DB_SCALE(sun4i_codec_micin_loopback_gain_scale,
                      -450,
                      150,
                      0);
+static DECLARE_TLV_DB_RANGE(sun4i_codec_micin_preamp_gain_scale_a10,
                      0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
                      1, 7, TLV_DB_SCALE_ITEM(3500, 300, 0));
+static DECLARE_TLV_DB_SCALE(sun4i_codec_adc_gain_scale, -450, 150, 0); +/* Sources:

A10 User Manual v1.5 20130820

A20 User Manual v1.4 20150510

*/

+static const char * const sun4i_codec_capture_source[] = {
  "Line-In",
  "FM",
  "Mic1",
  "Mic2",
  "Mic1,Mic2",
  "Mic1+Mic2",
  "Output Mixer",
  "Line-In,Mic1",
+}; +static SOC_ENUM_SINGLE_DECL(sun4i_codec_enum_capture_source,
                      SUN4I_CODEC_ADC_ACTL,
                      SUN4I_CODEC_ADC_ACTL_ADCIS,
                      sun4i_codec_capture_source);
+static const struct snd_kcontrol_new sun4i_codec_capture_source_controls =
  SOC_DAPM_ENUM("Route", sun4i_codec_enum_capture_source);
#define SUN4I_COMMON_CODEC_WIDGETS \
  SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,\
                 SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,\
                 sun4i_codec_pa_volume_scale)
  SOC_SINGLE_TLV("Power Amplifier Playback Volume",
SUN4I_CODEC_DAC_ACTL,\
                 SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0, \
                 sun4i_codec_pa_volume_scale), \
  /* Line-In, FM, Mic1, Mic2 */ \
  SOC_SINGLE_TLV("Line-In Playback Volume", \
                 SUN4I_CODEC_DAC_ACTL, \
                 SUN4I_CODEC_DAC_ACTL_LNG, \
                 1, \
                 0, \
                 sun4i_codec_linein_loopback_gain_scale), \
  SOC_SINGLE_TLV("FM Playback Volume", \
                 SUN4I_CODEC_DAC_ACTL, \
                 SUN4I_CODEC_DAC_ACTL_FMG, \
                 3, \
                 0, \
                 sun4i_codec_fmin_loopback_gain_scale), \
  SOC_SINGLE_TLV("Mic Playback Volume", \
                 SUN4I_CODEC_DAC_ACTL, \
                 SUN4I_CODEC_DAC_ACTL_MICG, \
                 7, \
                 0, \
                 sun4i_codec_micin_loopback_gain_scale), \
  /* ADC */ \
  SOC_SINGLE_TLV("Capture Volume", \
                 SUN4I_CODEC_ADC_ACTL, \
                 SUN4I_CODEC_ADC_ACTL_ADCG, \
                 4, \
                 0, \
                 sun4i_codec_adc_gain_scale)
static const struct snd_kcontrol_new sun4i_codec_widgets_a10[] = { SUN4I_COMMON_CODEC_WIDGETS,
  SOC_SINGLE_TLV("Mic1 Capture Volume",
                 SUN4I_CODEC_ADC_ACTL,
                 SUN4I_CODEC_ADC_ACTL_PREG1_A10,
                 3,
                 0,
                 sun4i_codec_micin_preamp_gain_scale_a10),
  SOC_SINGLE_TLV("Mic2 Capture Volume",
                 SUN4I_CODEC_ADC_ACTL,
                 SUN4I_CODEC_ADC_ACTL_PREG2_A10,
                 3,
                 0,
                 sun4i_codec_micin_preamp_gain_scale_a10),
};

static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = { SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_LDACLMIXS, 1, 0),
  SOC_DAPM_SINGLE("Left Line-In Playback Switch",
SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_LLNS, 1, 0),
  SOC_DAPM_SINGLE("Left FM Playback Switch", SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_LFMS, 1, 0),
  SOC_DAPM_SINGLE("Mic1 Playback Switch", SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_MIC1LS, 1, 0),
  SOC_DAPM_SINGLE("Mic2 Playback Switch", SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_MIC2LS, 1, 0),
};

static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls[] = { @@ -529,6 +636,14 @@ static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls[] = { SUN4I_CODEC_DAC_ACTL_RDACRMIXS, 1, 0), SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0),
  SOC_DAPM_SINGLE("Right Line-In Playback Switch",
SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_RLNS, 1, 0),
  SOC_DAPM_SINGLE("Right FM Playback Switch", SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_RFMS, 1, 0),
  SOC_DAPM_SINGLE("Mic1 Playback Switch", SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_MIC1RS, 1, 0),
  SOC_DAPM_SINGLE("Mic2 Playback Switch", SUN4I_CODEC_DAC_ACTL,
                  SUN4I_CODEC_DAC_ACTL_MIC2RS, 1, 0),
};

static const struct snd_kcontrol_new sun4i_codec_pa_mixer_controls[] = { @@ -561,6 +676,10 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = { SND_SOC_DAPM_DAC("Right DAC", "Codec Playback", SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_DACAENR, 0),
  /* MUX */
  SND_SOC_DAPM_MUX("Capture Source", SND_SOC_NOPM, 0, 0,
                   &sun4i_codec_capture_source_controls),
  /* Mixers */
  SND_SOC_DAPM_MIXER("Left Mixer", SND_SOC_NOPM, 0, 0,
                     sun4i_codec_left_mixer_controls,
@@ -580,6 +699,8 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = { /* Mic Pre-Amplifiers */ SND_SOC_DAPM_PGA("MIC1 Pre-Amplifier", SUN4I_CODEC_ADC_ACTL, SUN4I_CODEC_ADC_ACTL_PREG1EN, 0, NULL, 0),
  SND_SOC_DAPM_PGA("MIC2 Pre-Amplifier", SUN4I_CODEC_ADC_ACTL,
                   SUN4I_CODEC_ADC_ACTL_PREG2EN, 0, NULL, 0),

  /* Power Amplifier */
  SND_SOC_DAPM_MIXER("Power Amplifier", SUN4I_CODEC_ADC_ACTL,
@@ -590,9 +711,15 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = { &sun4i_codec_pa_mute),
    SND_SOC_DAPM_INPUT("Mic1"),
  SND_SOC_DAPM_INPUT("Mic2"),

  SND_SOC_DAPM_OUTPUT("HP Right"),
  SND_SOC_DAPM_OUTPUT("HP Left"),
  SND_SOC_DAPM_INPUT("Line-In Right"),
  SND_SOC_DAPM_INPUT("Line-In Left"),
  SND_SOC_DAPM_INPUT("FM Right"),
  SND_SOC_DAPM_INPUT("FM Left"),
};

static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { @@ -629,6 +756,36 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { { "Right ADC", NULL, "MIC1 Pre-Amplifier" }, { "MIC1 Pre-Amplifier", NULL, "Mic1"}, { "Mic1", NULL, "VMIC" },
  { "Right Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
  { "Left Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
  /* Mic2 Routes */
  { "Left ADC", NULL, "MIC2 Pre-Amplifier" },
  { "Right ADC", NULL, "MIC2 Pre-Amplifier" },
  { "MIC2 Pre-Amplifier", NULL, "Mic2"},
  { "Mic2", NULL, "VMIC" },
  { "Right Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
  { "Left Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
  /* Line-In, FM Routes */
  { "Right Mixer", "Right Line-In Playback Switch", "Line-In Right"
},
  { "Left Mixer", "Left Line-In Playback Switch", "Line-In Left" },
  { "Right Mixer", "Right FM Playback Switch", "FM Right" },
  { "Left Mixer", "Left FM Playback Switch", "FM Left" },
  /* ADC Capturing Sources */
  {"Capture Source", "Line-In", "Line-In"},
  {"Capture Source", "FM", "FM"},
  {"Capture Source", "Mic1", "MIC1 Pre-Amplifier"},
  {"Capture Source", "Mic2", "MIC2 Pre-Amplifier"},
  {"Capture Source", "Mic1,Mic2", "MIC1 Pre-Amplifier"},
  {"Capture Source", "Mic1,Mic2", "MIC2 Pre-Amplifier"},
  {"Capture Source", "Mic1+Mic2", "MIC1 Pre-Amplifier"},
  {"Capture Source", "Mic1+Mic2", "MIC2 Pre-Amplifier"},
  {"Capture Source", "Output Mixer", "Left Mixer"},
  {"Capture Source", "Output Mixer", "Right Mixer"},
  {"Capture Source", "Line-In,Mic1", "Line-In"},
  {"Capture Source", "Line-In,Mic1", "MIC1 Pre-Amplifier"},
};

static struct snd_soc_codec_driver sun4i_codec_codec_a10 = { @@ -757,8 +914,25 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) return card; };

+static DECLARE_TLV_DB_RANGE(sun7i_codec_micin_preamp_gain_scale,
  0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
  1, 7, TLV_DB_SCALE_ITEM(2400, 300, 0)
+);

static const struct snd_kcontrol_new sun7i_codec_widgets[] = { SUN4I_COMMON_CODEC_WIDGETS,
  SOC_SINGLE_TLV("Mic1 Capture Volume",
                 SUN7I_CODEC_AC_MIC_PHONE_CAL,
                 SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1,
                 7,
                 0,
                 sun7i_codec_micin_preamp_gain_scale),
  SOC_SINGLE_TLV("Mic2 Capture Volume",
                 SUN7I_CODEC_AC_MIC_PHONE_CAL,
                 SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2,
                 7,
                 0,
                 sun7i_codec_micin_preamp_gain_scale),
};

static struct snd_soc_codec_driver sun7i_codec_codec = {

-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.

3251

Age (days ago)

3253

Last active (days ago)

List overview

Download

3 comments

2 participants

tags (0)

participants (2)

Danny Milosavljevic
Yassin Jaffer