Merge tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Pull fbdev updates from Tomi Valkeinen:
 "Small fixes and improvements to various fbdev drivers"

* tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (24 commits)
  omapdss: extend pm notifier to handle hibernation
  OMAPDSS: Correct video ports description file path in DT binding doc
  OMAPDSS: disable VT switch
  fbdev: sh_mobile_lcdc: Fix destruction of uninitialized mutex
  video: fbdev: sh_mobile_lcdcfb: Fix ROP3 sysfs attribute parsing
  fbdev: pm3fb: cleanup some confusing indenting
  hyperv: hyperv_fb: match wait_for_completion_timeout return type
  video: fbdev: use msecs_to_jiffies for time conversions
  fbdev: via/via_clock: fix sparse warning
  video: fbdev: make of_device_id array const
  fbdev: sm501fb: use memset_io
  OMAPDSS: workaround for MFLAG + NV12 issue
  OMAPDSS: Add support for MFLAG
  OMAPDSS: setup default fifo thresholds
  OMAPDSS: DISPC: lock access to DISPC_CONTROL & DISPC_CONFIG
  OMAPDSS: DISPC: fix div by zero issue in overlay scaling
  OMAPDSS: DISPC: change sync_pclk_edge default value
  OMAPDSS: change signal_level & signal_edge enum values
  OMAPDSS: DISPC: explicit handling for sync and de levels
  OMAPDSS: DISPC: remove OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES
  ...

diff --combined drivers/gpu/drm/omapdrm/omap_connector.c
index b41965c2888d9e43ad57e1c7f74f6e55ee70b288,2c2173bc3f0085e9265c25897b02ee1a5f31b1cb..17739737dcf604139c188084d00d28883f4cc7a2
--- 1/drivers/gpu/drm/omapdrm/omap_connector.c
--- 2/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@@ -102,7 -102,7 +102,7 @@@ void copy_timings_drm_to_omap(struct om
  
        timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
        timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;
-       timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES;
+       timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
  }
  
  static enum drm_connector_status omap_connector_detect(
@@@ -271,6 -271,18 +271,6 @@@ static const struct drm_connector_helpe
        .best_encoder = omap_connector_attached_encoder,
  };
  
 -/* flush an area of the framebuffer (in case of manual update display that
 - * is not automatically flushed)
 - */
 -void omap_connector_flush(struct drm_connector *connector,
 -              int x, int y, int w, int h)
 -{
 -      struct omap_connector *omap_connector = to_omap_connector(connector);
 -
 -      /* TODO: enable when supported in dss */
 -      VERB("%s: %d,%d, %dx%d", omap_connector->dssdev->name, x, y, w, h);
 -}
 -
  /* initialize connector */
  struct drm_connector *omap_connector_init(struct drm_device *dev,
                int connector_type, struct omap_dss_device *dssdev,

diff --combined include/video/omapdss.h
index c8ed15daad02d37c5a8eec0b3787dfabf8ad9d3f,45a230190720633a58a9a0fd96851ae4fde519c0..f001a356fd98f896ae617fe64db45745e1dc4736
--- 1/include/video/omapdss.h
--- 2/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@@ -129,14 -129,13 +129,13 @@@ enum omap_rfbi_te_mode 
  };
  
  enum omap_dss_signal_level {
-       OMAPDSS_SIG_ACTIVE_HIGH = 0,
-       OMAPDSS_SIG_ACTIVE_LOW  = 1,
+       OMAPDSS_SIG_ACTIVE_LOW,
+       OMAPDSS_SIG_ACTIVE_HIGH,
  };
  
  enum omap_dss_signal_edge {
-       OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
-       OMAPDSS_DRIVE_SIG_RISING_EDGE,
        OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+       OMAPDSS_DRIVE_SIG_RISING_EDGE,
  };
  
  enum omap_dss_venc_type {
@@@ -689,7 -688,6 +688,7 @@@ struct omapdss_dsi_ops 
  };
  
  struct omap_dss_device {
 +      struct kobject kobj;
        struct device *dev;
  
        struct module *owner;