Skip to content

Commit 652b08a

Browse files
cristibirsannoglitch
authored andcommitted
ARM: at91: remove default values for PMC_PLL_ACR
Remove default values for PMC PLL Analog Control Register(ACR) as the values are specific for each SoC and PLL and load them from PLL characteristics structure Co-developed-by: Andrei Simion <andrei.simion@microchip.com> Signed-off-by: Andrei Simion <andrei.simion@microchip.com> Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com> [nicolas.ferre@microchip.com: fix pll acr write sequence, preserve val] Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
1 parent bfa2bdd commit 652b08a

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

drivers/clk/at91/clk-sam9x60-pll.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,8 @@ static int sam9x60_frac_pll_set(struct sam9x60_pll_core *core)
103103
(cmul == frac->mul && cfrac == frac->frac))
104104
goto unlock;
105105

106-
/* Recommended value for PMC_PLL_ACR */
107-
if (core->characteristics->upll)
108-
val = AT91_PMC_PLL_ACR_DEFAULT_UPLL;
109-
else
110-
val = AT91_PMC_PLL_ACR_DEFAULT_PLLA;
106+
/* Load recommended value for PMC_PLL_ACR */
107+
val = core->characteristics->acr;
111108
regmap_write(regmap, AT91_PMC_PLL_ACR, val);
112109

113110
regmap_write(regmap, AT91_PMC_PLL_CTRL1,

include/linux/clk/at91_pmc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
#define AT91_PMC_PCSR 0x18 /* Peripheral Clock Status Register */
4848

4949
#define AT91_PMC_PLL_ACR 0x18 /* PLL Analog Control Register [for SAM9X60] */
50-
#define AT91_PMC_PLL_ACR_DEFAULT_UPLL UL(0x12020010) /* Default PLL ACR value for UPLL */
51-
#define AT91_PMC_PLL_ACR_DEFAULT_PLLA UL(0x00020010) /* Default PLL ACR value for PLLA */
5250
#define AT91_PMC_PLL_ACR_UTMIVR (1 << 12) /* UPLL Voltage regulator Control */
5351
#define AT91_PMC_PLL_ACR_UTMIBG (1 << 13) /* UPLL Bandgap Control */
5452

0 commit comments

Comments
 (0)