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

Commit cb762ec8 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

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

parents fdb75adc f6432c3f

drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c

+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",