From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932356AbcILIEv (ORCPT ); Mon, 12 Sep 2016 04:04:51 -0400 Received: from down.free-electrons.com ([37.187.137.238]:46491 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932094AbcILIEs (ORCPT ); Mon, 12 Sep 2016 04:04:48 -0400 Date: Mon, 12 Sep 2016 10:04:18 +0200 From: Maxime Ripard To: Danny Milosavljevic Cc: Mark Brown , Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, Jaroslav Kysela , Takashi Iwai , Liam Girdwood , linux-sunxi@googlegroups.com Subject: Re: [PATCH v2] ASoC: sun4i-codec: Distinguish sun4i from sun7i Message-ID: <20160912080418.GE9449@lukather> References: <20160908195759.18485-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="hwvH6HDNit2nSK4j" Content-Disposition: inline In-Reply-To: <20160908195759.18485-1-dannym@scratchpost.org> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --hwvH6HDNit2nSK4j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Thu, Sep 08, 2016 at 09:57:59PM +0200, Danny Milosavljevic wrote: > Introduce mechanism to detect sun7i and provide a different regmap > and different controls for it - different compared to sun4i Allwinner A10. >=20 > 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. >=20 > 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. >=20 > Handle quirks by regmap config and codec and select the correct quirks > automatically. You're doing several different things in that patch: >=20 > Signed-off-by: Danny Milosavljevic > --- > sound/soc/sunxi/sun4i-codec.c | 78 ++++++++++++++++++++++++++++++++-----= ------ > 1 file changed, 58 insertions(+), 20 deletions(-) >=20 > diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c > index 0e19c50..239e330 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) 1) Renaming some registers > struct sun4i_codec { > struct device *dev; > @@ -509,7 +509,7 @@ static const struct snd_kcontrol_new sun4i_codec_pa_m= ute =3D > =20 > static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1); > =20 > -static const struct snd_kcontrol_new sun4i_codec_widgets[] =3D { > +static const struct snd_kcontrol_new sun4i_codec_controls[] =3D { 2) Changing some structure name > SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL, > SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0, > sun4i_codec_pa_volume_scale), > @@ -627,10 +627,60 @@ static const struct snd_soc_dapm_route sun4i_codec_= codec_dapm_routes[] =3D { > { "Mic1", NULL, "VMIC" }, > }; > =20 > +static const struct regmap_config sun4i_codec_regmap_config =3D { > + .reg_bits =3D 32, > + .reg_stride =3D 4, > + .val_bits =3D 32, > + .max_register =3D SUN4I_CODEC_ADC_RXCNT, > +}; > + > +static const struct regmap_config sun7i_codec_regmap_config =3D { > + .reg_bits =3D 32, > + .reg_stride =3D 4, > + .val_bits =3D 32, > + .max_register =3D SUN7I_CODEC_AC_MIC_PHONE_CAL, > +}; 3) Adding some custom regmap configs for the A10 and A20 variants > +struct sun4i_quirks { > + const struct snd_kcontrol_new *controls; > + unsigned int num_controls; 4) Allow to have some custom controls (but you're not using that anywhere yet). > + const struct regmap_config *regmap_config; > +}; > + > +static const struct sun4i_quirks sun4i_quirks =3D { > + .controls =3D NULL, > + .num_controls =3D 0U, > + .regmap_config =3D &sun4i_codec_regmap_config, > +}; > + > +static const struct sun4i_quirks sun7i_quirks =3D { > + .controls =3D NULL, > + .num_controls =3D 0U, > + .regmap_config =3D &sun7i_codec_regmap_config, > +}; > + > +static const struct of_device_id sun4i_codec_of_match[] =3D { > + { .compatible =3D "allwinner,sun4i-a10-codec", .data =3D &sun4i_quirks = }, > + { .compatible =3D "allwinner,sun7i-a20-codec", .data =3D &sun7i_quirks = }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, sun4i_codec_of_match); This could be related to 3 > + > +static int sun4i_codec_codec_probe(struct snd_soc_codec *scodec) > +{ > + const struct sun4i_quirks *quirks; > + > + quirks =3D of_device_get_match_data(scodec->dev); > + return snd_soc_add_codec_controls(scodec, > + quirks->controls, > + quirks->num_controls); > +} > + > static struct snd_soc_codec_driver sun4i_codec_codec =3D { > + .probe =3D sun4i_codec_codec_probe, And this to 4. > .component_driver =3D { > - .controls =3D sun4i_codec_widgets, > - .num_controls =3D ARRAY_SIZE(sun4i_codec_widgets), > + .controls =3D sun4i_codec_controls, > + .num_controls =3D ARRAY_SIZE(sun4i_codec_controls), 2) > .dapm_widgets =3D sun4i_codec_codec_dapm_widgets, > .num_dapm_widgets =3D ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), > .dapm_routes =3D sun4i_codec_codec_dapm_routes, > @@ -678,20 +728,6 @@ static struct snd_soc_dai_driver dummy_cpu_dai =3D { > }, > }; > =20 > -static const struct regmap_config sun4i_codec_regmap_config =3D { > - .reg_bits =3D 32, > - .reg_stride =3D 4, > - .val_bits =3D 32, > - .max_register =3D SUN4I_CODEC_AC_MIC_PHONE_CAL, > -}; > - > -static const struct of_device_id sun4i_codec_of_match[] =3D { > - { .compatible =3D "allwinner,sun4i-a10-codec" }, > - { .compatible =3D "allwinner,sun7i-a20-codec" }, > - {} > -}; > -MODULE_DEVICE_TABLE(of, sun4i_codec_of_match); > - > static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *d= ev, > int *num_links) > { > @@ -760,6 +796,7 @@ static int sun4i_codec_probe(struct platform_device *= pdev) > { > struct snd_soc_card *card; > struct sun4i_codec *scodec; > + const struct sun4i_quirks *quirks; > struct resource *res; > void __iomem *base; > int ret; > @@ -777,8 +814,9 @@ static int sun4i_codec_probe(struct platform_device *= pdev) > return PTR_ERR(base); > } > =20 > + quirks =3D of_device_get_match_data(&pdev->dev); > scodec->regmap =3D devm_regmap_init_mmio(&pdev->dev, base, > - &sun4i_codec_regmap_config); > + quirks->regmap_config); 3 This should be in separate patches. Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --hwvH6HDNit2nSK4j Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJX1mGCAAoJEBx+YmzsjxAg23MQAJLf+jQvXC28uYOKUZ50Y6mG +aJZbvnQHkqrR+l04DZeYVVjhRxJNmLz6+iJqzFzXC1hKAvw+VcU6G2nqyMcWgnX 5iuulecwPxRTybhgH7RSNNtZ2Em6cnrUHLQyGoRKINX7Kb3G8GFA7zOT0v+c5Mb2 YmV9xH7O++B0cIOtRtDepdTutn6RjjPxin6P9j60VN+L/hUxXct3jeNfZwwhXFYv EEsfhZdH2TuyX0QiDFPFeC6YtghB1LTmUfMO58gteKZggBfct+lnZWAqAGB0tima AxFgOKJk+eVfmnlM2RowFPYGB+ZC3aMjbJyK2HDTYSF88m2Dj1SaZPeYYglaCED1 SMi8+roU7A++gcAVvzL3q3ed3NpGWz6l7JDFaYqXrxjthXGDRHGTg3Wd3MfA09jk oRpqy1S5OJ0SQJc/5mzjnz5VgUJUvcmfQSn4xElm2L9U+Ix7KxaFWikS+G0thj+Y bmU5O4J6PrXeqzEy4Kw8vkmxFbPZgA0P9vm6hwrB6c9CJINq7MY7QNYz/WuJ1LVK 0iF9GVEn6dT4ISOLLsJ7uSIUJb1ZQt8icNv/XCgSUsIjDF6HI5Cl2sc2XPYWKb+u l+m7DM1Ctk1MSfi3XAFgt9cJIxug0/0Hddd7sw8b/wghvhq2AWDLuumI1+u4UY2w 0soRFLZ8eDag4cNHU8Ma =ErQW -----END PGP SIGNATURE----- --hwvH6HDNit2nSK4j--