Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6432c3f authored by Samantha Tran's avatar Samantha Tran Committed by Gerrit - the friendly Code Review server
Browse files

Revert "drm/msm: dpu: Use clk-name instead of assigned clk name"



This reverts commit 41a8e886.

This reversion is happening as a result of disabling the
disp/dpu directory as it will not be used in 4.19 downstream
display driver and these changes are made in the common layer
which affects the downstream driver functionalities. Separate
patches are submitted to revert the upstream driver and
introduce the downstream version of display driver.

Change-Id: Ic85675fe3c824e02775f594571aaa6853b9d6cbe
Signed-off-by: default avatarSamantha Tran <samtran@codeaurora.org>
parent e29ef848
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ 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, "clock-names");
	num_clk = of_property_count_strings(pdev->dev.of_node,
					    "assigned-clock-names");
	if (num_clk <= 0) {
		pr_debug("clocks are not defined\n");
		return 0;
@@ -161,7 +162,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,
						   "clock-names", i,
						   "assigned-clock-names", i,
						   &clock_name);
		if (rc) {
			dev_err(&pdev->dev, "Failed to get clock name for %d\n",