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 e9b62a1bb5c5d7d790b09d6ed2d819f510fc8c39,a36c36d3328e33cbe990aa25248795f7cdbe2dc8..fe4e7ec3bab079101363b5d83890573988811ec7
--- 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 3e697e893567547caac1b88ab4fc5e350b47f5c0,3baccf732d96dead3d8508d75d5201d2c8546181..7f16f985ab22a7beea6e68551bb9d170efc28401
--- 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 945fe5e539c1475e323e378e7413279f15717a19,3f4477fc1dbc3e1679337cd301bbda0d8b1905b5..6dfb96cea293e2c1cdc0deeff32096b9057710e4
--- 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 38d2920a95e63a9d32089cc3061e758c61c57c3c,6872b6adf095db4e771e1e3ccfd6a786fd7fb842..fc4c238c95836f10bd9237745d6f484b7f4e71ad
--- 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 ca4abb49924284750026272d4d7c90fc050f0a6d,8de111ea1dbcfeb435f56e0d988b0d2fe5eb3a82..2cfd70dee1b2d234f1aa6bb98e9a76f32ffc9928
--- 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 cbcf4bb5248c8155eded8902694dd8b31525fe5c,15145163be13eb3f7e85afff0e2a248df723f25b..d4892d84424e54d13ebc5cce2839b30d0432f56f
--- 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 f98b750fc4996933f0ccdc70eb3b6e33fc798277,3991b8fb91401b59c2dfaefad91af1887d588a3f..3ead47cccac57399db94b61223d712755c76258a
--- 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 dc0212a9754eb2e9f9c3b09da8422b5951814228,ad624b3d09f3249cf0d406d0d0b116e4a91a490e..b8bf6a9e555721c40517a7324aacc00aeba53c5a
--- 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 055f62fca5dc1453f9e70a2e07f3da1af66641e2,48779155e4d0c87cc0dc71e456cf3fe7b01e0edc..203694a52d1818e51d28d520cca69d0117518681
--- 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