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

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

Merge "msm_11ad: remove control of rf_clk3_pin if not defined in dts"

parents d3a3790f 05c8cb9b

arch/arm64/boot/dts/qcom/sm8150.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -3635,9 +3635,8 @@ 
		qcom,use-ext-supply;

		vddio-supply= <&pm8150_s5>;

		qcom,use-ext-clocks;

		clocks = <&clock_rpmh RPMH_RF_CLK3>,

			 <&clock_rpmh RPMH_RF_CLK3_A>;

		clock-names = "rf_clk3_clk", "rf_clk3_pin_clk";

		clocks = <&clock_rpmh RPMH_RF_CLK3>;

		clock-names = "rf_clk3_clk";

		qcom,smmu-support;

		qcom,smmu-mapping = <0x20000000 0xe0000000>;

		qcom,smmu-s1-en;

drivers/platform/msm/msm_11ad/msm_11ad.c

+9 −3
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ static int msm_11ad_init_clocks(struct msm11ad_ctx *ctx) 
{

	int rc;

	struct device *dev = ctx->dev;

	int rf_clk3_pin_idx;



	if (!of_property_read_bool(dev->of_node, "qcom,use-ext-clocks"))

		return 0;
@@ -472,9 +473,14 @@ static int msm_11ad_init_clocks(struct msm11ad_ctx *ctx) 
	if (rc)

		return rc;



	rc = msm_11ad_init_clk(dev, &ctx->rf_clk3_pin, "rf_clk3_pin_clk");

	rf_clk3_pin_idx = of_property_match_string(dev->of_node, "clock-names",

						   "rf_clk3_pin_clk");

	if (rf_clk3_pin_idx >= 0) {

		rc = msm_11ad_init_clk(dev, &ctx->rf_clk3_pin,

				       "rf_clk3_pin_clk");

		if (rc)

			msm_11ad_release_clk(ctx->dev, &ctx->rf_clk3);

	}



	return rc;

}