Merge tag 'asoc-hdmi-codec-pdata' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDave Airlie <airlied@redhat.com>
Mon, 4 Jul 2016 23:43:02 +0000 (09:43 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 4 Jul 2016 23:57:23 +0000 (09:57 +1000)
commit5dd0775e502b26b44e5bcb5f504a977a565f2f3e
tree11d17e1e3e6f25ac84c9c9b165df21d6965d4b32
parentdac2c48ca5ac9bb2d6339aaa733c60d5b801ee86
parentefc9194bcff84666832c6493bafa92029ac6634c
Merge tag 'asoc-hdmi-codec-pdata' of git://git./linux/kernel/git/broonie/sound into drm-next

ASoC: Add private data for HDMI CODEC callbacks

Allow the HDMI CODECs to get private data passed in in callbacks.

[airlied:
Add STI/mediatek patches from Arnd for drivers merged later in drm tree.]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
* tag 'asoc-hdmi-codec-pdata' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound:
  ASoC: hdmi-codec: callback function will be called with private data
drivers/gpu/drm/mediatek/mtk_hdmi.c
drivers/gpu/drm/sti/sti_hdmi.c