[RESEND PATCH 0/2] Convert Tegra HDA doc to json-schema
Convert Tegra HDA doc to YAML format. Ran binding validation checks to ensure there are no warnings/errors for HDA.
Patch "arm64: tegra: Fix Tegra194 HDA {clock,reset}-names ordering" is already merged and hence not included here.
Sameer Pujar (2): dt-bindings: tegra: Convert HDA doc to json-schema dt-bindings: tegra: Add missing HDA properties
.../bindings/sound/nvidia,tegra30-hda.txt | 35 ------- .../bindings/sound/nvidia,tegra30-hda.yaml | 112 +++++++++++++++++++++ 2 files changed, 112 insertions(+), 35 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml
Convert Tegra HDA doc to YAML format.
Signed-off-by: Sameer Pujar spujar@nvidia.com --- .../bindings/sound/nvidia,tegra30-hda.txt | 35 -------- .../bindings/sound/nvidia,tegra30-hda.yaml | 98 ++++++++++++++++++++++ 2 files changed, 98 insertions(+), 35 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt deleted file mode 100644 index 21cd310..0000000 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +++ /dev/null @@ -1,35 +0,0 @@ -NVIDIA Tegra30 HDA controller - -Required properties: -- compatible : For Tegra30, must contain "nvidia,tegra30-hda". Otherwise, - must contain '"nvidia,<chip>-hda", "nvidia,tegra30-hda"', where <chip> is - tegra114, tegra124, or tegra132. -- reg : Should contain the HDA registers location and length. -- interrupts : The interrupt from the HDA controller. -- clocks : Must contain an entry for each required entry in clock-names. - See ../clocks/clock-bindings.txt for details. -- clock-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x -- resets : Must contain an entry for each entry in reset-names. - See ../reset/reset.txt for details. -- reset-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x - -Optional properties: -- nvidia,model : The user-visible name of this sound complex. Since the property - is optional, legacy boards can use default name provided in hda driver. - -Example: - -hda@70030000 { - compatible = "nvidia,tegra124-hda", "nvidia,tegra30-hda"; - reg = <0x0 0x70030000 0x0 0x10000>; - interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&tegra_car TEGRA124_CLK_HDA>, - <&tegra_car TEGRA124_CLK_HDA2HDMI>, - <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>; - clock-names = "hda", "hda2hdmi", "hda2codec_2x"; - resets = <&tegra_car 125>, /* hda */ - <&tegra_car 128>, /* hda2hdmi */ - <&tegra_car 111>; /* hda2codec_2x */ - reset-names = "hda", "hda2hdmi", "hda2codec_2x"; - nvidia,model = "jetson-tk1-hda"; -}; diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml new file mode 100644 index 0000000..3059bc3 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml @@ -0,0 +1,98 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/nvidia,tegra30-hda.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NVIDIA Tegra HDA controller + +description: | + The High Definition Audio (HDA) block provides a serial interface to + audio codec. It supports multiple input and output streams. + +maintainers: + - Thierry Reding treding@nvidia.com + - Jon Hunter jonathanh@nvidia.com + +properties: + $nodename: + pattern: "^hda@[0-9a-f]*$" + + compatible: + oneOf: + - const: nvidia,tegra30-hda + - items: + - enum: + - nvidia,tegra194-hda + - nvidia,tegra186-hda + - nvidia,tegra210-hda + - nvidia,tegra124-hda + - const: nvidia,tegra30-hda + - items: + - const: nvidia,tegra132-hda + - const: nvidia,tegra124-hda + - const: nvidia,tegra30-hda + + reg: + maxItems: 1 + + interrupts: + description: The interrupt from the HDA controller + maxItems: 1 + + clocks: + maxItems: 3 + + clock-names: + maxItems: 3 + items: + - const: hda + - const: hda2hdmi + - const: hda2codec_2x + + resets: + maxItems: 3 + + reset-names: + maxItems: 3 + items: + - const: hda + - const: hda2hdmi + - const: hda2codec_2x + + nvidia,model: + $ref: /schemas/types.yaml#/definitions/string + description: | + The user-visible name of this sound complex. If this property is + not specified then boards can use default name provided in hda driver. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + +additionalProperties: false + +examples: + - | + #include<dt-bindings/clock/tegra124-car-common.h> + #include<dt-bindings/interrupt-controller/arm-gic.h> + + hda@70030000 { + compatible = "nvidia,tegra124-hda", "nvidia,tegra30-hda"; + reg = <0x70030000 0x10000>; + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&tegra_car TEGRA124_CLK_HDA>, + <&tegra_car TEGRA124_CLK_HDA2HDMI>, + <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>; + clock-names = "hda", "hda2hdmi", "hda2codec_2x"; + resets = <&tegra_car 125>, /* hda */ + <&tegra_car 128>, /* hda2hdmi */ + <&tegra_car 111>; /* hda2codec_2x */ + reset-names = "hda", "hda2hdmi", "hda2codec_2x"; + nvidia,model = "jetson-tk1-hda"; + }; + +...
On Thu, 03 Dec 2020 20:06:41 +0530, Sameer Pujar wrote:
Convert Tegra HDA doc to YAML format.
Signed-off-by: Sameer Pujar spujar@nvidia.com
.../bindings/sound/nvidia,tegra30-hda.txt | 35 -------- .../bindings/sound/nvidia,tegra30-hda.yaml | 98 ++++++++++++++++++++++ 2 files changed, 98 insertions(+), 35 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml
Reviewed-by: Rob Herring robh@kernel.org
Document the missing properties which are currently required for Tegra186/Tegra194 DT files.
Signed-off-by: Sameer Pujar spujar@nvidia.com --- .../devicetree/bindings/sound/nvidia,tegra30-hda.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml index 3059bc3..e543a61 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml @@ -60,6 +60,20 @@ properties: - const: hda2hdmi - const: hda2codec_2x
+ power-domains: + maxItems: 1 + + interconnects: + maxItems: 2 + + interconnect-names: + items: + - const: dma-mem + - const: write + + iommus: + maxItems: 1 + nvidia,model: $ref: /schemas/types.yaml#/definitions/string description: |
On Thu, 03 Dec 2020 20:06:42 +0530, Sameer Pujar wrote:
Document the missing properties which are currently required for Tegra186/Tegra194 DT files.
Signed-off-by: Sameer Pujar spujar@nvidia.com
.../devicetree/bindings/sound/nvidia,tegra30-hda.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
Reviewed-by: Rob Herring robh@kernel.org
On Thu, 3 Dec 2020 20:06:40 +0530, Sameer Pujar wrote:
Convert Tegra HDA doc to YAML format. Ran binding validation checks to ensure there are no warnings/errors for HDA.
Patch "arm64: tegra: Fix Tegra194 HDA {clock,reset}-names ordering" is already merged and hence not included here.
Sameer Pujar (2): dt-bindings: tegra: Convert HDA doc to json-schema dt-bindings: tegra: Add missing HDA properties
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] dt-bindings: tegra: Convert HDA doc to json-schema commit: 2d8f8955fe02c1f5d41c283f48d8c6a2a02ae17f [2/2] dt-bindings: tegra: Add missing HDA properties commit: 3759d5edc07598d55124d87bd292a95f79f47997
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
participants (3)
-
Mark Brown
-
Rob Herring
-
Sameer Pujar