[PATCH 0/3] Fixes for the audio setup on the rk3588-nanopc-t6

[PATCH 0/3] Fixes for the audio setup on the rk3588-nanopc-t6

[Heiko Stuebner]

The Nanopc-T6 board does contain some devicetree errors, that came to
light with recent changes to the board.

clock and port properties need to be part of the codec-binding like used
on other codecs already and one property needs to be removed from the
board.


Heiko Stuebner (3):
  ASoC: dt-bindings: realtek,rt5616: document mclk clock
  ASoC: dt-bindings: realtek,rt5616: Document audio graph port
  arm64: dts: rockchip: drop hp-pin-name property from audio card on
    nanopc-t6

 .../devicetree/bindings/sound/realtek,rt5616.yaml    | 12 ++++++++++++
 arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi   |  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

-- 
2.43.0

[PATCH 1/3] ASoC: dt-bindings: realtek,rt5616: document mclk clock

[Heiko Stuebner]

Both devicetrees and driver implementation already use the specified mclk
in the field, so at least document the clock too, similarly to other
Realtek codec.

This has the nice additional effect of getting rid of dtbscheck warning.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../devicetree/bindings/sound/realtek,rt5616.yaml         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml b/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml
index 248320804e5f..754111f2e70a 100644
--- a/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml
+++ b/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml
@@ -30,6 +30,14 @@ properties:
   reg:
     maxItems: 1
 
+  clocks:
+    items:
+      - description: Master clock to the CODEC
+
+  clock-names:
+    items:
+      - const: mclk
+
 required:
   - compatible
   - reg
-- 
2.43.0

[PATCH 2/3] ASoC: dt-bindings: realtek,rt5616: Document audio graph port

[Heiko Stuebner]

The codec can be used in conjunction with an audio-graph-card to provide
an endpoint for binding with the other side of the audio link.

Document the 'port' property that is used for this to prevent
dtbscheck errors like:

    rockchip/rk3588-nanopc-t6-lts.dtb: codec@1b: Unevaluated properties are not allowed ('port' was unexpected)
        from schema $id: http://devicetree.org/schemas/sound/realtek,rt5616.yaml#

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 Documentation/devicetree/bindings/sound/realtek,rt5616.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml b/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml
index 754111f2e70a..29071044c66e 100644
--- a/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml
+++ b/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml
@@ -38,6 +38,10 @@ properties:
     items:
       - const: mclk
 
+  port:
+    $ref: audio-graph-port.yaml#
+    unevaluatedProperties: false
+
 required:
   - compatible
   - reg
-- 
2.43.0

[PATCH 3/3] arm64: dts: rockchip: drop hp-pin-name property from audio card on nanopc-t6

[Heiko Stuebner]

The audio-card contains a hp-pin-name property that is not part of the
binding, and its contents also are just a "Headphones" string.

So that property also does not fullfill any specific use, therefore
just drop it.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index d035a44e5b20..fc131789b4c3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -76,7 +76,6 @@ sound {
 		simple-audio-card,mclk-fs = <256>;
 
 		simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;
-		simple-audio-card,hp-pin-name = "Headphones";
 
 		simple-audio-card,widgets =
 			"Headphone", "Headphones",
-- 
2.43.0

Re: [PATCH 1/3] ASoC: dt-bindings: realtek,rt5616: document mclk clock

[Krzysztof Kozlowski]

On Fri, Aug 30, 2024 at 10:38:17PM +0200, Heiko Stuebner wrote:
> Both devicetrees and driver implementation already use the specified mclk
> in the field, so at least document the clock too, similarly to other
> Realtek codec.
> 
> This has the nice additional effect of getting rid of dtbscheck warning.
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  .../devicetree/bindings/sound/realtek,rt5616.yaml         | 8 ++++++++
>  1 file changed, 8 insertions(+)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH 2/3] ASoC: dt-bindings: realtek,rt5616: Document audio graph port

[Krzysztof Kozlowski]

On Fri, Aug 30, 2024 at 10:38:18PM +0200, Heiko Stuebner wrote:
> The codec can be used in conjunction with an audio-graph-card to provide
> an endpoint for binding with the other side of the audio link.
> 
> Document the 'port' property that is used for this to prevent
> dtbscheck errors like:
> 
>     rockchip/rk3588-nanopc-t6-lts.dtb: codec@1b: Unevaluated properties are not allowed ('port' was unexpected)
>         from schema $id: http://devicetree.org/schemas/sound/realtek,rt5616.yaml#
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  Documentation/devicetree/bindings/sound/realtek,rt5616.yaml | 4 ++++
>  1 file changed, 4 insertions(+)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: (subset) [PATCH 0/3] Fixes for the audio setup on the rk3588-nanopc-t6

[Mark Brown]

On Fri, 30 Aug 2024 22:38:16 +0200, Heiko Stuebner wrote:
> The Nanopc-T6 board does contain some devicetree errors, that came to
> light with recent changes to the board.
> 
> clock and port properties need to be part of the codec-binding like used
> on other codecs already and one property needs to be removed from the
> board.
> 
> [...]

Applied to

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

Thanks!

[1/3] ASoC: dt-bindings: realtek,rt5616: document mclk clock
      commit: ea8f615b399988abd801fa52a5eb631d826d0ba4
[2/3] ASoC: dt-bindings: realtek,rt5616: Document audio graph port
      commit: 92ff90cffbeef9b1a4983017555a194f8bc83f77

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

Re: (subset) [PATCH 0/3] Fixes for the audio setup on the rk3588-nanopc-t6

[Heiko Stuebner]

On Fri, 30 Aug 2024 22:38:16 +0200, Heiko Stuebner wrote:
> The Nanopc-T6 board does contain some devicetree errors, that came to
> light with recent changes to the board.
> 
> clock and port properties need to be part of the codec-binding like used
> on other codecs already and one property needs to be removed from the
> board.
> 
> [...]

Applied, thanks!

[3/3] arm64: dts: rockchip: drop hp-pin-name property from audio card on nanopc-t6
      commit: 01c007567944913c29e6e19af241d0ba4e59ce24

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>