github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-30 19:21:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "clk: qcom: clk-alpha-pll: Only configure lucid_evo outputs once"

Browse Source
This commit is contained in:
qctecmdr 2022-09-06 14:03:03 -07:00 committed by Gerrit - the friendly Code Review server
commit 7f426d2858
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/qcom/camcc-pineapple.c
View File

@ -2318,7 +2318,6 @@ static struct clk_branch cam_cc_core_ahb_clk = {
.clkr = {
.enable_reg = 0x132d0,
.enable_mask = BIT(0),
.flags = QCOM_CLK_BOOT_CRITICAL,
.hw.init = &(const struct clk_init_data){
.name = "cam_cc_core_ahb_clk",
.parent_hws = (const struct clk_hw*[]){
@ -2337,7 +2336,6 @@ static struct clk_branch cam_cc_cpas_ahb_clk = {
.clkr = {
.enable_reg = 0x13220,
.enable_mask = BIT(0),
.flags = QCOM_CLK_BOOT_CRITICAL,
.hw.init = &(const struct clk_init_data){
.name = "cam_cc_cpas_ahb_clk",
.parent_hws = (const struct clk_hw*[]){

16
drivers/clk/qcom/clk-alpha-pll.c
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2015, 2018-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/kernel.h>
@ -3009,6 +3009,10 @@ int clk_lucid_evo_pll_configure(struct clk_alpha_pll *pll,
{
int ret;
ret = regmap_update_bits(regmap, PLL_USER_CTL(pll), PLL_OUT_MASK, PLL_OUT_MASK);
if (ret)
return ret;
ret = trion_pll_is_enabled(pll, regmap);
if (ret)
return ret;
@ -3130,11 +3134,6 @@ static int alpha_pll_lucid_evo_enable(struct clk_hw *hw)
if (ret)
return ret;
/* Enable the PLL outputs */
ret = regmap_update_bits(regmap, PLL_USER_CTL(pll), PLL_OUT_MASK, PLL_OUT_MASK);
if (ret)
return ret;
/* Enable the global PLL outputs */
ret = regmap_update_bits(regmap, PLL_MODE(pll), PLL_OUTCTRL, PLL_OUTCTRL);
if (ret)
@ -3167,11 +3166,6 @@ static void alpha_pll_lucid_evo_disable(struct clk_hw *hw)
if (ret)
return;
/* Disable the PLL outputs */
ret = regmap_update_bits(regmap, PLL_USER_CTL(pll), PLL_OUT_MASK, 0);
if (ret)
return;
/* Place the PLL mode in STANDBY */
regmap_write(pll->clkr.regmap, PLL_OPMODE(pll),
PLL_STANDBY);