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: 10545833 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 0C30A14BC for ; Thu, 26 Jul 2018 12:46:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE4702B168 for ; Thu, 26 Jul 2018 12:46:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E171D2B16B; Thu, 26 Jul 2018 12:46:21 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID 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 4B4C82B168 for ; Thu, 26 Jul 2018 12:46:21 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id F13F826779D; Thu, 26 Jul 2018 14:46:00 +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 8B3C0267783; Thu, 26 Jul 2018 14:45:54 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by alsa0.perex.cz (Postfix) with ESMTP id 085A626739D for ; Thu, 26 Jul 2018 14:45:53 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id b15-v6so1573705wrv.10 for ; Thu, 26 Jul 2018 05:45:52 -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=rc571qK2PF/vYSSf74S3wKhRS/GYo46zOC1qwKNhNSDmw+ZdCD7OvXxI0dMadkR6AI rkHWrTmqh97CrKNgK80eGzTt6rdWIx5XF1ZH6EvBuiwfp6Pd2AsLc82Svu7j2PE+K9Du rqdJOmbKw89obLvn6T+VilqNm8CZy+KMhwTQbdRLHqIm4gbtYJ2hNk1r8gygwFvhY8Ok WtakQGpJ5cx06npO3SbY/M5hC4uBfDzXEPHw1KwSKLqz7Z7KsJgTbkkVerCFgiUUXY/v e+mPSPRwmahEJZkCoYzkONu7+INpgJ4aF8qCzxXhdO+X2qVOdmhGAdzp31/uHfq47tyJ 36wQ== X-Gm-Message-State: AOUpUlHqxmGYtlwzvldAbFUulc71Vtzet1MlThmUO+H0vj93FaiM7Ie2 D6jgHiUbRBPT/n8NcxSyWypCcg== 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 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> Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet Subject: [alsa-devel] [PATCH 3/3] ASoC: meson: align axg card driver with DT bindings documentation 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 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");