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: 142962 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp414850ljj; Thu, 26 Jul 2018 05:45:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfDN64sPRUYcJgEpqnA8PQ5tN260A6wOQOIGkzIq5XIYB+IIwuw77IjBbyEeXnYdcEBSmW+ X-Received: by 2002:a62:5bc3:: with SMTP id p186-v6mr2011008pfb.42.1532609156497; Thu, 26 Jul 2018 05:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532609156; cv=none; d=google.com; s=arc-20160816; b=TdLYGPoQB+Iy5BnnzRxa+Sh/v3qvfFUEkT+Hxx1/I4ayBq/LqB5kn7vPHMizE96R8z RU1PyyeD/gW6D36lxfL8NibZl2Q1rWltJQCqYoDPVE47xjZbW8riobclA049S/fOyqdZ /A9bBRIxADz97fgsmR5fOCb136Fe3T5irNS64BiWvIIv5BX/JtzD94ZaV1uP/wlQoWRk WzzgGko7dCIy6fgzrHoVWY2nAtbpV+fzDWJcYe2FO8X6ZuwRy7rrLIH4ZHgWY1uTgiIq ECgDNzJvO8l2E2r+W5OnleBqFiaANdVnG+hxoD93ibzS16WJjMOoflvW9GidwUHuTjpe V3lg== 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=a+ev1bGmZHlGL08s3doi18bCWN3phVVcjsC7HmN0N84=; b=XW3bnoSTDUU6GD1vICnGLpkGekdoenQuGK9Yncmz2Hk+hGp/O1iYoRkUuJuiK7IfqL wqwvPLNDMbiLcg4sT9QCUSRfuHgSKKwVdkXZNHRP3jX5eH+sQ0tA6iDnJHqHyHF0+Fgg /jD4TFEpfFbqmT1H5eFm2wOOpRvWUKHYJ3o91ie/UWAkrKRLn5xXwBFMlvaAghIdXwQT 5DIvzEzh5gv5YTl8dqk+65E3XV9RnLgOpYjOCafP3I0p4UondYeZw+nDlaWj9PXUXH25 IcnDqjRsBpvAtSR4zvnqSgTAljEeIRIcMb+I85RdZi1zpv6S2G61BspdZviGXaK8Atk/ bfuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=SOUaedzX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=SOUaedzX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730572AbeGZOCf (ORCPT + 31 others); Thu, 26 Jul 2018 10:02:35 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33017 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730335AbeGZOCd (ORCPT ); Thu, 26 Jul 2018 10:02:33 -0400 Received: by mail-wr1-f65.google.com with SMTP id g6-v6so1596925wrp.0 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=U+Yl2RvzWu2e5PHEQLEQkSYKRxzCnzgwMXxhLaWqcLTCcuZyWLXYLdud6qwCojmJPo 8+TfHdHiZd6Kzfe+XdQFJvK/jIdPcgZ1EYOWM/REul1+8LfzO3pXBNKnH7exk+bUR69i oxYH8fj4lOtbdvAuknSKTo+J+wqkcT71LdjH+Fos9QUJRTV0UzNFRQLoMwoc8FnU5sg6 JXCWBWzIBcx0W2IWI1W2mZum4ZlRf2iF6GEriWve5KDlfQSvY99lN+1FexKXeoRaTxyo /97+UYjXpRxMYl9GljLnkuZfMVIWL2AbNaDkqkkSWaGzDPsBJHS+zfW/mlgGUSFUV3Kz Ma2A== X-Gm-Message-State: AOUpUlFeqDLUGxo/UwOTL/KEJdMBGagaE5AhyYTz9mNzFyOdjkOBk1SK 6MtYfiZNbQuXmWv5OatKeN0Ttw== 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 Cc: Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.17.1 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: 142963 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp414853ljj; Thu, 26 Jul 2018 05:45:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe9s9yfPpOyxHIzWBTpvGJTlecAOWmOnbpCM6F3mTSqtLBURYsSQlA7fpesIPiEcG9+kS+i X-Received: by 2002:a17:902:4c88:: with SMTP id b8-v6mr1754192ple.285.1532609156838; Thu, 26 Jul 2018 05:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532609156; cv=none; d=google.com; s=arc-20160816; b=1Es5HL4eKOcBbP3RJ9GiFEEjOMcLM0lNOB8a7p3inUEjUYt8R6uE9r4gMQV2Dtmh1E xpP34wzaDnymUZ2HR1k6Rb4YHfiZiYh+UOsztqQ8oQpYshkMHCDvfHE2FHb5J7GSXQfM 25b8tL+MhYzL+t6aR0E5VI2J/vyk/S+OyTtM9PxsUqNuBvI9qnTpW8VzfS8kbZiHcT63 ReZFHM5saUUOJhPL2O+pMFMpLpZzydQItAJfdisNwI8s6gsTo1j3MYa5HK21SQjUI/VT rMZDU3Ryudm7mZnP/Mqy5dDwxINE69iPF0iliyo+Vc3xcKRky3U5Cvmh6hRgEV1cIh2P udlg== 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=oYFISBtgclTnoaHc+EU4FaMncw/3kCdI1LZml71Zj98=; b=rlomq5B045tdD6xsKbNjIH7SYsZ65jIWGaEAKIWwnaBCZWeaYqRgqyqqgnt64MJ7Fo uEAaXF35jlBOUp2JqUbegzKas3fkLXajsLCCm9iKeA81Ka/GcO2X1RSOAZu8tNRAovvF JIY5jcEdM6LekhjlKq8yTLEwtyZ1LIAVmT6s3BO3XjOa9UvFpqR8grM2FlbY7GfKZdGb z9Fr8bvLhuGUS9qGovX55H17lKXxGYuBEepBWKlwsYjhAqhZ2SSJDvDuAAYnJyVfXEp0 Xr4u/nlfSKocoW1glvvzYH3UyKMsIcMeU879Wp+Cg9XtBWzzLBEKRr6vtNLDMD4ZJvGH Ggng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Eq5OUJP1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Eq5OUJP1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730637AbeGZOCg (ORCPT + 31 others); Thu, 26 Jul 2018 10:02:36 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46903 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729385AbeGZOCf (ORCPT ); Thu, 26 Jul 2018 10:02:35 -0400 Received: by mail-wr1-f67.google.com with SMTP id h14-v6so1582833wrw.13 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=ev4W+0uwJENRBa4gf4UItmDi3YAVOCqI53LiuyM1vyGJs3e3zOOLFeLClrQQhM/mIw jDmE0mBkiGRmN6MP8GyWnoCau1vbphfGTb8+ugYWwHa0UU5cv8lCKrxk/AYjKVxL0qIL v77TeOKeSsW4jy+Vs3h2PdYYOh4OrEXtxxb/m9AJelOTNzqN/M0OzvxaXrAialWUaY1X kLkWilM8tmt5hmp6gaSD5UfW+XFx6KgJSkaSckrJgrhepnPNZWoBfx/0WzmfIzWiGBpZ ni3JaRycdKUYrSCbOYX96xx6VnPzdPMbSI/uhhbS/KkLpwfXDjW8PG7PlY2ctU0nuLI8 46lw== X-Gm-Message-State: AOUpUlGlK37Ph4x1KVfW55nILhjEWOQVReQZ4TdlLLTa0MQXlS27GB77 Nmb5fiU5H6fCg6MsxVRxOqog9ZKcjtc= 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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 2.17.1 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 {