drm: omapdrm: dss: Initialize DSS internal features at probe time

The DSS internal features are derived from the platform device
compatible string which is available at probe time. Don't delay
initialization until bind time. This prepares for the merge of the two
DSS features structures that will be needed before the DSS is bound.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index c3fab0ddcde98635401c01434347d7f3ac717f78..7384e473875b516ddc00e5036f0ea46ac57bbb8c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1142,23 +1142,10 @@ static const struct soc_device_attribute dss_soc_devices[] = {
 static int dss_bind(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
-       const struct soc_device_attribute *soc;
        struct resource *dss_mem;
        u32 rev;
        int r;
 
-       dss.pdev = pdev;
-
-       /*
-        * The various OMAP3-based SoCs can't be told apart using the compatible
-        * string, use SoC device matching.
-        */
-       soc = soc_device_match(dss_soc_devices);
-       if (soc)
-               dss.feat = soc->data;
-       else
-               dss.feat = of_match_device(dss_of_match, &pdev->dev)->data;
-
        dss_mem = platform_get_resource(dss.pdev, IORESOURCE_MEM, 0);
        dss.base = devm_ioremap_resource(&pdev->dev, dss_mem);
        if (IS_ERR(dss.base))
@@ -1290,9 +1277,22 @@ static int dss_add_child_component(struct device *dev, void *data)
 
 static int dss_probe(struct platform_device *pdev)
 {
+       const struct soc_device_attribute *soc;
        struct component_match *match = NULL;
        int r;
 
+       dss.pdev = pdev;
+
+       /*
+        * The various OMAP3-based SoCs can't be told apart using the compatible
+        * string, use SoC device matching.
+        */
+       soc = soc_device_match(dss_soc_devices);
+       if (soc)
+               dss.feat = soc->data;
+       else
+               dss.feat = of_match_device(dss_of_match, &pdev->dev)->data;
+
        /* add all the child devices as components */
        device_for_each_child(&pdev->dev, &match, dss_add_child_component);