Merge omapdss header refactoring

Merge omapdss public header refactoring, which separates the public
header into omapdrm and omapfb parts.

diff --cc drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index e9b62a1,a36c36d..fe4e7ec
--- 1/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
--- 2/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@@ -18,8 -18,9 +18,8 @@@
  #include <linux/module.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
 -#include <linux/of_gpio.h>
  
- #include <video/omapdss.h>
+ #include "../dss/omapdss.h"
  
  struct panel_drv_data {
        struct omap_dss_device dssdev;

diff --cc drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index 3e697e8,3baccf7..7f16f98
--- 1/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
--- 2/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@@ -15,9 -15,7 +15,8 @@@
  #include <linux/slab.h>
  #include <linux/of.h>
  #include <linux/of_gpio.h>
 +#include <linux/regulator/consumer.h>
  
- #include <video/omapdss.h>
  #include <video/omap-panel-data.h>
  #include <video/of_display_timing.h>
  

diff --cc drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 945fe5e,3f4477f..6dfb96c
--- 1/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
--- 2/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@@ -15,10 -15,8 +15,9 @@@
  #include <linux/spi/spi.h>
  #include <linux/mutex.h>
  #include <linux/gpio.h>
 +#include <linux/gpio/consumer.h>
  
- #include <video/omapdss.h>
- #include <video/omap-panel-data.h>
+ #include "../dss/omapdss.h"
  
  static struct omap_video_timings lb035q02_timings = {
        .x_res = 320,

diff --cc drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 38d2920,6872b6a..fc4c238
--- 1/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
--- 2/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@@ -15,10 -15,10 +15,10 @@@
  #include <linux/delay.h>
  #include <linux/spi/spi.h>
  #include <linux/fb.h>
 -#include <linux/gpio.h>
 +#include <linux/gpio/consumer.h>
  #include <linux/of_gpio.h>
  
- #include <video/omapdss.h>
+ #include "../dss/omapdss.h"
  
  struct panel_drv_data {
        struct omap_dss_device  dssdev;

diff --cc drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/dispc.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/dpi.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/dsi.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/dss.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/dss_features.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/hdmi.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/hdmi4.c
index ca4abb4,8de111e..2cfd70d
--- 1/drivers/gpu/drm/omapdrm/dss/hdmi4.c
--- 2/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@@ -33,10 -33,9 +33,10 @@@
  #include <linux/gpio.h>
  #include <linux/regulator/consumer.h>
  #include <linux/component.h>
- #include <video/omapdss.h>
 +#include <linux/of.h>
  #include <sound/omap-hdmi-audio.h>
  
+ #include "omapdss.h"
  #include "hdmi4_core.h"
  #include "dss.h"
  #include "dss_features.h"

diff --cc drivers/gpu/drm/omapdrm/dss/hdmi5.c
index cbcf4bb,1514516..d4892d8
--- 1/drivers/gpu/drm/omapdrm/dss/hdmi5.c
--- 2/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@@ -38,10 -38,9 +38,10 @@@
  #include <linux/gpio.h>
  #include <linux/regulator/consumer.h>
  #include <linux/component.h>
- #include <video/omapdss.h>
 +#include <linux/of.h>
  #include <sound/omap-hdmi-audio.h>
  
+ #include "omapdss.h"
  #include "hdmi5_core.h"
  #include "dss.h"
  #include "dss_features.h"

diff --cc drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
index f98b750,3991b8f..3ead47c
--- 1/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
--- 2/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
@@@ -13,9 -13,8 +13,9 @@@
  #include <linux/io.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
- #include <video/omapdss.h>
 +#include <linux/seq_file.h>
  
+ #include "omapdss.h"
  #include "dss.h"
  #include "hdmi.h"
  

diff --cc drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index dc0212a,ad624b3..b8bf6a9
--- 1/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
--- 2/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@@ -16,11 -16,8 +16,10 @@@
  #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>
- 
+ #include "omapdss.h"
  #include "dss.h"
  #include "hdmi.h"
  

diff --cc drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
index 055f62f,4877915..203694a
--- 1/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
--- 2/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
@@@ -14,9 -14,8 +14,9 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  #include <linux/platform_device.h>
- #include <video/omapdss.h>
 +#include <linux/seq_file.h>
  
+ #include "omapdss.h"
  #include "dss.h"
  #include "hdmi.h"
  

diff --cc drivers/gpu/drm/omapdrm/dss/pll.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/video-pll.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_drv.h
Simple merge

diff --cc drivers/video/fbdev/omap2/omapfb/dss/manager.c
Simple merge

diff --cc include/video/omapfb_dss.h
Simple merge