diff options
author | Dave Airlie <airlied@redhat.com> | 2016-09-13 10:28:17 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-09-13 10:28:17 +1000 |
commit | 8506912b969b60aacc733315eeeb46b014d920a4 (patch) | |
tree | 42a786a5e6d20470f9eec8cd2614d9e827505a9c /Documentation | |
parent | b4eac5465b23a9bcb4a66376a5664086b4913288 (diff) | |
parent | df0bd1e8f3c508bf4c3445f94b12e38289b65f13 (diff) | |
download | linux-8506912b969b60aacc733315eeeb46b014d920a4.tar.gz linux-8506912b969b60aacc733315eeeb46b014d920a4.tar.bz2 linux-8506912b969b60aacc733315eeeb46b014d920a4.zip |
Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next
This adds the ASoC codec interfaces for TDA998x HDMI audio from
Jyri Sarha.
* 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: dts: am335x-boneblack: Add HDMI audio support
drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding
drm/i2c: tda998x: Improve tda998x_configure_audio() audio related pdata
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/display/bridge/tda998x.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/display/bridge/tda998x.txt b/Documentation/devicetree/bindings/display/bridge/tda998x.txt index e178e6b9f9ee..24cc2466185a 100644 --- a/Documentation/devicetree/bindings/display/bridge/tda998x.txt +++ b/Documentation/devicetree/bindings/display/bridge/tda998x.txt @@ -21,8 +21,19 @@ Optional properties: - video-ports: 24 bits value which defines how the video controller output is wired to the TDA998x input - default: <0x230145> + - audio-ports: array of 8-bit values, 2 values per one DAI[1]. + The first value defines the DAI type: TDA998x_SPDIF or TDA998x_I2S[2]. + The second value defines the tda998x AP_ENA reg content when the DAI + in question is used. The implementation allows one or two DAIs. If two + DAIs are defined, they must be of different type. + +[1] Documentation/sound/alsa/soc/DAI.txt +[2] include/dt-bindings/display/tda998x.h + Example: +#include <dt-bindings/display/tda998x.h> + tda998x: hdmi-encoder { compatible = "nxp,tda998x"; reg = <0x70>; @@ -30,4 +41,11 @@ Example: interrupts = <27 2>; /* falling edge */ pinctrl-0 = <&pmx_camera>; pinctrl-names = "default"; + video-ports = <0x230145>; + + #sound-dai-cells = <2>; + /* DAI-format AP_ENA reg value */ + audio-ports = < TDA998x_SPDIF 0x04 + TDA998x_I2S 0x03>; + }; |