From patchwork Thu Jul 26 12:45:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 949635 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="Eq5OUJP1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41bsKJ0pPgz9s0w for ; Thu, 26 Jul 2018 22:46:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730105AbeGZOCv (ORCPT ); Thu, 26 Jul 2018 10:02:51 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41817 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730368AbeGZOCe (ORCPT ); Thu, 26 Jul 2018 10:02:34 -0400 Received: by mail-wr1-f65.google.com with SMTP id j5-v6so1582807wrr.8 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=oYFISBtgclTnoaHc+EU4FaMncw/3kCdI1LZml71Zj98=; b=Eq5OUJP1mn4iJSVAowybKbUeXe6Sq19Ax9K4sAIhbDMNQDK8QrsmkYYxET8R4Zokxy fCeuAhT3jXpNQu9TgV72m/2qGX7LT1vN/Pdfbn7nNawbnBlvmua95QfpUmCP8QieanAe kMJ+wJTIDjgH0cB99kvaEAALYVninOLCoJLulcNmQPHKDgSFOcbaNawk8Qc8t8jQ4j+Y 3qmR18CXKXpLSIMGzJLjNWtMflvn/wWKtL39q3lYX2JWRU1XBy8Xs/Z313DJ19Vja0Fe xjDBzTBzrls03y3voiDsFIfsd95UszqOC+L9L4To25kbn26+BcGSO2MXedLF+0Qa5uq/ iRjA== 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=oYFISBtgclTnoaHc+EU4FaMncw/3kCdI1LZml71Zj98=; b=d71GA2lA2MZ6Wrpx/14vKRYflUHG75g0rIPqV5tlPfajeVEulevFu+egeSA59ykL+t QvpoYk7fjykmozSjefvQ1DC0vdr90/P6zOh2cdct5p8473ex6/UacrnIOBp7+U3dr8ON 4aeNItMnULhL7Q4R0CI+ddN69C6m/ZIja8qATudvf62utMqDExvmNBqA3fkKEConQatI oCb5UbNiIz6hfiLSmBlfNNFf1+ynTrQKcR+/7wbKeEmwGQ8NDBEUjkQ8M4KLKQdTuSjb 4h0wb27yJKkIT98nIpTn+2k8IwNfmssQca4IzHraXRyOIhqxa7lw2hstcYBV4Rh9SFSn OJfg== X-Gm-Message-State: AOUpUlFylX2zanqAq7nygrex5m6z5zoKD4NxNRz7vgV1Hh/BuodihgCu OxoenR0WTg6SEE7IGQKK0vZA3w== X-Google-Smtp-Source: AAOMgpcgkKKhaDXPiasJ9ATL7tOuCGk1qLqntD5atPbyop6Lpc7l/uqe4NC6Ay6TklKknHh2YQKYlQ== X-Received: by 2002:adf:8ec2:: with SMTP id q60-v6mr1422848wrb.275.1532609151713; Thu, 26 Jul 2018 05:45:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jul 2018 05:45:51 -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 2/3] ASoC: meson: update axg sound card bindings Date: Thu, 26 Jul 2018 14:45:43 +0200 Message-Id: <20180726124544.14740-3-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 Remove the amlogic prefix in front of the generic properties and change the card 'name' property to 'model' Suggested-by: Rob Herring Signed-off-by: Jerome Brunet --- .../bindings/sound/amlogic,axg-sound-card.txt | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt b/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt index 39e005da0407..80b411296480 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt +++ b/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt @@ -3,19 +3,19 @@ Amlogic AXG sound card: Required properties: - compatible: "amlogic,axg-sound-card" -- amlogic,name : User specified audio sound card name, one string +- model : User specified audio sound card name, one string Optional properties: -- amlogic,aux-devs : List of phandles pointing to auxiliary devices -- amlogic,widgets : Please refer to widgets.txt. -- amlogic,routing : A list of the connections between audio components. +- audio-aux-devs : List of phandles pointing to auxiliary devices +- audio-widgets : Please refer to widgets.txt. +- audio-routing : A list of the connections between audio components. Subnodes: -- amlogic,dai-link: Container for dai-link level properties and the - CODEC sub-nodes. There should be at least one (and - probably) subnode of this type. +- dai-link: Container for dai-link level properties and the CODEC + sub-nodes. There should be at least one (and probably more) + subnode of this type. Required dai-link properties: @@ -57,38 +57,38 @@ Example: sound { compatible = "amlogic,axg-sound-card"; - amlogic,name = "AXG-S420"; - amlogic,aux-devs = <&tdmin_a>, <&tdmout_c>; - amlogic,widgets = "Line", "Lineout", - "Line", "Linein", - "Speaker", "Speaker1 Left", - "Speaker", "Speaker1 Right"; - "Speaker", "Speaker2 Left", - "Speaker", "Speaker2 Right"; - amlogic,routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2", - "SPDIFOUT IN 0", "FRDDR_A OUT 3", - "TDM_C Playback", "TDMOUT_C OUT", - "TDMIN_A IN 2", "TDM_C Capture", - "TDMIN_A IN 5", "TDM_C Loopback", - "TODDR_A IN 0", "TDMIN_A OUT", - "Lineout", "Lineout AOUTL", - "Lineout", "Lineout AOUTR", - "Speaker1 Left", "SPK1 OUT_A", - "Speaker2 Left", "SPK2 OUT_A", - "Speaker1 Right", "SPK1 OUT_B", - "Speaker2 Right", "SPK2 OUT_B", - "Linein AINL", "Linein", - "Linein AINR", "Linein"; - - amlogic,dai-link@0 { + model = "AXG-S420"; + audio-aux-devs = <&tdmin_a>, <&tdmout_c>; + audio-widgets = "Line", "Lineout", + "Line", "Linein", + "Speaker", "Speaker1 Left", + "Speaker", "Speaker1 Right"; + "Speaker", "Speaker2 Left", + "Speaker", "Speaker2 Right"; + audio-routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2", + "SPDIFOUT IN 0", "FRDDR_A OUT 3", + "TDM_C Playback", "TDMOUT_C OUT", + "TDMIN_A IN 2", "TDM_C Capture", + "TDMIN_A IN 5", "TDM_C Loopback", + "TODDR_A IN 0", "TDMIN_A OUT", + "Lineout", "Lineout AOUTL", + "Lineout", "Lineout AOUTR", + "Speaker1 Left", "SPK1 OUT_A", + "Speaker2 Left", "SPK2 OUT_A", + "Speaker1 Right", "SPK1 OUT_B", + "Speaker2 Right", "SPK2 OUT_B", + "Linein AINL", "Linein", + "Linein AINR", "Linein"; + + dai-link@0 { sound-dai = <&frddr_a>; }; - amlogic,dai-link@1 { + dai-link@1 { sound-dai = <&toddr_a>; }; - amlogic,dai-link@2 { + dai-link@2 { sound-dai = <&tdmif_c>; dai-format = "i2s"; dai-tdm-slot-tx-mask-2 = <1 1>; @@ -114,7 +114,7 @@ sound { }; - amlogic,dai-link@4 { + dai-link@3 { sound-dai = <&spdifout>; codec {