[PATCH v3] ASoC: dt-bindings: mediatek: mt8192: re-add audio afe document
The document was merged as commit 1afc60e00de3 ("dt-bindings: mediatek: mt8192: add audio afe document").
However, [1] revealed that the commit 1afc60e00de3 breaks dt_binding_check due to dt-bindings/clock/mt8192-clk.h doesn't exist.
As a temporary fix, commit 7d94ca3c8acd ("ASoC: mt8192: revert add audio afe document") reverted commit 1afc60e00de3.
dt-bindings/clock/mt8192-clk.h is in mainline per commit f35f1a23e0e1 ("clk: mediatek: Add dt-bindings of MT8192 clocks"). Re-adds the document back.
[1]: https://mailman.alsa-project.org/pipermail/alsa-devel/2020-November/176873.h...
Signed-off-by: Tzung-Bi Shih tzungbi@google.com --- Changes from v2 (https://mailman.alsa-project.org/pipermail/alsa-devel/2021-August/189058.htm...): - Simplify the commit message.
Changes from v1 (https://mailman.alsa-project.org/pipermail/alsa-devel/2021-August/189048.htm...): - Add more context to the commit message.
.../bindings/sound/mt8192-afe-pcm.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml
diff --git a/Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml b/Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml new file mode 100644 index 000000000000..0170c93802d2 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml @@ -0,0 +1,100 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/mt8192-afe-pcm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek AFE PCM controller for mt8192 + +maintainers: + - Jiaxin Yu jiaxin.yu@mediatek.com + - Shane Chien shane.chien@mediatek.com + +properties: + compatible: + const: mediatek,mt8192-audio + + interrupts: + maxItems: 1 + + resets: + maxItems: 1 + + reset-names: + const: audiosys + + mediatek,apmixedsys: + $ref: "/schemas/types.yaml#/definitions/phandle" + description: The phandle of the mediatek apmixedsys controller + + mediatek,infracfg: + $ref: "/schemas/types.yaml#/definitions/phandle" + description: The phandle of the mediatek infracfg controller + + mediatek,topckgen: + $ref: "/schemas/types.yaml#/definitions/phandle" + description: The phandle of the mediatek topckgen controller + + power-domains: + maxItems: 1 + + clocks: + items: + - description: AFE clock + - description: ADDA DAC clock + - description: ADDA DAC pre-distortion clock + - description: audio infra sys clock + - description: audio infra 26M clock + + clock-names: + items: + - const: aud_afe_clk + - const: aud_dac_clk + - const: aud_dac_predis_clk + - const: aud_infra_clk + - const: aud_infra_26m_clk + +required: + - compatible + - interrupts + - resets + - reset-names + - mediatek,apmixedsys + - mediatek,infracfg + - mediatek,topckgen + - power-domains + - clocks + - clock-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/mt8192-clk.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/power/mt8192-power.h> + #include <dt-bindings/reset-controller/mt8192-resets.h> + + afe: mt8192-afe-pcm { + compatible = "mediatek,mt8192-audio"; + interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>; + resets = <&watchdog MT8192_TOPRGU_AUDIO_SW_RST>; + reset-names = "audiosys"; + mediatek,apmixedsys = <&apmixedsys>; + mediatek,infracfg = <&infracfg>; + mediatek,topckgen = <&topckgen>; + power-domains = <&scpsys MT8192_POWER_DOMAIN_AUDIO>; + clocks = <&audsys CLK_AUD_AFE>, + <&audsys CLK_AUD_DAC>, + <&audsys CLK_AUD_DAC_PREDIS>, + <&infracfg CLK_INFRA_AUDIO>, + <&infracfg CLK_INFRA_AUDIO_26M_B>; + clock-names = "aud_afe_clk", + "aud_dac_clk", + "aud_dac_predis_clk", + "aud_infra_clk", + "aud_infra_26m_clk"; + }; + +...
On Tue, 14 Sep 2021 17:12:04 +0800, Tzung-Bi Shih wrote:
The document was merged as commit 1afc60e00de3 ("dt-bindings: mediatek: mt8192: add audio afe document").
However, [1] revealed that the commit 1afc60e00de3 breaks dt_binding_check due to dt-bindings/clock/mt8192-clk.h doesn't exist.
As a temporary fix, commit 7d94ca3c8acd ("ASoC: mt8192: revert add audio afe document") reverted commit 1afc60e00de3.
dt-bindings/clock/mt8192-clk.h is in mainline per commit f35f1a23e0e1 ("clk: mediatek: Add dt-bindings of MT8192 clocks"). Re-adds the document back.
Signed-off-by: Tzung-Bi Shih tzungbi@google.com
Changes from v2 (https://mailman.alsa-project.org/pipermail/alsa-devel/2021-August/189058.htm...):
- Simplify the commit message.
Changes from v1 (https://mailman.alsa-project.org/pipermail/alsa-devel/2021-August/189048.htm...):
- Add more context to the commit message.
.../bindings/sound/mt8192-afe-pcm.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors: ./Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml:10:4: [warning] wrong indentation: expected 2 but found 3 (indentation) ./Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml:15:7: [warning] wrong indentation: expected 4 but found 6 (indentation)
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1527802
This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit.
On Tue, 14 Sep 2021 17:12:04 +0800, Tzung-Bi Shih wrote:
The document was merged as commit 1afc60e00de3 ("dt-bindings: mediatek: mt8192: add audio afe document").
However, [1] revealed that the commit 1afc60e00de3 breaks dt_binding_check due to dt-bindings/clock/mt8192-clk.h doesn't exist.
As a temporary fix, commit 7d94ca3c8acd ("ASoC: mt8192: revert add audio afe document") reverted commit 1afc60e00de3.
dt-bindings/clock/mt8192-clk.h is in mainline per commit f35f1a23e0e1 ("clk: mediatek: Add dt-bindings of MT8192 clocks"). Re-adds the document back.
Signed-off-by: Tzung-Bi Shih tzungbi@google.com
Changes from v2 (https://mailman.alsa-project.org/pipermail/alsa-devel/2021-August/189058.htm...):
- Simplify the commit message.
Changes from v1 (https://mailman.alsa-project.org/pipermail/alsa-devel/2021-August/189048.htm...):
- Add more context to the commit message.
.../bindings/sound/mt8192-afe-pcm.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml
With the indentation fixed,
Reviewed-by: Rob Herring robh@kernel.org
On Tue, 14 Sep 2021 17:12:04 +0800, Tzung-Bi Shih wrote:
The document was merged as commit 1afc60e00de3 ("dt-bindings: mediatek: mt8192: add audio afe document").
However, [1] revealed that the commit 1afc60e00de3 breaks dt_binding_check due to dt-bindings/clock/mt8192-clk.h doesn't exist.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: dt-bindings: mediatek: mt8192: re-add audio afe document commit: c861af7861aac72075046e9932c606c8cfe64427
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
On Tue, Sep 14, 2021 at 4:12 AM Tzung-Bi Shih tzungbi@google.com wrote:
The document was merged as commit 1afc60e00de3 ("dt-bindings: mediatek: mt8192: add audio afe document").
However, [1] revealed that the commit 1afc60e00de3 breaks dt_binding_check due to dt-bindings/clock/mt8192-clk.h doesn't exist.
As a temporary fix, commit 7d94ca3c8acd ("ASoC: mt8192: revert add audio afe document") reverted commit 1afc60e00de3.
dt-bindings/clock/mt8192-clk.h is in mainline per commit f35f1a23e0e1 ("clk: mediatek: Add dt-bindings of MT8192 clocks"). Re-adds the document back.
Sigh. What's the status of dt-bindings/reset-controller/mt8192-resets.h? Because now this is applied again and has an error in linux-next since the header is missing.
Rob
On Sat, Oct 16, 2021 at 8:41 PM Rob Herring robh+dt@kernel.org wrote:
Sigh. What's the status of dt-bindings/reset-controller/mt8192-resets.h? Because now this is applied again and has an error in linux-next since the header is missing.
It was moved by [1] and applied in [2].
[1]: https://lore.kernel.org/all/20210930103105.v4.1.I514d9aafff3a062f751b37d3fea... [2]: https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/commi...
Have proposed a patch[3] for fixing the issue in linux-next. But it would be still broken in ASoC tree for now.
[3]: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-October/191317.ht...
participants (4)
-
Mark Brown -
Rob Herring -
Rob Herring -
Tzung-Bi Shih