diff options
author | Mark Brown | 2019-03-18 12:15:09 +0100 |
---|---|---|
committer | Mark Brown | 2019-03-18 12:15:09 +0100 |
commit | 127470597b6b9466872d9794a80804ec95fff8ea (patch) | |
tree | b0087938a7f980c5b3d3879e0c2d18bab45d78e8 /Documentation/devicetree/bindings/sound | |
parent | ASoC: topology: create tlv before soc_tplg_init_kcontrol (diff) | |
parent | Linux 5.1-rc1 (diff) | |
download | kernel-qcow2-linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.gz kernel-qcow2-linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.xz kernel-qcow2-linux-127470597b6b9466872d9794a80804ec95fff8ea.zip |
Merge tag 'v5.1-rc1' into asoc-5.2
Linux 5.1-rc1
Diffstat (limited to 'Documentation/devicetree/bindings/sound')
-rw-r--r-- | Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt index 44d27456e8a4..21cd310963b1 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt @@ -13,6 +13,10 @@ Required properties: 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 { @@ -27,4 +31,5 @@ hda@70030000 { <&tegra_car 128>, /* hda2hdmi */ <&tegra_car 111>; /* hda2codec_2x */ reset-names = "hda", "hda2hdmi", "hda2codec_2x"; + nvidia,model = "jetson-tk1-hda"; }; |