ASoC: dt-bindings: simple-card: correct DAI subnodes pattern

Message ID 20230109083301.76282-1-krzysztof.kozlowski@linaro.org
State New
Headers
Series ASoC: dt-bindings: simple-card: correct DAI subnodes pattern |

Commit Message

Krzysztof Kozlowski Jan. 9, 2023, 8:33 a.m. UTC
  The simple-audio-card,dai-link node does not allow address/size-cells
thus children (cpu, codec) should come without unit addresses.  For
cases with multiple nodes of same type, require a dash before index
(e.g. cpu-x) and add trailing $ to the pattern to disallow other
characters.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/sound/simple-card.yaml       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
  

Comments

Mark Brown Jan. 9, 2023, 4:49 p.m. UTC | #1
On Mon, 09 Jan 2023 09:33:01 +0100, Krzysztof Kozlowski wrote:
> The simple-audio-card,dai-link node does not allow address/size-cells
> thus children (cpu, codec) should come without unit addresses.  For
> cases with multiple nodes of same type, require a dash before index
> (e.g. cpu-x) and add trailing $ to the pattern to disallow other
> characters.
> 
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: dt-bindings: simple-card: correct DAI subnodes pattern
      commit: cbf74baf02219978bfa9c2959eac6bf1d98c32cd

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
  

Patch

diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml
index ed19899bc94b..08743741b09e 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.yaml
+++ b/Documentation/devicetree/bindings/sound/simple-card.yaml
@@ -244,9 +244,9 @@  patternProperties:
         maxItems: 1
 
     patternProperties:
-      "^cpu(@[0-9a-f]+)?":
+      "^cpu(-[0-9]+)?$":
         $ref: "#/definitions/dai"
-      "^codec(@[0-9a-f]+)?":
+      "^codec(-[0-9]+)?$":
         $ref: "#/definitions/dai"
     additionalProperties: false
 
@@ -462,16 +462,16 @@  examples:
 
             convert-channels = <8>; /* TDM Split */
 
-            sndcpu1: cpu0 {
+            sndcpu1: cpu-0 {
                 sound-dai = <&rcar_sound 1>;
             };
-            cpu1 {
+            cpu-1 {
                 sound-dai = <&rcar_sound 2>;
             };
-            cpu2 {
+            cpu-2 {
                 sound-dai = <&rcar_sound 3>;
             };
-            cpu3 {
+            cpu-3 {
                 sound-dai = <&rcar_sound 4>;
             };
             codec {