A bunch of TI's codecs have binding schemas which force #sound-dai-cells
to one despite those codecs only having a single DAI. Allow for bindings
with zero DAI cells and deprecate the former non-zero value.
Signed-off-by: Martin Povišer <[email protected]>
---
Documentation/devicetree/bindings/sound/tas2562.yaml | 6 ++++--
Documentation/devicetree/bindings/sound/tas2770.yaml | 6 ++++--
Documentation/devicetree/bindings/sound/tas27xx.yaml | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml
index a5bb561bfcfb..31a3024ea789 100644
--- a/Documentation/devicetree/bindings/sound/tas2562.yaml
+++ b/Documentation/devicetree/bindings/sound/tas2562.yaml
@@ -55,7 +55,9 @@ properties:
description: TDM TX current sense time slot.
'#sound-dai-cells':
- const: 1
+ # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
+ # compatibility but is deprecated.
+ enum: [0, 1]
required:
- compatible
@@ -72,7 +74,7 @@ examples:
codec: codec@4c {
compatible = "ti,tas2562";
reg = <0x4c>;
- #sound-dai-cells = <1>;
+ #sound-dai-cells = <0>;
interrupt-parent = <&gpio1>;
interrupts = <14>;
shutdown-gpios = <&gpio1 15 0>;
diff --git a/Documentation/devicetree/bindings/sound/tas2770.yaml b/Documentation/devicetree/bindings/sound/tas2770.yaml
index 26088adb9dc2..8908bf1122e9 100644
--- a/Documentation/devicetree/bindings/sound/tas2770.yaml
+++ b/Documentation/devicetree/bindings/sound/tas2770.yaml
@@ -57,7 +57,9 @@ properties:
- 1 # Falling edge
'#sound-dai-cells':
- const: 1
+ # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
+ # compatibility but is deprecated.
+ enum: [0, 1]
required:
- compatible
@@ -74,7 +76,7 @@ examples:
codec: codec@41 {
compatible = "ti,tas2770";
reg = <0x41>;
- #sound-dai-cells = <1>;
+ #sound-dai-cells = <0>;
interrupt-parent = <&gpio1>;
interrupts = <14>;
reset-gpio = <&gpio1 15 0>;
diff --git a/Documentation/devicetree/bindings/sound/tas27xx.yaml b/Documentation/devicetree/bindings/sound/tas27xx.yaml
index 8cba01316855..a876545ec87d 100644
--- a/Documentation/devicetree/bindings/sound/tas27xx.yaml
+++ b/Documentation/devicetree/bindings/sound/tas27xx.yaml
@@ -50,7 +50,9 @@ properties:
description: TDM TX voltage sense time slot.
'#sound-dai-cells':
- const: 1
+ # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
+ # compatibility but is deprecated.
+ enum: [0, 1]
required:
- compatible
@@ -67,7 +69,7 @@ examples:
codec: codec@38 {
compatible = "ti,tas2764";
reg = <0x38>;
- #sound-dai-cells = <1>;
+ #sound-dai-cells = <0>;
interrupt-parent = <&gpio1>;
interrupts = <14>;
reset-gpios = <&gpio1 15 0>;
--
2.38.3
On 09/05/2023 17:34, Martin Povišer wrote:
> A bunch of TI's codecs have binding schemas which force #sound-dai-cells
> to one despite those codecs only having a single DAI. Allow for bindings
> with zero DAI cells and deprecate the former non-zero value.
>
> Signed-off-by: Martin Povišer <[email protected]>
> ---
> Documentation/devicetree/bindings/sound/tas2562.yaml | 6 ++++--
> Documentation/devicetree/bindings/sound/tas2770.yaml | 6 ++++--
> Documentation/devicetree/bindings/sound/tas27xx.yaml | 6 ++++--
> 3 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml
> index a5bb561bfcfb..31a3024ea789 100644
> --- a/Documentation/devicetree/bindings/sound/tas2562.yaml
> +++ b/Documentation/devicetree/bindings/sound/tas2562.yaml
> @@ -55,7 +55,9 @@ properties:
> description: TDM TX current sense time slot.
>
> '#sound-dai-cells':
> - const: 1
> + # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
> + # compatibility but is deprecated.
> + enum: [0, 1]
Does it? I see playback and capture.
Best regards,
Krzysztof
> On 10. 5. 2023, at 9:17, Krzysztof Kozlowski <[email protected]> wrote:
>
> On 09/05/2023 17:34, Martin Povišer wrote:
>> A bunch of TI's codecs have binding schemas which force #sound-dai-cells
>> to one despite those codecs only having a single DAI. Allow for bindings
>> with zero DAI cells and deprecate the former non-zero value.
>>
>> Signed-off-by: Martin Povišer <[email protected]>
>> ---
>> Documentation/devicetree/bindings/sound/tas2562.yaml | 6 ++++--
>> Documentation/devicetree/bindings/sound/tas2770.yaml | 6 ++++--
>> Documentation/devicetree/bindings/sound/tas27xx.yaml | 6 ++++--
>> 3 files changed, 12 insertions(+), 6 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml
>> index a5bb561bfcfb..31a3024ea789 100644
>> --- a/Documentation/devicetree/bindings/sound/tas2562.yaml
>> +++ b/Documentation/devicetree/bindings/sound/tas2562.yaml
>> @@ -55,7 +55,9 @@ properties:
>> description: TDM TX current sense time slot.
>>
>> '#sound-dai-cells':
>> - const: 1
>> + # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
>> + # compatibility but is deprecated.
>> + enum: [0, 1]
>
> Does it? I see playback and capture.
I think so. Playback and capture are not separate DAIs.
Martin
>
> Best regards,
> Krzysztof
> On 10. 5. 2023, at 9:30, Martin Povišer <[email protected]> wrote:
>
>> On 10. 5. 2023, at 9:17, Krzysztof Kozlowski <[email protected]> wrote:
>>
>> On 09/05/2023 17:34, Martin Povišer wrote:
>>> A bunch of TI's codecs have binding schemas which force #sound-dai-cells
>>> to one despite those codecs only having a single DAI. Allow for bindings
>>> with zero DAI cells and deprecate the former non-zero value.
>>>
>>> Signed-off-by: Martin Povišer <[email protected]>
>>> ---
>>> '#sound-dai-cells':
>>> - const: 1
>>> + # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
>>> + # compatibility but is deprecated.
>>> + enum: [0, 1]
>>
>> Does it? I see playback and capture.
>
> I think so. Playback and capture are not separate DAIs.
>
> Martin
I double checked, I am pretty sure. There’s a single snd_soc_dai_driver,
which becomes a single DAI.
Martin
>
>>
>> Best regards,
>> Krzysztof
>
>
On 10/05/2023 09:33, Martin Povišer wrote:
>
>> On 10. 5. 2023, at 9:30, Martin Povišer <[email protected]> wrote:
>>
>>> On 10. 5. 2023, at 9:17, Krzysztof Kozlowski <[email protected]> wrote:
>>>
>>> On 09/05/2023 17:34, Martin Povišer wrote:
>>>> A bunch of TI's codecs have binding schemas which force #sound-dai-cells
>>>> to one despite those codecs only having a single DAI. Allow for bindings
>>>> with zero DAI cells and deprecate the former non-zero value.
>>>>
>>>> Signed-off-by: Martin Povišer <[email protected]>
>>>> ---
>
>>>> '#sound-dai-cells':
>>>> - const: 1
>>>> + # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
>>>> + # compatibility but is deprecated.
>>>> + enum: [0, 1]
>>>
>>> Does it? I see playback and capture.
>>
>> I think so. Playback and capture are not separate DAIs.
>>
>> Martin
>
> I double checked, I am pretty sure. There’s a single snd_soc_dai_driver,
> which becomes a single DAI.
Indeed, I see now one entry... Ehh... -ENOTENOUGHCOFFEE
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On Tue, 09 May 2023 17:34:12 +0200, Martin Povišer wrote:
> A bunch of TI's codecs have binding schemas which force #sound-dai-cells
> to one despite those codecs only having a single DAI. Allow for bindings
> with zero DAI cells and deprecate the former non-zero value.
>
>
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: dt-bindings: Adjust #sound-dai-cells on TI's single-DAI codecs
commit: efb2bfd7b3d210c479b9361c176d7426e5eb8663
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark