Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753673AbbL0ReR (ORCPT ); Sun, 27 Dec 2015 12:34:17 -0500 Received: from down.free-electrons.com ([37.187.137.238]:55989 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751524AbbL0ReP (ORCPT ); Sun, 27 Dec 2015 12:34:15 -0500 Date: Sun, 27 Dec 2015 18:34:09 +0100 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: [linux-sunxi] [PATCH v8 1/2] ASoc: sun4i-codec: Add FM, Line and Mic inputs Message-ID: <20151227173409.GH30359@lukather> References: <20151221123148.1ab6480b@dayas> <20151221123303.7d47e26f@dayas> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GOdHDkIp180r3pqZ" Content-Disposition: inline In-Reply-To: <20151221123303.7d47e26f@dayas> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5897 Lines: 168 --GOdHDkIp180r3pqZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Mon, Dec 21, 2015 at 12:33:03PM +0100, Danny Milosavljevic wrote: > This is the first part: >=20 > sun4i-codec: make it possible to use different codec_widgets for A10 a= nd A20. Please make a meaningful commit log and title explaining what and why you're doing it. >=20 > Signed-off-by: Danny Milosavljevic > --- > b/sound/soc/sunxi/sun4i-codec.c | 45 ++++++++++++++++++++++++++++++--= -------- > 1 file changed, 34 insertions(+), 11 deletions(-) >=20 > 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 =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_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[] =3D { > + SUN4I_COMMON_CODEC_WIDGETS, > }; > =20 > static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = =3D { > @@ -627,9 +631,9 @@ static const struct snd_soc_dapm_route sun4i_codec_co= dec_dapm_routes[] =3D { > { "Mic1", NULL, "VMIC" }, > }; > =20 > -static struct snd_soc_codec_driver sun4i_codec_codec =3D { > - .controls =3D sun4i_codec_widgets, > - .num_controls =3D ARRAY_SIZE(sun4i_codec_widgets), > +static struct snd_soc_codec_driver sun4i_codec_codec_a10 =3D { > + .controls =3D sun4i_codec_widgets_a10, > + .num_controls =3D ARRAY_SIZE(sun4i_codec_widgets_a10), There's no need to change the structure name. > .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, > @@ -680,7 +684,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 { > @@ -753,10 +757,24 @@ static struct snd_soc_card *sun4i_codec_create_card= (struct device *dev) > return card; > }; > =20 > +static const struct snd_kcontrol_new sun7i_codec_widgets[] =3D { > + SUN4I_COMMON_CODEC_WIDGETS, > +}; > + > +static struct snd_soc_codec_driver sun7i_codec_codec =3D { > + .controls =3D sun7i_codec_widgets, > + .num_controls =3D ARRAY_SIZE(sun7i_codec_widgets), > + .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), > +}; > 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 =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_a10; A new line here would be nice. > + ret =3D snd_soc_register_codec(&pdev->dev, codec, > &sun4i_codec_dai, 1); > if (ret) { > dev_err(&pdev->dev, "Failed to register our codec\n"); Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --GOdHDkIp180r3pqZ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWgCERAAoJEBx+YmzsjxAgXlwP/3vPde4Mc5R455BccUvA50dM e/oTeJNTaOx5QV98cRJZfFpGplMdxkJuvN8snLSJ5X4ar00kkiw+wMFI3ltH+Jot BfeYA4UzwAizGUAu7CbAdEM9dEaD2oD65UxbcG2dSSHa03tL8F3JneQi+PXTrtX0 NaVd/kooLwyuCND8y70mZATw3SZgoog/ogva32SZm2UmtKM/f3vdaGzb2HE/IgFk hzDM9aw9GlSS/Uox5cpIAYS2eUEHsLiOS0MEapesqR7usY+bCYAVHV0glTnXvThZ NEBfmcGJwtpIoTVMcjnXBLnAEGs6LJKf+qHLvmtFiAKzPjnJ03AcjNFJNiArM//b AY0sB9Gv82u84MxMONAoWmGCCDcMfmSKTO4Qne1qldhmUA1eUc7YBypcopyAnL+Q 1T3oOV4YjZL3mIzvM58H8AGgFWwntjzrlyXsuYG30h8MW/RuVPkjXYWBl6eKKFqZ Uw4dNex2f4NaRz2KNIkMkux/USD0fMCYeVw8dQsRQuHmPrVBYE3Pvq9QDOBgyQFa yY3IlVhJgf3sw7//FkutB3ugl8URXuZ2G1IPRGUa/fD/vOTEixdMsa7uXD8xx6uc b8cmR1vV4n6Gu/CJbrErjbF1oZ7+5agl5xKWA8PtYLkQnoBWlJEmvf94pKFD/cOX dBTjx1H9garUveB2HlLJ =9aLW -----END PGP SIGNATURE----- --GOdHDkIp180r3pqZ-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/