Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97a2482d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-4.3-cleanup' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 16478b61 5cf4af3b

Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt

+4 −4
Original line number Diff line number Diff line
@@ -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";

};