From patchwork Thu Jul 26 12:45:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10545827 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 BBF0014BC 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 A8FAE2B168 for ; Thu, 26 Jul 2018 12:46:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D7342B170; 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 5D0592B16A for ; Thu, 26 Jul 2018 12:46:10 +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=yKD+aWhOBw8a3SWwFjSM+UTKC/RhhFt2o1bUwxm7Ei4=; b=d7+BFQ6cBhwwrD/TrB1Lgca1BH Zy/LglFO1mlMKJAXHdWK+MCa7VQurlYvQUSgfj75qFrNnv4aUeb8ol6DhEsPO+H4KDEtVGS/aFpxs CF2kNwnK9zJnVZilQgStpdoEeO60rchVjbiVaIf+IgGfaSWv/+dz4wQhiDfNx4tSVNDu5+g/IXere qj+x1HeU1sZ9v95LnOOnAhsJB654yLVP2R63qtAbHSw/mIaGeHjGJhOlUELccj6aGfTRGubRU7Dl/ 9tKmmoCEU/kSxLfMpec2AjqdNrsKoRe+eTdIj3O8ZTZ6zDLjg0XVdy3tJSiH1FEZzxtgvtMq3lK23 VpLJLPBA==; 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 1fifej-0005aK-Jn; Thu, 26 Jul 2018 12:46:09 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fifee-0005Tt-1G for linux-amlogic@lists.infradead.org; Thu, 26 Jul 2018 12:46:05 +0000 Received: by mail-wr1-x442.google.com with SMTP id h15-v6so1585180wrs.7 for ; Thu, 26 Jul 2018 05:45:51 -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=a+ev1bGmZHlGL08s3doi18bCWN3phVVcjsC7HmN0N84=; b=SOUaedzXxtGnPxHEyOFiPlxXXC7pvP5qC2+5nOvXb/Wgpxg7FLcKG1K7W09w9VsbE8 sMBibxY3wBGbb7AOHSnVWBvS9FCS9QXs9aQzYsQgAwH/7gcJ/PHewM2+Dz5pA1o9/zOP GbEDJvX/rgyE3t45Wg8DZKMHddO6Pf7icLaTgZ44hj13r29g42DzoOFDkqSjr1KFSD02 LZzJlomoHOA1GZ25iqk/duk7brLknuh1D+oz1/77tyonCo4bo279CoVHepTfSgl5w5Rt 6jAn+4MZhNjdJUu9+fVgZa8U7GMDPNWEeD8Z+aeunPtVyGrxr8BmojN6om+g5480ho92 Ywdg== 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=a+ev1bGmZHlGL08s3doi18bCWN3phVVcjsC7HmN0N84=; b=VOCBBvwgqFBHMysgU1hJXHro4OXO/Zur4SF6wVz5PRvnJz1V7IlXISNZ4/EP49irQd hdxSz94jeH7GbS8nT/vgU3T7OM610MahanoC19Eow5bfXulJyiZgILkvT2H7+iOkVGnV O1CaaCFWyzbQQs9qEyKmx3stGeXxkPW9G3HS1ksEHCwJFHmTEW4/8FnBf2Anhc3HEhTh 28IXPzzXF0NQjhc8ruRMk2UhRoL6a6jwmpAe2oxrV7VPMLsZ9rMRJWxQvsBH5zNiignG NKl+NiB+m8f3ePaHlGG5MJz75irVLLsvVw8s437W38EkKIF/4A5+IVlnPfgjSqQpm1EX W26g== X-Gm-Message-State: AOUpUlHZ7IYFjxISVbVowj8317YX8FTTsTzpWmmCX0wfrwuAQpnaKwX6 /wQACcUibE28yZ06TFNd76p4Ruleu48= X-Google-Smtp-Source: AAOMgpexpjF9VUVJagjAHwizM2j8sqdrimDsg171xx54WHaIJ3AN0NEz80JI2LL626ihgDp0QfPuyQ== X-Received: by 2002:adf:fdcd:: with SMTP id i13-v6mr1442163wrs.276.1532609150700; Thu, 26 Jul 2018 05:45:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jul 2018 05:45:50 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood , Kevin Hilman , Carlo Caione , Rob Herring Subject: [PATCH 1/3] ASoC: meson: use IRQ_RETVAL in the fifo irq handler Date: Thu, 26 Jul 2018 14:45:42 +0200 Message-Id: <20180726124544.14740-2-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_054604_073762_1AE64C6C X-CRM114-Status: GOOD ( 11.04 ) 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 Use IRQ_RETVAL instead of the open coded ternary operation. Suggested-by: Takashi Iwai Signed-off-by: Jerome Brunet --- sound/soc/meson/axg-fifo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c index db367d85290f..30262550e37b 100644 --- a/sound/soc/meson/axg-fifo.c +++ b/sound/soc/meson/axg-fifo.c @@ -174,7 +174,7 @@ static irqreturn_t axg_fifo_pcm_irq_block(int irq, void *dev_id) /* Ack irqs */ axg_fifo_ack_irq(fifo, status); - return !status ? IRQ_NONE : IRQ_HANDLED; + return IRQ_RETVAL(status); } static int axg_fifo_pcm_open(struct snd_pcm_substream *ss) 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: 10545829 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 0241C112B for ; Thu, 26 Jul 2018 12:46:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1D582B168 for ; Thu, 26 Jul 2018 12:46:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3B982B16B; Thu, 26 Jul 2018 12:46:11 +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 584822B168 for ; Thu, 26 Jul 2018 12:46:11 +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=oaxELKUwrAywbsC33BwI+PhIMoyi78KddYDGnkDfL90=; b=fOjHwYtzFO2NbhBBuvLmXtTPke iKs7n2M2dnbSVsRMAYN1vAdr6CfJ/LtSM5ky8yUfJ4cIyVFQ9c9JaUuf1jshYkzIqesp5M5mUClMU Px3myDYQw+v1SUoEEuhl1drbxXdYgnMZFTV5gaoKpPZwDN23lTMnhGTu+HSQL5ZuVxJnKEyQqiqXU mM3N4kJ8GvmVdciu1EuE1Ony7eooV2B6nvbmKmC6c5i/54jaupFvxN5sliRQ8v/JE2dfvVRr1a2ms /v+Xs2I9sYAi30Fdaw6sdYRj9r4UmIAPQhIUU12pnp8/GQpSKdRfQ688DPFok39DX9eJvg4BLTzRd pEIuNduA==; 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 1fifek-0005b3-8d; Thu, 26 Jul 2018 12:46:10 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fifee-0005Ty-4s for linux-amlogic@lists.infradead.org; Thu, 26 Jul 2018 12:46:06 +0000 Received: by mail-wr1-x441.google.com with SMTP id t13-v6so1576427wrv.12 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=AnIuqyNfdM/w803l9tJgLG6JHy4A3XYKMTfOnJQww1lQM5T3DnP+wM1G5HFeyAdo8G sUG8dHUOU6W1wdRC2kN3zRvCemCKqZnRX1xl2oWwP07YMo3YyajdFMVdjQI+xS/CLYxY 4TDQNFHp2klmFG6DIai7XE/kt+7wrGIAb+Vx9Es289fNCoDBoqQLh+jDpO165vO5guIy UN6M138TrqAFSt3LLRjER9WCLvf00S02O4tpI9ApLLB9cB0F0hhOL2t3Snd3o1n6+/lA k43G7ctY6q8TpQaP8tbhcl6zcmGo1hVBOnP/1B1TnDyGWG6qmkZHcs3OTDp+SRQ0630h Sqsw== X-Gm-Message-State: AOUpUlF8r6FmRuyAbwX1ZNLZA5SqkFi/opPnsyDZWeFPUnwIhz/1pMni cf3vKfdcHioaVUMhBgNOjO1egw== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180726_054604_220732_DF93CF90 X-CRM114-Status: GOOD ( 10.74 ) 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 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 { 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");