diff mbox series

ASoC: dt-binding: convert amlogic,g12a-tohdmitx to dt-schema

Message ID 20240605-topic-amlogic-upstream-bindings-convert-g12a-tohdmitx-v1-1-b851c195e241@linaro.org (mailing list archive)
State New, archived
Headers show
Series ASoC: dt-binding: convert amlogic,g12a-tohdmitx to dt-schema | expand

Commit Message

Neil Armstrong June 5, 2024, 4:23 p.m. UTC
Convert text bindings to dt-schema format for the Amlogic TX HDMI
control glue.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 .../bindings/sound/amlogic,g12a-tohdmitx.txt       | 58 ----------------------
 .../bindings/sound/amlogic,g12a-tohdmitx.yaml      | 56 +++++++++++++++++++++
 2 files changed, 56 insertions(+), 58 deletions(-)


---
base-commit: c3f38fa61af77b49866b006939479069cd451173
change-id: 20240605-topic-amlogic-upstream-bindings-convert-g12a-tohdmitx-d85095861d88

Best regards,

Comments

Krzysztof Kozlowski June 6, 2024, 7:45 a.m. UTC | #1
On 05/06/2024 18:23, Neil Armstrong wrote:
> Convert text bindings to dt-schema format for the Amlogic TX HDMI
> control glue.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

subject: dt-bindings (missing 's')

> ---
>  .../bindings/sound/amlogic,g12a-tohdmitx.txt       | 58 ----------------------
>  .../bindings/sound/amlogic,g12a-tohdmitx.yaml      | 56 +++++++++++++++++++++
>  2 files changed, 56 insertions(+), 58 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt b/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
> deleted file mode 100644
> index 4e8cd7eb7cec..000000000000
> --- a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -* Amlogic HDMI Tx control glue
> -

> +
> +title: Amlogic G12a HDMI TX Control Glue
> +
> +maintainers:
> +  - Jerome Brunet <jbrunet@baylibre.com>
> +
> +allOf:
> +  - $ref: dai-common.yaml#
> +
> +properties:
> +  $nodename:
> +    pattern: "^audio-controller@.*"
> +
> +  "#sound-dai-cells":
> +    const: 1
> +
> +  compatible:
> +    oneOf:
> +      - items:
> +          - const: amlogic,g12a-tohdmitx
> +      - items:
> +          - enum:
> +              - amlogic,sm1-tohdmitx
> +          - const: amlogic,g12a-tohdmitx
> +
> +  reg:
> +    maxItems: 1
> +
> +  resets:
> +    maxItems: 1
> +
> +  sound-name-prefix: true

Drop

> +
> +required:
> +  - "#sound-dai-cells"
> +  - compatible
> +  - reg
> +  - resets

Please keep the same order as in "properties:" block.

> +
> +additionalProperties: false

and here instead:
unevaluatedProperties: false

> 


Best regards,
Krzysztof
Krzysztof Kozlowski June 6, 2024, 7:45 a.m. UTC | #2
On 06/06/2024 09:45, Krzysztof Kozlowski wrote:
> On 05/06/2024 18:23, Neil Armstrong wrote:
>> Convert text bindings to dt-schema format for the Amlogic TX HDMI
>> control glue.
>>
>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> 
> subject: dt-bindings (missing 's')
> 
>> ---
>>  .../bindings/sound/amlogic,g12a-tohdmitx.txt       | 58 ----------------------
>>  .../bindings/sound/amlogic,g12a-tohdmitx.yaml      | 56 +++++++++++++++++++++
>>  2 files changed, 56 insertions(+), 58 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt b/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
>> deleted file mode 100644
>> index 4e8cd7eb7cec..000000000000
>> --- a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
>> +++ /dev/null
>> @@ -1,58 +0,0 @@
>> -* Amlogic HDMI Tx control glue
>> -
> 
>> +
>> +title: Amlogic G12a HDMI TX Control Glue
>> +
>> +maintainers:
>> +  - Jerome Brunet <jbrunet@baylibre.com>
>> +
>> +allOf:
>> +  - $ref: dai-common.yaml#
>> +
>> +properties:
>> +  $nodename:
>> +    pattern: "^audio-controller@.*"
>> +
>> +  "#sound-dai-cells":
>> +    const: 1
>> +
>> +  compatible:
>> +    oneOf:
>> +      - items:
>> +          - const: amlogic,g12a-tohdmitx
>> +      - items:
>> +          - enum:
>> +              - amlogic,sm1-tohdmitx
>> +          - const: amlogic,g12a-tohdmitx
>> +
>> +  reg:
>> +    maxItems: 1
>> +
>> +  resets:
>> +    maxItems: 1
>> +
>> +  sound-name-prefix: true
> 
> Drop
> 
>> +
>> +required:
>> +  - "#sound-dai-cells"
>> +  - compatible
>> +  - reg
>> +  - resets
> 
> Please keep the same order as in "properties:" block.
> 
>> +
>> +additionalProperties: false
> 
> and here instead:
> unevaluatedProperties: false
> 

and with above changes:

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

Best regards,
Krzysztof
Neil Armstrong June 6, 2024, 7:59 a.m. UTC | #3
On 06/06/2024 09:45, Krzysztof Kozlowski wrote:
> On 06/06/2024 09:45, Krzysztof Kozlowski wrote:
>> On 05/06/2024 18:23, Neil Armstrong wrote:
>>> Convert text bindings to dt-schema format for the Amlogic TX HDMI
>>> control glue.
>>>
>>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
>>
>> subject: dt-bindings (missing 's')
>>
>>> ---
>>>   .../bindings/sound/amlogic,g12a-tohdmitx.txt       | 58 ----------------------
>>>   .../bindings/sound/amlogic,g12a-tohdmitx.yaml      | 56 +++++++++++++++++++++
>>>   2 files changed, 56 insertions(+), 58 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt b/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
>>> deleted file mode 100644
>>> index 4e8cd7eb7cec..000000000000
>>> --- a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
>>> +++ /dev/null
>>> @@ -1,58 +0,0 @@
>>> -* Amlogic HDMI Tx control glue
>>> -
>>
>>> +
>>> +title: Amlogic G12a HDMI TX Control Glue
>>> +
>>> +maintainers:
>>> +  - Jerome Brunet <jbrunet@baylibre.com>
>>> +
>>> +allOf:
>>> +  - $ref: dai-common.yaml#
>>> +
>>> +properties:
>>> +  $nodename:
>>> +    pattern: "^audio-controller@.*"
>>> +
>>> +  "#sound-dai-cells":
>>> +    const: 1
>>> +
>>> +  compatible:
>>> +    oneOf:
>>> +      - items:
>>> +          - const: amlogic,g12a-tohdmitx
>>> +      - items:
>>> +          - enum:
>>> +              - amlogic,sm1-tohdmitx
>>> +          - const: amlogic,g12a-tohdmitx
>>> +
>>> +  reg:
>>> +    maxItems: 1
>>> +
>>> +  resets:
>>> +    maxItems: 1
>>> +
>>> +  sound-name-prefix: true
>>
>> Drop
>>
>>> +
>>> +required:
>>> +  - "#sound-dai-cells"
>>> +  - compatible
>>> +  - reg
>>> +  - resets
>>
>> Please keep the same order as in "properties:" block.
>>
>>> +
>>> +additionalProperties: false
>>
>> and here instead:
>> unevaluatedProperties: false
>>
> 
> and with above changes:
> 
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Ack,

Thanks,
Neil

> 
> Best regards,
> Krzysztof
>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt b/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
deleted file mode 100644
index 4e8cd7eb7cec..000000000000
--- a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt
+++ /dev/null
@@ -1,58 +0,0 @@ 
-* Amlogic HDMI Tx control glue
-
-Required properties:
-- compatible: "amlogic,g12a-tohdmitx" or
-	      "amlogic,sm1-tohdmitx"
-- reg: physical base address of the controller and length of memory
-       mapped region.
-- #sound-dai-cells: should be 1.
-- resets: phandle to the dedicated reset line of the hdmitx glue.
-
-Example on the S905X2 SoC:
-
-tohdmitx: audio-controller@744 {
-	compatible = "amlogic,g12a-tohdmitx";
-	reg = <0x0 0x744 0x0 0x4>;
-	#sound-dai-cells = <1>;
-	resets = <&clkc_audio AUD_RESET_TOHDMITX>;
-};
-
-Example of an 'amlogic,axg-sound-card':
-
-sound {
-	compatible = "amlogic,axg-sound-card";
-
-[...]
-
-	dai-link-x {
-		sound-dai = <&tdmif_a>;
-		dai-format = "i2s";
-		dai-tdm-slot-tx-mask-0 = <1 1>;
-
-		codec-0 {
-			sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
-		};
-
-		codec-1 {
-			sound-dai = <&external_dac>;
-		};
-	};
-
-	dai-link-y {
-		sound-dai = <&tdmif_c>;
-		dai-format = "i2s";
-		dai-tdm-slot-tx-mask-0 = <1 1>;
-
-		codec {
-			sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>;
-		};
-	};
-
-	dai-link-z {
-		sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-		codec {
-			sound-dai = <&hdmi_tx>;
-		};
-	};
-};
diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.yaml b/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.yaml
new file mode 100644
index 000000000000..34e9de1366f1
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.yaml
@@ -0,0 +1,56 @@ 
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/amlogic,g12a-tohdmitx.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic G12a HDMI TX Control Glue
+
+maintainers:
+  - Jerome Brunet <jbrunet@baylibre.com>
+
+allOf:
+  - $ref: dai-common.yaml#
+
+properties:
+  $nodename:
+    pattern: "^audio-controller@.*"
+
+  "#sound-dai-cells":
+    const: 1
+
+  compatible:
+    oneOf:
+      - items:
+          - const: amlogic,g12a-tohdmitx
+      - items:
+          - enum:
+              - amlogic,sm1-tohdmitx
+          - const: amlogic,g12a-tohdmitx
+
+  reg:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  sound-name-prefix: true
+
+required:
+  - "#sound-dai-cells"
+  - compatible
+  - reg
+  - resets
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
+
+    tohdmitx: audio-controller@744 {
+        compatible = "amlogic,g12a-tohdmitx";
+        reg = <0x744 0x4>;
+        #sound-dai-cells = <1>;
+        resets = <&clkc_audio AUD_RESET_TOHDMITX>;
+    };