From patchwork Wed Jun 24 17:49:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191704 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp64767ilg; Wed, 24 Jun 2020 10:50:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG9Ktyt5Qr5n3GC6GgjCLIkbVZb4qq1sflqwTGMLhsJCxfixHmnU4QxrykYzkMmpt7iayZ X-Received: by 2002:a17:906:b6d1:: with SMTP id ec17mr22288068ejb.486.1593021026503; Wed, 24 Jun 2020 10:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593021026; cv=none; d=google.com; s=arc-20160816; b=WBQbJ/f5NBOZhU4+6S7l9/Rrb1Df9cEDTAuyxls4gBe4RC5Rda1yFt7oXBPpv1F+AC qNWo3ETu7cDXADCbqDcK5XcQQ9aWiA6uvv8AW1C0seGY/BOnSnR7eJavuq6BJpgKcBi6 A7rhh13Mp6RtfWiRk1LNZLtv5A0TEdFJSer0shlFyUlPJMVeOgo5sbV0gjDnJpQMlC1Q SYj8XOHdXbU509OpPqsZHZrfywaAFQIokhth7BYDd97iS6RnK9CVmPlVVSskkYiBy9el R6004etE83DDKkxvDSyhOBZlJ6oe2q4axd4H0vEuRfXmkL8Klf0MZvoVD0BRinjaIVCU S2yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kULjw8GNfWNWdNFzaMSzkxUfYNEK2eh4pWXT0B+D/Fs=; b=h0cUuOhC5yTVSdZcw1e9uzdm0HXHzIzaLX5wcwl2twfEQffTjyVIHzRslYjSCsZJtA fqRJAEewHlHddW3+3Ywb8KvGlu1Y01vPdiFLLXGws17liqUY/PyTvIyuqbcBV19mQPSP ZJ48YeDhCPo1u0ccXSfAV2STrxk8vLLDQZWFsfgU1MKzbVDrgxyuMSERBCFB2nzvm9uJ tNx0rrqiX5XOLnbgz6iYr+aDUw3WQJyb7dmUC+oykeg+sFtv6SPNn4ppyGcndJR3Trvu xLgXtZHpRo4N7WG7FKzbBYlq7lWx5aN/X0DMzwd28nIgRMY5f4hgnDHUG85qiKhMAqD6 pXiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="H/Fy23zn"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g5si4957628eds.213.2020.06.24.10.50.26; Wed, 24 Jun 2020 10:50:26 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="H/Fy23zn"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405633AbgFXRuZ (ORCPT + 6 others); Wed, 24 Jun 2020 13:50:25 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:33032 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405556AbgFXRuZ (ORCPT ); Wed, 24 Jun 2020 13:50:25 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnho6062623; Wed, 24 Jun 2020 12:49:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593020983; bh=kULjw8GNfWNWdNFzaMSzkxUfYNEK2eh4pWXT0B+D/Fs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=H/Fy23zn1NqDybmM73ewTSCcoaz0B8fPFUVmsLeSba1Mt2M51JHSZEX86z02VWAFw nE6Zv7gmPe+0liXImGeWxlWP5xuYFVefa9eE/oCbP14BMyWm32CbYSyiAYjWdZSgcL z2u4s58MoqqRA3Wn07ZH4BtWVH+C/07S+HbwuALE= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnhXo081997; Wed, 24 Jun 2020 12:49:43 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 12:49:43 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 12:49:43 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnhee035721; Wed, 24 Jun 2020 12:49:43 -0500 From: Dan Murphy To: , , , CC: , , , , Dan Murphy Subject: [PATCH v6 1/7] dt-bindings: tas2562: Fix shut-down gpio property Date: Wed, 24 Jun 2020 12:49:26 -0500 Message-ID: <20200624174932.9604-2-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624174932.9604-1-dmurphy@ti.com> References: <20200624174932.9604-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Fix the shut-down gpio property to be shut-down-gpio and fix the example. Signed-off-by: Dan Murphy --- Documentation/devicetree/bindings/sound/tas2562.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.26.2 diff --git a/Documentation/devicetree/bindings/sound/tas2562.txt b/Documentation/devicetree/bindings/sound/tas2562.txt index 94796b547184..fd0ac8636c01 100644 --- a/Documentation/devicetree/bindings/sound/tas2562.txt +++ b/Documentation/devicetree/bindings/sound/tas2562.txt @@ -16,7 +16,7 @@ Optional properties: - interrupt-parent: phandle to the interrupt controller which provides the interrupt. - interrupts: (GPIO) interrupt to which the chip is connected. -- shut-down: GPIO used to control the state of the device. +- shut-down-gpio: GPIO used to control the state of the device. Examples: tas2562@4c { @@ -28,7 +28,7 @@ tas2562@4c { interrupt-parent = <&gpio1>; interrupts = <14>; - shut-down = <&gpio1 15 0>; + shut-down-gpio = <&gpio1 15 0>; ti,imon-slot-no = <0>; }; From patchwork Wed Jun 24 17:49:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191705 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp64842ilg; Wed, 24 Jun 2020 10:50:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1b2XePraJLDrTYHe7sOByRGIsP3Yh4R54oG/C7pbSeGbGWsqPd6iQoPFd9DcTAP0fqmlV X-Received: by 2002:a05:6402:155a:: with SMTP id p26mr26741995edx.376.1593021032827; Wed, 24 Jun 2020 10:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593021032; cv=none; d=google.com; s=arc-20160816; b=snsYE8FmN0iXqxi7qtcUGjAhknXN4BmPDwA46RvRhE2SIuwwt1G5j/etLcXbnjZApp IpcSxOzYSZN/vQW251K773SKHjrR05zy9Y963cMDKZMDWTx2g0mnzr7O1x4TB8o5d7jf YHDsx+C0iFOYUAd7N1YyAvDpBsTP9ffm3aPttqxm8b1je2KxQN+FYujEoasljQVmwU7Q 81tmYaRbXllzudVSGAZbe+btxWf4eZDt80/qZFGQMq3cpfhxWkpOKD0K+O+D+IUlGhAv JC2/GrhIOQ5wRPjR+Y8KIRdCVSk+Ix6OQtKNKnR08FZ4Lj3/Agd5LilH6sDOZNwngAhy 0flQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qUC2mpsw94iRI+GEjoOUWoy0avC1fy2ViW4yz+XKfrY=; b=wJKW4xxCyVn2YTJ2fIprpnDqKECasymFx817FzcDuc6BxbR2oWSbpdoC1ATIUb/6kI +/PqE8zfE9FRrcG0jRWWcCuwxJeDvTEy14k2Pg7QLrXOJ6YFpokdzXqHN7NdVlbSI9WD 8QPkAuKsGBcFgiof6AZ4h4NgJ1BjLqRn7zHqFjwmROad/n6YI03tTD0V/KUofvx551iw QhhyWCuYekAsH+vG06OtNjzF5D7T+XsOyo8Mi7sNjV470yDgmBvCwPRoY8UybXGFmAxx v2mIta5hd3HcsVrstemwSOIPPWE/jLWIvMcVD3KVX14/49sa0rsVc7VOVZ+v5EZ2eacB alZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=fox6jLpg; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g5si4957628eds.213.2020.06.24.10.50.32; Wed, 24 Jun 2020 10:50:32 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=fox6jLpg; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405640AbgFXRub (ORCPT + 6 others); Wed, 24 Jun 2020 13:50:31 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:57334 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405556AbgFXRub (ORCPT ); Wed, 24 Jun 2020 13:50:31 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnnEW029401; Wed, 24 Jun 2020 12:49:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593020989; bh=qUC2mpsw94iRI+GEjoOUWoy0avC1fy2ViW4yz+XKfrY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=fox6jLpgHTle2yD1yFAMXCGlmhphEV2Pj+i/b8gVXIKvLvK82Xqei3ha1cUV9v8sM WHp8wEMVp5d2ElWmUFi8wCsOVG8VKowh5fTYbwwEMCtGQ3Jfw8uKoT/QprtRgGAGey j0/twIUAz7nGdzoEA/+YSzZbqEhYWq8n/4LGDZOs= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnnJr082068; Wed, 24 Jun 2020 12:49:49 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 12:49:48 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 12:49:48 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnmij119276; Wed, 24 Jun 2020 12:49:48 -0500 From: Dan Murphy To: , , , CC: , , , , Dan Murphy Subject: [PATCH v6 2/7] ASoC: tas2562: Update shutdown GPIO property Date: Wed, 24 Jun 2020 12:49:27 -0500 Message-ID: <20200624174932.9604-3-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624174932.9604-1-dmurphy@ti.com> References: <20200624174932.9604-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Update the shutdown GPIO property to be shutdown from shut-down. Fixes: c173dba44c2d2 ("ASoC: tas2562: Introduce the TAS2562 amplifier") Signed-off-by: Dan Murphy --- sound/soc/codecs/tas2562.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.26.2 diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index 7fae88655a0f..f6495426f562 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -619,8 +619,8 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562) struct device *dev = tas2562->dev; int ret = 0; - tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down-gpio", - GPIOD_OUT_HIGH); + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down", + GPIOD_OUT_HIGH); if (IS_ERR(tas2562->sdz_gpio)) { if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) { tas2562->sdz_gpio = NULL; From patchwork Wed Jun 24 17:49:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191706 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp64881ilg; Wed, 24 Jun 2020 10:50:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxktTEVjPWrEMGznUTpP6K6fwWRg+EGc6MtksypTguHsd4z7gZP2fi2+B8OvmsYE8S3seIZ X-Received: by 2002:a17:906:76c4:: with SMTP id q4mr27553476ejn.371.1593021035741; Wed, 24 Jun 2020 10:50:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593021035; cv=none; d=google.com; s=arc-20160816; b=xLdaCerGnUYneBga+dY6tc9Yzl/VmUW/VhGPhkrz9v9WIlCXSXZrc0B25v64P9FrqV AKmHlIJ6sHlGNN0jvpRv6Auwn+d2hJRHTXKN+A/s1XubyR+7jZzbIPHqcQnhxEs4p71x J6l/Qaba8jNLYLkQqPzi9oSF5cSbMOCcflw3Dsi2fYWs3orqWakP7ynbYLRPEbqoW/DY joPcxx5XDVyvg1vCFVjSMIqF7sX7ImC75RdZacvQYUndbdnC+P7T0k2YPJajmxCtAu5A LQ1nxNYllRqjdLIeDlzwGx7hdHHBqZpYgS61Wk0iv59Nn4nPswWANTYf1vjdRcAif8oG VsXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=e4c8HtBVunTIXDjsz5ID1fxiAatAsli/NNkAvswBlVQ=; b=Rc7nsPrEtIzDso5bP7A9HV3u1TbkvCrPdab/8ZvdjqylDuWxlfAPuZnoH7vnLyQLWj uQkhm86d1gjyJFSJuvRYpAhS4R/cn8JKxzKK2sCL2OtNyL3V5FAWdtPCu/MnQIRrvToL ZsFMTDPjMlwqSmY+Jjhn1dznpr2KuwJd5ZELe+Ibl0LBREyfZND7NGV2hNIEYklsjgVc QyTCFFdG5H2XOJglqajO8c6gWXmi2Ot1DYA88TjZ44eTs/nwULMu8FFxBeWvaH205t7F j0pKtuHmrx5HbSGMJlAZlDfoPHE9t4rx0GNZInlgg/FkahQK/WhOnBNmSnV7TImrSECN Ipsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ynwewCyb; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g5si4957628eds.213.2020.06.24.10.50.35; Wed, 24 Jun 2020 10:50:35 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ynwewCyb; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405769AbgFXRue (ORCPT + 6 others); Wed, 24 Jun 2020 13:50:34 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:33054 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405556AbgFXRud (ORCPT ); Wed, 24 Jun 2020 13:50:33 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnsQZ062662; Wed, 24 Jun 2020 12:49:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593020994; bh=e4c8HtBVunTIXDjsz5ID1fxiAatAsli/NNkAvswBlVQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ynwewCybshtrvVA0QUDM9/D6QwkAOfOTlHYUnPCXIq3iltzJyjxAlxIakNaNjXlXm tUPR6/1sybju7bdqbVqaUOqzqnOtrNt2SLiNHhun0Y26MkLKvNRtbffavfLnvN1WDX Xkhfmq4b2Ngy9CARWYJ7D1OnE8Xm8bGB8ARYFMXg= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHns9H082161; Wed, 24 Jun 2020 12:49:54 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 12:49:53 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 12:49:53 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnrEX119444; Wed, 24 Jun 2020 12:49:53 -0500 From: Dan Murphy To: , , , CC: , , , , Dan Murphy Subject: [PATCH v6 3/7] ASoC: tas2562: Fix format issue for extra space before a comma Date: Wed, 24 Jun 2020 12:49:28 -0500 Message-ID: <20200624174932.9604-4-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624174932.9604-1-dmurphy@ti.com> References: <20200624174932.9604-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Fix the issue found that there is an extra space before a comma in the volume control. Fixes: bf726b1c86f2c ("ASoC: tas2562: Add support for digital volume control") Signed-off-by: Dan Murphy --- sound/soc/codecs/tas2562.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.26.2 diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index f6495426f562..d26e30a2948c 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -504,7 +504,7 @@ static const struct snd_kcontrol_new tas2562_snd_controls[] = { .info = snd_soc_info_volsw, .get = tas2562_volume_control_get, .put = tas2562_volume_control_put, - .private_value = SOC_SINGLE_VALUE(TAS2562_DVC_CFG1, 0, 110, 0, 0) , + .private_value = SOC_SINGLE_VALUE(TAS2562_DVC_CFG1, 0, 110, 0, 0), }, }; From patchwork Wed Jun 24 17:49:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191707 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp64953ilg; Wed, 24 Jun 2020 10:50:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVCNmg/Z9cc5CPMR1fhuLf+m/OePM06z5ciaLBSB6+oQ7Vm6du4gdYHV5dlcL2Z3Dd7jpx X-Received: by 2002:aa7:da17:: with SMTP id r23mr28946041eds.261.1593021041447; Wed, 24 Jun 2020 10:50:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593021041; cv=none; d=google.com; s=arc-20160816; b=T632tu781rac0dOZRJD0Gulp2h5389r0/UdYlgU3qrX8pe+daotwmS1yDX4OyyZ0v1 VndmEDNSGDYv9+Fw1lDyQAQrXAiKfh7Ecv4Ph+NxTFPutuqD/wpSg39MFmVjWL4QHihw mM2MkG8/hq7AfTzGpcH6ClRhcx9vA11rLPsPUETGGZ/Jfr81Ok6Np3dQaL+tadCH/fOU giB6dmBF6nVMGv7fn7DWdAZVbl6QUxg4f2rmkC5Z0KdsWXtWGEn9j6DRtp1emITTr9f/ WHDLNuYZWKbz6DONtWa0SUnnGP6VN0GfYwK6MKdDgsM/0xP9z4S9tG2tccQdM/JsFde8 R7DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Y5MdwCGXU77RAWVwX/WygJujeCPyLUiyCkJR3oQySLQ=; b=W6+n+DeGhRRQ3ZzSp89Xq1P2y1u8ezRkX6eYIByuEHYaSLKRojY9JQN4aqigTcGTd2 X8IIsUZIddFzUB8IlslSRndWHVdsWP887W501lsvqq7i1p2uE/RJLSyeLcWBabZF0OfQ LnKdn7iZPD5+YIeiREb+THqOdovi2XWkCkhItVRIOzt0dq/RaNlmy3GjHJg3csg/TYM2 vU+N4Fiy0UNky7mRuOFzWaKvkSQmc5DRlGnW3e5ElDMs9qRYHjFj20XvihGX1E3ufJgO McZ7JarWk89j1RU37qNK5FMXTXLOmoKrtpTyWAh0mmfolAjpUyrD60AqmDWWDYEhhDtm d8kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=o5g25OCC; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e7si8850446edn.164.2020.06.24.10.50.41; Wed, 24 Jun 2020 10:50:41 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=o5g25OCC; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405687AbgFXRuk (ORCPT + 6 others); Wed, 24 Jun 2020 13:50:40 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:33094 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405556AbgFXRuk (ORCPT ); Wed, 24 Jun 2020 13:50:40 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnx6i062677; Wed, 24 Jun 2020 12:49:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593020999; bh=Y5MdwCGXU77RAWVwX/WygJujeCPyLUiyCkJR3oQySLQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=o5g25OCCFUZZ3BAWAxqxAbf9F7AgYKdNEJZBl163nV9U3u4CQAUcyavwqVOXzeZK4 IHeZloQ4cQKB4dIp1bZjkykKUklkO0NVAcMtMzHcOP/8BbQZmSuFzvGgIcVQGLpWJl hZW2lVq4Jpe7lHpIZFM5+wESUO/byafWBnS8onEw= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnxnB082225; Wed, 24 Jun 2020 12:49:59 -0500 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 12:49:59 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 12:49:59 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHnxUf119507; Wed, 24 Jun 2020 12:49:59 -0500 From: Dan Murphy To: , , , CC: , , , , Dan Murphy Subject: [PATCH v6 4/7] ASoC: tas2562: Add rx and tx slot programming Date: Wed, 24 Jun 2020 12:49:29 -0500 Message-ID: <20200624174932.9604-5-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624174932.9604-1-dmurphy@ti.com> References: <20200624174932.9604-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add programming for the tdm slots for both tx and rx offsets. Signed-off-by: Dan Murphy --- sound/soc/codecs/tas2562.c | 17 ++++++++++++++++- sound/soc/codecs/tas2562.h | 4 ++++ 2 files changed, 20 insertions(+), 1 deletion(-) -- 2.26.2 diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index d26e30a2948c..2f1d4b697f01 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -208,6 +208,22 @@ static int tas2562_set_dai_tdm_slot(struct snd_soc_dai *dai, if (ret < 0) return ret; + if (tx_mask > TAS2562_TX_OFF_MAX) { + dev_err(tas2562->dev, "TX slot is larger then %d", + TAS2562_TX_OFF_MAX); + return -EINVAL; + } + + ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG1, + TAS2562_RX_OFF_MASK, rx_mask << 1); + if (ret < 0) + return ret; + + ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG4, + TAS2562_TX_OFF_MASK, tx_mask << 1); + if (ret < 0) + return ret; + return 0; } @@ -327,7 +343,6 @@ static int tas2562_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG1, TAS2562_TDM_CFG1_RX_OFFSET_MASK, tdm_rx_start_slot); - if (ret < 0) return ret; diff --git a/sound/soc/codecs/tas2562.h b/sound/soc/codecs/tas2562.h index 28e75fc431d0..47e59c82eef3 100644 --- a/sound/soc/codecs/tas2562.h +++ b/sound/soc/codecs/tas2562.h @@ -34,6 +34,10 @@ #define TAS2562_TDM_DET TAS2562_REG(0, 0x11) #define TAS2562_REV_ID TAS2562_REG(0, 0x7d) +#define TAS2562_RX_OFF_MASK GENMASK(5, 1) +#define TAS2562_TX_OFF_MASK GENMASK(3, 1) +#define TAS2562_TX_OFF_MAX 7 + /* Page 2 */ #define TAS2562_DVC_CFG1 TAS2562_REG(2, 0x0c) #define TAS2562_DVC_CFG2 TAS2562_REG(2, 0x0d) From patchwork Wed Jun 24 17:49:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191709 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp65089ilg; Wed, 24 Jun 2020 10:50:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPfzH1wGUTxx7ASqc0A7NVGLR3DEzR4bthfdoyaS80gQ/6LTCnvDwa0rJtc9PTOJP+6vgD X-Received: by 2002:a17:906:6dca:: with SMTP id j10mr20973841ejt.64.1593021052397; Wed, 24 Jun 2020 10:50:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593021052; cv=none; d=google.com; s=arc-20160816; b=AIHnMaBfnURlIuKJ7r7o4LaoQgNgwNucvp8bgTY8U0NpjeFtKsmFQDLMHSHuJp7Llx B0F1PuVb8DG4Tqtix9DKmiu+CvH57pvHnXJ9MWPAGKHeGdJybhcRJAWDkEtvWVpkx0mA Q6b7dIRa3iycBbWVUeQsr1u8GSd1qLCIvIJKOL5XHtcFCqPjcKkIfX/vZAF4Oi2Z+QRx s0LTsa2SN5Fc0XYj9mYSHuNhbRxa/keY26qvI2HohQ+H31C+slHU5RnZrl74rRrnp901 R7cvBTAeawmBYCwIO69SFf/8EiNMhvGMfbV8ww01qirBIH3Sg/XE0hjOxfX8LRCCOtyr /lig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nvx312mv4VGvwwIjEoy4EfaLo8OvbsRscw5gPQDVBlY=; b=pGos4h+TKCt785CVTqF1pY//J9WgPPods8VFgSWNeDZUsOrrU73pgDeea0vHj0AnvJ Ll6cCq5GWMuLPcaRVuogkUwOuTPuLSGms3nTvMGOWGJionUZXu7yRZ2uzziUgA3Iur3S w7t8P/8ykvl5qTXzcVwQ9Wtou92yQsNFy379fg9rM8jKwTS1VNBk7nlnl+P3gkURI/Wk 3RsGN+F6drU6qfISfFrfWGLdp89eMkyR9mHziDUPvACITnjTRnoaB8lbVZheRREdSOdR 5V+oGKo3TRYUw8wnqSe3BMmzm43qPeWjHa0U5ngW040d4YY19rulb4aJZxBVYQqYd5VD 67ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=UuIMApBC; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id eb14si7010790edb.11.2020.06.24.10.50.52; Wed, 24 Jun 2020 10:50:52 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=UuIMApBC; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405794AbgFXRuv (ORCPT + 6 others); Wed, 24 Jun 2020 13:50:51 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:46680 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405783AbgFXRus (ORCPT ); Wed, 24 Jun 2020 13:50:48 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OHo6po045222; Wed, 24 Jun 2020 12:50:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593021006; bh=nvx312mv4VGvwwIjEoy4EfaLo8OvbsRscw5gPQDVBlY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=UuIMApBCFrsUafHq38CHPN33dwMXPgJNpII9lsNB6m/ijyTl7/XrdhB3EO6oviq04 zDezPyB3xAPVKVjR/PivPaJHGkJU88Y4yOfBCvPL5y5TyVW//ffKkmWPDYN2BJjzGQ 59XUJNwvW2d/2O4ADpmouXYgrB7o27LJwnT9Qa2o= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 05OHo6R6065119 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 Jun 2020 12:50:06 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 12:50:05 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 12:50:05 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHo5r0120431; Wed, 24 Jun 2020 12:50:05 -0500 From: Dan Murphy To: , , , CC: , , , , Dan Murphy Subject: [PATCH v6 5/7] dt-bindings: tas2562: Add voltage sense slot property Date: Wed, 24 Jun 2020 12:49:30 -0500 Message-ID: <20200624174932.9604-6-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624174932.9604-1-dmurphy@ti.com> References: <20200624174932.9604-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add a property to configure the slot for the voltage sense monitoring of the device. Vsense data will be sent to the processor via the slot defined by the property Signed-off-by: Dan Murphy --- Documentation/devicetree/bindings/sound/tas2562.txt | 3 +++ 1 file changed, 3 insertions(+) -- 2.26.2 diff --git a/Documentation/devicetree/bindings/sound/tas2562.txt b/Documentation/devicetree/bindings/sound/tas2562.txt index fd0ac8636c01..dc6d7362ded7 100644 --- a/Documentation/devicetree/bindings/sound/tas2562.txt +++ b/Documentation/devicetree/bindings/sound/tas2562.txt @@ -11,6 +11,8 @@ Required properties: - compatible: - Should contain "ti,tas2562", "ti,tas2563". - reg: - The i2c address. Should be 0x4c, 0x4d, 0x4e or 0x4f. - ti,imon-slot-no:- TDM TX current sense time slot. + - ti,vmon-slot-no:- TDM TX voltage sense time slot. This slot must always be + greater then ti,imon-slot-no. Optional properties: - interrupt-parent: phandle to the interrupt controller which provides @@ -30,5 +32,6 @@ tas2562@4c { shut-down-gpio = <&gpio1 15 0>; ti,imon-slot-no = <0>; + ti,vmon-slot-no = <1>; }; From patchwork Wed Jun 24 17:49:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191708 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp65045ilg; Wed, 24 Jun 2020 10:50:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwn1Fhk+JSMzDtfYfp34RPN1VegCbimoClvrD8QdTI82g5g0Zhp2tmEK8k2AVTxgGfHbIIZ X-Received: by 2002:a17:906:2304:: with SMTP id l4mr25352120eja.104.1593021048592; Wed, 24 Jun 2020 10:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593021048; cv=none; d=google.com; s=arc-20160816; b=0UviaTdx5+813kiDF1WaC2HjC5lvrXdz7lx88kvftVUR5+y/fEnZBPAogu2ByefaEI Vl9ybCYUNrRXpfwf+f2bapThkSUZEszMUhiWeGrBdhHVpT2B6kkL40KHgRqOKE9wEUZA GrUNg5WrV2AOqxvyWHOmguk+CpMvDakS/N1UdLSoHGilLZs1tR/IXDVSD6sfg4uIEHGA jEDi51etLk/BYZrIXnqENVDkhgpvAwlhuUtUQsjA4uroRCboWmf+vf3EZgUS721yT8VI d2XUkQ428YbzU2VjryWxKqUrrHO29CbPs/7DYahsPq7Ez2XlT304PT/rIJvRI57pr0vs BGBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=M1MPBLSDMN936E020JiJBRBjKYmEXCOU5/4sosJb4SA=; b=ml+HhPW+5A3qStf55hoSJ3J7C9Fqj4jhFoHW4NHOXRoxta5xQziXrUYHmqK4SB6Wgj iXurFZ4cxfq0ZM95mFJY0ESs04OWN7ZjPUisO8a2Bo//dH5HpGZw6edZ8IrgWpOCx5z8 fBvuTzhA3krRH1Q7OVCu3Gz2q/T/R60xT/J3mS5DJKaVrEsiUDWC5PYLMKdc04ZdXPWt YCEls9c9EzLjncKwxYECuNdoR0FFQdrl7nPUVZfyYGZcEX2UkTGzd8I7f5boT5NqBtmP r3/LofnI4/PSu1Mclhkt9nq/7Vn2OdONN4siZNCHjq4d2Mc3QS+jDW9DlvhSVgMdkMEh thLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=pZff7Yfm; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f1si12319369ejh.665.2020.06.24.10.50.48; Wed, 24 Jun 2020 10:50:48 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=pZff7Yfm; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405784AbgFXRur (ORCPT + 6 others); Wed, 24 Jun 2020 13:50:47 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:57382 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405556AbgFXRur (ORCPT ); Wed, 24 Jun 2020 13:50:47 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OHo6D3029498; Wed, 24 Jun 2020 12:50:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593021006; bh=M1MPBLSDMN936E020JiJBRBjKYmEXCOU5/4sosJb4SA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=pZff7YfmW5idGnjmzn03bLGpLVISV35yDJhQlL0pmpCptF/UMM1G0gtkHJGb0nVFe QHnPism+n+RSAjYOMQcpkAf8WcihC72ISl9H9fSWLUaAp11+/VKVLXgKEwLGj09pKV sgnMZg0HIkHTwbCjySg55Kr1eaPrJRwKdDEneT4s= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 05OHo6Pr071498 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 Jun 2020 12:50:06 -0500 Received: from DLEE105.ent.ti.com (157.170.170.35) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 12:50:05 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 12:50:05 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHo5QI120458; Wed, 24 Jun 2020 12:50:05 -0500 From: Dan Murphy To: , , , CC: , , , , Dan Murphy Subject: [PATCH v6 6/7] ASoC: tas2562: Add voltage sense slot configuration Date: Wed, 24 Jun 2020 12:49:31 -0500 Message-ID: <20200624174932.9604-7-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624174932.9604-1-dmurphy@ti.com> References: <20200624174932.9604-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add Vsense slot configuration based on the device tree. Adding this property enables the slot programming to be moved to the tdm_set_slot callback. This in affect sets the slots for the Isense and Vsense and enabling this these modes are now based on whether these features were powered on or not. Signed-off-by: Dan Murphy --- sound/soc/codecs/tas2562.c | 65 ++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 14 deletions(-) -- 2.26.2 diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index 2f1d4b697f01..b0b7cef79433 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -224,12 +224,26 @@ static int tas2562_set_dai_tdm_slot(struct snd_soc_dai *dai, if (ret < 0) return ret; + ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG5, + TAS2562_TDM_CFG5_VSNS_SLOT_MASK, + tas2562->v_sense_slot); + if (ret < 0) + return ret; + + ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG6, + TAS2562_TDM_CFG6_ISNS_SLOT_MASK, + tas2562->i_sense_slot); + if (ret < 0) + return ret; + return 0; } static int tas2562_set_bitwidth(struct tas2562_data *tas2562, int bitwidth) { int ret; + int val; + int sense_en; switch (bitwidth) { case SNDRV_PCM_FORMAT_S16_LE: @@ -237,21 +251,18 @@ static int tas2562_set_bitwidth(struct tas2562_data *tas2562, int bitwidth) TAS2562_TDM_CFG2, TAS2562_TDM_CFG2_RXWLEN_MASK, TAS2562_TDM_CFG2_RXWLEN_16B); - tas2562->v_sense_slot = tas2562->i_sense_slot + 2; break; case SNDRV_PCM_FORMAT_S24_LE: snd_soc_component_update_bits(tas2562->component, TAS2562_TDM_CFG2, TAS2562_TDM_CFG2_RXWLEN_MASK, TAS2562_TDM_CFG2_RXWLEN_24B); - tas2562->v_sense_slot = tas2562->i_sense_slot + 4; break; case SNDRV_PCM_FORMAT_S32_LE: snd_soc_component_update_bits(tas2562->component, TAS2562_TDM_CFG2, TAS2562_TDM_CFG2_RXWLEN_MASK, TAS2562_TDM_CFG2_RXWLEN_32B); - tas2562->v_sense_slot = tas2562->i_sense_slot + 4; break; default: @@ -259,17 +270,27 @@ static int tas2562_set_bitwidth(struct tas2562_data *tas2562, int bitwidth) return -EINVAL; } - ret = snd_soc_component_update_bits(tas2562->component, - TAS2562_TDM_CFG5, - TAS2562_TDM_CFG5_VSNS_EN | TAS2562_TDM_CFG5_VSNS_SLOT_MASK, - TAS2562_TDM_CFG5_VSNS_EN | tas2562->v_sense_slot); + val = snd_soc_component_read(tas2562->component, TAS2562_PWR_CTRL); + if (val < 0) + return val; + + if (val & (1 << TAS2562_VSENSE_POWER_EN)) + sense_en = 0; + else + sense_en = TAS2562_TDM_CFG5_VSNS_EN; + + ret = snd_soc_component_update_bits(tas2562->component, TAS2562_TDM_CFG5, + TAS2562_TDM_CFG5_VSNS_EN, sense_en); if (ret < 0) return ret; - ret = snd_soc_component_update_bits(tas2562->component, - TAS2562_TDM_CFG6, - TAS2562_TDM_CFG6_ISNS_EN | TAS2562_TDM_CFG6_ISNS_SLOT_MASK, - TAS2562_TDM_CFG6_ISNS_EN | tas2562->i_sense_slot); + if (val & (1 << TAS2562_ISENSE_POWER_EN)) + sense_en = 0; + else + sense_en = TAS2562_TDM_CFG6_ISNS_EN; + + ret = snd_soc_component_update_bits(tas2562->component, TAS2562_TDM_CFG6, + TAS2562_TDM_CFG6_ISNS_EN, sense_en); if (ret < 0) return ret; @@ -645,9 +666,25 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562) ret = fwnode_property_read_u32(dev->fwnode, "ti,imon-slot-no", &tas2562->i_sense_slot); - if (ret) - dev_err(dev, "Looking up %s property failed %d\n", - "ti,imon-slot-no", ret); + if (ret) { + dev_err(dev, "Property %s is missing setting default slot\n", + "ti,imon-slot-no"); + tas2562->i_sense_slot = 0; + } + + + ret = fwnode_property_read_u32(dev->fwnode, "ti,vmon-slot-no", + &tas2562->v_sense_slot); + if (ret) { + dev_info(dev, "Property %s is missing setting default slot\n", + "ti,vmon-slot-no"); + tas2562->v_sense_slot = 2; + } + + if (tas2562->v_sense_slot < tas2562->i_sense_slot) { + dev_err(dev, "Vsense slot must be greater than Isense slot\n"); + return -EINVAL; + } return ret; } From patchwork Wed Jun 24 17:49:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191710 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp65134ilg; Wed, 24 Jun 2020 10:50:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBdRdUKbRzy5QCyfD7hFwRMwWn0/uZWfUfNPZWgyCcBkrEXZC5LPXxniHJm/XCsu3QG2U7 X-Received: by 2002:a17:906:5fc4:: with SMTP id k4mr16266904ejv.94.1593021057147; Wed, 24 Jun 2020 10:50:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593021057; cv=none; d=google.com; s=arc-20160816; b=Evy5hBpI6ApwOhtmLusr9SKXXlIbLTmCsJN53mBF9Sf78cBYALluTBnSzU+GbhyxqY pP3qcS7xR2mjl/JyUyIZZzFQMrCi1w34PKACJR4QshWvoK24wNMq1jWkrZ85YdUQrW4A MtVUy66FHsNYSHqL77YL3hv1gPAeUI9nSmFlnU8ugS61l0+kzjo8QnKyRLqVGQTQAbiP /sSiLNbYCejlF/1UwBiN4r+nroaGEa376o7ue6VP2bZeyvlJzm9g1wmw+jrBkIB8lVwu 5yxmgcbT2c/mAnrm5NtNYtXqhKsA4T9kLGaQ+sUsEg5PgvvuzKl6F4GvGXedbDq6xm3w pb/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=k5QXD9rLVHVE83qsFkalFRHulnjUdzuUDG+p/Omjzzg=; b=wEtIqqAtMovPD8cCyhREMobGawF5jAYjqctP8069iIQKPS02ZBIBFgl+7O9TcBYOy4 Ls3373NB/ubSL7zmKxHGgPNPFiVoyPXyO+eXYZ77Xn3OOj0cMxNoL6dyxv9HjLRYURk+ 9nBjWQB/24w6aZI6H8YdgMy03n/YUhjhisxbp5jkxVIOVJf/tJfuttxNlHtwt9LCmBQw lpKKXhm9RNmvIo5iZ6exg+mtUpqIMWKRHZWpWbA5RQEGukwE62WIImVHhaFlWSvnQxj7 lvZs2K1SdX4V2AWU2JltfZYNHzRU61mglpeVAItcaJFss6B1vqY54Fy23AeSSFaO5xUa LVqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=xtfDb0OW; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n16si12771501edo.74.2020.06.24.10.50.56; Wed, 24 Jun 2020 10:50:57 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=xtfDb0OW; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405806AbgFXRuz (ORCPT + 6 others); Wed, 24 Jun 2020 13:50:55 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:57392 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405803AbgFXRux (ORCPT ); Wed, 24 Jun 2020 13:50:53 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OHoB9U029508; Wed, 24 Jun 2020 12:50:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593021011; bh=k5QXD9rLVHVE83qsFkalFRHulnjUdzuUDG+p/Omjzzg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=xtfDb0OWEHo3CtPfdtPGRoLQhgxgL5ie6Au+a5XbV+NVyPF7EzVsA/pdc803ShN8h Mfe358AhvsBumOuNIiYkxL4UviZm0UffFeF3kLMU7vRYXsunsNAkvxVXQfyVDMr7QA iqAvJdtSV4UPClkfbvCkE0H4now7BriKHrHS3mSk= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 05OHoBBH071686 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 Jun 2020 12:50:11 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 12:50:11 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 12:50:11 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OHoA3Z037324; Wed, 24 Jun 2020 12:50:10 -0500 From: Dan Murphy To: , , , CC: , , , , Dan Murphy Subject: [PATCH v6 7/7] dt-bindings: tas2562: Convert the tas2562 binding to yaml Date: Wed, 24 Jun 2020 12:49:32 -0500 Message-ID: <20200624174932.9604-8-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624174932.9604-1-dmurphy@ti.com> References: <20200624174932.9604-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert the TAS2562 text file to yaml format. Signed-off-by: Dan Murphy --- .../devicetree/bindings/sound/tas2562.txt | 37 --------- .../devicetree/bindings/sound/tas2562.yaml | 77 +++++++++++++++++++ 2 files changed, 77 insertions(+), 37 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/tas2562.txt create mode 100644 Documentation/devicetree/bindings/sound/tas2562.yaml -- 2.26.2 diff --git a/Documentation/devicetree/bindings/sound/tas2562.txt b/Documentation/devicetree/bindings/sound/tas2562.txt deleted file mode 100644 index dc6d7362ded7..000000000000 --- a/Documentation/devicetree/bindings/sound/tas2562.txt +++ /dev/null @@ -1,37 +0,0 @@ -Texas Instruments TAS2562 Smart PA - -The TAS2562 is a mono, digital input Class-D audio amplifier optimized for -efficiently driving high peak power into small loudspeakers. -Integrated speaker voltage and current sense provides for -real time monitoring of loudspeaker behavior. - -Required properties: - - #address-cells - Should be <1>. - - #size-cells - Should be <0>. - - compatible: - Should contain "ti,tas2562", "ti,tas2563". - - reg: - The i2c address. Should be 0x4c, 0x4d, 0x4e or 0x4f. - - ti,imon-slot-no:- TDM TX current sense time slot. - - ti,vmon-slot-no:- TDM TX voltage sense time slot. This slot must always be - greater then ti,imon-slot-no. - -Optional properties: -- interrupt-parent: phandle to the interrupt controller which provides - the interrupt. -- interrupts: (GPIO) interrupt to which the chip is connected. -- shut-down-gpio: GPIO used to control the state of the device. - -Examples: -tas2562@4c { - #address-cells = <1>; - #size-cells = <0>; - compatible = "ti,tas2562"; - reg = <0x4c>; - - interrupt-parent = <&gpio1>; - interrupts = <14>; - - shut-down-gpio = <&gpio1 15 0>; - ti,imon-slot-no = <0>; - ti,vmon-slot-no = <1>; -}; - diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml new file mode 100644 index 000000000000..1fb467e14d4c --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas2562.yaml @@ -0,0 +1,77 @@ +# SPDX-License-Identifier: (GPL-2.0+ OR BSD-2-Clause) +# Copyright (C) 2019 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/sound/tas2562.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Texas Instruments TAS2562 Smart PA + +maintainers: + - Dan Murphy + +description: | + The TAS2562 is a mono, digital input Class-D audio amplifier optimized for + efficiently driving high peak power into small loudspeakers. + Integrated speaker voltage and current sense provides for + real time monitoring of loudspeaker behavior. + +properties: + compatible: + enum: + - ti,tas2562 + - ti,tas2563 + + reg: + maxItems: 1 + description: | + I2C address of the device can be one of these 0x4c, 0x4d, 0x4e or 0x4f + + shut-down-gpio: + description: GPIO used to control the state of the device. + deprecated: true + + shutdown-gpio: + description: GPIO used to control the state of the device. + + interrupts: + maxItems: 1 + + ti,imon-slot-no: + $ref: /schemas/types.yaml#/definitions/uint32 + description: TDM TX current sense time slot. + + ti,vmon-slot-no: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + TDM TX voltage sense time slot. This slot must always be greater then + ti,imon-slot-no. + + '#sound-dai-cells': + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + codec: codec@4c { + compatible = "ti,tas2562"; + reg = <0x4c>; + #sound-dai-cells = <1>; + interrupt-parent = <&gpio1>; + interrupts = <14>; + shutdown-gpio = <&gpio1 15 0>; + ti,imon-slot-no = <0>; + ti,vmon-slot-no = <2>; + }; + }; + +...