summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2019-08-13 20:09:42 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 15:11:44 +0200
commitdba52f500f6ffeb71e0b2176363965d0c6339469 (patch)
treebf19ef28413b4b5094ee0bc80a52bbaf46c2531d /arch
parentb753aac64f9eab6a68d4797b170d7b56c4f61769 (diff)
downloadlinux-stable-dba52f500f6ffeb71e0b2176363965d0c6339469.tar.gz
linux-stable-dba52f500f6ffeb71e0b2176363965d0c6339469.tar.bz2
linux-stable-dba52f500f6ffeb71e0b2176363965d0c6339469.zip
arm64: dts: qcom: qcs404-evb: Mark WCSS clocks protected
[ Upstream commit 54d895bea43c94f31304d59f82d755b7f4b59e7c ] '7d0c76bdf227 ("clk: qcom: Add WCSS gcc clock control for QCS404")' introduces two new clocks to gcc. These are not used before clk_disable_unused() and as such the clock framework tries to disable them. But on the EVB these registers are only accessible through TrustZone, so these clocks must be marked as "protected" to prevent the clock code from touching them. Numerical values are used as the constants are not yet available in a common tree. Reviewed-by: Niklas Cassel <niklas.cassel@linaro.org> Reported-by: Mark Brown <broonie@kernel.org> Reported-by: Niklas Cassel <niklas.cassel@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/qcom/qcs404-evb.dtsi4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
index 11c0a7137823..db6df76e97a1 100644
--- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
@@ -61,7 +61,9 @@
protected-clocks = <GCC_BIMC_CDSP_CLK>,
<GCC_CDSP_CFG_AHB_CLK>,
<GCC_CDSP_BIMC_CLK_SRC>,
- <GCC_CDSP_TBU_CLK>;
+ <GCC_CDSP_TBU_CLK>,
+ <141>, /* GCC_WCSS_Q6_AHB_CLK */
+ <142>; /* GCC_WCSS_Q6_AXIM_CLK */
};
&pms405_spmi_regulators {