Merge branch '4.8/omapdrm-pll' (omapdrm PLL work)
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 6 Jun 2016 07:16:51 +0000 (10:16 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 6 Jun 2016 07:16:51 +0000 (10:16 +0300)
Merge omapdrm PLL work, which makes it possible to use the DSS PLLs in a
versatile manner, for example, HDMI PLL can be used for LCDs.

1  2 
drivers/gpu/drm/omapdrm/dss/dsi.c
drivers/gpu/drm/omapdrm/dss/dss.c
drivers/gpu/drm/omapdrm/dss/hdmi4.c
drivers/gpu/drm/omapdrm/dss/hdmi5.c
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c

Simple merge
Simple merge
Simple merge
Simple merge
index f1015e8b82675ffe21f420c375e2ef429b3d88a1,ac866d23c2dc372e1073f21f67423e0e30ec611a..dc0212a9754eb2e9f9c3b09da8422b5951814228
@@@ -16,7 -16,7 +16,8 @@@
  #include <linux/io.h>
  #include <linux/platform_device.h>
  #include <linux/clk.h>
 +#include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
  
  #include <video/omapdss.h>