Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.git] / drivers / gpu / drm / tegra / hub.c

diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c
index 3e26be5359cf2ec27009ec2855e429d8e800d82e..71cc3cf60066316a6a8686e79cff9fb29fbe26d4 100644 (file)
--- a/drivers/gpu/drm/tegra/hub.c
+++ b/drivers/gpu/drm/tegra/hub.c
@@ -742,7 +742,9 @@ static const struct host1x_client_ops tegra_display_hub_ops = {
 
 static int tegra_display_hub_probe(struct platform_device *pdev)
 {
+       struct device_node *child = NULL;
        struct tegra_display_hub *hub;
+       struct clk *clk;
        unsigned int i;
        int err;
 
@@ -801,6 +803,34 @@ static int tegra_display_hub_probe(struct platform_device *pdev)
                        return err;
        }
 
+       hub->num_heads = of_get_child_count(pdev->dev.of_node);
+
+       hub->clk_heads = devm_kcalloc(&pdev->dev, hub->num_heads, sizeof(clk),
+                                     GFP_KERNEL);
+       if (!hub->clk_heads)
+               return -ENOMEM;
+
+       for (i = 0; i < hub->num_heads; i++) {
+               child = of_get_next_child(pdev->dev.of_node, child);
+               if (!child) {
+                       dev_err(&pdev->dev, "failed to find node for head %u\n",
+                               i);
+                       return -ENODEV;
+               }
+
+               clk = devm_get_clk_from_child(&pdev->dev, child, "dc");
+               if (IS_ERR(clk)) {
+                       dev_err(&pdev->dev, "failed to get clock for head %u\n",
+                               i);
+                       of_node_put(child);
+                       return PTR_ERR(clk);
+               }
+
+               hub->clk_heads[i] = clk;
+       }
+
+       of_node_put(child);
+
        /* XXX: enable clock across reset? */
        err = reset_control_assert(hub->rst);
        if (err < 0)
@@ -840,12 +870,16 @@ static int tegra_display_hub_remove(struct platform_device *pdev)
 static int __maybe_unused tegra_display_hub_suspend(struct device *dev)
 {
        struct tegra_display_hub *hub = dev_get_drvdata(dev);
+       unsigned int i = hub->num_heads;
        int err;
 
        err = reset_control_assert(hub->rst);
        if (err < 0)
                return err;
 
+       while (i--)
+               clk_disable_unprepare(hub->clk_heads[i]);
+
        clk_disable_unprepare(hub->clk_hub);
        clk_disable_unprepare(hub->clk_dsc);
        clk_disable_unprepare(hub->clk_disp);
@@ -856,6 +890,7 @@ static int __maybe_unused tegra_display_hub_suspend(struct device *dev)
 static int __maybe_unused tegra_display_hub_resume(struct device *dev)
 {
        struct tegra_display_hub *hub = dev_get_drvdata(dev);
+       unsigned int i;
        int err;
 
        err = clk_prepare_enable(hub->clk_disp);
@@ -870,13 +905,22 @@ static int __maybe_unused tegra_display_hub_resume(struct device *dev)
        if (err < 0)
                goto disable_dsc;
 
+       for (i = 0; i < hub->num_heads; i++) {
+               err = clk_prepare_enable(hub->clk_heads[i]);
+               if (err < 0)
+                       goto disable_heads;
+       }
+
        err = reset_control_deassert(hub->rst);
        if (err < 0)
-               goto disable_hub;
+               goto disable_heads;
 
        return 0;
 
-disable_hub:
+disable_heads:
+       while (i--)
+               clk_disable_unprepare(hub->clk_heads[i]);
+
        clk_disable_unprepare(hub->clk_hub);
 disable_dsc:
        clk_disable_unprepare(hub->clk_dsc);