From: Sean Paul Date: Wed, 25 Jul 2018 20:34:44 +0000 (-0400) Subject: drm/msm: dpu: Use clock-names instead of assigned-clock-names X-Git-Tag: for-linus-4.19b-rc1b-tag~59^2~10^2~12 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=41a8e8865a82b4fd4ff62b43b7c6d3bc5831f93d;p=users%2Fdwmw2%2Flinux.git 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 Signed-off-by: Rob Clark --- 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 8d907faa7496a..c1d7eac4fa258 100644 --- 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",