Convert NVIDIA Tegra20 AC97 binding to DT schema.
Change -gpio to -gpios in both schema and nvidia/tegra20-colibri.dtsi
Signed-off-by: Mohammad Shehar Yaar Tausif <[email protected]>
---
Changes v1->v2:
- change -gpio to -gpios in both schema and dtsi
- tested against dts
- add header files and defines
---
.../bindings/sound/nvidia,tegra20-ac97.txt | 36 --------
.../bindings/sound/nvidia,tegra20-ac97.yaml | 86 +++++++++++++++++++
arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi | 4 +-
3 files changed, 88 insertions(+), 38 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt
create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt
deleted file mode 100644
index eaf00102d92c..000000000000
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-NVIDIA Tegra 20 AC97 controller
-
-Required properties:
-- compatible : "nvidia,tegra20-ac97"
-- reg : Should contain AC97 controller registers location and length
-- interrupts : Should contain AC97 interrupt
-- resets : Must contain an entry for each entry in reset-names.
- See ../reset/reset.txt for details.
-- reset-names : Must include the following entries:
- - ac97
-- dmas : Must contain an entry for each entry in clock-names.
- See ../dma/dma.txt for details.
-- dma-names : Must include the following entries:
- - rx
- - tx
-- clocks : Must contain one entry, for the module clock.
- See ../clocks/clock-bindings.txt for details.
-- nvidia,codec-reset-gpio : The Tegra GPIO controller's phandle and the number
- of the GPIO used to reset the external AC97 codec
-- nvidia,codec-sync-gpio : The Tegra GPIO controller's phandle and the number
- of the GPIO corresponding with the AC97 DAP _FS line
-
-Example:
-
-ac97@70002000 {
- compatible = "nvidia,tegra20-ac97";
- reg = <0x70002000 0x200>;
- interrupts = <0 81 0x04>;
- nvidia,codec-reset-gpio = <&gpio 170 0>;
- nvidia,codec-sync-gpio = <&gpio 120 0>;
- clocks = <&tegra_car 3>;
- resets = <&tegra_car 3>;
- reset-names = "ac97";
- dmas = <&apbdma 12>, <&apbdma 12>;
- dma-names = "rx", "tx";
-};
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml
new file mode 100644
index 000000000000..9a68578f6fc3
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml
@@ -0,0 +1,86 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/nvidia,tegra20-ac97.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NVIDIA Tegra20 AC97 controller
+
+maintainers:
+ - Thierry Reding <[email protected]>
+ - Jon Hunter <[email protected]>
+
+properties:
+ compatible:
+ const: nvidia,tegra20-ac97
+
+ reg:
+ maxItems: 1
+
+ resets:
+ maxItems: 1
+
+ reset-names:
+ const: ac97
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ dmas:
+ maxItems: 2
+
+ dma-names:
+ items:
+ - const: rx
+ - const: tx
+
+ nvidia,codec-reset-gpios:
+ description:
+ The Tegra GPIO controller's phandle and the number
+ of the GPIO used to reset the external AC97 codec
+ maxItems: 1
+
+ nvidia,codec-sync-gpios:
+ description:
+ The Tegra GPIO controller's phandle and the number
+ of the GPIO corresponding with the AC97 DAP _FS line
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - resets
+ - reset-names
+ - interrupts
+ - clocks
+ - dmas
+ - dma-names
+ - nvidia,codec-reset-gpios
+ - nvidia,codec-sync-gpios
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/tegra20-car.h>
+ #include <dt-bindings/gpio/tegra-gpio.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/gpio/gpio.h>
+
+ ac97@70002000 {
+ compatible = "nvidia,tegra20-ac97";
+ reg = <0x70002000 0x200>;
+ resets = <&tegra_car 3>;
+ reset-names = "ac97";
+ interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&tegra_car 3>;
+ dmas = <&apbdma 12>, <&apbdma 12>;
+ dma-names = "rx", "tx";
+ nvidia,codec-reset-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
+ nvidia,codec-sync-gpios = <&gpio TEGRA_GPIO(P, 0) GPIO_ACTIVE_HIGH>;
+ };
+...
diff --git a/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi b/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi
index 8c1d5c9fa483..2ff7be8f1382 100644
--- a/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi
@@ -445,9 +445,9 @@ lvp0 {
tegra_ac97: ac97@70002000 {
status = "okay";
- nvidia,codec-reset-gpio =
+ nvidia,codec-reset-gpios =
<&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>;
- nvidia,codec-sync-gpio =
+ nvidia,codec-sync-gpios =
<&gpio TEGRA_GPIO(P, 0) GPIO_ACTIVE_HIGH>;
};
--
2.44.0
On 22/04/2024 14:38, Mohammad Shehar Yaar Tausif wrote:
> Convert NVIDIA Tegra20 AC97 binding to DT schema.
> Change -gpio to -gpios in both schema and nvidia/tegra20-colibri.dtsi
Why? Please always explain why you are doing things. "gpio" suffix is
deprecated.
>
> Signed-off-by: Mohammad Shehar Yaar Tausif <[email protected]>
> ---
> Changes v1->v2:
> - change -gpio to -gpios in both schema and dtsi
> - tested against dts
> - add header files and defines
> ---
> .../bindings/sound/nvidia,tegra20-ac97.txt | 36 --------
> .../bindings/sound/nvidia,tegra20-ac97.yaml | 86 +++++++++++++++++++
> arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi | 4 +-
Bindings are separate patches.
> 3 files changed, 88 insertions(+), 38 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt
> create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml
>
> diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt
> deleted file mode 100644
> index eaf00102d92c..000000000000
> --- a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -NVIDIA Tegra 20 AC97 controller
> -
> -Required properties:
> -- compatible : "nvidia,tegra20-ac97"
> -- reg : Should contain AC97 controller registers location and length
> -- interrupts : Should contain AC97 interrupt
> -- resets : Must contain an entry for each entry in reset-names.
> - See ../reset/reset.txt for details.
> -- reset-names : Must include the following entries:
> - - ac97
> -- dmas : Must contain an entry for each entry in clock-names.
> - See ../dma/dma.txt for details.
> -- dma-names : Must include the following entries:
> - - rx
> - - tx
> -- clocks : Must contain one entry, for the module clock.
> - See ../clocks/clock-bindings.txt for details.
> -- nvidia,codec-reset-gpio : The Tegra GPIO controller's phandle and the number
> - of the GPIO used to reset the external AC97 codec
> -- nvidia,codec-sync-gpio : The Tegra GPIO controller's phandle and the number
> - of the GPIO corresponding with the AC97 DAP _FS line
> -
> -Example:
> -
> -ac97@70002000 {
> - compatible = "nvidia,tegra20-ac97";
> - reg = <0x70002000 0x200>;
> - interrupts = <0 81 0x04>;
> - nvidia,codec-reset-gpio = <&gpio 170 0>;
> - nvidia,codec-sync-gpio = <&gpio 120 0>;
> - clocks = <&tegra_car 3>;
> - resets = <&tegra_car 3>;
> - reset-names = "ac97";
> - dmas = <&apbdma 12>, <&apbdma 12>;
> - dma-names = "rx", "tx";
> -};
> diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml
> new file mode 100644
> index 000000000000..9a68578f6fc3
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml
> @@ -0,0 +1,86 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/sound/nvidia,tegra20-ac97.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: NVIDIA Tegra20 AC97 controller
> +
> +maintainers:
> + - Thierry Reding <[email protected]>
> + - Jon Hunter <[email protected]>
> +
> +properties:
> + compatible:
> + const: nvidia,tegra20-ac97
> +
> + reg:
> + maxItems: 1
> +
> + resets:
> + maxItems: 1
> +
> + reset-names:
> + const: ac97
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
> +
> + dmas:
> + maxItems: 2
> +
> + dma-names:
> + items:
> + - const: rx
> + - const: tx
> +
> + nvidia,codec-reset-gpios:
> + description:
> + The Tegra GPIO controller's phandle and the number
> + of the GPIO used to reset the external AC97 codec
Drop redundant parts and just "Reset pin of external AC97 codec"
> + maxItems: 1
> +
> + nvidia,codec-sync-gpios:
> + description:
> + The Tegra GPIO controller's phandle and the number
> + of the GPIO corresponding with the AC97 DAP _FS line
"AC97 DAP _FS line"
Best regards,
Krzysztof