Unverified Commit 1f16aaee authored by Mark Brown's avatar Mark Brown
Browse files

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

This series adds support for audio graph based solution on Tegra186 and
Tegra194. This enables audio paths for I2S, DMIC and DSPK modules.

Depending on the platform Jetson TX2 or Jetson AGX Xavier, required I/O
module instances are enabled. Since the latter board has on board audio
codec, DT support for the same is enabled and external audio playback and
capture can be used.

Changelog
=========

v1 --> v2:
----------
  - Dropped patch "ASoC: tegra: Select SND_SOC_RT5659" as per suggestion
    from Mark.
  - Add new patch "ASoC: rt5659: Add Kconfig prompt"
  - Add new patch "arm64: defconfig: Enable RT5659"
  - No changes in other patches from earlier series.

Sameer Pujar (9):
  ASoC: dt-bindings: rt5659: Update binding doc
  ASoC: dt-bindings: tegra: Add iommus property to Tegra graph card
  ASoC: audio-graph-card: Add clocks property to endpoint node
  ASoC: rt5659: Add Kconfig prompt
  arm64: defconfig: Enable RT5659
  arm64: tegra: Add RT5658 device entry
  Revert "arm64: tegra: Disable the ACONNECT for Jetson TX2"
  arm64: tegra: Audio graph sound card for Jetson TX2
  arm64: tegra: Audio graph sound card for Jetson AGX Xavier

 .../bindings/sound/audio-graph-port.yaml           |   3 +
 .../sound/nvidia,tegra-audio-graph-card.yaml       |   3 +
 Documentation/devicetree/bindings/sound/rt5659.txt |  11 +
 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 609 +++++++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra186.dtsi           |  22 +
 arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 468 ++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra194.dtsi           |  20 +
 arch/arm64/configs/defconfig                       |   1 +
 sound/soc/codecs/Kconfig                           |   2 +-
 9 files changed, 1138 insertions(+), 1 deletion(-)

--
2.7.4
parents e86caa01 563c2681

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ properties: 
        properties:

          remote-endpoint:

            maxItems: 1

          clocks:

            maxItems: 1

            description: Describes the clock used by audio component.

          mclk-fs:

            description: |

              Multiplication factor between stream rate and codec mclk.

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

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ properties: 
    minItems: 1

    maxItems: 3



  iommus:

    maxItems: 1



required:

  - clocks

  - clock-names

Documentation/devicetree/bindings/sound/rt5659.txt

+11 −0
Original line number Diff line number Diff line
@@ -37,10 +37,21 @@ Optional properties: 
- realtek,jd-src

  0: No JD is used

  1: using JD3 as JD source

  2: JD source for Intel HDA header



- realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.

- realtek,reset-gpios : The GPIO that controls the CODEC's RESET pin.



- sound-name-prefix: Please refer to name-prefix.txt



- ports: A Codec may have a single or multiple I2S interfaces. These

  interfaces on Codec side can be described under 'ports' or 'port'.

  When the SoC or host device is connected to multiple interfaces of

  the Codec, the connectivity can be described using 'ports' property.

  If a single interface is used, then 'port' can be used. The usage

  depends on the platform or board design.

  Please refer to Documentation/devicetree/bindings/graph.txt



Pins on the device (for linking into audio routes) for RT5659/RT5658:



  * DMIC L1

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ config SND_SOC_RT5651 
	depends on I2C



config SND_SOC_RT5659

	tristate

	tristate "Realtek RT5658/RT5659 Codec"

	depends on I2C



config SND_SOC_RT5660