Skip to content

Commit 77428b2

Browse files
committed
clk: at91: sam9x60-pll: keep only one definition for register maps
Merge of stable branch brought dual definition of register map. Fix this taking latest changes into account. Avoids the following warning: "drivers/clk/at91/clk-sam9x60-pll.c:39: warning: "PMC_PLL_CTRL1_MUL_MSK" redefined" Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
1 parent 96df32a commit 77428b2

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#define PMC_PLL_CTRL1 0x10
2424
#define PMC_PLL_CTRL1_FRACR_MSK GENMASK(21, 0)
25-
#define PMC_PLL_CTRL1_MUL_MSK GENMASK(30, 24)
25+
#define PMC_PLL_CTRL1_MUL_MSK GENMASK(31, 24)
2626

2727
#define PMC_PLL_ACR 0x18
2828
#define PMC_PLL_ACR_DEFAULT_UPLL 0x12020010UL
@@ -35,9 +35,6 @@
3535
#define PMC_PLL_UPDT_UPDATE BIT(8)
3636

3737
#define PMC_PLL_ISR0 0xec
38-
#define PMC_PLL_CTRL0_DIV_MSK GENMASK(7, 0)
39-
#define PMC_PLL_CTRL1_MUL_MSK GENMASK(31, 24)
40-
#define PMC_PLL_CTRL1_FRACR_MSK GENMASK(21, 0)
4138

4239
#define PLL_DIV_MAX (FIELD_GET(PMC_PLL_CTRL0_DIV_MSK, UINT_MAX) + 1)
4340
#define UPLL_DIV 2

0 commit comments

Comments
 (0)