Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...
authorDave Airlie <airlied@redhat.com>
Wed, 15 Apr 2015 22:33:30 +0000 (08:33 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 15 Apr 2015 22:33:30 +0000 (08:33 +1000)
commit52139bdea1558e854123d7a07e7648f5a8c77a5c
tree846c411449c8a4f0618ec3426cff697428cc0c51
parentfc16fc4d69d5f1b67d3d6ac97bd3b4e1cc3f74cc
parent1dbee1a3c38a8792c235048df1d709fc5ca3a185
Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next

This set of patches adjust the setup of the HDMI CTS/N values for audio
support to be compliant with the work-around given in the iMX6 errata
documentation as part of the preparation for integrating audio support
for this driver, and also update the HDMI phy configuration for Rockchip
devices to improve the HDMI eye pattern.

* 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  drm: rockchip/dw_hdmi-rockchip: improve for HDMI electrical test
  drm: bridge/dw_hdmi: separate VLEVCTRL settting into platform driver
  drm: bridge/dw_hdmi: fixed codec style
  drm: bridge/dw_hdmi: adjust n/cts setting order
  drm: bridge/dw_hdmi: protect n/cts setting with a mutex
  drm: bridge/dw_hdmi: combine hdmi_set_clock_regenerator_n() and hdmi_regenerate_cts()

Conflicts:
drivers/gpu/drm/imx/dw_hdmi-imx.c
drivers/gpu/drm/imx/dw_hdmi-imx.c