From: Dave Airlie <airlied@redhat.com>
Date: Tue, 13 Sep 2016 00:28:17 +0000 (+1000)
Subject: Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into... 
X-Git-Tag: v4.13~2107^2~28
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8506912b969b60aacc733315eeeb46b014d920a4;p=mirror_ubuntu-bionic-kernel.git

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
---

8506912b969b60aacc733315eeeb46b014d920a4