From patchwork Fri Feb 5 17:24:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 8237631 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0E5D9BEEE5 for ; Fri, 5 Feb 2016 17:25:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBC2520260 for ; Fri, 5 Feb 2016 17:25:17 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 8AAC3200C1 for ; Fri, 5 Feb 2016 17:25:16 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6565B260695; Fri, 5 Feb 2016 18:25:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, NO_DNS_FOR_FROM,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 340162606F7; Fri, 5 Feb 2016 18:25:10 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id CE03F260710; Fri, 5 Feb 2016 18:25:08 +0100 (CET) Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by alsa0.perex.cz (Postfix) with ESMTP id 473ED260695 for ; Fri, 5 Feb 2016 18:25:03 +0100 (CET) Received: by mail-pf0-f174.google.com with SMTP id c10so5537799pfc.2 for ; Fri, 05 Feb 2016 09:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=w/XEAJc/1P9UFZEI2DJs1xLb2F/3IVnf77xNYMWKPLg=; b=o8XQTrelR3KxSJMEWRoIH/2qjRyy874NhvBJXgx1Nnz2CUsjODtGzqiIC7IvXbErSe gyHy702iaFbmI7HIgykjD/Sj/GYRgdALAYoTsS1UIxE4Y8zvG/MKaJkpE/vYx4NLwQF6 qQZ0d4T30dMZsLj31chEcaA28ydFnty+eZc3JWVl7g86a8UzWHOMU0wkANuKaP7eHfF5 huBjR+RUH7qseTvGl9zkechPbKdtvAMatORUjIVjWdgNFNOy8AaymCdpUZO70trBCdE9 mflCmcfu+iMiWi18h1M3gnfJleeJelfcbQhni+qMAd8nkgOnJjXIto2WBpz5aG+vWPja nafg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=w/XEAJc/1P9UFZEI2DJs1xLb2F/3IVnf77xNYMWKPLg=; b=BoW7viP67Oo5DVlMWGgqr7GpoTRMPeAvO96aSzOjGSREERCsE25zRSvJvf2OR+aCUy TYuVCcN9WRscUmueeqB1ibDSTQiVCg/zQeU6kpTZvV2ASwrajHr84gZqsxQkocW2nfcV 2Bs3t8we23f+d8wvp7CIXTLf3yjCvCNo6xE06C9tw4g/GUSx5JLruk/U+U7Fwj5P8KTW RWLhB4mY0LwFgczzv6mgPG9nFC0FiFEbdUY994jyZKT2BByhYmyoFcgVpAiEFkywwjlF q4AWVv+txUGJbYRNgNZwenTbUVkyXLM7GLmDF63ijg0JnCTQDDaNSZxSbzTKlIEuvOFv 33bg== X-Gm-Message-State: AG10YORhw3yOORKnc6UfgrKk07PrlA18BJTfBEB4OWUakAh7E5pTYUKKkexOjeg07mJJGbxA X-Received: by 10.98.0.150 with SMTP id 144mr21424863pfa.139.1454693102524; Fri, 05 Feb 2016 09:25:02 -0800 (PST) Received: from panicking (111-243-18-14.dynamic.hinet.net. [111.243.18.14]) by smtp.gmail.com with ESMTPSA id tv6sm25924068pab.4.2016.02.05.09.25.00 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 05 Feb 2016 09:25:02 -0800 (PST) Date: Fri, 5 Feb 2016 18:24:57 +0100 From: Michael Trimarchi To: Mark Brown Message-ID: <20160205172451.GA30542@panicking> References: <1452382685-18009-1-git-send-email-michael@amarulasolutions.com> <1452382685-18009-4-git-send-email-michael@amarulasolutions.com> <20160110120045.GW6588@sirena.org.uk> <20160110173812.GA16304@panicking> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160110173812.GA16304@panicking> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Jacob Siverskog , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, lgirdwood@gmail.com, Johan Hovold Subject: [alsa-devel] [PATCH V3] ASoC: pcm179x: Add support for pcm1795 and pcm1796 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Michael Trimarchi --- Not get time to retest Changes v3 -> v2: - rebase after i2c support Changes v1 -> v2: - Use switch for support new variants - sort the compatible list sound/soc/codecs/pcm179x-i2c.c | 6 ---- sound/soc/codecs/pcm179x-spi.c | 6 ---- sound/soc/codecs/pcm179x.c | 62 ++++++++++++++++++++++++++++++++++++++++-- sound/soc/codecs/pcm179x.h | 9 ++++-- 4 files changed, 66 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/pcm179x-i2c.c b/sound/soc/codecs/pcm179x-i2c.c index 4118106..609f07f 100644 --- a/sound/soc/codecs/pcm179x-i2c.c +++ b/sound/soc/codecs/pcm179x-i2c.c @@ -44,12 +44,6 @@ static int pcm179x_i2c_remove(struct i2c_client *client) return pcm179x_common_exit(&client->dev); } -static const struct of_device_id pcm179x_of_match[] = { - { .compatible = "ti,pcm1792a", }, - { } -}; -MODULE_DEVICE_TABLE(of, pcm179x_of_match); - static const struct i2c_device_id pcm179x_i2c_ids[] = { { "pcm179x", 0 }, { } diff --git a/sound/soc/codecs/pcm179x-spi.c b/sound/soc/codecs/pcm179x-spi.c index da924d4..6ae0e4d 100644 --- a/sound/soc/codecs/pcm179x-spi.c +++ b/sound/soc/codecs/pcm179x-spi.c @@ -43,12 +43,6 @@ static int pcm179x_spi_remove(struct spi_device *spi) return pcm179x_common_exit(&spi->dev); } -static const struct of_device_id pcm179x_of_match[] = { - { .compatible = "ti,pcm1792a", }, - { } -}; -MODULE_DEVICE_TABLE(of, pcm179x_of_match); - static const struct spi_device_id pcm179x_spi_ids[] = { { "pcm179x", 0 }, { }, diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c index 06a6657..73c80d3 100644 --- a/sound/soc/codecs/pcm179x.c +++ b/sound/soc/codecs/pcm179x.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include @@ -72,8 +74,31 @@ struct pcm179x_private { struct regmap *regmap; unsigned int format; unsigned int rate; +#define PCM1795 1 + unsigned int codec_model; }; +static int pcm179x_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); + u64 formats = PCM1792A_FORMATS; + + switch (priv->codec_model) { + case PCM1795: + formats = PCM1795_FORMATS; + break; + default: + break; + } + + snd_pcm_hw_constraint_mask64(substream->runtime, + SNDRV_PCM_HW_PARAM_FORMAT, formats); + + return 0; +} + static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int format) { @@ -112,8 +137,10 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_RIGHT_J: switch (params_width(params)) { - case 24: case 32: + val = 1; + break; + case 24: val = 2; break; case 16: @@ -125,8 +152,10 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, break; case SND_SOC_DAIFMT_I2S: switch (params_width(params)) { - case 24: case 32: + val = 4; + break; + case 24: val = 5; break; case 16: @@ -152,6 +181,7 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, } static const struct snd_soc_dai_ops pcm179x_dai_ops = { + .startup = pcm179x_startup, .set_fmt = pcm179x_set_dai_fmt, .hw_params = pcm179x_hw_params, .digital_mute = pcm179x_digital_mute, @@ -190,7 +220,7 @@ static struct snd_soc_dai_driver pcm179x_dai = { .rates = SNDRV_PCM_RATE_CONTINUOUS, .rate_min = 10000, .rate_max = 200000, - .formats = PCM1792A_FORMATS, }, + .formats = PCM179X_FORMATS, }, .ops = &pcm179x_dai_ops, }; @@ -214,15 +244,41 @@ static struct snd_soc_codec_driver soc_codec_dev_pcm179x = { .num_dapm_routes = ARRAY_SIZE(pcm179x_dapm_routes), }; +static const unsigned int codec_model = PCM1795; + +const struct of_device_id pcm179x_of_match[] = { + { .compatible = "ti,pcm1792a", }, + { .compatible = "ti,pcm1795", + .data = &codec_model, + }, + { .compatible = "ti,pcm1796", }, + { } +}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match); +EXPORT_SYMBOL_GPL(pcm179x_of_match); + int pcm179x_common_init(struct device *dev, struct regmap *regmap) { struct pcm179x_private *pcm179x; + struct device_node *np = dev->of_node; + const unsigned int *codec_model = NULL; pcm179x = devm_kzalloc(dev, sizeof(struct pcm179x_private), GFP_KERNEL); if (!pcm179x) return -ENOMEM; + if (np) { + const struct of_device_id *of_id; + + of_id = of_match_device(pcm179x_of_match, dev); + if (of_id) + codec_model = of_id->data; + } + + if (codec_model) + pcm179x->codec_model = *codec_model; + pcm179x->regmap = regmap; dev_set_drvdata(dev, pcm179x); diff --git a/sound/soc/codecs/pcm179x.h b/sound/soc/codecs/pcm179x.h index 11e3312..4c00047 100644 --- a/sound/soc/codecs/pcm179x.h +++ b/sound/soc/codecs/pcm179x.h @@ -17,10 +17,15 @@ #ifndef __PCM179X_H__ #define __PCM179X_H__ -#define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S16_LE) +#define PCM179X_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ + SNDRV_PCM_FMTBIT_S16_LE) + +#define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE) + +#define PCM1795_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE) extern const struct regmap_config pcm179x_regmap_config; +extern const struct of_device_id pcm179x_of_match[]; int pcm179x_common_init(struct device *dev, struct regmap *regmap); int pcm179x_common_exit(struct device *dev);