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

Pull fbdev updates from Tomi Valkeinen:
 "Summary:

   - pxafb: device-tree support
   - An unsafe kernel parameter 'lockless_register_fb' for debugging
     problems happening while inside the console lock
   - Small miscellaneous fixes & cleanups
   - omapdss: add writeback support functions
   - Separation of omapfb and omapdrm (see below)

  About the separation of omapfb and omapdrm, see

    http://permalink.gmane.org/gmane.comp.video.dri.devel/143151

  for longer story.  The short version:

  omapfb and omapdrm have shared low level drivers (omapdss and panel
  drivers), making further development of omapdrm difficult.  After
  these patches omapfb and omapdrm have their own versions of the
  drivers, which are more or less direct copies for now but will diverge
  soon.

  This also means that omapfb (everything under drivers/video/fbdev/omap2/)
  is now in maintenance mode, and all new development will be done for
  omapdrm (drivers/gpu/drm/omapdrm/)"

* tag 'fbdev-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (49 commits)
  video: fbdev: pxafb: fix out of memory error path
  drm/omap: make omapdrm select OMAP2_DSS
  drm/omap: move omapdss & displays under omapdrm
  omapfb: move vrfb into omapfb
  omapfb: take omapfb's private omapdss into use
  omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_*
  omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP*
  omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h
  omapfb: copy omapdss & displays for omapfb
  omapfb: allow compilation only if DRM_OMAP is disabled
  fbdev: omap2: panel-dpi: simplify gpio setting
  fbdev: omap2: panel-dpi: in .disable first disable backlight then display
  OMAPDSS: DSS: fix a warning message
  video: omapdss: delete unneeded of_node_put
  OMAPDSS: DISPC: Remove boolean comparisons
  OMAPDSS: DSI: cleanup DSI_IRQ_ERROR_MASK define
  OMAPDSS: remove extra out == NULL checks
  OMAPDSS: change internal dispc functions to static
  OMAPDSS: make a two dss feat funcs internal to omapdss
  OMAPDSS: remove extra EXPORT_SYMBOLs
  ...

1 files changed, 183 insertions, 0 deletions

diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
new file mode 100644
index 000000000000..bf407b6ba15c
--- /dev/null
+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2013 Texas Instruments
+ * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/seq_file.h>
+
+#include <video/omapdss.h>
+
+#include "dss.h"
+
+struct device_node *
+omapdss_of_get_next_port(const struct device_node *parent,
+                         struct device_node *prev)
+{
+        struct device_node *port = NULL;
+
+        if (!parent)
+                return NULL;
+
+        if (!prev) {
+                struct device_node *ports;
+                /*
+                 * It's the first call, we have to find a port subnode
+                 * within this node or within an optional 'ports' node.
+                 */
+                ports = of_get_child_by_name(parent, "ports");
+                if (ports)
+                        parent = ports;
+
+                port = of_get_child_by_name(parent, "port");
+
+                /* release the 'ports' node */
+                of_node_put(ports);
+        } else {
+                struct device_node *ports;
+
+                ports = of_get_parent(prev);
+                if (!ports)
+                        return NULL;
+
+                do {
+                        port = of_get_next_child(ports, prev);
+                        if (!port) {
+                                of_node_put(ports);
+                                return NULL;
+                        }
+                        prev = port;
+                } while (of_node_cmp(port->name, "port") != 0);
+
+                of_node_put(ports);
+        }
+
+        return port;
+}
+EXPORT_SYMBOL_GPL(omapdss_of_get_next_port);
+
+struct device_node *
+omapdss_of_get_next_endpoint(const struct device_node *parent,
+                             struct device_node *prev)
+{
+        struct device_node *ep = NULL;
+
+        if (!parent)
+                return NULL;
+
+        do {
+                ep = of_get_next_child(parent, prev);
+                if (!ep)
+                        return NULL;
+                prev = ep;
+        } while (of_node_cmp(ep->name, "endpoint") != 0);
+
+        return ep;
+}
+EXPORT_SYMBOL_GPL(omapdss_of_get_next_endpoint);
+
+struct device_node *dss_of_port_get_parent_device(struct device_node *port)
+{
+        struct device_node *np;
+        int i;
+
+        if (!port)
+                return NULL;
+
+        np = of_get_parent(port);
+
+        for (i = 0; i < 2 && np; ++i) {
+                struct property *prop;
+
+                prop = of_find_property(np, "compatible", NULL);
+
+                if (prop)
+                        return np;
+
+                np = of_get_next_parent(np);
+        }
+
+        return NULL;
+}
+
+u32 dss_of_port_get_port_number(struct device_node *port)
+{
+        int r;
+        u32 reg;
+
+        r = of_property_read_u32(port, "reg", &reg);
+        if (r)
+                reg = 0;
+
+        return reg;
+}
+
+static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
+{
+        struct device_node *np;
+
+        np = of_parse_phandle(node, "remote-endpoint", 0);
+        if (!np)
+                return NULL;
+
+        np = of_get_next_parent(np);
+
+        return np;
+}
+
+struct device_node *
+omapdss_of_get_first_endpoint(const struct device_node *parent)
+{
+        struct device_node *port, *ep;
+
+        port = omapdss_of_get_next_port(parent, NULL);
+
+        if (!port)
+                return NULL;
+
+        ep = omapdss_of_get_next_endpoint(port, NULL);
+
+        of_node_put(port);
+
+        return ep;
+}
+EXPORT_SYMBOL_GPL(omapdss_of_get_first_endpoint);
+
+struct omap_dss_device *
+omapdss_of_find_source_for_first_ep(struct device_node *node)
+{
+        struct device_node *ep;
+        struct device_node *src_port;
+        struct omap_dss_device *src;
+
+        ep = omapdss_of_get_first_endpoint(node);
+        if (!ep)
+                return ERR_PTR(-EINVAL);
+
+        src_port = omapdss_of_get_remote_port(ep);
+        if (!src_port) {
+                of_node_put(ep);
+                return ERR_PTR(-EINVAL);
+        }
+
+        of_node_put(ep);
+
+        src = omap_dss_find_output_by_port_node(src_port);
+
+        of_node_put(src_port);
+
+        return src ? src : ERR_PTR(-EPROBE_DEFER);
+}
+EXPORT_SYMBOL_GPL(omapdss_of_find_source_for_first_ep);