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

Commit b3997808 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'asoc-tohdmitx' of... 

Merge tag 'asoc-tohdmitx' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into HEAD

ASoC: tohdmitx bindings

The patch on this branch adds bindings for tohdmitx, including a header
to be used in DT bindings which needs to be shared with the arm-soc tree
in order to allow system DTs to be merged.

# gpg: Signature made Fri 14 Jun 2019 11:43:33 AM PDT
# gpg:                using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg:                issuer "broonie@kernel.org"
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" [full]
# gpg:                 aka "Mark Brown <broonie@debian.org>" [full]
# gpg:                 aka "Mark Brown <broonie@kernel.org>" [full]
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>" [full]
# gpg:                 aka "Mark Brown <broonie@linaro.org>" [unknown]
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>" [unknown]

* tag 'asoc-tohdmitx' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound:
  ASoC: meson: add tohdmitx DT bindings
parents 568465c3 abdcfc25

Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt

0 → 100644
+55 −0
Original line number Diff line number Diff line 
* Amlogic HDMI Tx control glue



Required properties:

- compatible: "amlogic,g12a-tohdmitx"

- reg: physical base address of the controller and length of memory

       mapped region.

- #sound-dai-cells: should be 1.



Example on the S905X2 SoC:



tohdmitx: audio-controller@744 {

	compatible = "amlogic,g12a-tohdmitx";

	reg = <0x0 0x744 0x0 0x4>;

	#sound-dai-cells = <1>;

};



Example of an 'amlogic,axg-sound-card':



sound {

	compatible = "amlogic,axg-sound-card";



[...]



	dai-link-x {

		sound-dai = <&tdmif_a>;

		dai-format = "i2s";

		dai-tdm-slot-tx-mask-0 = <1 1>;



		codec-0 {

			sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;

		};



		codec-1 {

			sound-dai = <&external_dac>;

		};

	};



	dai-link-y {

		sound-dai = <&tdmif_c>;

		dai-format = "i2s";

		dai-tdm-slot-tx-mask-0 = <1 1>;



		codec {

			sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>;

		};

	};



	dai-link-z {

		sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;



		codec {

			sound-dai = <&hdmi_tx>;

		};

	};

};

include/dt-bindings/sound/meson-g12a-tohdmitx.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __DT_MESON_G12A_TOHDMITX_H

#define __DT_MESON_G12A_TOHDMITX_H



#define TOHDMITX_I2S_IN_A	0

#define TOHDMITX_I2S_IN_B	1

#define TOHDMITX_I2S_IN_C	2

#define TOHDMITX_I2S_OUT	3

#define TOHDMITX_SPDIF_IN_A	4

#define TOHDMITX_SPDIF_IN_B	5

#define TOHDMITX_SPDIF_OUT	6



#endif /* __DT_MESON_G12A_TOHDMITX_H */