]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3afeea03581c75540ec083d21185b36e28c8dace
tree846c411449c8a4f0618ec3426cff697428cc0c51
parentba9479eb28cc44d15a0950553569dbc2d2bcf228
parentb1dbe4b89076e9ce6fd32c67c8e8a750eba480b7
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