On 13/10/2023 08:59, Eugen Hristev wrote:
> Convert the mediatek,audsys binding to YAML, together with the associated
> binding bindings/sound/mt2701-afe-pcm.yaml .
>
> Signed-off-by: Eugen Hristev <eugen.hristev@xxxxxxxxxxxxx>
> ---
> Changes in v4:
Thank you for your patch. There is something to discuss/improve.
...
> + reg:
> + maxItems: 1
> +
> + '#clock-cells':
> + const: 1
> +
> + audio-controller:
> + $ref: /schemas/sound/mt2701-afe-pcm.yaml#
> + type: object
> +
> +required:
> + - compatible
> + - reg
clock-cells were required before.
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/power/mt2701-power.h>
> + #include <dt-bindings/clock/mt2701-clk.h>
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> + audsys: clock-controller@11220000 {
> + compatible = "mediatek,mt7622-audsys", "syscon";
> + reg = <0 0x11220000 0 0x2000>;
> + #clock-cells = <1>;
> +
> + afe: audio-controller {
> + compatible = "mediatek,mt2701-audio";
> + interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-names = "afe", "asys";
> + power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> +
> + clocks = <&infracfg CLK_INFRA_AUDIO>,
> + <&topckgen CLK_TOP_AUD_MUX1_SEL>,
> + <&topckgen CLK_TOP_AUD_MUX2_SEL>,
> + <&topckgen CLK_TOP_AUD_48K_TIMING>,
> + <&topckgen CLK_TOP_AUD_44K_TIMING>,
> + <&topckgen CLK_TOP_AUD_K1_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K2_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K3_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K4_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K1_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_K2_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_K3_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_K4_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_I2S1_MCLK>,
> + <&topckgen CLK_TOP_AUD_I2S2_MCLK>,
> + <&topckgen CLK_TOP_AUD_I2S3_MCLK>,
> + <&topckgen CLK_TOP_AUD_I2S4_MCLK>,
> + <&audsys CLK_AUD_I2SO1>,
> + <&audsys CLK_AUD_I2SO2>,
> + <&audsys CLK_AUD_I2SO3>,
> + <&audsys CLK_AUD_I2SO4>,
> + <&audsys CLK_AUD_I2SIN1>,
> + <&audsys CLK_AUD_I2SIN2>,
> + <&audsys CLK_AUD_I2SIN3>,
> + <&audsys CLK_AUD_I2SIN4>,
> + <&audsys CLK_AUD_ASRCO1>,
> + <&audsys CLK_AUD_ASRCO2>,
> + <&audsys CLK_AUD_ASRCO3>,
> + <&audsys CLK_AUD_ASRCO4>,
> + <&audsys CLK_AUD_AFE>,
> + <&audsys CLK_AUD_AFE_CONN>,
> + <&audsys CLK_AUD_A1SYS>,
> + <&audsys CLK_AUD_A2SYS>,
> + <&audsys CLK_AUD_AFE_MRGIF>;
> +
> + clock-names = "infra_sys_audio_clk",
> + "top_audio_mux1_sel",
> + "top_audio_mux2_sel",
> + "top_audio_a1sys_hp",
> + "top_audio_a2sys_hp",
> + "i2s0_src_sel",
> + "i2s1_src_sel",
> + "i2s2_src_sel",
> + "i2s3_src_sel",
> + "i2s0_src_div",
> + "i2s1_src_div",
> + "i2s2_src_div",
> + "i2s3_src_div",
> + "i2s0_mclk_en",
> + "i2s1_mclk_en",
> + "i2s2_mclk_en",
> + "i2s3_mclk_en",
> + "i2so0_hop_ck",
> + "i2so1_hop_ck",
> + "i2so2_hop_ck",
> + "i2so3_hop_ck",
> + "i2si0_hop_ck",
> + "i2si1_hop_ck",
> + "i2si2_hop_ck",
> + "i2si3_hop_ck",
> + "asrc0_out_ck",
> + "asrc1_out_ck",
> + "asrc2_out_ck",
> + "asrc3_out_ck",
> + "audio_afe_pd",
> + "audio_afe_conn_pd",
> + "audio_a1sys_pd",
> + "audio_a2sys_pd",
> + "audio_mrgif_pd";
> +
> + assigned-clocks = <&topckgen CLK_TOP_AUD_MUX1_SEL>,
> + <&topckgen CLK_TOP_AUD_MUX2_SEL>,
> + <&topckgen CLK_TOP_AUD_MUX1_DIV>,
> + <&topckgen CLK_TOP_AUD_MUX2_DIV>;
> + assigned-clock-parents = <&topckgen CLK_TOP_AUD1PLL_98M>,
> + <&topckgen CLK_TOP_AUD2PLL_90M>;
> + assigned-clock-rates = <0>, <0>, <49152000>, <45158400>;
> + };
> + };
> + };
> diff --git a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
> deleted file mode 100644
> index f548e6a58240..000000000000
> --- a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
> +++ /dev/null
> @@ -1,146 +0,0 @@
> -Mediatek AFE PCM controller for mt2701
> -
> -Required properties:
> -- compatible: should be one of the following.
> - - "mediatek,mt2701-audio"
> - - "mediatek,mt7622-audio"
> -- interrupts: should contain AFE and ASYS interrupts
> -- interrupt-names: should be "afe" and "asys"
> -- power-domains: should define the power domain
> -- clocks: Must contain an entry for each entry in clock-names
> - See ../clocks/clock-bindings.txt for details
> -- clock-names: should have these clock names:
> - "infra_sys_audio_clk",
> - "top_audio_mux1_sel",
> - "top_audio_mux2_sel",
> - "top_audio_a1sys_hp",
> - "top_audio_a2sys_hp",
> - "i2s0_src_sel",
> - "i2s1_src_sel",
> - "i2s2_src_sel",
> - "i2s3_src_sel",
> - "i2s0_src_div",
> - "i2s1_src_div",
> - "i2s2_src_div",
> - "i2s3_src_div",
> - "i2s0_mclk_en",
> - "i2s1_mclk_en",
> - "i2s2_mclk_en",
> - "i2s3_mclk_en",
> - "i2so0_hop_ck",
> - "i2so1_hop_ck",
> - "i2so2_hop_ck",
> - "i2so3_hop_ck",
> - "i2si0_hop_ck",
> - "i2si1_hop_ck",
> - "i2si2_hop_ck",
> - "i2si3_hop_ck",
> - "asrc0_out_ck",
> - "asrc1_out_ck",
> - "asrc2_out_ck",
> - "asrc3_out_ck",
> - "audio_afe_pd",
> - "audio_afe_conn_pd",
> - "audio_a1sys_pd",
> - "audio_a2sys_pd",
> - "audio_mrgif_pd";
> -- assigned-clocks: list of input clocks and dividers for the audio system.
> - See ../clocks/clock-bindings.txt for details.
> -- assigned-clocks-parents: parent of input clocks of assigned clocks.
> -- assigned-clock-rates: list of clock frequencies of assigned clocks.
> -
> -Must be a subnode of MediaTek audsys device tree node.
> -See ../arm/mediatek/mediatek,audsys.txt for details about the parent node.
> -
> -Example:
> -
> - audsys: audio-subsystem@11220000 {
> - compatible = "mediatek,mt2701-audsys", "syscon";
> - ...
> -
> - afe: audio-controller {
> - compatible = "mediatek,mt2701-audio";
> - interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>,
> - <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;
> - interrupt-names = "afe", "asys";
> - power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> -
> - clocks = <&infracfg CLK_INFRA_AUDIO>,
> - <&topckgen CLK_TOP_AUD_MUX1_SEL>,
> - <&topckgen CLK_TOP_AUD_MUX2_SEL>,
> - <&topckgen CLK_TOP_AUD_48K_TIMING>,
> - <&topckgen CLK_TOP_AUD_44K_TIMING>,
> - <&topckgen CLK_TOP_AUD_K1_SRC_SEL>,
> - <&topckgen CLK_TOP_AUD_K2_SRC_SEL>,
> - <&topckgen CLK_TOP_AUD_K3_SRC_SEL>,
> - <&topckgen CLK_TOP_AUD_K4_SRC_SEL>,
> - <&topckgen CLK_TOP_AUD_K1_SRC_DIV>,
> - <&topckgen CLK_TOP_AUD_K2_SRC_DIV>,
> - <&topckgen CLK_TOP_AUD_K3_SRC_DIV>,
> - <&topckgen CLK_TOP_AUD_K4_SRC_DIV>,
> - <&topckgen CLK_TOP_AUD_I2S1_MCLK>,
> - <&topckgen CLK_TOP_AUD_I2S2_MCLK>,
> - <&topckgen CLK_TOP_AUD_I2S3_MCLK>,
> - <&topckgen CLK_TOP_AUD_I2S4_MCLK>,
> - <&audsys CLK_AUD_I2SO1>,
> - <&audsys CLK_AUD_I2SO2>,
> - <&audsys CLK_AUD_I2SO3>,
> - <&audsys CLK_AUD_I2SO4>,
> - <&audsys CLK_AUD_I2SIN1>,
> - <&audsys CLK_AUD_I2SIN2>,
> - <&audsys CLK_AUD_I2SIN3>,
> - <&audsys CLK_AUD_I2SIN4>,
> - <&audsys CLK_AUD_ASRCO1>,
> - <&audsys CLK_AUD_ASRCO2>,
> - <&audsys CLK_AUD_ASRCO3>,
> - <&audsys CLK_AUD_ASRCO4>,
> - <&audsys CLK_AUD_AFE>,
> - <&audsys CLK_AUD_AFE_CONN>,
> - <&audsys CLK_AUD_A1SYS>,
> - <&audsys CLK_AUD_A2SYS>,
> - <&audsys CLK_AUD_AFE_MRGIF>;
> -
> - clock-names = "infra_sys_audio_clk",
> - "top_audio_mux1_sel",
> - "top_audio_mux2_sel",
> - "top_audio_a1sys_hp",
> - "top_audio_a2sys_hp",
> - "i2s0_src_sel",
> - "i2s1_src_sel",
> - "i2s2_src_sel",
> - "i2s3_src_sel",
> - "i2s0_src_div",
> - "i2s1_src_div",
> - "i2s2_src_div",
> - "i2s3_src_div",
> - "i2s0_mclk_en",
> - "i2s1_mclk_en",
> - "i2s2_mclk_en",
> - "i2s3_mclk_en",
> - "i2so0_hop_ck",
> - "i2so1_hop_ck",
> - "i2so2_hop_ck",
> - "i2so3_hop_ck",
> - "i2si0_hop_ck",
> - "i2si1_hop_ck",
> - "i2si2_hop_ck",
> - "i2si3_hop_ck",
> - "asrc0_out_ck",
> - "asrc1_out_ck",
> - "asrc2_out_ck",
> - "asrc3_out_ck",
> - "audio_afe_pd",
> - "audio_afe_conn_pd",
> - "audio_a1sys_pd",
> - "audio_a2sys_pd",
> - "audio_mrgif_pd";
> -
> - assigned-clocks = <&topckgen CLK_TOP_AUD_MUX1_SEL>,
> - <&topckgen CLK_TOP_AUD_MUX2_SEL>,
> - <&topckgen CLK_TOP_AUD_MUX1_DIV>,
> - <&topckgen CLK_TOP_AUD_MUX2_DIV>;
> - assigned-clock-parents = <&topckgen CLK_TOP_AUD1PLL_98M>,
> - <&topckgen CLK_TOP_AUD2PLL_90M>;
> - assigned-clock-rates = <0>, <0>, <49152000>, <45158400>;
> - };
> - };
> diff --git a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.yaml b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.yaml
> new file mode 100644
> index 000000000000..70821c37e728
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.yaml
mediatek,mt2701-audio.yaml
> @@ -0,0 +1,229 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/sound/mt2701-afe-pcm.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: MediaTek Audio Front End (AFE) PCM controller for mt2701
> +
> +description:
> + The AFE PCM node must be a subnode of the MediaTek audsys device tree node.
> + # $ref: /schemas/arm/mediatek/mediatek,audsys.yaml#
Drop comment.
> +
> +maintainers:
> + - Eugen Hristev <eugen.hristev@xxxxxxxxxxxxx>
> +
> +properties:
> + compatible:
> + enum:
> + - mediatek,mt2701-audio
> + - mediatek,mt7622-audio
> +
> + interrupts:
> + items:
> + - description: AFE interrupt
> + - description: ASYS interrupt
> +
> + interrupt-names:
> + items:
> + - const: afe
> + - const: asys
> +
> + power-domains:
> + maxItems: 1
> +
> + clocks:
> + items:
> + - description: audio infra sys clock
> + - description: top audio mux 1
> + - description: top audio mux 2
> + - description: top audio sys a1 clock
> + - description: top audio sys a2 clock
> + - description: i2s0 source selection
> + - description: i2s1 source selection
> + - description: i2s2 source selection
> + - description: i2s3 source selection
> + - description: i2s0 source divider
> + - description: i2s1 source divider
> + - description: i2s2 source divider
> + - description: i2s3 source divider
> + - description: i2s0 master clock
> + - description: i2s1 master clock
> + - description: i2s2 master clock
> + - description: i2s3 master clock
> + - description: i2so0 hopping clock
> + - description: i2so1 hopping clock
> + - description: i2so2 hopping clock
> + - description: i2so3 hopping clock
> + - description: i2si0 hopping clock
> + - description: i2si1 hopping clock
> + - description: i2si2 hopping clock
> + - description: i2si3 hopping clock
> + - description: asrc0 output clock
> + - description: asrc1 output clock
> + - description: asrc2 output clock
> + - description: asrc3 output clock
> + - description: audio front end pd clock
> + - description: audio front end conn pd clock
> + - description: top audio a1 sys pd
> + - description: top audio a2 sys pd
> + - description: audio merge interface pd
> +
> + clock-names:
> + items:
> + - const: infra_sys_audio_clk
> + - const: top_audio_mux1_sel
> + - const: top_audio_mux2_sel
> + - const: top_audio_a1sys_hp
> + - const: top_audio_a2sys_hp
> + - const: i2s0_src_sel
> + - const: i2s1_src_sel
> + - const: i2s2_src_sel
> + - const: i2s3_src_sel
> + - const: i2s0_src_div
> + - const: i2s1_src_div
> + - const: i2s2_src_div
> + - const: i2s3_src_div
> + - const: i2s0_mclk_en
> + - const: i2s1_mclk_en
> + - const: i2s2_mclk_en
> + - const: i2s3_mclk_en
> + - const: i2so0_hop_ck
> + - const: i2so1_hop_ck
> + - const: i2so2_hop_ck
> + - const: i2so3_hop_ck
> + - const: i2si0_hop_ck
> + - const: i2si1_hop_ck
> + - const: i2si2_hop_ck
> + - const: i2si3_hop_ck
> + - const: asrc0_out_ck
> + - const: asrc1_out_ck
> + - const: asrc2_out_ck
> + - const: asrc3_out_ck
> + - const: audio_afe_pd
> + - const: audio_afe_conn_pd
> + - const: audio_a1sys_pd
> + - const: audio_a2sys_pd
> + - const: audio_mrgif_pd
> +
> + assigned-clock-parents: true
> + assigned-clock-rates: true
> + assigned-clocks: true
Drop all three.
> +
> +required:
> + - compatible
> + - interrupts
> + - interrupt-names
> + - power-domains
> + - clocks
> + - clock-names
> + - assigned-clocks
> + - assigned-clock-parents
> + - assigned-clock-rates
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/power/mt2701-power.h>
> + #include <dt-bindings/clock/mt2701-clk.h>
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + audsys: audio-subsystem@11220000 {
Drop example. You are duplcating the other one and it is enough if one
binding has full picture.
Best regards,
Krzysztof
