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

Commit 1b891630 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: Change the halt check type for gcc_pcie_pipe_clk for mdm9x40"

parents b813f78a f62dd61b

arch/arm/boot/dts/qcom/mdm9640-cc.dtsi

+2 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -1052,6 +1052,7 @@ 
		compatible = "qcom,cbc";

		compatible = "qcom,cbc";

		qcom,base-offset = <GCC_PCIE_PIPE_CBCR>;

		qcom,base-offset = <GCC_PCIE_PIPE_CBCR>;

		qcom,parent = <&pcie_pipe_clk_src>;

		qcom,parent = <&pcie_pipe_clk_src>;

		qcom,halt-check = <5>;

		qcom,bcr-offset = <GCC_PCIEPHY_PHY_BCR>;

		qcom,bcr-offset = <GCC_PCIEPHY_PHY_BCR>;

	};

	};

drivers/clk/msm/clock-local2.c

+4 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -2336,6 +2336,9 @@ static void *cbc_dt_parser(struct device *dev, struct device_node *np) 
	/* Optional property */

	/* Optional property */

	of_property_read_u32(np, "qcom,bcr-offset", &branch_clk->bcr_reg);

	of_property_read_u32(np, "qcom,bcr-offset", &branch_clk->bcr_reg);





	of_property_read_u32(np, "qcom,halt-check",

					(u32 *)&branch_clk->halt_check);



	branch_clk->has_sibling = of_property_read_bool(np,

	branch_clk->has_sibling = of_property_read_bool(np,

							"qcom,has-sibling");

							"qcom,has-sibling");