[PATCH v2 1/3] ASoC: dt-bindings: Use name-prefix schema
name-prefix.txt does not exist anymore, just reference the schema instead.
Signed-off-by: Alexander Stein alexander.stein@mailbox.org --- Changes in v2: * Fix 'pass' -> 'true'
.../devicetree/bindings/sound/simple-audio-amplifier.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml b/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml index 26379377a7ac..8327846356d3 100644 --- a/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml +++ b/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml @@ -9,6 +9,9 @@ title: Simple Audio Amplifier Device Tree Bindings maintainers: - Jerome Brunet jbrunet@baylibre.com
+allOf: + - $ref: name-prefix.yaml# + properties: compatible: enum: @@ -22,10 +25,7 @@ properties: description: > power supply for the device
- sound-name-prefix: - $ref: /schemas/types.yaml#/definitions/string - description: > - See ./name-prefix.txt + sound-name-prefix: true
required: - compatible
This is used in meson-gxl and meson-g12-common .dtsi. Add the property to the binding. This fixes the dtschema warning: audio-controller@32000: 'sound-name-prefix' does not match any of the regexes: 'pinctrl-[0-9]+'
Signed-off-by: Alexander Stein alexander.stein@mailbox.org --- All users have set this to "ACODEC", but I am not sure if this value is mandatory, so I opted to not set a pattern for this property.
Changes in v2: * None
Documentation/devicetree/bindings/sound/amlogic,t9015.yaml | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml index db7b04da0b39..580a3d040abc 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml @@ -9,6 +9,9 @@ title: Amlogic T9015 Internal Audio DAC maintainers: - Jerome Brunet jbrunet@baylibre.com
+allOf: + - $ref: name-prefix.yaml# + properties: $nodename: pattern: "^audio-controller@.*" @@ -38,6 +41,8 @@ properties: description: Analogue power supply.
+ sound-name-prefix: true + required: - "#sound-dai-cells" - compatible
On Sat, 18 Dec 2021 15:34:22 +0100, Alexander Stein wrote:
This is used in meson-gxl and meson-g12-common .dtsi. Add the property to the binding. This fixes the dtschema warning: audio-controller@32000: 'sound-name-prefix' does not match any of the regexes: 'pinctrl-[0-9]+'
Signed-off-by: Alexander Stein alexander.stein@mailbox.org
All users have set this to "ACODEC", but I am not sure if this value is mandatory, so I opted to not set a pattern for this property.
Changes in v2:
- None
Documentation/devicetree/bindings/sound/amlogic,t9015.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Reviewed-by: Rob Herring robh@kernel.org
This is used in meson-sm1 and meson-g12 .dtsi. Add the property to the binding. This fixes the dtschema warning: audio-controller@740: 'sound-name-prefix' does not match any of the regexes: 'pinctrl-[0-9]+'
Signed-off-by: Alexander Stein alexander.stein@mailbox.org --- All users have set this to "TOACODEC", but I am not sure if this value is mandatory, so I opted to not set a pattern for this property.
Changes in v2: * Fix 'pass' -> 'true'
.../devicetree/bindings/sound/amlogic,g12a-toacodec.yaml | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml index 3c3891d17238..77469a45bb7a 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml @@ -9,6 +9,9 @@ title: Amlogic G12a Internal DAC Control Glue maintainers: - Jerome Brunet jbrunet@baylibre.com
+allOf: + - $ref: name-prefix.yaml# + properties: $nodename: pattern: "^audio-controller@.*" @@ -31,6 +34,8 @@ properties: resets: maxItems: 1
+ sound-name-prefix: true + required: - "#sound-dai-cells" - compatible
On Sat, 18 Dec 2021 15:34:23 +0100, Alexander Stein wrote:
This is used in meson-sm1 and meson-g12 .dtsi. Add the property to the binding. This fixes the dtschema warning: audio-controller@740: 'sound-name-prefix' does not match any of the regexes: 'pinctrl-[0-9]+'
Signed-off-by: Alexander Stein alexander.stein@mailbox.org
All users have set this to "TOACODEC", but I am not sure if this value is mandatory, so I opted to not set a pattern for this property.
Changes in v2:
- Fix 'pass' -> 'true'
.../devicetree/bindings/sound/amlogic,g12a-toacodec.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Reviewed-by: Rob Herring robh@kernel.org
On Sat 18 Dec 2021 at 15:34, Alexander Stein alexander.stein@mailbox.org wrote:
name-prefix.txt does not exist anymore, just reference the schema instead.
Signed-off-by: Alexander Stein alexander.stein@mailbox.org
Thanks for doing this.
To keep things coherent, it would be nice if you could do the same for the other amlogic sound components. They all use prefixes, except card drivers.
Side note: Any ASoC component could use the sound-name-prefix. Is there a way express that somehow ? instead of repeating this type of change in every codec/cpu binding doc ?
Changes in v2:
- Fix 'pass' -> 'true'
.../devicetree/bindings/sound/simple-audio-amplifier.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml b/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml index 26379377a7ac..8327846356d3 100644 --- a/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml +++ b/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml @@ -9,6 +9,9 @@ title: Simple Audio Amplifier Device Tree Bindings maintainers:
- Jerome Brunet jbrunet@baylibre.com
+allOf:
- $ref: name-prefix.yaml#
properties: compatible: enum: @@ -22,10 +25,7 @@ properties: description: > power supply for the device
- sound-name-prefix:
- $ref: /schemas/types.yaml#/definitions/string
- description: >
See ./name-prefix.txt
- sound-name-prefix: true
I've seen a couple of file with this, according the commit description it solves some kind of name clash but I did not really get how ...
required:
- compatible
On Sat, 18 Dec 2021 15:34:21 +0100, Alexander Stein wrote:
name-prefix.txt does not exist anymore, just reference the schema instead.
Signed-off-by: Alexander Stein alexander.stein@mailbox.org
Changes in v2:
- Fix 'pass' -> 'true'
.../devicetree/bindings/sound/simple-audio-amplifier.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Rob Herring robh@kernel.org
On Sat, 18 Dec 2021 15:34:21 +0100, Alexander Stein wrote:
name-prefix.txt does not exist anymore, just reference the schema instead.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: dt-bindings: Use name-prefix schema commit: 0d422a466ef7fdbbe402194ac06144d1bbcdc227 [2/3] ASoC: meson: t9015: add missing sound-name-prefix property commit: 847cbea6459d5beb3f0f960fde4337f28b663eae [3/3] ASoC: meson: g12a: add missing sound-name-prefix property commit: 1f6532073e3e9caee1dbc3f9b4be28359a181ea4
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
participants (4)
-
Alexander Stein -
Jerome Brunet -
Mark Brown -
Rob Herring