From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965304AbcHaRq1 (ORCPT ); Wed, 31 Aug 2016 13:46:27 -0400 Received: from down.free-electrons.com ([37.187.137.238]:44037 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753177AbcHaRqZ (ORCPT ); Wed, 31 Aug 2016 13:46:25 -0400 Date: Wed, 31 Aug 2016 19:46:23 +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 v9 1/2] ASoC: sun4i-codec: Distinguish sun4i from sun7i Message-ID: <20160831174623.GA20462@lukather> References: <20160830054403.7878-1-dannym@scratchpost.org> <20160830054403.7878-2-dannym@scratchpost.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="PEIAKu/WMn1b1Hv9" Content-Disposition: inline In-Reply-To: <20160830054403.7878-2-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 --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Danny, On Tue, Aug 30, 2016 at 07:44:02AM +0200, Danny Milosavljevic wrote: > This distinguishes sun4i from sun7i. It is necessary because they use > different registers for the audio mixer. Your Signed-off-by is missing > --- > sound/soc/sunxi/sun4i-codec.c | 44 +++++++++++++++++++++++++++++++++----= ------ > 1 file changed, 34 insertions(+), 10 deletions(-) >=20 > diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c > index 0e19c50..30f4ea2 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) That will need at least some mention in the commit log. > =20 > struct sun4i_codec { > struct device *dev; > @@ -509,10 +510,17 @@ static const struct snd_kcontrol_new sun4i_codec_pa= _mute =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 { > - 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[] =3D { > + SUN4I_COMMON_CODEC_CONTROLS, > +}; > + > +static const struct snd_kcontrol_new sun7i_codec_controls[] =3D { > + SUN4I_COMMON_CODEC_CONTROLS, > }; > =20 > static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = =3D { > @@ -629,8 +637,18 @@ static const struct snd_soc_dapm_route sun4i_codec_c= odec_dapm_routes[] =3D { > =20 > static struct snd_soc_codec_driver sun4i_codec_codec =3D { > .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), > + .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, > + .num_dapm_routes =3D ARRAY_SIZE(sun4i_codec_codec_dapm_routes), > + }, > +}; You need a new line here. > +static struct snd_soc_codec_driver sun7i_codec_codec =3D { > + .component_driver =3D { > + .controls =3D sun7i_codec_controls, > + .num_controls =3D ARRAY_SIZE(sun7i_codec_controls), > .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, > @@ -682,7 +700,7 @@ 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, > + .max_register =3D SUN7I_CODEC_AC_MIC_PHONE_CAL, > }; > =20 > static const struct of_device_id sun4i_codec_of_match[] =3D { > @@ -760,6 +778,7 @@ 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; > @@ -822,7 +841,12 @@ static int sun4i_codec_probe(struct platform_device = *pdev) > scodec->capture_dma_data.maxburst =3D 4; > scodec->capture_dma_data.addr_width =3D DMA_SLAVE_BUSWIDTH_2_BYTES; > =20 > - ret =3D snd_soc_register_codec(&pdev->dev, &sun4i_codec_codec, > + if (of_device_is_compatible(pdev->dev.of_node, > + "allwinner,sun7i-a20-codec")) > + codec =3D &sun7i_codec_codec; > + else > + codec =3D &sun4i_codec_codec; It would be better to add a structure assiocated to the data field of of_device_id. That way, you'll also be able to have any quirks without adding more checks (such as a different regmap config, like Chen-Yu suggested). Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --PEIAKu/WMn1b1Hv9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXxxfvAAoJEBx+YmzsjxAgx4EQAKqwjgL/LllfR5oMlIVoDL7K OYJ2yu1uMFmuAX7ZMFssmokjVjtlm30bqgLtxQcYN4JhW1QGWOJ1dOqPNf3ZoPdr n3f1zfLWNZsZ5ntI65FsapjzbCPmE/NYXXo1cu3Xdokn851uiMeCKXs9Amy4HVOH 5hw3fHX8nQzUDDFd/ojGQQDxuz0+QBc1PqHxtQh7IPcAUXfrJy9YSDGz6e48KFNp PxPypv5u35hHP3iFgr/tcVzhDYBp2ehmGmtK1A9OQBrf9icf4EqXbkszV/8VPpRC Cncs5395iNNjkgvUte25XeR+6tfWY2hPDCyHiW7IrDsqLcTSMcppvzPH35JT4jfT a9XsdBA24GVw39MZ87CdPkXy0DgbBcmN4w39T/eYUFrw3VFVrKEARQzfs9Yq5/Xm xaZPPvfPjbeYHp4n44iJatj5j6Gu8mZ3sJ8mK/Ug4bAGoQ5Z3kcYFN/S2LPVo0ch BeQnD8Ic3n0WKjq6NF8H7QcnsFT2teIV2kBVxdbSXPqKbzIXuZL5/2p9Lb97BmTs WKFJH3shxRqsQBMV7CW1DfOFTG7889wRiACiEA+V1QmW65AdXkELXmh8hVApOZPA yoEH+E+kH/b/+i9Qqk2GBqar9wBiTowE78lD8WdZhzPhxNJn6k2d0pM1TT3n6i4o kK4IRoQn3ebkPJEWYxyS =enFE -----END PGP SIGNATURE----- --PEIAKu/WMn1b1Hv9--