From patchwork Fri Jun 12 17:14:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 187853 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp586585ilo; Fri, 12 Jun 2020 10:15:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxvY0tgx4xYGx8OxfZw0IxNjnw+wQRz7Xa+Iiyv3leY4u4GVTkr9neng3bnCS30ZV/1qpS X-Received: by 2002:aa7:c944:: with SMTP id h4mr12481112edt.383.1591982104799; Fri, 12 Jun 2020 10:15:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591982104; cv=none; d=google.com; s=arc-20160816; b=CxLqTydSX2qn9MWRszsFlmioNa2d8A8LRXRvtQfy9WIqkHkr0DLao0abCD8ut3z6RC ZICsgNJ+2sWuID7yvBIdj2cLKrBPmixFvm0u1Obd3mGBHPEByK7L/LeuRxaWfrjs3EF9 JjFlGlk0Y0z6NBZ+1FnchSH/6O2llluONrM4PbNblo5rae+vJBD0E7mX+3qNOcvtf6ms 3oUD14N1zD38mlleMRdjsyl1MPhynMJ0blKAlpiolDurEQJ/jG8m46GazgiTVXQYZkDv kJ8fXm70MDY4jOInUUGjhx4YOHgVW5sFbtApRiJIOrBzUtL42CGv+zNioNpe6JxmwFFI Q/UQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=aLQVB8/ze/NIyKkp7l6il9bxa8ayHgHHrDx19rGRjK0=; b=qbCabFAXZo69M/FT+/fEWe240fg54Ekm4GO/L9kSJPWpKyAQGSs8hLdi7KiOos4okA GwMBuI7EzAVUzej+6XYtfkuKtDpz+CHo9wfcr656rO5M5o3zzgJzZGYsJjayw1+39Zmt GBPiuH0RD7+vPRmZNSFQl1JtqAPtxO9r/WdFkdxoPgMKSKe1e81qD1hRo6SU+5zKoD/Z YuvEzwb/RCi1Ib3OrShq4+WxUcnaYrJkQyz0RQA19tFjg6Nzx+xIkkLXsSdpN8segXxq DZpnOBQQfZJRCRGuq9sFNBThU0SrLtU/CSYjDNX90styhok9eQ6ID7CD7SXl0Gw0N0lm iQAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="K0bSCez/"; 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 s4si3851155edy.21.2020.06.12.10.15.04; Fri, 12 Jun 2020 10:15:04 -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="K0bSCez/"; 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 S1726448AbgFLRPC (ORCPT + 6 others); Fri, 12 Jun 2020 13:15:02 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:44832 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726263AbgFLRPC (ORCPT ); Fri, 12 Jun 2020 13:15:02 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05CHEIh1035399; Fri, 12 Jun 2020 12:14:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1591982059; bh=aLQVB8/ze/NIyKkp7l6il9bxa8ayHgHHrDx19rGRjK0=; h=From:To:CC:Subject:Date; b=K0bSCez/GHRfhAnmAslZgGYiUI6jhP/vw61R93pIczkFFdtS5bZCbvpAFcAvJXQ3L +aCEC/NSRJc6ZCskSo0CgQXHIAVP+n4E+sPt9p9RoSYPOdj08mumjHAm+JDiavzxfH PMuDzU2T8BnEZmQUGJo67Zn9fXZE0XHmbb2ii3s0= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 05CHEIhd082259 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 12 Jun 2020 12:14:18 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) 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; Fri, 12 Jun 2020 12:14:18 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) 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 via Frontend Transport; Fri, 12 Jun 2020 12:14:18 -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 05CHEI7V041519; Fri, 12 Jun 2020 12:14:18 -0500 From: Dan Murphy To: , , , , CC: , , , Dan Murphy Subject: [PATCH v4 1/2] dt-bindings: tas2562: Convert the tas2562 binding to yaml Date: Fri, 12 Jun 2020 12:14:11 -0500 Message-ID: <20200612171412.25423-1-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 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 | 34 --------- .../devicetree/bindings/sound/tas2562.yaml | 69 +++++++++++++++++++ 2 files changed, 69 insertions(+), 34 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 94796b547184..000000000000 --- a/Documentation/devicetree/bindings/sound/tas2562.txt +++ /dev/null @@ -1,34 +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. - -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. - -Examples: -tas2562@4c { - #address-cells = <1>; - #size-cells = <0>; - compatible = "ti,tas2562"; - reg = <0x4c>; - - interrupt-parent = <&gpio1>; - interrupts = <14>; - - shut-down = <&gpio1 15 0>; - ti,imon-slot-no = <0>; -}; - diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml new file mode 100644 index 000000000000..d2d3401bf251 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas2562.yaml @@ -0,0 +1,69 @@ +# 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. + + '#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>; + }; + }; + From patchwork Fri Jun 12 17:14:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 187854 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp586678ilo; Fri, 12 Jun 2020 10:15:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+QN/2Qg+5XNQT8hY2CHy7JGa1B8wnlIfvct6Zis4vAo7hLGsmFBIcT0ycXHNHmCse3/3d X-Received: by 2002:a17:906:7b54:: with SMTP id n20mr1638289ejo.144.1591982109454; Fri, 12 Jun 2020 10:15:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591982109; cv=none; d=google.com; s=arc-20160816; b=W2tD9QSedDXorYteLj1NK88Ka+q0s7pDbOyXKd6yXnJpuMnvRNxYChljuKrqKqS5H+ BEI7EU8qmKOhbbNY48MKkg7RxoMxASTPF7axWUbry0VbyCwMDmjQSrLnyStYujWs0zvO S3DcR/zzAGbJzy48n/L3eRd107F2iY5BNQTc+moKkveukJ2egiypyxrm5Fa/6VmQOylp CfvgNiUkT1cXzBjQI0IlH+/+FQEC/Vh7R+2bliNfkAiAOQQ6z2cTUhXGXrHobQFa/V8u pnCjk5njGy4LxD93E5HkHuO4T4PBcTARCRTnESwomalRFSmRWMHBuEWNfF+2VjCGCH5n PApQ== 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=0CHEg/2YdJEaIawncJx10SE2riY6XRSDzxRhI2/Jvlg=; b=aMn/GAHgJSBKFiaN5NO6A8w3rf80wJkg283hTyTP039xJZLZKtYvSMut5Oi4LdpRNm PhaYNhdovzbKHscJjg/1azzeirHL4fn22dBfPbEjtqVpXJBDzZN+wRCtYjiZZDXWR3an 2Ul70V/pm7o92auAAU0vqYB7vXSE0G0mx1t7tYizB4J4AYJ2Y6JDa0+8UHue3hDP5OrO EeRrrVIt29rHRLpHqDa5j6Z0Xpkee/rtiCa6vojHjEmvmK2Vd0c7dC1dMrHUpTMSwrUz 8hxWY4b32RUh03KqiLItQrqUZIeXRvaJmwqt1jFCZoRHY26H+DQiZMFG8iQ2m1BTn4m9 SifA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=OK5Nh3Z2; 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 o10si4797340ejj.111.2020.06.12.10.15.09; Fri, 12 Jun 2020 10:15:09 -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=OK5Nh3Z2; 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 S1726263AbgFLRPI (ORCPT + 6 others); Fri, 12 Jun 2020 13:15:08 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:44848 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726617AbgFLRPD (ORCPT ); Fri, 12 Jun 2020 13:15:03 -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 05CHEOIc035407; Fri, 12 Jun 2020 12:14:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1591982064; bh=0CHEg/2YdJEaIawncJx10SE2riY6XRSDzxRhI2/Jvlg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=OK5Nh3Z2OTYUVBCeVNRk4E+OPFD5HYCeYi8rMkyH5xA4x6HX7+yjEFqUPLHDrsEE0 UTnU+o3aM5yrZd4uwke2n/ngzPqioCd5QgF3kzNPjNjoptlzP1++VN/Aq4FqCxEp7E 8DdRtJaw1072Urtb/ncJSDBfhdn2bzJnybK5BFD8= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 05CHENbX014806 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 12 Jun 2020 12:14:24 -0500 Received: from DLEE102.ent.ti.com (157.170.170.32) 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; Fri, 12 Jun 2020 12:14:23 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE102.ent.ti.com (157.170.170.32) 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; Fri, 12 Jun 2020 12:14:23 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05CHENtL091610; Fri, 12 Jun 2020 12:14:23 -0500 From: Dan Murphy To: , , , , CC: , , , Dan Murphy Subject: [PATCH v4 2/2] ASoC: tas2562: Update shutdown GPIO property Date: Fri, 12 Jun 2020 12:14:12 -0500 Message-ID: <20200612171412.25423-2-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612171412.25423-1-dmurphy@ti.com> References: <20200612171412.25423-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 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 2.26.2 diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index 7fae88655a0f..6026d8b1e7d3 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -619,7 +619,7 @@ 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", + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shutdown", GPIOD_OUT_HIGH); if (IS_ERR(tas2562->sdz_gpio)) { if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) { @@ -628,6 +628,21 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562) } } + /* + * The shut-down property is deprecated but needs to be checked for + * backwards compatibility. + */ + if (tas2562->sdz_gpio == NULL) { + 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; + return -EPROBE_DEFER; + } + } + } + ret = fwnode_property_read_u32(dev->fwnode, "ti,imon-slot-no", &tas2562->i_sense_slot); if (ret)