ASoC: dt-bindings: realtek,rt5640: Various fixes
Subsystems (4)
Jon Hunter
maintainercover ASoC: dt-bindings: realtek,rt5640: Various fixes
This series includes fixes for the realtek,rt5640 dt-binding to address a few warnings that are observed when running the CHECK_DTBS=y for some DTBs that use this codec.
Jon Hunter (3):
ASoC: dt-bindings: realtek,rt5640: Document mclk
ASoC: dt-bindings: realtek,rt5640: Update jack-detect
ASoC: dt-bindings: realtek,rt5640: Document port node
.../devicetree/bindings/sound/realtek,rt5640.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+)
Signature · 1 line
2.43.0
Jon Hunter
maintainerPATCH 1/3 ASoC: dt-bindings: realtek,rt5640: Document mclk
Commit eba5a0bac211 ("ASoC: dt-bindings: realtek,rt5640: Convert to dtschema") converted the rt5640 dt-binding to yaml format but in the process dropped 'clock' and 'clock-names' properties that are used to specify the codec 'mclk'. This is causing DTB build warnings for boards that use this codec and define an 'mclk' in device-tree. Update the rt5640 binding document to add the optional mclk.
--- .../devicetree/bindings/sound/realtek,rt5640.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/sound/realtek,rt5640.yaml +8 -0
@@ -44,6 +44,14 @@ properties: - realtek,rt5640 - realtek,rt5639 + clocks: + items: + - description: phandle and clock specifier for codec MCLK. + + clock-names: + items: + - const: mclk + reg: maxItems: 1
Signature · 1 line
2.43.0
Re: [PATCH 1/3] ASoC: dt-bindings: realtek,rt5640: Document mclk
Quoted 7 lines · Jon Hunter
Commit
eba5a0bac211("ASoC: dt-bindings: realtek,rt5640: Convert to dtschema") converted the rt5640 dt-binding to yaml format but in the process dropped 'clock' and 'clock-names' properties that are used to specify the codec 'mclk'. This is causing DTB build warnings for boards that use this codec and define an 'mclk' in device-tree. Update the rt5640 binding document to add the optional mclk.
Quoted 5 lines
Fixes eba5a0bac211 ("ASoC: dt-bindings: realtek,rt5640: Convert to dtschema")Signed-off-by Jon Hunter <[email protected]>--- .../devicetree/bindings/sound/realtek,rt5640.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Best regards,
Krzysztof
Jon Hunter
maintainerPATCH 2/3 ASoC: dt-bindings: realtek,rt5640: Update jack-detect
In reply to Jon HunterThe device-tree property 'realtek,jack-detect-source' currently only permits values from 0-6. However, commit 2b9c8d2b3c89 ("ASoC: rt5640:
Add the HDA header support") updated the Realtek rt5640 to support setting the 'realtek,jack-detect-source' to 7 to support the HDA header.
The Tegra234 platforms currently set 'realtek,jack-detect-source' to 7 for the HDA header and this is causing a warning when building device-tree.
audio-codec@1c (realtek,rt5640): realtek,jack-detect-source:
7 is not one of [0, 1, 2, 3, 4, 5, 6]
Given that the driver already supports this settings, update the binding document for the rt5640 device to add the HDA header as a valid configuration for the 'realtek,jack-detect-source' property.
--- Documentation/devicetree/bindings/sound/realtek,rt5640.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/sound/realtek,rt5640.yaml +1 -0
@@ -106,6 +106,7 @@ properties: - 4 # Use GPIO2 for jack-detect - 5 # Use GPIO3 for jack-detect - 6 # Use GPIO4 for jack-detect + - 7 # Use HDA header for jack-detect realtek,jack-detect-not-inverted: description:
Signature · 1 line
2.43.0
Re: [PATCH 2/3] ASoC: dt-bindings: realtek,rt5640: Update jack-detect
Quoted 16 lines · Jon Hunter
The device-tree property 'realtek,jack-detect-source' currently only permits values from 0-6. However, commit
2b9c8d2b3c89("ASoC: rt5640:
Add the HDA header support") updated the Realtek rt5640 to support setting the 'realtek,jack-detect-source' to 7 to support the HDA header.The Tegra234 platforms currently set 'realtek,jack-detect-source' to 7 for the HDA header and this is causing a warning when building device-tree.
audio-codec@1c (realtek,rt5640): realtek,jack-detect-source:
7 is not one of [0, 1, 2, 3, 4, 5, 6]Given that the driver already supports this settings, update the binding document for the rt5640 device to add the HDA header as a valid configuration for the 'realtek,jack-detect-source' property.
Quoted 5 lines
Fixes 2b9c8d2b3c89 ("ASoC: rt5640: Add the HDA header support")Signed-off-by Jon Hunter <[email protected]>--- Documentation/devicetree/bindings/sound/realtek,rt5640.yaml | 1 + 1 file changed, 1 insertion(+)
Best regards,
Krzysztof
Jon Hunter
maintainerPATCH 3/3 ASoC: dt-bindings: realtek,rt5640: Document port node
In reply to Jon HunterVarious boards that use the rt5640 audio codec define a 'port' child node under the codec node to describe the interface between it and the SoC that it is connected to. The binding document for the rt5640 codec does not define the 'port' child node and so this is generating warnings when running the DTB checks for these boards. Add the 'port' node to the binding document for the rt5640 codec to fix this.
--- Documentation/devicetree/bindings/sound/realtek,rt5640.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/sound/realtek,rt5640.yaml +4 -0
@@ -130,6 +130,10 @@ properties: - 2 # Scale current by 1.0 - 3 # Scale current by 1.5 + port: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + required: - compatible - reg
Signature · 1 line
2.43.0
Re: [PATCH 3/3] ASoC: dt-bindings: realtek,rt5640: Document port node
Quoted 11 lines · Jon Hunter
Various boards that use the rt5640 audio codec define a 'port' child node under the codec node to describe the interface between it and the SoC that it is connected to. The binding document for the rt5640 codec does not define the 'port' child node and so this is generating warnings when running the DTB checks for these boards. Add the 'port' node to the binding document for the rt5640 codec to fix this.
Signed-off-by Jon Hunter <[email protected]>--- Documentation/devicetree/bindings/sound/realtek,rt5640.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Best regards,
Krzysztof
Mark Brown
maintainerQuoted 10 lines · Jon Hunter
This series includes fixes for the realtek,rt5640 dt-binding to address a few warnings that are observed when running the CHECK_DTBS=y for some DTBs that use this codec.
Jon Hunter (3):
ASoC: dt-bindings: realtek,rt5640: Document mclk
ASoC: dt-bindings: realtek,rt5640: Update jack-detect
ASoC: dt-bindings: realtek,rt5640: Document port node[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: dt-bindings: realtek,rt5640: Document mclk
commit: 66b47b9c069fa548db64bde6a32d3b33aa05f740
[2/3] ASoC: dt-bindings: realtek,rt5640: Update jack-detect
commit: 25b858474497b5f7e2198f6fc9381488d9bdb55d
[3/3] ASoC: dt-bindings: realtek,rt5640: Document port node
commit: b540b4e157c4b24d0501e5e50ffba598d066de42All 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
Jon Hunter
maintainerHi Mark, Rob,
Quoted 16 lines · Mark Brown
Quoted 10 lines · Jon Hunter
This series includes fixes for the realtek,rt5640 dt-binding to address a few warnings that are observed when running the CHECK_DTBS=y for some DTBs that use this codec.
Jon Hunter (3):
ASoC: dt-bindings: realtek,rt5640: Document mclk
ASoC: dt-bindings: realtek,rt5640: Update jack-detect
ASoC: dt-bindings: realtek,rt5640: Document port node[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Quoted 8 lines
Thanks!
[1/3] ASoC: dt-bindings: realtek,rt5640: Document mclk
commit: 66b47b9c069fa548db64bde6a32d3b33aa05f740 [2/3] ASoC: dt-bindings: realtek,rt5640: Update jack-detect commit: 25b858474497b5f7e2198f6fc9381488d9bdb55d [3/3] ASoC: dt-bindings: realtek,rt5640: Document port node commit: b540b4e157c4b24d0501e5e50ffba598d066de42
I noticed on today's -next I am getting the following error when running the dtbs_check ...
Documentation/devicetree/bindings/sound/realtek,rt5640.yaml: ignoring, error parsing file
It appears that Rob also has merged similar fixes to the above and now we have two lots of fixes merged and duplicated properties ...
bc5a847a80d4 ASoC: dt-bindings: realtek,rt5640: Various fixes f66e7da2a6b1 ASoC: dt-bindings: realtek,rt5640: Allow 7 for realtek,jack-detect-source 101b982654ac ASoC: dt-bindings: realtek,rt5640: Add missing properties/node b540b4e157c4 ASoC: dt-bindings: realtek,rt5640: Document port node 25b858474497 ASoC: dt-bindings: realtek,rt5640: Update jack-detect 66b47b9c069f ASoC: dt-bindings: realtek,rt5640: Document mclk
So we need to drop one set of fixes from one of the trees.
Thanks
Jon
Signature · 1 line
nvpublic
Mark Brown
maintainerQuoted 9 lines · Jon Hunter
I noticed on today's -next I am getting the following error when running the
dtbs_check...
Documentation/devicetree/bindings/sound/realtek,rt5640.yaml: ignoring, error parsing fileIt appears that Rob also has merged similar fixes to the above and now we have two lots of fixes merged and duplicated properties ...
So we need to drop one set of fixes from one of the trees.
Can you send a patch that puts everything into a good state please?
Mark Brown
maintainerQuoted 8 lines · Mark Brown
Quoted 4 lines · Jon Hunter
It appears that Rob also has merged similar fixes to the above and now we have two lots of fixes merged and duplicated properties ...
So we need to drop one set of fixes from one of the trees.
Can you send a patch that puts everything into a good state please?
I think I've got it sorted, you'd added the clock properties in different places so git merge didn't tell me about it like for the other ones.
Thierry Reding
AppliedFrom: Thierry Reding <[email protected]>
Quoted 10 lines · Jon Hunter
This series includes fixes for the realtek,rt5640 dt-binding to address a few warnings that are observed when running the CHECK_DTBS=y for some DTBs that use this codec.
Jon Hunter (3):
ASoC: dt-bindings: realtek,rt5640: Document mclk
ASoC: dt-bindings: realtek,rt5640: Update jack-detect
ASoC: dt-bindings: realtek,rt5640: Document port node[...]
Applied, thanks!
[1/3] ASoC: dt-bindings: realtek,rt5640: Document mclk
commit: 601a821631c55014b02371740c39748d0af916c1
[2/3] ASoC: dt-bindings: realtek,rt5640: Update jack-detect
commit: 2efe28d11cc19b69b19b9bcdb6f498c1bf842fbc
[3/3] ASoC: dt-bindings: realtek,rt5640: Document port node
commit: b2788f6320722d6059f849f35a77eb082608c627Best regards,
Signature · 1 line
Thierry Reding <[email protected]>
Rob Herring
maintainerQuoted 16 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Quoted 10 lines · Jon Hunter
This series includes fixes for the realtek,rt5640 dt-binding to address a few warnings that are observed when running the CHECK_DTBS=y for some DTBs that use this codec.
Jon Hunter (3):
ASoC: dt-bindings: realtek,rt5640: Document mclk
ASoC: dt-bindings: realtek,rt5640: Update jack-detect
ASoC: dt-bindings: realtek,rt5640: Document port node[...]
Quoted 8 lines
Applied, thanks!
[1/3] ASoC: dt-bindings: realtek,rt5640: Document mclk
commit: 601a821631c55014b02371740c39748d0af916c1 [2/3] ASoC: dt-bindings: realtek,rt5640: Update jack-detect commit: 2efe28d11cc19b69b19b9bcdb6f498c1bf842fbc [3/3] ASoC: dt-bindings: realtek,rt5640: Document port node commit: b2788f6320722d6059f849f35a77eb082608c627
Please drop these. linux-next is broken. Plus Mark already said he applied them.
Rob
Quoted 19 lines · Rob Herring
Quoted 18 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Quoted 10 lines · Jon Hunter
This series includes fixes for the realtek,rt5640 dt-binding to address a few warnings that are observed when running the CHECK_DTBS=y for some DTBs that use this codec.
Jon Hunter (3):
ASoC: dt-bindings: realtek,rt5640: Document mclk
ASoC: dt-bindings: realtek,rt5640: Update jack-detect
ASoC: dt-bindings: realtek,rt5640: Document port node[...]
Applied, thanks!
Quoted 8 lines
Quoted 6 lines
[1/3] ASoC: dt-bindings: realtek,rt5640: Document mclk
commit: 601a821631c55014b02371740c39748d0af916c1 [2/3] ASoC: dt-bindings: realtek,rt5640: Update jack-detect commit: 2efe28d11cc19b69b19b9bcdb6f498c1bf842fbc [3/3] ASoC: dt-bindings: realtek,rt5640: Document port node commit: b2788f6320722d6059f849f35a77eb082608c627Please drop these. linux-next is broken. Plus Mark already said he applied them.
Sorry, I missed that. Unfortunately neither patchwork nor b4 show this information, and I must've scolled by Mark's reply (or forgotten about it). Dropped from the Tegra tree now.
Thanks,
Thierry