Unverified Commit 6b050d45 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Tegra210 audio graph card" from Sameer Pujar <spujar@nvidia.com>: 

This series adds audio graph based sound card support for Tegra210
platforms like Jetson-TX1 an Jetson-Nano. The following preparatory
audio graph enhancement series is already merged.
 * https://patchwork.kernel.org/project/alsa-devel/list/?series=375629&state=*

Following are the summary of changes:
 * Add graph/audio-graph based schemas or schema updates for Tegra210
   component and machine drivers.
 * Add Tegra audio graph machine driver.
 * Add required DT support for Jetson-TX1/Nano.

This work is based on earlier discussion of DPCM usage for Tegra
and simple card driver updates.
 * https://lkml.org/lkml/2020/4/30/519
 * https://lkml.org/lkml/2020/6/27/4

Original v6 series was sent about 6-7 weeks back. The dependency commit,
https://lore.kernel.org/alsa-devel/1610948585-16286-1-git-send-email-spujar@nvidia.com/
is now merged. Resending this now to appear in the top of the mail list.

Changelog
=========

v5 -> v6
--------
 * Added ports or port description in YAML docs for Tegra AHUB
   devices and graph card in patch 1/6 and 2/6. Reference of
   audio-graph-port.yaml is used for AHUB devices.
 * Dropped redundant NULL check return for of_device_get_match_data()
   in patch 3/6.
 * Added 'Reviewed-by' tag from Jon Hunter.
 * No changes in remaining patches.

v4 -> v5
--------
 * Audio graph related changes were sent in separate v5 series as
   mentioned above and are dropped from current series.
 * Graph and audio graph doc patches are dropped from this series
   and are sent separately as mentioned above.
 * Minor change with phandle label for TX1 and Nano platform DT files.
 * No changes in other patches.

v3 -> v4
--------
 * Added new patches to convert graph.txt and audio-graph-card.txt
   to corresponding json-schema files. Later these references
   are used in Tegra audio graph schema.

 * AHUB component binding docs are updated to reflect the usage
   of ports/port/endpoint

 * More common stuff is moved into graph_parse_of() and this is
   used by both generic and Tegra audio graph.

 * DT binding for Tegra audio graph is updated to included "ports { }"

 * As per the suggestion 'void *data' member is dropped from
   'asoc_simple_priv' and instead container method is used to
   maintain required custom data internal to Tegra audio graph.

v2 -> v3
--------
 * Dropped new compatible addition in generic graph driver
   after reviewing it with Morimoto-san. Instead added Tegra
   audio graph driver and new compatibles are added in the same.
 * Added new patches to expose new members for customization
   in audio graph driver.
 * Added new patch for Tegra audio graph driver and related
   documentation.
 * Minor change in below commit where mutex version of helper is used
   "ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM"
 * DT binding is updated to use the newly exposed compatibles
 * No changes in other patches

v1 -> v2
--------
 * Re-organized ports/endpoints description for ADMAIF and XBAR.
   Updated DT patches accordingly.
 * After above change, multiple Codec endpoint support is not
   required and hence dropped for now. This will be considered
   separately if at all required in future.
 * Re-ordered patches in the series.

Sameer Pujar (6):
  ASoC: dt-bindings: tegra: Add graph bindings
  ASoC: dt-bindings: tegra: Add json-schema for Tegra audio graph card
  ASoC: tegra: Add audio graph based card driver
  arm64: defconfig: Enable Tegra audio graph card driver
  arm64: tegra: Audio graph header for Tegra210
  arm64: tegra: Audio graph sound card for Jetson Nano and TX1

 .../sound/nvidia,tegra-audio-graph-card.yaml       | 187 +++++++++++++++
 .../bindings/sound/nvidia,tegra186-dspk.yaml       |  18 +-
 .../bindings/sound/nvidia,tegra210-admaif.yaml     |  13 +-
 .../bindings/sound/nvidia,tegra210-ahub.yaml       |  13 +-
 .../bindings/sound/nvidia,tegra210-dmic.yaml       |  18 +-
 .../bindings/sound/nvidia,tegra210-i2s.yaml        |  18 +-
 .../boot/dts/nvidia/tegra210-audio-graph.dtsi      | 153 ++++++++++++
 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 262 +++++++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 146 ++++++++++++
 arch/arm64/configs/defconfig                       |   1 +
 sound/soc/tegra/Kconfig                            |   9 +
 sound/soc/tegra/Makefile                           |   2 +
 sound/soc/tegra/tegra_audio_graph_card.c           | 251 ++++++++++++++++++++
 13 files changed, 1085 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-audio-graph.dtsi
 create mode 100644 sound/soc/tegra/tegra_audio_graph_card.c

--
2.7.4
parents 97692432 202e2f77

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml

0 → 100644
+187 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/nvidia,tegra-audio-graph-card.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Audio Graph based Tegra sound card driver



description: |

  This is based on generic audio graph card driver along with additional

  customizations for Tegra platforms. It uses the same bindings with

  additional standard clock DT bindings required for Tegra.



maintainers:

  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph.yaml#



properties:

  compatible:

    enum:

      - nvidia,tegra210-audio-graph-card

      - nvidia,tegra186-audio-graph-card



  clocks:

    minItems: 2



  clock-names:

    minItems: 2

    items:

      - const: pll_a

      - const: plla_out0



  assigned-clocks:

    minItems: 1

    maxItems: 3



  assigned-clock-parents:

    minItems: 1

    maxItems: 3



  assigned-clock-rates:

    minItems: 1

    maxItems: 3



required:

  - clocks

  - clock-names

  - assigned-clocks

  - assigned-clock-parents



unevaluatedProperties: false



examples:

  - |

    #include<dt-bindings/clock/tegra210-car.h>



    tegra_sound {

        compatible = "nvidia,tegra210-audio-graph-card";



        clocks = <&tegra_car TEGRA210_CLK_PLL_A>,

                 <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;

        clock-names = "pll_a", "plla_out0";



        assigned-clocks = <&tegra_car TEGRA210_CLK_PLL_A>,

                          <&tegra_car TEGRA210_CLK_PLL_A_OUT0>,

                          <&tegra_car TEGRA210_CLK_EXTERN1>;

        assigned-clock-parents = <0>, <0>, <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;

        assigned-clock-rates = <368640000>, <49152000>, <12288000>;



        dais = /* FE */

               <&admaif1_port>,

               /* Router */

               <&xbar_i2s1_port>,

               /* I/O DAP Ports */

               <&i2s1_port>;



        label = "jetson-tx1-ape";

    };



    // The ports are defined for AHUB and its child devices.

    ahub@702d0800 {

        compatible = "nvidia,tegra210-ahub";

        reg = <0x702d0800 0x800>;

        clocks = <&tegra_car TEGRA210_CLK_D_AUDIO>;

        clock-names = "ahub";

        assigned-clocks = <&tegra_car TEGRA210_CLK_D_AUDIO>;

        assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;

        #address-cells = <1>;

        #size-cells = <1>;

        ranges = <0x702d0000 0x702d0000 0x0000e400>;



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0x0>;

                xbar_admaif1_ep: endpoint {

                    remote-endpoint = <&admaif1_ep>;

                };

            };



            // ...



            xbar_i2s1_port: port@a {

                reg = <0xa>;

                xbar_i2s1_ep: endpoint {

                    remote-endpoint = <&i2s1_cif_ep>;

                };

            };

        };



        admaif@702d0000 {

            compatible = "nvidia,tegra210-admaif";

            reg = <0x702d0000 0x800>;

            dmas = <&adma 1>,  <&adma 1>,

                   <&adma 2>,  <&adma 2>,

                   <&adma 3>,  <&adma 3>,

                   <&adma 4>,  <&adma 4>,

                   <&adma 5>,  <&adma 5>,

                   <&adma 6>,  <&adma 6>,

                   <&adma 7>,  <&adma 7>,

                   <&adma 8>,  <&adma 8>,

                   <&adma 9>,  <&adma 9>,

                   <&adma 10>, <&adma 10>;

            dma-names = "rx1",  "tx1",

                        "rx2",  "tx2",

                        "rx3",  "tx3",

                        "rx4",  "tx4",

                        "rx5",  "tx5",

                        "rx6",  "tx6",

                        "rx7",  "tx7",

                        "rx8",  "tx8",

                        "rx9",  "tx9",

                        "rx10", "tx10";



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                admaif1_port: port@0 {

                    reg = <0x0>;

                    admaif1_ep: endpoint {

                        remote-endpoint = <&xbar_admaif1_ep>;

                    };

                };



                // More ADMAIF ports to follow

            };

        };



        i2s@702d1000 {

            compatible = "nvidia,tegra210-i2s";

            clocks = <&tegra_car TEGRA210_CLK_I2S0>;

            clock-names = "i2s";

            assigned-clocks = <&tegra_car TEGRA210_CLK_I2S0>;

            assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;

            assigned-clock-rates = <1536000>;

            reg = <0x702d1000 0x100>;



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0x0>;



                    i2s1_cif_ep: endpoint {

                        remote-endpoint = <&xbar_i2s1_ep>;

                    };

                };



                i2s1_port: port@1 {

                    reg = <0x1>;



                    i2s1_dap: endpoint {

                        dai-format = "i2s";

                    };

                };

            };

        };

    };



...

Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml

+17 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ maintainers: 
  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^dspk@[0-9a-f]*$"
@@ -55,6 +58,19 @@ properties: 
      The name can be "DSPK1" or "DSPKx", where x depends on the maximum

      available instances on a Tegra SoC.



  ports:

    type: object

    properties:

      port@0:

        description: |

          DSPK ACIF (Audio Client Interface) port connected to the

          corresponding AHUB (Audio Hub) ACIF port.



      port@1:

        description: |

          DSPK DAP (Digital Audio Port) interface which can be connected

          to external audio codec for playback.



required:

  - compatible

  - reg
@@ -64,7 +80,7 @@ required: 
  - assigned-clock-parents

  - sound-name-prefix



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml

+12 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ maintainers: 
  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^admaif@[0-9a-f]*$"
@@ -37,6 +40,14 @@ properties: 


  dma-names: true



  ports:

    description: |

      Contains list of ACIF (Audio CIF) port nodes for ADMAIF channels.

      The number of port nodes depends on the number of ADMAIF channels

      that SoC may have. These are interfaced with respective ACIF ports

      in AHUB (Audio Hub). Each port is capable of data transfers in

      both directions.



if:

  properties:

    compatible:
@@ -81,7 +92,7 @@ required: 
  - dmas

  - dma-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml

+11 −2
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ maintainers: 
  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^ahub@[0-9a-f]*$"
@@ -56,6 +59,13 @@ properties: 


  ranges: true



  ports:

    description: |

      Contains list of ACIF (Audio CIF) port nodes for AHUB (Audio Hub).

      These are connected to ACIF interfaces of AHUB clients. Thus the

      number of port nodes depend on the number of clients that AHUB may

      have depending on the SoC revision.



required:

  - compatible

  - reg
@@ -67,8 +77,7 @@ required: 
  - "#size-cells"

  - ranges



additionalProperties:

  type: object

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml

+17 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ maintainers: 
  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^dmic@[0-9a-f]*$"
@@ -56,6 +59,19 @@ properties: 
      The name can be "DMIC1" or "DMIC2" ... "DMICx", where x depends

      on the maximum available instances on a Tegra SoC.



  ports:

    type: object

    properties:

      port@0:

        description: |

          DMIC ACIF (Audio Client Interface) port connected to the

          corresponding AHUB (Audio Hub) ACIF port.



      port@1:

        description: |

          DMIC DAP (Digital Audio Port) interface which can be connected

          to external audio codec for capture.



required:

  - compatible

  - reg
@@ -64,7 +80,7 @@ required: 
  - assigned-clocks

  - assigned-clock-parents



additionalProperties: false

unevaluatedProperties: false



examples:

  - |