* [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i @ 2016-09-05 19:24 Danny Milosavljevic 2016-09-05 19:24 ` Danny Milosavljevic 2016-09-06 0:58 ` Mark Brown 0 siblings, 2 replies; 6+ messages in thread From: Danny Milosavljevic @ 2016-09-05 19:24 UTC (permalink / raw) To: Maxime Ripard, Mark Brown, Chen-Yu Tsai, linux-kernel, linux-arm-kernel, alsa-devel, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, linux-sunxi Cc: Danny Milosavljevic Here's just the part that allows distinguishing sun4i from sun7i. Since I'm waiting for Chen-Yu's DAPM_DOUBLE patch series I figured I'd post the preliminaries in the mean time which will not change and can be applied independently without problems. Danny Milosavljevic (1): ASoC: sun4i-codec: Distinguish sun4i from sun7i sound/soc/sunxi/sun4i-codec.c | 66 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 12 deletions(-) -- 2.1.4 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i 2016-09-05 19:24 [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i Danny Milosavljevic @ 2016-09-05 19:24 ` Danny Milosavljevic 2016-09-06 3:29 ` Chen-Yu Tsai ` (2 more replies) 2016-09-06 0:58 ` Mark Brown 1 sibling, 3 replies; 6+ messages in thread From: Danny Milosavljevic @ 2016-09-05 19:24 UTC (permalink / raw) To: Maxime Ripard, Mark Brown, Chen-Yu Tsai, linux-kernel, linux-arm-kernel, alsa-devel, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, linux-sunxi Cc: Danny Milosavljevic ASoC: sun4i-codec: Distinguish sun4i from sun7i Introduce mechanism to detect sun7i and provide a different regmap, codec and different controls for it - different compared to sun4i Allwinner A10. The controls will be extended in a forthcoming patch - it is necessary to distinguish between sun4i and sun7i controls because the mic gains are in different registers. Renamed SUN4I_CODEC_AC_SYS_VERI to SUN7I_CODEC_AC_DAC_CAL and renamed SUN4I_CODEC_AC_MIC_PHONE_CAL to SUN7I_CODEC_AC_MIC_PHONE_CAL because these are actually not present on Allwinner A10. Handle quirks by regmap config and codec and select the correct quirks automatically. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org> --- sound/soc/sunxi/sun4i-codec.c | 66 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 0e19c50..8531c93 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -96,8 +96,8 @@ /* 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 +509,17 @@ 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_CONTROLS \ + 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_controls[] = { + SUN4I_COMMON_CODEC_CONTROLS, +}; + +static const struct snd_kcontrol_new sun7i_codec_controls[] = { + SUN4I_COMMON_CODEC_CONTROLS, }; static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = { @@ -629,8 +636,19 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { static struct snd_soc_codec_driver sun4i_codec_codec = { .component_driver = { - .controls = sun4i_codec_widgets, - .num_controls = ARRAY_SIZE(sun4i_codec_widgets), + .controls = sun4i_codec_controls, + .num_controls = ARRAY_SIZE(sun4i_codec_controls), + .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 struct snd_soc_codec_driver sun7i_codec_codec = { + .component_driver = { + .controls = sun7i_codec_controls, + .num_controls = ARRAY_SIZE(sun7i_codec_controls), .dapm_widgets = sun4i_codec_codec_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), .dapm_routes = sun4i_codec_codec_dapm_routes, @@ -682,12 +700,34 @@ 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 = SUN4I_CODEC_ADC_RXCNT, +}; + +static const struct regmap_config sun7i_codec_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = SUN7I_CODEC_AC_MIC_PHONE_CAL, +}; + +struct sun4i_quirks { + const struct snd_soc_codec_driver *codec; + const struct regmap_config *regmap_config; +}; + +static const struct sun4i_quirks sun4i_quirks = { + .codec = &sun4i_codec_codec, + .regmap_config = &sun4i_codec_regmap_config, +}; + +static const struct sun4i_quirks sun7i_quirks = { + .codec = &sun7i_codec_codec, + .regmap_config = &sun7i_codec_regmap_config, }; static const struct of_device_id sun4i_codec_of_match[] = { - { .compatible = "allwinner,sun4i-a10-codec" }, - { .compatible = "allwinner,sun7i-a20-codec" }, + { .compatible = "allwinner,sun4i-a10-codec", .data = &sun4i_quirks }, + { .compatible = "allwinner,sun7i-a20-codec", .data = &sun7i_quirks }, {} }; MODULE_DEVICE_TABLE(of, sun4i_codec_of_match); @@ -760,6 +800,7 @@ static int sun4i_codec_probe(struct platform_device *pdev) { struct snd_soc_card *card; struct sun4i_codec *scodec; + struct sun4i_quirks *quirks; struct resource *res; void __iomem *base; int ret; @@ -777,8 +818,9 @@ static int sun4i_codec_probe(struct platform_device *pdev) return PTR_ERR(base); } + quirks = of_device_get_match_data(&pdev->dev); scodec->regmap = devm_regmap_init_mmio(&pdev->dev, base, - &sun4i_codec_regmap_config); + quirks->regmap_config); if (IS_ERR(scodec->regmap)) { dev_err(&pdev->dev, "Failed to create our regmap\n"); return PTR_ERR(scodec->regmap); -- 2.1.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i 2016-09-05 19:24 ` Danny Milosavljevic @ 2016-09-06 3:29 ` Chen-Yu Tsai 2016-09-06 6:39 ` Maxime Ripard 2016-09-06 10:28 ` Mark Brown 2 siblings, 0 replies; 6+ messages in thread From: Chen-Yu Tsai @ 2016-09-06 3:29 UTC (permalink / raw) To: Danny Milosavljevic Cc: Maxime Ripard, Mark Brown, Chen-Yu Tsai, linux-kernel, linux-arm-kernel, Linux-ALSA, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, linux-sunxi On Tue, Sep 6, 2016 at 3:24 AM, Danny Milosavljevic <dannym@scratchpost.org> wrote: > ASoC: sun4i-codec: Distinguish sun4i from sun7i > > Introduce mechanism to detect sun7i and provide a different regmap, codec > and different controls for it - different compared to sun4i Allwinner A10. > > The controls will be extended in a forthcoming patch - it is necessary to > distinguish between sun4i and sun7i controls because the mic gains are in > different registers. > > Renamed SUN4I_CODEC_AC_SYS_VERI to SUN7I_CODEC_AC_DAC_CAL and renamed > SUN4I_CODEC_AC_MIC_PHONE_CAL to SUN7I_CODEC_AC_MIC_PHONE_CAL because these > are actually not present on Allwinner A10. > > Handle quirks by regmap config and codec and select the correct quirks > automatically. > > Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i 2016-09-05 19:24 ` Danny Milosavljevic 2016-09-06 3:29 ` Chen-Yu Tsai @ 2016-09-06 6:39 ` Maxime Ripard 2016-09-06 10:28 ` Mark Brown 2 siblings, 0 replies; 6+ messages in thread From: Maxime Ripard @ 2016-09-06 6:39 UTC (permalink / raw) To: Danny Milosavljevic Cc: Mark Brown, Chen-Yu Tsai, linux-kernel, linux-arm-kernel, alsa-devel, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, linux-sunxi [-- Attachment #1: Type: text/plain, Size: 5525 bytes --] Hi, On Mon, Sep 05, 2016 at 09:24:04PM +0200, Danny Milosavljevic wrote: > ASoC: sun4i-codec: Distinguish sun4i from sun7i > > Introduce mechanism to detect sun7i and provide a different regmap, codec > and different controls for it - different compared to sun4i Allwinner A10. > > The controls will be extended in a forthcoming patch - it is necessary to > distinguish between sun4i and sun7i controls because the mic gains are in > different registers. > > Renamed SUN4I_CODEC_AC_SYS_VERI to SUN7I_CODEC_AC_DAC_CAL and renamed > SUN4I_CODEC_AC_MIC_PHONE_CAL to SUN7I_CODEC_AC_MIC_PHONE_CAL because these > are actually not present on Allwinner A10. > > Handle quirks by regmap config and codec and select the correct quirks > automatically. > > Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org> > --- > sound/soc/sunxi/sun4i-codec.c | 66 +++++++++++++++++++++++++++++++++++-------- > 1 file changed, 54 insertions(+), 12 deletions(-) > > diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c > index 0e19c50..8531c93 100644 > --- a/sound/soc/sunxi/sun4i-codec.c > +++ b/sound/soc/sunxi/sun4i-codec.c > @@ -96,8 +96,8 @@ > /* 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 +509,17 @@ 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_CONTROLS \ > + 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_controls[] = { > + SUN4I_COMMON_CODEC_CONTROLS, > +}; > + > +static const struct snd_kcontrol_new sun7i_codec_controls[] = { > + SUN4I_COMMON_CODEC_CONTROLS, > }; > > static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = { > @@ -629,8 +636,19 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { > > static struct snd_soc_codec_driver sun4i_codec_codec = { > .component_driver = { > - .controls = sun4i_codec_widgets, > - .num_controls = ARRAY_SIZE(sun4i_codec_widgets), > + .controls = sun4i_codec_controls, > + .num_controls = ARRAY_SIZE(sun4i_codec_controls), > + .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 struct snd_soc_codec_driver sun7i_codec_codec = { > + .component_driver = { > + .controls = sun7i_codec_controls, > + .num_controls = ARRAY_SIZE(sun7i_codec_controls), > .dapm_widgets = sun4i_codec_codec_dapm_widgets, > .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), > .dapm_routes = sun4i_codec_codec_dapm_routes, > @@ -682,12 +700,34 @@ 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 = SUN4I_CODEC_ADC_RXCNT, > +}; > + > +static const struct regmap_config sun7i_codec_regmap_config = { > + .reg_bits = 32, > + .reg_stride = 4, > + .val_bits = 32, > + .max_register = SUN7I_CODEC_AC_MIC_PHONE_CAL, > +}; > + > +struct sun4i_quirks { > + const struct snd_soc_codec_driver *codec; > + const struct regmap_config *regmap_config; > +}; > + > +static const struct sun4i_quirks sun4i_quirks = { > + .codec = &sun4i_codec_codec, > + .regmap_config = &sun4i_codec_regmap_config, > +}; > + > +static const struct sun4i_quirks sun7i_quirks = { > + .codec = &sun7i_codec_codec, > + .regmap_config = &sun7i_codec_regmap_config, > }; > > static const struct of_device_id sun4i_codec_of_match[] = { > - { .compatible = "allwinner,sun4i-a10-codec" }, > - { .compatible = "allwinner,sun7i-a20-codec" }, > + { .compatible = "allwinner,sun4i-a10-codec", .data = &sun4i_quirks }, > + { .compatible = "allwinner,sun7i-a20-codec", .data = &sun7i_quirks }, > {} > }; > MODULE_DEVICE_TABLE(of, sun4i_codec_of_match); > @@ -760,6 +800,7 @@ static int sun4i_codec_probe(struct platform_device *pdev) > { > struct snd_soc_card *card; > struct sun4i_codec *scodec; > + struct sun4i_quirks *quirks; > struct resource *res; > void __iomem *base; > int ret; > @@ -777,8 +818,9 @@ static int sun4i_codec_probe(struct platform_device *pdev) > return PTR_ERR(base); > } > > + quirks = of_device_get_match_data(&pdev->dev); > scodec->regmap = devm_regmap_init_mmio(&pdev->dev, base, > - &sun4i_codec_regmap_config); > + quirks->regmap_config); I think you also wanted to pass quirks->codec to snd_soc_register_codec? Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i 2016-09-05 19:24 ` Danny Milosavljevic 2016-09-06 3:29 ` Chen-Yu Tsai 2016-09-06 6:39 ` Maxime Ripard @ 2016-09-06 10:28 ` Mark Brown 2 siblings, 0 replies; 6+ messages in thread From: Mark Brown @ 2016-09-06 10:28 UTC (permalink / raw) To: Danny Milosavljevic Cc: Maxime Ripard, Chen-Yu Tsai, linux-kernel, linux-arm-kernel, alsa-devel, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, linux-sunxi [-- Attachment #1: Type: text/plain, Size: 889 bytes --] On Mon, Sep 05, 2016 at 09:24:04PM +0200, Danny Milosavljevic wrote: > -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_CONTROLS \ > + 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_controls[] = { > + SUN4I_COMMON_CODEC_CONTROLS, > +}; No, please don't do this - macros like this just make the code harder to work with. Do what everything else that handles multiple devices in one driver does and have several different tables of controls, registering the ones that are appropriate for the current device at runtime. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 455 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i 2016-09-05 19:24 [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i Danny Milosavljevic 2016-09-05 19:24 ` Danny Milosavljevic @ 2016-09-06 0:58 ` Mark Brown 1 sibling, 0 replies; 6+ messages in thread From: Mark Brown @ 2016-09-06 0:58 UTC (permalink / raw) To: Danny Milosavljevic Cc: Maxime Ripard, Chen-Yu Tsai, linux-kernel, linux-arm-kernel, alsa-devel, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, linux-sunxi [-- Attachment #1: Type: text/plain, Size: 636 bytes --] On Mon, Sep 05, 2016 at 09:24:03PM +0200, Danny Milosavljevic wrote: > Here's just the part that allows distinguishing sun4i from sun7i. > > Since I'm waiting for Chen-Yu's DAPM_DOUBLE patch series I figured I'd post the preliminaries in the mean time which will not change and can be applied independently without problems. Please don't send cover letters for single patches, if there is anything that needs saying put it in the changelog of the patch or after the --- if it's administrative stuff. This reduces mail volume and ensures that any important information is recorded in the changelog rather than being lost. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 455 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-06 10:33 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-09-05 19:24 [PATCH] ASoC: sun4i-codec: Distinguish sun4i from sun7i Danny Milosavljevic 2016-09-05 19:24 ` Danny Milosavljevic 2016-09-06 3:29 ` Chen-Yu Tsai 2016-09-06 6:39 ` Maxime Ripard 2016-09-06 10:28 ` Mark Brown 2016-09-06 0:58 ` Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).