From 2f43ef99ac623b6d9154c26d4f6785df18b4d8e4 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 15 Mar 2023 13:47:58 +0200 Subject: [PATCH 1/6] ASoC: dt-bindings: everest,es8316: Document audio graph port The ES8316 codec is currently used in conjunction with audio-graph-card to provide an endpoint for binding with the other side of the audio link. This is achieved via the 'port' property, which is not allowed: rk3399-rockpro64.dtb: codec@11: Unevaluated properties are not allowed ('port' was unexpected) Fix the issue by documenting the missing property. Signed-off-by: Cristian Ciocaltea Link: https://lore.kernel.org/r/20230315114806.3819515-4-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown --- Documentation/devicetree/bindings/sound/everest,es8316.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/everest,es8316.yaml b/Documentation/devicetree/bindings/sound/everest,es8316.yaml index d9f8f0c7f6bb..80cd81ecae6f 100644 --- a/Documentation/devicetree/bindings/sound/everest,es8316.yaml +++ b/Documentation/devicetree/bindings/sound/everest,es8316.yaml @@ -28,6 +28,10 @@ properties: items: - const: mclk + port: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + "#sound-dai-cells": const: 0 From bf4062b7420d01b4fafd7211fd2dc68b916591bd Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 15 Mar 2023 13:47:59 +0200 Subject: [PATCH 2/6] ASoC: dt-bindings: rockchip: Document audio graph port The Rockchip I2S controller is currently used in conjunction with audio-graph-card to provide an endpoint for binding with the other side of the audio link. This is achieved via the 'port' property, which is not allowed: rk3399-rockpro64.dtb: i2s@ff890000: Unevaluated properties are not allowed ('port' was unexpected) Fix the issue by documenting the missing property. Signed-off-by: Cristian Ciocaltea Link: https://lore.kernel.org/r/20230315114806.3819515-5-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown --- Documentation/devicetree/bindings/sound/rockchip-i2s.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml b/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml index 1cb4da300607..c32b4750651c 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml @@ -82,6 +82,10 @@ properties: resets: maxItems: 2 + port: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + rockchip,capture-channels: $ref: /schemas/types.yaml#/definitions/uint32 default: 2 From bfbae373c55e3b1c15a6ba656211dbbe7c390aa1 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 15 Mar 2023 13:48:00 +0200 Subject: [PATCH 3/6] ASoC: dt-bindings: rockchip: i2s-tdm: Document audio graph port Document the 'port' property to allow the Rockchip I2S TDM controller to be used in conjunction with the audio-graph-card. The property will be used to provide an endpoint for binding to the other side of the audio link. Signed-off-by: Cristian Ciocaltea Link: https://lore.kernel.org/r/20230315114806.3819515-6-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown --- Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml index 4c95895de75e..7d2c2991c566 100644 --- a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml +++ b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml @@ -86,6 +86,10 @@ properties: - tx-m - rx-m + port: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: From 9971f3358338950d9d3345184fb2c0cfc6fc8552 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 15 Mar 2023 13:48:01 +0200 Subject: [PATCH 4/6] ASoC: dt-bindings: rockchip: i2s-tdm: Document power-domains The binding document is missing the power-domains property. Add it. Signed-off-by: Cristian Ciocaltea Link: https://lore.kernel.org/r/20230315114806.3819515-7-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown --- Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml index 7d2c2991c566..7bb6c5dff786 100644 --- a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml +++ b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml @@ -90,6 +90,9 @@ properties: $ref: audio-graph-port.yaml# unevaluatedProperties: false + power-domains: + maxItems: 1 + rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: From b0fe6a91fa9d5599ba3cace2748906e086c5a56e Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 15 Mar 2023 13:48:02 +0200 Subject: [PATCH 5/6] ASoC: dt-bindings: rockchip: Add compatible for RK3588 Add new compatible string for the Rockchip I2S/PCM controller found on RK3588 and RK3588S SoCs. Signed-off-by: Cristian Ciocaltea Link: https://lore.kernel.org/r/20230315114806.3819515-8-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown --- Documentation/devicetree/bindings/sound/rockchip-i2s.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml b/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml index c32b4750651c..fcb01abffa97 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.yaml @@ -34,6 +34,7 @@ properties: - rockchip,rk3366-i2s - rockchip,rk3368-i2s - rockchip,rk3399-i2s + - rockchip,rk3588-i2s - rockchip,rv1126-i2s - const: rockchip,rk3066-i2s From 0e6c37610934e9b91f6f5f2599de5e2f1ab59e72 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 15 Mar 2023 13:48:03 +0200 Subject: [PATCH 6/6] ASoC: rockchip: i2s: Add compatible for RK3588 The Rockchip I2S driver supports the RK3588/RK3588S SoCs, hence add the corresponding compatible string. Signed-off-by: Cristian Ciocaltea Link: https://lore.kernel.org/r/20230315114806.3819515-9-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown --- sound/soc/rockchip/rockchip_i2s.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index a8758ad68442..2e24cc0570eb 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -659,6 +659,7 @@ static const struct of_device_id rockchip_i2s_match[] __maybe_unused = { { .compatible = "rockchip,rk3366-i2s", }, { .compatible = "rockchip,rk3368-i2s", }, { .compatible = "rockchip,rk3399-i2s", .data = &rk3399_i2s_pins }, + { .compatible = "rockchip,rk3588-i2s", }, { .compatible = "rockchip,rv1126-i2s", }, {}, };