Merge "disp: msm: dp: check for pixel1 rcg only for mst supported platforms" (e050ac91) · Commits · e / devices / android_kernel_fairphone_FP5

msm/dp/dp_power.c

+11 −9

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		*/

		#include <linux/clk.h>
		@@ -212,21 +212,23 @@ static int dp_power_clk_init(struct dp_power_private *power, bool enable)

		power->pixel_parent = clk_get(dev, "pixel_parent");
		if (IS_ERR(power->pixel_parent)) {
		DP_DEBUG("Unable to get DP pixel RCG parent: %d\n",
		DP_ERR("Unable to get DP pixel RCG parent: %d\n",
		PTR_ERR(power->pixel_parent));
		rc = PTR_ERR(power->pixel_parent);
		power->pixel_parent = NULL;
		goto err_pixel_parent;
		}

		if (power->parser->has_mst) {
		power->pixel1_clk_rcg = clk_get(dev, "pixel1_clk_rcg");
		if (IS_ERR(power->pixel1_clk_rcg)) {
		DP_DEBUG("Unable to get DP pixel1 clk RCG: %d\n",
		DP_ERR("Unable to get DP pixel1 clk RCG: %d\n",
		PTR_ERR(power->pixel1_clk_rcg));
		rc = PTR_ERR(power->pixel1_clk_rcg);
		power->pixel1_clk_rcg = NULL;
		goto err_pixel1_clk_rcg;
		}
		}
		} else {
		if (power->pixel1_clk_rcg)
		clk_put(power->pixel1_clk_rcg);