summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2018-07-25 22:34:44 +0200
committerRob Clark <robdclark@gmail.com>2018-07-30 14:50:12 +0200
commit41a8e8865a82b4fd4ff62b43b7c6d3bc5831f93d (patch)
treea47d9636975bce72e6dcb0d4d40c924429a6ba54 /drivers/gpu/drm/msm
parentdrm/msm: dpu: Use 'vsync' instead of 'vsync_clk' in cmdmode encoder (diff)
downloadlinux-41a8e8865a82b4fd4ff62b43b7c6d3bc5831f93d.tar.xz
linux-41a8e8865a82b4fd4ff62b43b7c6d3bc5831f93d.zip
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>
Diffstat (limited to 'drivers/gpu/drm/msm')
-rw-r--r--drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c5
1 files changed, 2 insertions, 3 deletions
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 8d907faa7496..c1d7eac4fa25 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",