From patchwork Mon Dec 1 06:51:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Hsu X-Patchwork-Id: 41749 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8276620672 for ; Mon, 1 Dec 2014 06:52:49 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id hs14sf2656076lab.5 for ; Sun, 30 Nov 2014 22:52:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Mxep/kOBvPCm6HwSUgoQvw5XyP4NY9nqtiKpDO7jhsw=; b=DAhTUAwKljX0gO0jlJa92irFdtG1xvLmKJ2VmC5zcu3AgZrJt/NSXcSYgQugyk0IhW OKNZrKFKHg9jMmJoK/lfvLdzFSg1isBGkuZV6eZCIEG58ePbTLIPVfMJpsavud23LTsf E1YK7XseYUn/I7wz2uSnod9bJd4xba1rjy0hUHMEUJ3cKn7i7lU//QFZgtqnQjtU7egc cgYKeAoS+oP9xpiph2gdGLNJoOHhGo9jryFr5f+gYjTwE+mUH8J+Bw4eyaDHs2zQ5JJu aY7K0SGP37riJ7V7x6kJME7qrs5WpnQfhhXEtG1sQJh1B7J0soEeFpVZdNCph6hPr6oo 2jTw== X-Gm-Message-State: ALoCoQn/Cqqotc+zyNTiUThB2Lx/0l0w6U8kPou30+lgAdRnIU4sYOXSHHvUIkG+wGsQGFeLWgju X-Received: by 10.194.95.74 with SMTP id di10mr5780756wjb.0.1417416768276; Sun, 30 Nov 2014 22:52:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.1 with SMTP id s1ls4420lal.23.gmail; Sun, 30 Nov 2014 22:52:47 -0800 (PST) X-Received: by 10.152.234.235 with SMTP id uh11mr3762787lac.69.1417416767741; Sun, 30 Nov 2014 22:52:47 -0800 (PST) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id h4si16755439lbd.53.2014.11.30.22.52.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 22:52:47 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id hv19so3551787lab.0 for ; Sun, 30 Nov 2014 22:52:47 -0800 (PST) X-Received: by 10.112.62.166 with SMTP id z6mr53909514lbr.74.1417416767409; Sun, 30 Nov 2014 22:52:47 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp236481lbc; Sun, 30 Nov 2014 22:52:46 -0800 (PST) X-Received: by 10.67.15.106 with SMTP id fn10mr5262596pad.143.1417416760986; Sun, 30 Nov 2014 22:52:40 -0800 (PST) Received: from Kraken ([124.219.7.128]) by mx.google.com with ESMTP id fa4si27209641pbc.238.2014.11.30.22.52.39 for ; Sun, 30 Nov 2014 22:52:40 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of xavier@kraken: DNS timeout) client-ip=124.219.7.128; Received: by Kraken (Postfix, from userid 1011) id 9C2296A2A4F; Mon, 1 Dec 2014 14:52:15 +0800 (CST) From: Xavier Hsu To: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, patches@linaro.org Cc: lars@metafoo.de, ckeepax@opensource.wolfsonmicro.com, Xavier Hsu , Andy Green Subject: [PATCHv6 6/9] ASOC: wm8971: add constraint for setting set_sysclk() Date: Mon, 1 Dec 2014 14:51:58 +0800 Message-Id: <1417416721-17271-6-git-send-email-xavier.hsu@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1417416721-17271-1-git-send-email-xavier.hsu@linaro.org> References: <1417416721-17271-1-git-send-email-xavier.hsu@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: xavier.hsu@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Xavier Hsu Signed-off-by: Andy Green --- sound/soc/codecs/wm8971.c | 80 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 5f711bd..1f3abbb 100755 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -40,7 +40,9 @@ static struct workqueue_struct *wm8971_workq; /* codec private data */ struct wm8971_priv { + /* MCLK */ unsigned int sysclk; + struct snd_pcm_hw_constraint_list *sysclk_constraints; /* De-emphasis */ struct mutex deemph_mutex; @@ -530,6 +532,35 @@ static int get_coeff(int mclk, int rate) return -EINVAL; } +/* The set of rates we can generate from the above for each SYSCLK */ +static const unsigned int rates_48000[] = { + 8000, 12000, 16000, 24000, 32000, 48000, 96000 +}; + +static struct snd_pcm_hw_constraint_list constraints_48000 = { + .count = ARRAY_SIZE(rates_48000), + .list = rates_48000, +}; + +static const unsigned int rates_44100[] = { + 8000, 11025, 22050, 44100, 88200 +}; + +static struct snd_pcm_hw_constraint_list constraints_44100 = { + .count = ARRAY_SIZE(rates_44100), + .list = rates_44100, +}; + +static const unsigned int rates_12[] = { + 8000, 11025, 12000, 16000, 22050, 24000, 32000, 41100, 48000, + 88235, 96000, +}; + +static struct snd_pcm_hw_constraint_list constraints_12 = { + .count = ARRAY_SIZE(rates_12), + .list = rates_12, +}; + static int wm8971_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id, unsigned int freq, int dir) { @@ -537,15 +568,29 @@ static int wm8971_set_dai_sysclk(struct snd_soc_dai *codec_dai, struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec); switch (freq) { - case 11289600: - case 12000000: case 12288000: - case 16934400: + case 24576000: case 18432000: - wm8971->sysclk = freq; - return 0; + case 36864000: + wm8971->sysclk_constraints = &constraints_48000; + break; + case 11289600: + case 22579200: + case 16934400: + case 33868800: + wm8971->sysclk_constraints = &constraints_44100; + break; + case 12000000: + case 24000000: + wm8971->sysclk_constraints = &constraints_12; + break; + default: + return -EINVAL; } - return -EINVAL; + + wm8971->sysclk = freq; + + return 0; } static int wm8971_set_dai_fmt(struct snd_soc_dai *codec_dai, @@ -604,6 +649,28 @@ static int wm8971_set_dai_fmt(struct snd_soc_dai *codec_dai, return 0; } +static int wm8971_pcm_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec); + + /* The set of sample rates that can be supported depends on the + * MCLK supplied to the CODEC - enforce this. + */ + if (!wm8971->sysclk) { + dev_err(codec->dev, + "No MCLK configured, call set_sysclk() on init\n"); + return -EINVAL; + } + + snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + wm8971->sysclk_constraints); + + return 0; +} + static int wm8971_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -689,6 +756,7 @@ static int wm8971_set_bias_level(struct snd_soc_codec *codec, SNDRV_PCM_FMTBIT_S24_LE) static const struct snd_soc_dai_ops wm8971_dai_ops = { + .startup = wm8971_pcm_startup, .hw_params = wm8971_pcm_hw_params, .digital_mute = wm8971_mute, .set_fmt = wm8971_set_dai_fmt,