From patchwork Thu Jul 26 12:45:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10545825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A7C10112B for ; Thu, 26 Jul 2018 12:46:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 941A42B16B for ; Thu, 26 Jul 2018 12:46:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8801E2B16E; Thu, 26 Jul 2018 12:46:10 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 C0F652B168 for ; Thu, 26 Jul 2018 12:46:07 +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=Lh0dOVlt3JYnimW2rLosIzu/o3k52faq4q4GlXf1p74=; b=OT8O6j44dcF6OfohNoQ5CwiyR4 fhGr50THF6CdgNBUt/odB5iyCTrL0dgNvJmB2PcQmU66qZkcq1ZFu+BjcErQHM5TziiQOTxTPp6pj aHjClp3ttxN7e9zbwhQAF+XHcpJ3AJKR8qHdI5TfmYAOzlibxw+iAf0YmGQxJ9NH8aw0nifQF/Evy PytOhVvfHC8+ljIA5EAS2EoGkfir/35LQxscMgK5mKYEBuw/g4cki0/FbTusJ+kfoUXJDZeiWQIPf ++/HInMfQf5i8TaKoXw7dp20W5S3IZyu1eTmwWCfms60wOC7zRoBjyyIYSDHJt3mHM6meghjDFAkC SuTsEa2A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fifeg-0005Y3-SV; Thu, 26 Jul 2018 12:46:06 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fifec-0005U5-NJ for linux-amlogic@lists.infradead.org; Thu, 26 Jul 2018 12:46:04 +0000 Received: by mail-wr1-x444.google.com with SMTP id c13-v6so1593202wrt.1 for ; Thu, 26 Jul 2018 05:45:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7WYqd29pcrxIUECLsEnZrt9IL920I+CRQcYOJWWeBW0=; b=PcySDuY5G9Z+Kf1qJ3mhTGR5C7mGXwcovLEzeRTbLZVFATGXGXMd0Z64GE539LOVpi gO3Djl2eFvdsytiass27KfWyB7z5QUcdBNQ0p8Y55LkNO4pStaRvBGhe002g5x8No9kp aq1MIH2VZ+CiJY9hZYw7YJqiF5hXN8pQc1KLLOQEX7p84eG8zYkbGYEO8qQ6VEKY8IOX Q1Uk982vluST1i5NLHC8LtJqDoU5JOp6jqCQhotIw8x9Em4LU6x7MwYf1ve32L2+WRd+ ejcA5N3rq8jJk8F6Lr5Fz+x77Xa2CzApE9h3Cm+gVrvchO28FcHDVSqOaNAlIQOMd6Iy 7zpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7WYqd29pcrxIUECLsEnZrt9IL920I+CRQcYOJWWeBW0=; b=F6upS+s8HLQ1RZWB0+LAUNxs16fKjeMnLASnsUK/FJyTKiIDcKENO3XIfp4iBc6QZJ 7lXNZiLBslqs+Xee97ycY8lYzUpzLLWU7SQDEyqeM65P65q8Rz2f6X/vVj2LYJhvbrMu fBRbQKPZ4rLpAF5XOO4ruyHP8cj7rzedCa0QlHcZy1l8kBwOF3la5/RmYB7paKC/IToF Yq1XBgROm0/JZ7A3M+Kj4wn6uF+ql4ajYrLaGJoKobeoGAx4PxQvMB0H/e7pskx5e+bs Jexi9xQqItsvEQF/wOJVaSg8NTNjvDVDu4675aRJZf+SANGd0zho9Wz02ys1iaG7mglS DXXQ== X-Gm-Message-State: AOUpUlEmI8NJSXLsB1t0kj9StGSObYzqDl99xd2K3BgKMx5EQV3YTMn8 OxsKvUIit3wZ7c7UqgDpgVhw1A== X-Google-Smtp-Source: AAOMgpcZ4k2LjjdC7zyCqHpNnifDQzSn4uiklnDQdVeWU3ori52h6tO76WR5OCPjTqud8jDXWKf8TQ== X-Received: by 2002:adf:e491:: with SMTP id i17-v6mr1536571wrm.145.1532609152778; Thu, 26 Jul 2018 05:45:52 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id m207-v6sm1867744wma.31.2018.07.26.05.45.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jul 2018 05:45:52 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood , Kevin Hilman , Carlo Caione , Rob Herring Subject: [PATCH 3/3] ASoC: meson: align axg card driver with DT bindings documentation Date: Thu, 26 Jul 2018 14:45:44 +0200 Message-Id: <20180726124544.14740-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180726124544.14740-1-jbrunet@baylibre.com> References: <20180726124544.14740-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180726_054602_763930_FB97F064 X-CRM114-Status: GOOD ( 11.71 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Drop amlogic prefix in front of the generic DT properties and change property "name" to "model". Signed-off-by: Jerome Brunet --- sound/soc/meson/axg-card.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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");