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

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

Merge "msm: clock-pll: Introduce configuration of CONFIG_CTL register"

parents 3575752e 73a6d165

drivers/clk/qcom/clock-pll.c

+8 −3
Original line number Diff line number Diff line
@@ -33,8 +33,10 @@ 
#define PLL_M_REG(x)		(*(x)->base + (unsigned long) (x)->m_reg)

#define PLL_N_REG(x)		(*(x)->base + (unsigned long) (x)->n_reg)

#define PLL_CONFIG_REG(x)	(*(x)->base + (unsigned long) (x)->config_reg)

#define PLL_CFG_CTL_REG(x)	(*(x)->base + (unsigned long) \

#define PLL_CFG_ALT_REG(x)	(*(x)->base + (unsigned long) \

							(x)->config_alt_reg)

#define PLL_CFG_CTL_REG(x)	(*(x)->base + (unsigned long) \

							(x)->config_ctl_reg)



static DEFINE_SPINLOCK(pll_reg_lock);
@@ -546,14 +548,14 @@ static void __configure_alt_config(struct pll_alt_config config, 
{

	u32 regval;



	regval = readl_relaxed(PLL_CFG_CTL_REG(regs));

	regval = readl_relaxed(PLL_CFG_ALT_REG(regs));



	if (config.mask) {

		regval &= ~config.mask;

		regval |= config.val;

	}



	writel_relaxed(regval, PLL_CFG_CTL_REG(regs));

	writel_relaxed(regval, PLL_CFG_ALT_REG(regs));

}



void __configure_pll(struct pll_config *config,
@@ -604,6 +606,9 @@ void __configure_pll(struct pll_config *config, 


	if (regs->config_alt_reg)

		__configure_alt_config(config->alt_cfg, regs);



	if (regs->config_ctl_reg)

		writel_relaxed(config->cfg_ctl_val, PLL_CFG_CTL_REG(regs));

}



void configure_sr_pll(struct pll_config *config,

include/soc/qcom/clock-pll.h

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ struct pll_config { 
	u32 main_output_mask;

	u32 aux_output_val;

	u32 aux_output_mask;

	u32 cfg_ctl_val;

	/* SR2 PLL specific fields */

	u32 add_factor_val;

	u32 add_factor_mask;
@@ -165,6 +166,7 @@ struct pll_config_regs { 
	void __iomem *n_reg;

	void __iomem *config_reg;

	void __iomem *config_alt_reg;

	void __iomem *config_ctl_reg;

	void __iomem *mode_reg;

	void *const __iomem *base;

};