• Dave Airlie's avatar
    Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · 52139bde
    Dave Airlie authored
    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
    52139bde
dw_hdmi-imx.c 6.92 KB