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: 142964 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp414856ljj; Thu, 26 Jul 2018 05:45:57 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfdWsHi8FBnIu7PaOfkvQXrEgOJ2Vk8i3GOPwUYlBsTgvsF5i3Pf0w7qUY0EVDU9FxrQKMK X-Received: by 2002:a63:9802:: with SMTP id q2-v6mr1846682pgd.70.1532609157143; Thu, 26 Jul 2018 05:45:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532609157; cv=none; d=google.com; s=arc-20160816; b=UDVBwX34nYuLFZtwJckotrfMyviWQtVvf2BcAlhjPJHmD95Moba2VH2ostHhS2Ryw/ YXrz5Dee/Svi85X7tAsBkDk+TC3C7jeig/hE2U4uE4OxcD6sIjEqvuuqhydowY/ob8V2 XWJaFj7sPGSK1gRcTyUY62posIR9PY+82HqcBseT8YqYp+hGnSEkcf+iih6cD48mqOuQ 6V5I5h/3Ej6EKPs48RtIYiCdEUKZbPw46QphGnAxoPkP2rar4dIheOv8eJT5QAeUJJSD GUBYAzyGdR11byGnZl09zI01yUpuHS6cIelgPV6T9yTJBi20Kdypz95UYcGOoQrYdugN UueQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=HYMNtp44pzZLM40Mkk7iwlxREahVe+4mHqnm/lq9yKk=; b=NoaEZi29uSpvxHYU+XHQNgmEBzzGDBT/gxZmcPJ3QmBn9XQJmeYWJMERkhNQ8Q04wv 8f9uIzlflBcNU1cwQIqceYVxpvZuXtPvYtrJvA13wzfYA97g5N6kvmrZsDOtPV3+zGPM D1aj42ZcN5cJQVRrAb7DWeViLdc+6ssPPpXEDbfR4ggn8PxNqPqSs6c61+sqC8TSAjFo 0UllC0zJVaQyKTp7yTzkX9QekQMgyFniFo3NqlCZ/vCGqdzZaXYnDzdorJXgIItl8T31 ERkhXKnUBCVfLjJkGjxjX6OWA1WOxobC2j//pLGQD4bnZnVLDNxLzxVQ8UXdB+qfxG9V Psrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=PcySDuY5; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 24-v6si1273213pgx.314.2018.07.26.05.45.56; Thu, 26 Jul 2018 05:45:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=PcySDuY5; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729385AbeGZOCg (ORCPT + 5 others); Thu, 26 Jul 2018 10:02:36 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42659 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730085AbeGZOCg (ORCPT ); Thu, 26 Jul 2018 10:02:36 -0400 Received: by mail-wr1-f65.google.com with SMTP id e7-v6so1581050wrs.9 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=g6iVdHiYxI7MiOaM8Eel/Oe3f2uj47Itit6lDHMrZ/Y/xeBmv3DeSv5FeaGe3SHzpu W0j5NWDzlB1a6AXLI6i1OGBlpN8OiQLLVEAAFCOCLurFiSPrrPCi+K90DG2Kewe47U4M L85egpGO8KgmaKniV/eW91izNcJ5hUW9dSUIs1QpN8/SM6AhmnHAMJsAFr1tSrqUQ+O5 jzP5BeYuZt/WMo631/QMiK8XDPR8DQkDriKygbbmMghvaVL+3cS1GhM11edYnEqnxzXF BVX6Ujb+/FHrVyjWE70m9Wkt9n5y0U8Bubgm8OvOu6GJ1Ef/twFWcmrwGLYnqQ/AmoqZ zy2Q== X-Gm-Message-State: AOUpUlHQHpxahYW3ycsa+/7riJSWKIG6vxbs1kz69C6Z9VwLMYGCsx59 lD1nM8K5PymgmhWYM0s2m8SocQ== 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 Cc: Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org 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> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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(-) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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");