drm/msm: dpu: Use clock-names instead of assigned-clock-names

In these cases, we want to enumerate _all_ clocks, not just the ones
that are assigned a rate.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
index 8d907faa7496a20bfa194a60e25dcc7b64abdbc8..c1d7eac4fa258a334313b56cb379c37a2817a659 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
@@ -147,8 +147,7 @@ int msm_dss_parse_clock(struct platform_device *pdev,
                return -EINVAL;
 
        mp->num_clk = 0;
-       num_clk = of_property_count_strings(pdev->dev.of_node,
-                                           "assigned-clock-names");
+       num_clk = of_property_count_strings(pdev->dev.of_node, "clock-names");
        if (num_clk <= 0) {
                pr_debug("clocks are not defined\n");
                return 0;
@@ -162,7 +161,7 @@ int msm_dss_parse_clock(struct platform_device *pdev,
 
        for (i = 0; i < num_clk; i++) {
                rc = of_property_read_string_index(pdev->dev.of_node,
-                                                  "assigned-clock-names", i,
+                                                  "clock-names", i,
                                                   &clock_name);
                if (rc) {
                        dev_err(&pdev->dev, "Failed to get clock name for %d\n",