From patchwork Wed Mar 7 17:04:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 10264525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AE4D4602BD for ; Wed, 7 Mar 2018 17:05:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A6F22947F for ; Wed, 7 Mar 2018 17:05:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C84B294E5; Wed, 7 Mar 2018 17:05:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B2A12947F for ; Wed, 7 Mar 2018 17:05:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933545AbeCGRFG (ORCPT ); Wed, 7 Mar 2018 12:05:06 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:29428 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933468AbeCGRFF (ORCPT ); Wed, 7 Mar 2018 12:05:05 -0500 Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20180307170503epoutp0197ba4ad8d56735a0913f67c7435877c4~Zsjg7OaQ71577015770epoutp01d; Wed, 7 Mar 2018 17:05:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20180307170503epoutp0197ba4ad8d56735a0913f67c7435877c4~Zsjg7OaQ71577015770epoutp01d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1520442303; bh=okgXJkDtfScrQG6K6QgVqlxk0NICHfvWPo1ZOVo/gDc=; h=From:To:Cc:Subject:Date:References:From; b=u1T7sMgL/afno0IwZToO6t90RjGsjcG69oBuZn9H06jAbDsv4sMnalo7esSNK9PER jDA0qvHV0F5XCr7g2VIgCI9mVFKSoQIV5F+Wf5ReCrToIHXXr4922eXfTPNHQIIPUM 4CEFH9vRud7ngE8OJXFknSg8x6jinwF8MmrU9ueo= Received: from epsmges1p5.samsung.com (unknown [182.195.42.57]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20180307170503epcas1p3b68ccc16a97547c8a39a0bcc94d84f71~ZsjgiEIHE3248332483epcas1p3D; Wed, 7 Mar 2018 17:05:03 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p5.samsung.com (Symantec Messaging Gateway) with SMTP id 7C.55.04037.FBB10AA5; Thu, 8 Mar 2018 02:05:03 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20180307170502epcas1p187b4623a868daa6045465836903e591f~Zsjf3-Ubg3098630986epcas1p1C; Wed, 7 Mar 2018 17:05:02 +0000 (GMT) X-AuditID: b6c32a39-47fff70000000fc5-22-5aa01bbf83df Received: from epmmp1.local.host ( [203.254.227.16]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 7C.8E.03826.EBB10AA5; Thu, 8 Mar 2018 02:05:02 +0900 (KST) Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P580011GCS5PL80@mmp1.samsung.com>; Thu, 08 Mar 2018 02:05:02 +0900 (KST) From: Sylwester Nawrocki To: broonie@kernel.org Cc: lgirdwood@gmail.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, robh+dt@kernel.org, linux-samsung-soc@vger.kernel.org, b.zolnierkie@samsung.com, m.szyprowski@samsung.com, Sylwester Nawrocki Subject: [PATCH 6/6] ASoC: samsung: Add HDMI audio support for Chromebook Snow Date: Wed, 07 Mar 2018 18:04:50 +0100 Message-id: <20180307170450.14182-1-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsWy7bCmru5+6QVRBi8viVpcuXiIyWLjjPWs FlMfPmGzmH/kHKvFtysdTBYzzu9jslh75C67ReveI+wWh9+0szpwemz43MTmsXPWXXaPTas6 2Tz6tqxi9Pi8SS6ANYrLJiU1J7MstUjfLoErY+asP8wFbXYVx+fMZW5gvGvYxcjJISFgItF1 4RNjFyMXh5DADkaJPRfmsEM43xkl/m1qZuti5ACrOrMmAiK+m1Fi6f3VLBDOL0aJ5p53TCCj 2AQMJXqP9jGC2CICYhK353QygxQxC7xjlNj29ilYkbBAgMTx3/vYQGwWAVWJ3r7zYHFeAWuJ m31X2CFukpd4v+A+2E0SAh1sEhe3bGCGSLhI7Do+mQXCFpZ4dXwLO8R50hKXjtpChKslOtu6 2CF6Wxgl/ky7xAaRsJY4fPwiK4jNLMAn8e5rDytEL69ER5sQRImHxKpNi6FWOUrMnH4frFVI IFai8+55tgmMkgsYGVYxiqUWFOempxYbFpjqFSfmFpfmpesl5+duYgRHpJblDsZj53wOMQpw MCrx8B74OT9KiDWxrLgy9xCjBAezkgjvkz9AId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rwBAS5R QgLpiSWp2ampBalFMFkmDk6pBsbzpydeXL+cQfttj47tAa1XQi1yB8Wn3o1df15vl83LSUzL j3kcSTg6K+Rn4RSNOC2OhvWzmVfObdwcHeyio7zT+OyD3r4rCgknozx/nfLZvHrHwWvvllRL mebvnbQkb5+SftD/w23mHmU+DU8CXipsmH04XGn537f8lS//HVIIEvG9Erh939+1SizFGYmG WsxFxYkA0eq/zsQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHJMWRmVeSWpSXmKPExsVy+t9jAd190guiDC5OVLK4cvEQk8XGGetZ LaY+fMJmMf/IOVaLb1c6mCxmnN/HZLH2yF12i9a9R9gtDr9pZ3Xg9NjwuYnNY+esu+wem1Z1 snn0bVnF6PF5k1wAaxSXTUpqTmZZapG+XQJXxsxZf5gL2uwqjs+Zy9zAeNewi5GDQ0LAROLM moguRi4OIYGdjBJ3329mh3B+MUp8b+5h7mLk5GATMJToPdrHCGKLCIhJ3J7TyQxSxCzwjlFi +a3XrCAJYQE/iUddB8CKWARUJXr7zjOB2LwC1hI3+66wg9gSAvIS7xfcZ5zAyLWAkWEVo2Rq QXFuem6xUYFhXmq5XnFibnFpXrpecn7uJkZgqGw7rNW3g/H+kvhDjAIcjEo8vBJ/5kcJsSaW FVfmHmKU4GBWEuF9AhLiTUmsrEotyo8vKs1JLT7EKM3BoiTOezvvWKSQQHpiSWp2ampBahFM lomDU6qBsaPmGif7dPucBLt/G+yfn73v38RqXS+Vf2nHdr9vArPfPqvVrKx+sbz4Jd+VBz0H 0vfKBEYcsv13YU3RtLeWh8X7DZ/PWXdKf+68xTo7VM+Fa/uY7ow6oRozudw3REJssrb5pi9b L3kcsu+UP9728WRC655X/suffUsLjDvCV/Bw3YnTC0T/JSuxFGckGmoxFxUnAgAnRB7yEQIA AA== X-CMS-MailID: 20180307170502epcas1p187b4623a868daa6045465836903e591f X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20180307170502epcas1p187b4623a868daa6045465836903e591f X-RootMTR: 20180307170502epcas1p187b4623a868daa6045465836903e591f References: Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch updates the driver so, in addition to current DT bindings, it also handles the new DT bindings with cpu, codec subnodes which allow for sound support on the HDMI interface. Signed-off-by: Sylwester Nawrocki --- sound/soc/samsung/snow.c | 225 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 177 insertions(+), 48 deletions(-) diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index fc62110f500f..d10fd578b60d 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -11,92 +11,207 @@ * General Public License for more details. */ +#include #include #include #include #include - +#include #include #include "i2s.h" -#define FIN_PLL_RATE 24000000 +#define FIN_PLL_RATE 24000000UL -static struct snd_soc_dai_link snow_dai[] = { - { - .name = "Primary", - .stream_name = "Primary", - .codec_dai_name = "HiFi", - .dai_fmt = SND_SOC_DAIFMT_I2S | - SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS, - }, +struct snow_priv { + struct snd_soc_dai_link dai_link; + struct clk *clk_i2s_bus; +}; + +static int snow_card_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + static const unsigned int pll_rate[] = { + 73728000U, 67737602U, 49152000U, 45158401U, 32768001U + }; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snow_priv *priv = snd_soc_card_get_drvdata(rtd->card); + int bfs, psr, rfs, bitwidth; + unsigned long int rclk; + long int freq = -EINVAL; + int ret, i; + + bitwidth = snd_pcm_format_width(params_format(params)); + if (bitwidth < 0) { + dev_err(rtd->card->dev, "Invalid bit-width: %d\n", bitwidth); + return bitwidth; + } + + if (bitwidth != 16 && bitwidth != 24) { + dev_err(rtd->card->dev, "Unsupported bit-width: %d\n", bitwidth); + return -EINVAL; + } + + bfs = 2 * bitwidth; + + switch (params_rate(params)) { + case 16000: + case 22050: + case 24000: + case 32000: + case 44100: + case 48000: + case 88200: + case 96000: + rfs = 8 * bfs; + break; + case 64000: + rfs = 384; + break; + case 8000: + case 11025: + case 12000: + rfs = 16 * bfs; + break; + default: + return -EINVAL; + } + + rclk = params_rate(params) * rfs; + + for (psr = 8; psr > 0; psr /= 2) { + for (i = 0; i < ARRAY_SIZE(pll_rate); i++) { + if ((pll_rate[i] - rclk * psr) <= 2) { + freq = pll_rate[i]; + break; + } + } + } + if (freq < 0) { + dev_err(rtd->card->dev, "Unsupported RCLK rate: %lu\n", rclk); + return -EINVAL; + } + + ret = clk_set_rate(priv->clk_i2s_bus, freq); + if (ret < 0) { + dev_err(rtd->card->dev, "I2S bus clock rate set failed\n"); + return ret; + } + + return 0; +} + +static const struct snd_soc_ops snow_card_ops = { + .hw_params = snow_card_hw_params, }; static int snow_late_probe(struct snd_soc_card *card) { struct snd_soc_pcm_runtime *rtd; struct snd_soc_dai *codec_dai; - struct snd_soc_dai *cpu_dai; - int ret; rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); - codec_dai = rtd->codec_dai; - cpu_dai = rtd->cpu_dai; - - /* Set the MCLK rate for the codec */ - ret = snd_soc_dai_set_sysclk(codec_dai, 0, - FIN_PLL_RATE, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; + /* In the multi-codec case codec_dai 0 is HDMI and 1 is MAX98095. */ + if (rtd->num_codecs > 1) + codec_dai = rtd->codec_dais[1]; + else + codec_dai = rtd->codec_dai; - return 0; + /* Set the MCLK rate for the codec */ + return snd_soc_dai_set_sysclk(codec_dai, 0, + FIN_PLL_RATE, SND_SOC_CLOCK_IN); } static struct snd_soc_card snow_snd = { .name = "Snow-I2S", .owner = THIS_MODULE, - .dai_link = snow_dai, - .num_links = ARRAY_SIZE(snow_dai), - .late_probe = snow_late_probe, }; static int snow_probe(struct platform_device *pdev) { + struct device *dev = &pdev->dev; struct snd_soc_card *card = &snow_snd; - struct device_node *i2s_node, *codec_node; - int i, ret; - - i2s_node = of_parse_phandle(pdev->dev.of_node, - "samsung,i2s-controller", 0); - if (!i2s_node) { - dev_err(&pdev->dev, - "Property 'i2s-controller' missing or invalid\n"); - return -EINVAL; - } + struct device_node *cpu, *codec; + struct snd_soc_dai_link *link; + struct snow_priv *priv; + int ret; - codec_node = of_parse_phandle(pdev->dev.of_node, - "samsung,audio-codec", 0); - if (!codec_node) { - dev_err(&pdev->dev, - "Property 'audio-codec' missing or invalid\n"); - return -EINVAL; - } + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + link = &priv->dai_link; + + link->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS; + + link->name = "Primary"; + link->stream_name = link->name; + + card->dai_link = link; + card->num_links = 1; + card->dev = dev; + + /* Try new DT bindings with HDMI support first. */ + cpu = of_get_child_by_name(dev->of_node, "cpu"); + + if (cpu) { + link->ops = &snow_card_ops; - for (i = 0; i < ARRAY_SIZE(snow_dai); i++) { - snow_dai[i].codec_of_node = codec_node; - snow_dai[i].cpu_of_node = i2s_node; - snow_dai[i].platform_of_node = i2s_node; + link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0); + of_node_put(cpu); + + if (!link->cpu_of_node) { + dev_err(dev, "Failed parsing cpu/sound-dai property\n"); + return -EINVAL; + } + + codec = of_get_child_by_name(dev->of_node, "codec"); + ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); + of_node_put(codec); + + if (ret < 0) { + of_node_put(link->cpu_of_node); + dev_err(dev, "Failed parsing codec node\n"); + return ret; + } + + priv->clk_i2s_bus = of_clk_get_by_name(link->cpu_of_node, + "i2s_opclk0"); + if (IS_ERR(priv->clk_i2s_bus)) { + snd_soc_of_put_dai_link_codecs(link); + of_node_put(link->cpu_of_node); + return PTR_ERR(priv->clk_i2s_bus); + } + } else { + link->codec_dai_name = "HiFi", + + link->cpu_of_node = of_parse_phandle(dev->of_node, + "samsung,i2s-controller", 0); + if (!link->cpu_of_node) { + dev_err(dev, "i2s-controller property parse error\n"); + return -EINVAL; + } + + link->codec_of_node = of_parse_phandle(dev->of_node, + "samsung,audio-codec", 0); + if (!link->codec_of_node) { + of_node_put(link->cpu_of_node); + dev_err(dev, "audio-codec property parse error\n"); + return -EINVAL; + } } - card->dev = &pdev->dev; + link->platform_of_node = link->cpu_of_node; /* Update card-name if provided through DT, else use default name */ snd_soc_of_parse_card_name(card, "samsung,model"); - ret = devm_snd_soc_register_card(&pdev->dev, card); + snd_soc_card_set_drvdata(card, priv); + + ret = devm_snd_soc_register_card(dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); return ret; @@ -105,6 +220,19 @@ static int snow_probe(struct platform_device *pdev) return ret; } +static int snow_remove(struct platform_device *pdev) +{ + struct snow_priv *priv = platform_get_drvdata(pdev); + + of_node_put(priv->dai_link.cpu_of_node); + of_node_put(link->codec_of_node); + snd_soc_of_put_dai_link_codecs(&priv->dai_link); + + clk_put(priv->clk_i2s_bus); + + return 0; +} + static const struct of_device_id snow_of_match[] = { { .compatible = "google,snow-audio-max98090", }, { .compatible = "google,snow-audio-max98091", }, @@ -120,6 +248,7 @@ static struct platform_driver snow_driver = { .of_match_table = snow_of_match, }, .probe = snow_probe, + .remove = snow_remove, }; module_platform_driver(snow_driver);