From patchwork Thu Aug 10 04:54:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 9892743 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 8B83060236 for ; Thu, 10 Aug 2017 04:56:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81BAD28AAC for ; Thu, 10 Aug 2017 04:56:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7662128AB2; Thu, 10 Aug 2017 04:56:05 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 16D3128AAE for ; Thu, 10 Aug 2017 04:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=pMAekQ5rFu+EZjblFouNKfwX1eWwsPXQslE0F1tkKm8=; b=bzz2CcGUM6k+oXcq4e5u0hzf8e 5pWOuEL2jYCBd2cAApXe9ZBxkhtseYDYBKFxZGPWF6Gi5WEND6f6v9MPCnPWULgakTu3TYN34p5B0 mA3kW71nyiD6eONEaH2AwWIjQFRUNOu+H2WvZdaT1fe3FiIQ7brKm+SMhx6t/TlsTG8RHSVLSfk2r ozw/bskNuRje+0eIiNKQxxadwKHqhBKiMN535emvKl8soLEKhAgmzFfyKnfZ1qdI2pOtqyYU96hF2 DOfOw1cgZhJJ9t3qs/h48Ng2uE8Lp3SWZ3PW30dmgcC36+kbOfD9JO/s3dS83Zz69ec29KtZ1RIPG tPKWv/5A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dffVp-0000Ar-Kw; Thu, 10 Aug 2017 04:56:01 +0000 Received: from regular1.263xmail.com ([211.150.99.134]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dffVd-0008JW-9O; Thu, 10 Aug 2017 04:55:56 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.164]) by regular1.263xmail.com (Postfix) with ESMTP id D72CC912E; Thu, 10 Aug 2017 12:55:23 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id 5F01F3B7; Thu, 10 Aug 2017 12:55:14 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <085a18fd2622fee25e3e21efed18ec3e> X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 23177E1SB9G; Thu, 10 Aug 2017 12:55:24 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org, dgreid@chromium.org, heiko@sntech.de Subject: [PATCH v2 1/3] ASoC: rockchip: Parse dai links from dts Date: Thu, 10 Aug 2017 12:54:56 +0800 Message-Id: <1502340898-28403-2-git-send-email-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1502340898-28403-1-git-send-email-jeffy.chen@rock-chips.com> References: <1502340898-28403-1-git-send-email-jeffy.chen@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170809_215550_548749_D17F64A6 X-CRM114-Status: GOOD ( 14.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, briannorris@chromium.org, Liam Girdwood , Jeffy Chen , dianders@chromium.org, Jaroslav Kysela , linux-rockchip@lists.infradead.org, Mark Brown , Takashi Iwai , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Refactor rockchip_sound_probe, parse dai links from dts instead of hard coding them. Signed-off-by: Jeffy Chen --- Changes in v2: Let rockchip,codec-names be a required property, because we plan to add more supported codecs to the fixed dai link list in the driver. sound/soc/rockchip/rk3399_gru_sound.c | 125 ++++++++++++++++++++++------------ 1 file changed, 81 insertions(+), 44 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 3475c61..03b7fae 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -247,9 +247,7 @@ enum { DAILINK_RT5514_DSP, }; -#define DAILINK_ENTITIES (DAILINK_DA7219 + 1) - -static struct snd_soc_dai_link rockchip_dailinks[] = { +static const struct snd_soc_dai_link rockchip_dais[] = { [DAILINK_MAX98357A] = { .name = "MAX98357A", .stream_name = "MAX98357A PCM", @@ -290,8 +288,6 @@ static struct snd_soc_dai_link rockchip_dailinks[] = { static struct snd_soc_card rockchip_sound_card = { .name = "rk3399-gru-sound", .owner = THIS_MODULE, - .dai_link = rockchip_dailinks, - .num_links = ARRAY_SIZE(rockchip_dailinks), .dapm_widgets = rockchip_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets), .dapm_routes = rockchip_dapm_routes, @@ -305,71 +301,112 @@ static int rockchip_sound_match_stub(struct device *dev, void *data) return 1; } -static int rockchip_sound_probe(struct platform_device *pdev) +static int rockchip_sound_of_parse_dais(struct device *dev, + struct snd_soc_card *card) { - struct snd_soc_card *card = &rockchip_sound_card; + struct device *rt5514_dev; + struct device_driver *rt5514_drv; struct device_node *cpu_node; - struct device *dev; - struct device_driver *drv; - int i, ret; - - cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0); - if (!cpu_node) { - dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or invalid\n"); - return -EINVAL; - } - - for (i = 0; i < DAILINK_ENTITIES; i++) { - rockchip_dailinks[i].platform_of_node = cpu_node; - rockchip_dailinks[i].cpu_of_node = cpu_node; + struct device_node *np_codec; + struct snd_soc_dai_link *dai; + bool has_rt5514 = false; + int i, index, ret; + + card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais), + GFP_KERNEL); + if (!card->dai_link) + return -ENOMEM; + + cpu_node = of_parse_phandle(dev->of_node, "rockchip,cpu", 0); + + card->num_links = 0; + for (i = 0; i < DAILINK_RT5514_DSP; i++) { + index = of_property_match_string(dev->of_node, + "rockchip,codec-names", + rockchip_dais[i].name); + if (index < 0) + continue; + + np_codec = of_parse_phandle(dev->of_node, + "rockchip,codec", index); + if (!np_codec) { + dev_err(dev, "Missing 'rockchip,codec' for %s\n", + rockchip_dais[i].name); + return -EINVAL; + } + if (!of_device_is_available(np_codec)) + continue; - rockchip_dailinks[i].codec_of_node = - of_parse_phandle(pdev->dev.of_node, "rockchip,codec", i); - if (!rockchip_dailinks[i].codec_of_node) { - dev_err(&pdev->dev, - "Property[%d] 'rockchip,codec' missing or invalid\n", i); + if (!cpu_node) { + dev_err(dev, "Missing 'rockchip,cpu' for %s\n", + rockchip_dais[i].name); return -EINVAL; } + + dai = &card->dai_link[card->num_links++]; + *dai = rockchip_dais[i]; + + dai->codec_of_node = np_codec; + dai->platform_of_node = cpu_node; + dai->cpu_of_node = cpu_node; + + if (i == DAILINK_RT5514) + has_rt5514 = true; } + if (!has_rt5514) + return 0; + /** * To acquire the spi driver of the rt5514 and set the dai-links names * for soc_bind_dai_link */ - drv = driver_find("rt5514", &spi_bus_type); - if (!drv) { - dev_err(&pdev->dev, "Can not find the rt5514 driver at the spi bus\n"); + rt5514_drv = driver_find("rt5514", &spi_bus_type); + if (!rt5514_drv) { + dev_err(dev, "Can not find the rt5514 driver at the spi bus\n"); return -EINVAL; } - dev = driver_find_device(drv, NULL, NULL, rockchip_sound_match_stub); - if (!dev) { - dev_err(&pdev->dev, "Can not find the rt5514 device\n"); + rt5514_dev = driver_find_device(rt5514_drv, NULL, NULL, + rockchip_sound_match_stub); + if (!rt5514_dev) { + dev_err(dev, "Can not find the rt5514 device\n"); return -ENODEV; } /* Set DMIC delay */ - ret = device_property_read_u32(&pdev->dev, "dmic-delay", - &rt5514_dmic_delay); - if (ret) { + ret = device_property_read_u32(dev, "dmic-delay", &rt5514_dmic_delay); + if (ret < 0) { rt5514_dmic_delay = 0; - dev_dbg(&pdev->dev, + dev_dbg(dev, "no optional property 'dmic-delay' found, default: no delay\n"); } - rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL); - rockchip_dailinks[DAILINK_RT5514_DSP].cpu_dai_name = kstrdup_const(dev_name(dev), GFP_KERNEL); - rockchip_dailinks[DAILINK_RT5514_DSP].platform_name = kstrdup_const(dev_name(dev), GFP_KERNEL); + dai = &card->dai_link[card->num_links++]; + *dai = rockchip_dais[DAILINK_RT5514_DSP]; + + dai->cpu_name = devm_kstrdup(dev, dev_name(rt5514_dev), GFP_KERNEL); + dai->cpu_dai_name = dai->cpu_name; + dai->platform_name = dai->cpu_name; + + return 0; +} + +static int rockchip_sound_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &rockchip_sound_card; + int ret; + + ret = rockchip_sound_of_parse_dais(&pdev->dev, card); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to parse dais: %d\n", ret); + return ret; + } card->dev = &pdev->dev; platform_set_drvdata(pdev, card); - ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) - dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", - __func__, ret); - - return ret; + return devm_snd_soc_register_card(&pdev->dev, card); } static const struct of_device_id rockchip_sound_of_match[] = {