diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-20 18:41:42 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-20 18:41:42 -0700 |
| commit | 97a2482d9891f0ad6a3710e0b6ae9949c140c7f1 (patch) | |
| tree | f7b3ec11fffeabd71ac96a341ddf29f484d5ac95 | |
| parent | 16478b61f0d88a08163b92af27f0e77f471576ce (diff) | |
| parent | 5cf4af3bebb718b72a23b7e80fddfe8b4e8b0620 (diff) | |
| download | blackbird-op-linux-97a2482d9891f0ad6a3710e0b6ae9949c140c7f1.tar.gz blackbird-op-linux-97a2482d9891f0ad6a3710e0b6ae9949c140c7f1.zip | |
Merge tag 'tegra-for-4.3-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup
ARM: tegra: Cleanup patches for v4.3-rc1
Just a couple of trivial cleanups to make the HDA controller driver code
match the device tree binding.
* tag 'tegra-for-4.3-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ALSA: hda/tegra: Order clock and reset names consistently
ALSA: hda/tegra - Fix hda2codec_2x clock and reset names
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt index 13e2ef496724..275c6ea356f6 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt @@ -8,10 +8,10 @@ Required properties: - interrupts : The interrupt from the HDA controller. - clocks : Must contain an entry for each required entry in clock-names. See ../clocks/clock-bindings.txt for details. -- clock-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi +- clock-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x - resets : Must contain an entry for each entry in reset-names. See ../reset/reset.txt for details. -- reset-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi +- reset-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x Example: @@ -24,7 +24,7 @@ hda@0,70030000 { <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>; clock-names = "hda", "hda2hdmi", "hda2codec_2x"; resets = <&tegra_car 125>, /* hda */ - <&tegra_car 128>; /* hda2hdmi */ - <&tegra_car 111>, /* hda2codec_2x */ + <&tegra_car 128>, /* hda2hdmi */ + <&tegra_car 111>; /* hda2codec_2x */ reset-names = "hda", "hda2hdmi", "hda2codec_2x"; }; |
