diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:13 +0100 |
| commit | a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab (patch) | |
| tree | 5d9292f82ef7a236930febee51373565e1842398 /Documentation | |
| parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
| parent | f4aa5e214eeaf7f1c7f157526a5aa29784cb6a1f (diff) | |
| download | lwn-a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab.tar.gz lwn-a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab.zip | |
Merge remote-tracking branch 'asoc/for-5.7' into asoc-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/nau8825.txt | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Documentation/devicetree/bindings/sound/rt1308.txt | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/nau8825.txt b/Documentation/devicetree/bindings/sound/nau8825.txt index d16d96839bcb..388a7bc60b1f 100644 --- a/Documentation/devicetree/bindings/sound/nau8825.txt +++ b/Documentation/devicetree/bindings/sound/nau8825.txt @@ -101,5 +101,5 @@ Example: nuvoton,crosstalk-enable; clock-names = "mclk"; - clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>; + clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_2>; }; diff --git a/Documentation/devicetree/bindings/sound/rt1308.txt b/Documentation/devicetree/bindings/sound/rt1308.txt index 2d46084afce4..2d46084afce4 100755..100644 --- a/Documentation/devicetree/bindings/sound/rt1308.txt +++ b/Documentation/devicetree/bindings/sound/rt1308.txt |