From patchwork Mon Dec 25 05:39:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shenghao Ding X-Patchwork-Id: 758280 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 965AA10F1; Mon, 25 Dec 2023 05:41:09 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="pEIXGY+1" Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3BP5e4FL002329; Sun, 24 Dec 2023 23:40:04 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1703482804; bh=HrK4CoxRPJxishw+m4OPd+FN7MY4k6voZtPY9fvBQXg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=pEIXGY+1WzghaZdx6u7sMLBA3d7Vso4jwAw75avSyUMhHYFryHjhDWTeD4JyL9s// B1YupcKuoVTIbsord9xbfVIPr1OHkGPEcnPa+mbWPCzyYuj52i0IT6m659znG3RNZC R0AJMnaJKb7fWs/Zih1y65BRVWadilbCV2qjjFQI= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3BP5e4tQ002095 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 24 Dec 2023 23:40:04 -0600 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Sun, 24 Dec 2023 23:40:04 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE104.ent.ti.com (10.64.6.25) 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; Sun, 24 Dec 2023 23:40:04 -0600 Received: from LT5CG31242FY.dhcp.ti.com ([10.250.160.240]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3BP5defe118972; Sun, 24 Dec 2023 23:39:57 -0600 From: Shenghao Ding To: , , CC: , , , , , , , , <13916275206@139.com>, , , , , , , , Shenghao Ding Subject: [PATCH v3 3/5] ASoC: tas2781: Add tas2563 into header file for DSP mode Date: Mon, 25 Dec 2023 13:39:29 +0800 Message-ID: <20231225053932.1138-3-shenghao-ding@ti.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20231225053932.1138-1-shenghao-ding@ti.com> References: <20231225053932.1138-1-shenghao-ding@ti.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Move tas2563 from tas2562 header file to tas2781 header file, because tas2563 only work in bypass-DSP mode with tas2562 driver. In oder 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 dooes is to parse the firmware and download them to the tas2781 or tas2563, then power on tas2781 or tas2563. So, tas2781 driver can be resued as tas2563 driver。 Only attention will be paid to downloading corresponding firmware. Signed-off-by: Shenghao Ding --- Change in v3: - Move tas2563 to tas2781 driver - Add more comments on why move tas2563 to tas2781 driver - Provide rationale in terms of bindings and hardware, not in terms of driver. Or at least not only. --- include/sound/tas2781.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h index a6c808b22318..45be543110ac 100644 --- a/include/sound/tas2781.h +++ b/include/sound/tas2781.h @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0 */ // -// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier +// ALSA SoC Texas Instruments TAS2781/TAS2563 Audio Smart Amplifier // // Copyright (C) 2022 - 2023 Texas Instruments Incorporated // https://www.ti.com // -// The TAS2781 driver implements a flexible and configurable +// The TAS2781/TAS2563 driver implements a flexible and configurable // algo coefficient setting for one, two, or even multiple -// TAS2781 chips. +// TAS2781/TAS2563 chips. // // Author: Shenghao Ding // Author: Kevin Lu @@ -60,6 +60,7 @@ enum audio_device { TAS2781 = 0, + TAS2563 }; enum device_catlog_id { From patchwork Mon Dec 25 05:39:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenghao Ding X-Patchwork-Id: 758279 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 9658310EE; Mon, 25 Dec 2023 05:41:09 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="AfvWDeCU" Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3BP5eDf9002428; Sun, 24 Dec 2023 23:40:13 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1703482813; bh=IzvHSce1KXGXvd7Susyupy1VQZBvpXf3R+NT2Xh9qEE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=AfvWDeCU0yT1R3yAPjxur7nFtQar9HClWrDAX4x+Btf0BQbh1zn/HdzfQV7wAVmhK tha65BOYLYNZ23eTCxhfay5CYC7hZ/yfbfokXmBr/DQp5FxeQAnGQljpRBLRbv/BSd zzyIgK4D1iJ393Hxr8ithtP+XyIVkqyAJBMcSiMQ= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3BP5eDJs002184 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 24 Dec 2023 23:40:13 -0600 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Sun, 24 Dec 2023 23:40:12 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE106.ent.ti.com (10.64.6.27) 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; Sun, 24 Dec 2023 23:40:12 -0600 Received: from LT5CG31242FY.dhcp.ti.com ([10.250.160.240]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3BP5deff118972; Sun, 24 Dec 2023 23:40:05 -0600 From: Shenghao Ding To: , , CC: , , , , , , , , <13916275206@139.com>, , , , , , , , Shenghao Ding Subject: [PATCH v3 4/5] ASoC: tas2781: Add tas2563 into driver Date: Mon, 25 Dec 2023 13:39:30 +0800 Message-ID: <20231225053932.1138-4-shenghao-ding@ti.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20231225053932.1138-1-shenghao-ding@ti.com> References: <20231225053932.1138-1-shenghao-ding@ti.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Move tas2563 from tas2562 driver to tas2781 driver, because tas2563 only work in bypass-DSP mode with tas2562 driver. In oder 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 dooes is to parse the firmware and download them to the tas2781 or tas2563, then power on tas2781 or tas2563. So, tas2781 driver can be resued as tas2563 driver. Only attention will be paid to downloading corresponding firmware. Signed-off-by: Shenghao Ding --- Change in v3: - Add tas2563 to tas2781 driver - Add more comments on why move tas2563 to tas2781 driver - Provide rationale in terms of bindings and hardware, not in terms of driver. Or at least not only. --- sound/soc/codecs/tas2781-i2c.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 55cd5e3c23a5..c6afc87f2c69 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -5,9 +5,9 @@ // Copyright (C) 2022 - 2023 Texas Instruments Incorporated // https://www.ti.com // -// The TAS2781 driver implements a flexible and configurable +// The TAS2781/TAS2563 driver implements a flexible and configurable // algo coefficient setting for one, two, or even multiple -// TAS2781 chips. +// TAS2781/TAS2563 chips. // // Author: Shenghao Ding // Author: Kevin Lu @@ -33,6 +33,7 @@ static const struct i2c_device_id tasdevice_id[] = { { "tas2781", TAS2781 }, + { "tas2563", TAS2563 }, {} }; MODULE_DEVICE_TABLE(i2c, tasdevice_id); @@ -40,6 +41,7 @@ MODULE_DEVICE_TABLE(i2c, tasdevice_id); #ifdef CONFIG_OF static const struct of_device_id tasdevice_of_match[] = { { .compatible = "ti,tas2781" }, + { .compatible = "ti,tas2563" }, {}, }; MODULE_DEVICE_TABLE(of, tasdevice_of_match); From patchwork Mon Dec 25 05:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenghao Ding X-Patchwork-Id: 758278 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 914EE443E; Mon, 25 Dec 2023 05:41:12 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="NU1/5+7N" Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3BP5eLIU002555; Sun, 24 Dec 2023 23:40:21 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1703482821; bh=/cJuzaMwBV9bj1owzJ1BkwCP1ERmEL8XbnhumEog2aY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=NU1/5+7NkV+Tnr0pFQOv3BY5XDp9UBTRWADPZVzrfCWL+PB72rZAO4u+UKchVtYaW lFx1TfgOUGWDNmqXphkEHjTHB22a64qv2iCncEwGNLIzx8XRuX+J0+dSxLrSoRol2m hyX5pjWduaeQtidtc9tsmc3FHQpWvW2n+2vrUgxU= Received: from DFLE100.ent.ti.com (dfle100.ent.ti.com [10.64.6.21]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3BP5eLom034343 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 24 Dec 2023 23:40:21 -0600 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Sun, 24 Dec 2023 23:40:21 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE115.ent.ti.com (10.64.6.36) 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; Sun, 24 Dec 2023 23:40:21 -0600 Received: from LT5CG31242FY.dhcp.ti.com ([10.250.160.240]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3BP5defg118972; Sun, 24 Dec 2023 23:40:14 -0600 From: Shenghao Ding To: , , CC: , , , , , , , , <13916275206@139.com>, , , , , , , , Shenghao Ding Subject: [PATCH v3 5/5] ASoC: dt-bindings: Add tas2563 into ti, ta2781.yaml to enable DSP mode Date: Mon, 25 Dec 2023 13:39:31 +0800 Message-ID: <20231225053932.1138-5-shenghao-ding@ti.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20231225053932.1138-1-shenghao-ding@ti.com> References: <20231225053932.1138-1-shenghao-ding@ti.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Move tas2563 from tas2562.yaml to tas2781.yaml, because tas2563 only work in bypass-DSP mode with tas2562 driver. In oder 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 dooes is to parse the firmware and download them to the tas2781 or tas2563, then power on tas2781 or tas2563. So, tas2781 driver can be resued as tas2563 driver. Only attention will be paid to downloading corresponding firmware. Signed-off-by: Shenghao Ding --- Change in v3: - Add devicetree list and other list of necessary people and lists to CC - Express Compatibility in the bindings - Add more comments on why move tas2563 to tas2781 driver - Provide rationale in terms of bindings and hardware, not in terms of driver. Or at least not only. --- .../devicetree/bindings/sound/ti,tas2781.yaml | 66 ++++++++++++++----- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml index a69e6c223308..bbe8e5f2c013 100644 --- a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml +++ b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml @@ -5,36 +5,72 @@ $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 TAS2781/TAS2563 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 + The TAS2781/TAS2563 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# + - 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 + else: + 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 properties: compatible: + description: | + 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. + + 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. enum: - ti,tas2781 + - ti,tas2563 + # Tas781 driver can support both tas2563 and tas2781, because the + # hardware part in the driver code, such as register setting and DSP + # firmware, all these are stored in the binary firmware. What drivder + # dooes is to parse the firmware and download it to the tas2781 or + # tas2563, then control tas2781 or tas2563 to power on/off or switch + # different dsp params. So, tas2781 driver can be resued as tas2563 + # driver. Only attention will be paid to downloading corresponding + # firmware. - reg: - description: - I2C address, in multiple tas2781s case, all the i2c address - aggregate as one Audio Device to support multiple audio slots. - maxItems: 8 - minItems: 1 - items: - minimum: 0x38 - maximum: 0x3f + reg: true reset-gpios: maxItems: 1