From patchwork Thu Jan 4 14:57:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ding, Shenghao" X-Patchwork-Id: 185033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5660630dyb; Thu, 4 Jan 2024 07:00:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IEGPJpZHQW+NSxblurqvIBixt2R3xTbM2COpm4g+9P/j/SRwPHKUsznLxVNT8AMgO8BVCMc X-Received: by 2002:a05:6a20:be1f:b0:197:33ea:f45 with SMTP id ge31-20020a056a20be1f00b0019733ea0f45mr689446pzb.60.1704380443964; Thu, 04 Jan 2024 07:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704380443; cv=none; d=google.com; s=arc-20160816; b=PbpKWpznbgQi7BVJsaVKWzDTROa+Rq66fH58bTFTCbw7zsoa5b3RKf2/uDA0chSxEk pCy0kys1dSHOAVdkmkB5/JvgDowTMWRMai0L5C+SW7h6FeOWMCy4E2Am5LsOvls+2KBj Q8sG/jEa+KxQUeLJnCq2SaKbISaV5DGRtJX60zrX5tuUTWLQbo7q4h4n+ng7Qyzj4lCL ZcZT9v5J0ABWjljy2XKh2bZc7H6i8QiRL0UM78DA6amZ0TsM92DSSAZ1KWKWrXInuKLA QW7OUqLCJzH2WZh74Do5v4B7tRA3R/XV8bPCAWgvo8qq4XkWQ8TtvyB5NIv5J6tqJFx5 zcVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=8hWmAMoSrq6UPFSMfKTuynRM3F7QsEgFBw7C/guNTDQ=; fh=nmpqriIAxzz9z4/piqOabUsFkiEK8VDv7G5j+pvfHas=; b=aRAefASCSvta+jQ3niT7fKh6BBuqjDQYnva2zldyUZx3EGQolnwvns3uPf/hIamQow meiCZYkYMexWTYo+QqM8iDPF1MKEmhGgQyR2uZu6iAQDqSX8GAbxcAB62Em4X/DW1w2i IWaA3SwKwI3SyLZ3HlNKRa3n/h1Kq93gN0zt6eTq5aPrrLRjhxD9SlCS/0P/m4hFRaW+ hvk86ShLWpX8RQYqKo9ZnjKyaFVJSY+8GhUAT5c/Ubiux8SwFV7GMAhbpIEy5lK/uZlF Y21a7WvoPnhU6tiu2E9avSKYqVGOht3YJoCkuRV0NINZyewahY6q7H8XBadTDU+EyZ/M jHTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=tBWnpnvl; spf=pass (google.com: domain of linux-kernel+bounces-16816-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16816-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w17-20020a056a0014d100b006dac20d935fsi1306983pfu.141.2024.01.04.07.00.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:00:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-16816-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=tBWnpnvl; spf=pass (google.com: domain of linux-kernel+bounces-16816-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16816-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2B67C287F84 for ; Thu, 4 Jan 2024 15:00:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 173DA24A0A; Thu, 4 Jan 2024 14:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="tBWnpnvl" X-Original-To: linux-kernel@vger.kernel.org Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4D4C241E8; Thu, 4 Jan 2024 14:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 404EvYYD047662; Thu, 4 Jan 2024 08:57:34 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1704380254; bh=8hWmAMoSrq6UPFSMfKTuynRM3F7QsEgFBw7C/guNTDQ=; h=From:To:CC:Subject:Date; b=tBWnpnvlhU3m6KuMUBDrZiFi/Yo/VeyrrMNtXONvaC9rQanRfPyPLiFojhWxM8HD1 ihM+4qsW2Aegj/IF2v8Uny8W3cTvup1eG+B+v5llHJmj4lJTly0/5qLz3QlhI7e6kv 6fWL5RGpgOp4TLWV+bAc/+OEW6HNWZ6Mrh/evXZM= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 404EvYuc034161 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Jan 2024 08:57:34 -0600 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 4 Jan 2024 08:57:33 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) 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.2507.23 via Frontend Transport; Thu, 4 Jan 2024 08:57:33 -0600 Received: from LT5CG31242FY.dhcp.ti.com ([10.250.161.227]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 404EvPfM105959; Thu, 4 Jan 2024 08:57:26 -0600 From: Shenghao Ding To: , , CC: , , , , , , , , <13916275206@139.com>, , , , , , , , Shenghao Ding Subject: [PATCH v5 1/4] ASoC: dt-bindings: move tas2563 from tas2562.yaml to tas2781.yaml Date: Thu, 4 Jan 2024 22:57:16 +0800 Message-ID: <20240104145721.1398-1-shenghao-ding@ti.com> X-Mailer: git-send-email 2.33.0.windows.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787172428608416638 X-GMAIL-MSGID: 1787172428608416638 Move tas2563 from tas2562.yaml to tas2781.yaml to unbind tas2563 from tas2562 driver code and bind it to tas2781 driver code, because tas2563 only work in bypass-DSP mode with tas2562 driver. In order to enable DSP mode for tas2563, it has been moved to tas2781 driver. As to the hardware part, such as register setting and DSP firmware, all these are stored in the binary firmware. What tas2781 drivder does is to parse the firmware and download it to the chip, then power on the chip. So, tas2781 driver can be resued as tas2563 driver. Only attention will be paid to downloading corresponding firmware. Signed-off-by: Shenghao Ding Reviewed-by: Krzysztof Kozlowski --- Change in v5: - remove tas2563, which will be move to tas2781 driver. - Add more comments on why to move tas2563 to tas2781 driver. - Provide rationale in terms of bindings and hardware, not in terms of driver. Or at least not only. - Reorder chip, tas2563 is first, tas2781 is second. - Add datasheet linkings. - squash both tas2562 and tas2781 binding patches. - Put allOf: to the end of the file, after required: block. - restore the widest constraints of minItems/maxItems at reg. --- .../devicetree/bindings/sound/tas2562.yaml | 2 - .../devicetree/bindings/sound/ti,tas2781.yaml | 78 +++++++++++++++---- 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml index f01c0dde0cf7..d28c102c0ce7 100644 --- a/Documentation/devicetree/bindings/sound/tas2562.yaml +++ b/Documentation/devicetree/bindings/sound/tas2562.yaml @@ -18,7 +18,6 @@ description: | Specifications about the audio amplifier can be found at: https://www.ti.com/lit/gpn/tas2562 - https://www.ti.com/lit/gpn/tas2563 https://www.ti.com/lit/gpn/tas2564 https://www.ti.com/lit/gpn/tas2110 @@ -29,7 +28,6 @@ properties: compatible: enum: - ti,tas2562 - - ti,tas2563 - ti,tas2564 - ti,tas2110 diff --git a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml index a69e6c223308..976238689249 100644 --- a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml +++ b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml @@ -5,36 +5,46 @@ $id: http://devicetree.org/schemas/sound/ti,tas2781.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Texas Instruments TAS2781 SmartAMP +title: Texas Instruments TAS2563/TAS2781 SmartAMP maintainers: - Shenghao Ding -description: - The TAS2781 is a mono, digital input Class-D audio amplifier - optimized for efficiently driving high peak power into small - loudspeakers. An integrated on-chip DSP supports Texas Instruments - Smart Amp speaker protection algorithm. The integrated speaker - voltage and current sense provides for real time +description: | + The TAS2563/TAS2781 is a mono, digital input Class-D audio + amplifier optimized for efficiently driving high peak power into + small loudspeakers. An integrated on-chip DSP supports Texas + Instruments Smart Amp speaker protection algorithm. The + integrated speaker voltage and current sense provides for real time monitoring of loudspeaker behavior. -allOf: - - $ref: dai-common.yaml# + Specifications about the audio amplifier can be found at: + https://www.ti.com/lit/gpn/tas2563 + https://www.ti.com/lit/gpn/tas2781 properties: compatible: - enum: - - ti,tas2781 + description: | + ti,tas2563: 6.1-W Boosted Class-D Audio Amplifier With Integrated + DSP and IV Sense, 16/20/24/32bit stereo I2S or multichannel TDM. + + ti,tas2781: 24-V Class-D Amplifier with Real Time Integrated Speaker + Protection and Audio Processing, 16/20/24/32bit stereo I2S or + multichannel TDM. + oneOf: + - items: + - enum: + - ti,tas2563 + - const: ti,tas2781 + - enum: + - ti,tas2781 reg: description: - I2C address, in multiple tas2781s case, all the i2c address + I2C address, in multiple-AMP case, all the i2c address aggregate as one Audio Device to support multiple audio slots. maxItems: 8 minItems: 1 - items: - minimum: 0x38 - maximum: 0x3f reset-gpios: maxItems: 1 @@ -49,6 +59,44 @@ required: - compatible - reg +allOf: + - $ref: dai-common.yaml# + - if: + properties: + compatible: + contains: + enum: + - ti,tas2563 + then: + properties: + reg: + description: + I2C address, in multiple-AMP case, all the i2c address + aggregate as one Audio Device to support multiple audio slots. + maxItems: 4 + minItems: 1 + items: + minimum: 0x4c + maximum: 0x4f + + - if: + properties: + compatible: + contains: + enum: + - ti,tas2781 + then: + properties: + reg: + description: + I2C address, in multiple-AMP case, all the i2c address + aggregate as one Audio Device to support multiple audio slots. + maxItems: 8 + minItems: 1 + items: + minimum: 0x38 + maximum: 0x3f + additionalProperties: false examples: