From patchwork Wed Aug 9 12:19:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 9897483 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 15BFD603B4 for ; Sat, 12 Aug 2017 21:40:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06B572889F for ; Sat, 12 Aug 2017 21:40:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF9032896D; Sat, 12 Aug 2017 21:40:18 +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, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 149BB2889F for ; Sat, 12 Aug 2017 21:40:17 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 70C49266C72; Sat, 12 Aug 2017 23:39:42 +0200 (CEST) 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 C77C9266C25; Wed, 9 Aug 2017 14:20:11 +0200 (CEST) Received: from regular1.263xmail.com (regular1.263xmail.com [211.150.99.141]) by alsa0.perex.cz (Postfix) with ESMTP id 4C638266B7E for ; Wed, 9 Aug 2017 14:20:08 +0200 (CEST) Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.164]) by regular1.263xmail.com (Postfix) with ESMTP id 5BD4F6B; Wed, 9 Aug 2017 20:20:05 +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 9756137E; Wed, 9 Aug 2017 20:19:58 +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: <201b9ba76abf0e9e1692dd896b1b5ffc> 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 29591L5J02P; Wed, 09 Aug 2017 20:20:05 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org, dgreid@chromium.org, heiko@sntech.de Date: Wed, 9 Aug 2017 20:19:37 +0800 Message-Id: <1502281179-15916-2-git-send-email-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1502281179-15916-1-git-send-email-jeffy.chen@rock-chips.com> References: <1502281179-15916-1-git-send-email-jeffy.chen@rock-chips.com> X-Mailman-Approved-At: Sat, 12 Aug 2017 23:39:37 +0200 Cc: alsa-devel@alsa-project.org, briannorris@chromium.org, Liam Girdwood , Jeffy Chen , dianders@chromium.org, linux-rockchip@lists.infradead.org, Mark Brown , Takashi Iwai , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH 1/3] ASoC: rockchip: Parse dai links from dts 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.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 --- sound/soc/rockchip/rk3399_gru_sound.c | 129 ++++++++++++++++++++++------------ 1 file changed, 86 insertions(+), 43 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 3475c61..c2bc675 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,118 @@ 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; - } + struct device_node *np_codec; + struct snd_soc_dai_link *dai; + bool has_rt5514 = false, legacy; + 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); + + legacy = !of_get_property(dev->of_node, "rockchip,codec-names", NULL); + + card->num_links = 0; + for (i = 0; i < DAILINK_RT5514_DSP; i++) { + if (!legacy) { + index = of_property_match_string(dev->of_node, + "rockchip,codec-names", + rockchip_dais[i].name); + if (index < 0) + continue; + } else { + index = i; + } - for (i = 0; i < DAILINK_ENTITIES; i++) { - rockchip_dailinks[i].platform_of_node = cpu_node; - rockchip_dailinks[i].cpu_of_node = cpu_node; + 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 (!legacy && !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[] = {