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 dooes 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 <[email protected]>
---
Change in v4:
- 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.
---
.../devicetree/bindings/sound/tas2562.yaml | 2 -
.../devicetree/bindings/sound/ti,tas2781.yaml | 85 ++++++++++++++-----
2 files changed, 64 insertions(+), 23 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..78d89008c36f 100644
--- a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml
+++ b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml
@@ -5,36 +5,41 @@
$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 <[email protected]>
-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
-
- 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
+ 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: true
reset-gpios:
maxItems: 1
@@ -49,6 +54,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:
--
2.34.1
Move tas2563 from tas2562 driver to tas2781 driver 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 dooes 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 <[email protected]>
---
Change in v4:
- Move tas2563 from tas2562 driver 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/tas2562.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c
index 962c2cdfa017..54561ae598b8 100644
--- a/sound/soc/codecs/tas2562.c
+++ b/sound/soc/codecs/tas2562.c
@@ -59,7 +59,6 @@ struct tas2562_data {
enum tas256x_model {
TAS2562,
- TAS2563,
TAS2564,
TAS2110,
};
@@ -721,7 +720,6 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562)
static const struct i2c_device_id tas2562_id[] = {
{ "tas2562", TAS2562 },
- { "tas2563", TAS2563 },
{ "tas2564", TAS2564 },
{ "tas2110", TAS2110 },
{ }
@@ -770,7 +768,6 @@ static int tas2562_probe(struct i2c_client *client)
#ifdef CONFIG_OF
static const struct of_device_id tas2562_of_match[] = {
{ .compatible = "ti,tas2562", },
- { .compatible = "ti,tas2563", },
{ .compatible = "ti,tas2564", },
{ .compatible = "ti,tas2110", },
{ },
--
2.34.1
Move tas2563 from tas2562 driver to tas2781 driver 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 dooes 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 <[email protected]>
---
Change in v4:
- 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.
- In all cases, to make the lists ordered by a chip model, tas2563 is first,
tas2781 is second.
---
sound/soc/codecs/tas2781-i2c.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c
index 55cd5e3c23a5..bd5ef4ff96fe 100644
--- a/sound/soc/codecs/tas2781-i2c.c
+++ b/sound/soc/codecs/tas2781-i2c.c
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: GPL-2.0
//
-// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier
+// ALSA SoC Texas Instruments TAS2563/TAS2781 Audio Smart Amplifier
//
// Copyright (C) 2022 - 2023 Texas Instruments Incorporated
// https://www.ti.com
//
-// The TAS2781 driver implements a flexible and configurable
+// The TAS2563/TAS2781 driver implements a flexible and configurable
// algo coefficient setting for one, two, or even multiple
-// TAS2781 chips.
+// TAS2563/TAS2781 chips.
//
// Author: Shenghao Ding <[email protected]>
// Author: Kevin Lu <[email protected]>
@@ -32,6 +32,7 @@
#include <sound/tas2781-tlv.h>
static const struct i2c_device_id tasdevice_id[] = {
+ { "tas2563", TAS2563 },
{ "tas2781", TAS2781 },
{}
};
@@ -39,6 +40,7 @@ MODULE_DEVICE_TABLE(i2c, tasdevice_id);
#ifdef CONFIG_OF
static const struct of_device_id tasdevice_of_match[] = {
+ { .compatible = "ti,tas2563" },
{ .compatible = "ti,tas2781" },
{},
};
--
2.34.1
On 28/12/2023 16:30, Shenghao Ding wrote:
> 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 dooes 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 <[email protected]>
>
> ---
> Change in v4:
> - 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.
> ---
> .../devicetree/bindings/sound/tas2562.yaml | 2 -
> .../devicetree/bindings/sound/ti,tas2781.yaml | 85 ++++++++++++++-----
> 2 files changed, 64 insertions(+), 23 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..78d89008c36f 100644
> --- a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml
> +++ b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml
> @@ -5,36 +5,41 @@
> $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 <[email protected]>
>
> -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
> -
> - 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
> + 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: true
min/maxItems must stay here
I already reminded this in v3.
Best regards,
Krzysztof
> -----Original Message-----
> From: Krzysztof Kozlowski <[email protected]>
> Sent: Wednesday, January 3, 2024 3:38 PM
> To: Ding, Shenghao <[email protected]>; [email protected];
> [email protected]
> Cc: [email protected]; [email protected]; Lu, Kevin
> <[email protected]>; Xu, Baojun <[email protected]>;
> [email protected]; [email protected]; [email protected]; pierre-
> [email protected]; [email protected]; linux-
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected]; Gupta, Peeyush
> <[email protected]>; Navada Kanyana, Mukund <[email protected]>
> Subject: [EXTERNAL] Re: [PATCH v4 1/4] ASoC: dt-bindings: move tas2563
> from tas2562.yaml to tas2781.yaml
>
> On 28/12/2023 16:30, Shenghao Ding wrote:
> > 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 dooes 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 <[email protected]>
> >
> > ---
> > Change in v4:
> > - 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.
> > ---
> > .../devicetree/bindings/sound/tas2562.yaml | 2 -
> > .../devicetree/bindings/sound/ti,tas2781.yaml | 85
> > ++++++++++++++-----
> > 2 files changed, 64 insertions(+), 23 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..78d89008c36f 100644
> > --- a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml
> > +++ b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml
> > @@ -5,36 +5,41 @@
> > $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 <[email protected]>
> >
> > -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
> > -
> > - 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
> > + 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: true
>
> min/maxItems must stay here
>
> I already reminded this in v3.
How to express maxItems is 4 for tas2563 on the same i2c bus(only 4 different i2c addresses)
and maxItems is 8 for tas2781 on the same i2c bus (8 different i2c addresses) here.
>
>
> Best regards,
> Krzysztof
On 03/01/2024 16:10, Ding, Shenghao wrote:
>>> - 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
>>> + 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: true
>>
>> min/maxItems must stay here
>>
>> I already reminded this in v3.
> How to express maxItems is 4 for tas2563 on the same i2c bus(only 4 different i2c addresses)
> and maxItems is 8 for tas2781 on the same i2c bus (8 different i2c addresses) here.
Here you have only the widest constraints. In allOf:if:then you
customize them.
Best regards,
Krzysztof