drm/msm: Drop the gpu binding

The driver currently identifies the GPU components it needs by parsing
a phandle list from the 'gpus' DT property.

This isn't the right binding to go with. So, for now, just search all
device nodes and find the gpu node we need by parsing a list of
compatible strings.

Once we know how to link the kms and gpu drivers, we'll drop this method
and use the correct binding.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 7333efd1eae8aa93bb363a0f87de2657644af55f..66371f23cc229b65a2f5aa6addaf7fe316c278f4 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -804,25 +804,6 @@ static int compare_of(struct device *dev, void *data)
        return dev->of_node == data;
 }
 
-static int add_components(struct device *dev, struct component_match **matchptr,
-               const char *name)
-{
-       struct device_node *np = dev->of_node;
-       unsigned i;
-
-       for (i = 0; ; i++) {
-               struct device_node *node;
-
-               node = of_parse_phandle(np, name, i);
-               if (!node)
-                       break;
-
-               component_match_add(dev, matchptr, compare_of, node);
-       }
-
-       return 0;
-}
-
 /*
  * Identify what components need to be added by parsing what remote-endpoints
  * our MDP output ports are connected to. In the case of LVDS on MDP4, there
@@ -939,10 +920,31 @@ static int add_display_components(struct device *dev,
        return ret;
 }
 
+/*
+ * We don't know what's the best binding to link the gpu with the drm device.
+ * Fow now, we just hunt for all the possible gpus that we support, and add them
+ * as components.
+ */
+static const struct of_device_id msm_gpu_match[] = {
+       { .compatible = "qcom,adreno-3xx" },
+       { .compatible = "qcom,kgsl-3d0" },
+       { },
+};
+
 static int add_gpu_components(struct device *dev,
                              struct component_match **matchptr)
 {
-       return add_components(dev, matchptr, "gpus");
+       struct device_node *np;
+
+       np = of_find_matching_node(NULL, msm_gpu_match);
+       if (!np)
+               return 0;
+
+       component_match_add(dev, matchptr, compare_of, np);
+
+       of_node_put(np);
+
+       return 0;
 }
 
 static int msm_drm_bind(struct device *dev)