From patchwork Thu Jul 26 15:01:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 142977 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp565044ljj; Thu, 26 Jul 2018 08:01:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcRWRwEEWcO7O+ZLecjm8MDzGX1fy5zjtfydmuq2yK32neqhoyFdZF8r0C+ay8Oi+01nBdP X-Received: by 2002:a1c:7408:: with SMTP id p8-v6mr1751151wmc.118.1532617306331; Thu, 26 Jul 2018 08:01:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532617306; cv=none; d=google.com; s=arc-20160816; b=0XHKyFFo7i37gbKc+yU8zPGwJZfpaY0XzYKiONTLb/c++wXx3a+SKEQbtcRw+b3tC5 aYi+THwXCmGqA2lWJMr+9X5SA3934aflPPbJvdtqWYqPxbu7yr5C+0sNoF4CEYreCoWE 3vMP+qexXRQkpbnt7CP/LgNdKwBocUY7RiLjS/GvzL6We/8dMON0CyUzIFK7vYlA1uay XvbHtwvERhPPGRvZnLgGUtOrUV3jTQjGrcuC8KYL6UE7l05kK11aYq7ap8HGHZXpsaM2 huir3NYRtB+NF1ggEhdqiRVKRT04ibfcI6yaWFBDTEp+t91mlmeJqeqryoAxkCczGIbx Z7cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=RSAzIyHW3wqkXLHly+sA49UOzmN5MGjLzbEfO082fjQ=; b=dWdTSrCtPOxTL/I5i2AWrwp4o6DGLU2ePQNf42jT7XzuBBjDaVhWT84Uv6zfAmKFC6 3S8k9oj9uV1aWL/tY7uZjj4eGJCTBlyBedNWFWfhIuw/Qa53Sv3r9yw7Wlpwu73EwVkW 2jAledrUXL+xHBk0kRu9Uo+qFm8kz8bDw+aY8Rmqt0Fe5X55vMg8eMWJkCeGXQC926AP R9TDd5GFA+Jvfg+wYuvuw9xa2IHrbJtM0dqsC40P00SvlLWefO4kxMi7yHySbTEKdw7Q t+6RgsxgTyaGMIG1jUZsS85edgOO76FyTpmwszhicEnuSsJq8lVELFHB6jA+8ITPeVBw tgYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=p96lbAMP; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id o57-v6si1288394wrf.258.2018.07.26.08.01.46; Thu, 26 Jul 2018 08:01:46 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=p96lbAMP; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8BEB626779A; Thu, 26 Jul 2018 17:01:44 +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 BB5242677A9; Thu, 26 Jul 2018 17:01:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 38A452677A1 for ; Thu, 26 Jul 2018 17:01:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=EPa3G7fnI1mmDwOEguTfQ2D5nXGrTkmQqgHAZxbiVSQ=; b=p96lbAMPbHMR gxBlqR9wh/EfZ9nVMjCVkYda/nI1rRw6tgwAo+IoB8HIIXDjQFJPmNbPpDZapUrU3+WByzhLY4I1w fiSINlOsqFDkHYc/sJ15fFKJMPRIrMjrYbJqWhcSosL/DXWykQjmE1dm9rdJ+8Ir6DLGszgLgoVV4 8kGzc=; Received: from [2a00:23c4:5d8e:0:97c8:1971:bc17:6a1a] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fihls-0007gg-FJ; Thu, 26 Jul 2018 15:01:40 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id F013E440078; Thu, 26 Jul 2018 16:01:39 +0100 (BST) From: Mark Brown To: Jerome Brunet In-Reply-To: <20180726124544.14740-4-jbrunet@baylibre.com> Message-Id: <20180726150139.F013E440078@finisterre.ee.mobilebroadband> Date: Thu, 26 Jul 2018 16:01:39 +0100 (BST) Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Rob Herring , Kevin Hilman , Liam Girdwood , linux-kernel@vger.kernel.org, Mark Brown , Carlo Caione , linux-amlogic@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: meson: align axg card driver with DT bindings documentation" to the asoc tree 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 The patch ASoC: meson: align axg card driver with DT bindings documentation has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 435857e015dc7b337c5f21d195ac2e4ffd694283 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Thu, 26 Jul 2018 14:45:44 +0200 Subject: [PATCH] ASoC: meson: align axg card driver with DT bindings documentation Drop amlogic prefix in front of the generic DT properties and change property "name" to "model". Signed-off-by: Jerome Brunet Signed-off-by: Mark Brown --- sound/soc/meson/axg-card.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index d6d1081d94ad..2914ba0d965b 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -123,7 +123,7 @@ static int axg_card_add_aux_devices(struct snd_soc_card *card) struct snd_soc_aux_dev *aux; int num, i; - num = of_count_phandle_with_args(node, PREFIX "aux-devs", NULL); + num = of_count_phandle_with_args(node, "audio-aux-devs", NULL); if (num == -ENOENT) { /* * It is ok to have no auxiliary devices but for this card it @@ -144,8 +144,8 @@ static int axg_card_add_aux_devices(struct snd_soc_card *card) card->num_aux_devs = num; for (i = 0; i < card->num_aux_devs; i++, aux++) { - aux->codec_of_node = of_parse_phandle(node, - PREFIX "aux-devs", i); + aux->codec_of_node = + of_parse_phandle(node, "audio-aux-devs", i); if (!aux->codec_of_node) return -EINVAL; } @@ -610,18 +610,18 @@ static int axg_card_probe(struct platform_device *pdev) priv->card.owner = THIS_MODULE; priv->card.dev = dev; - ret = snd_soc_of_parse_card_name(&priv->card, PREFIX "name"); + ret = snd_soc_of_parse_card_name(&priv->card, "model"); if (ret < 0) return ret; - ret = axg_card_parse_of_optional(&priv->card, PREFIX "routing", + ret = axg_card_parse_of_optional(&priv->card, "audio-routing", snd_soc_of_parse_audio_routing); if (ret) { dev_err(dev, "error while parsing routing\n"); return ret; } - ret = axg_card_parse_of_optional(&priv->card, PREFIX "widgets", + ret = axg_card_parse_of_optional(&priv->card, "audio-widgets", snd_soc_of_parse_audio_simple_widgets); if (ret) { dev_err(dev, "error while parsing widgets\n");