Merge branch 'at91-5.4-trunk/base_clk' into linux-5.4-at91

Author: noglitch

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

@@ -22,7 +22,7 @@
 
 #define PMC_PLL_CTRL1	0x10
 #define		PMC_PLL_CTRL1_FRACR_MSK		GENMASK(21, 0)
-#define		PMC_PLL_CTRL1_MUL_MSK		GENMASK(30, 24)
+#define		PMC_PLL_CTRL1_MUL_MSK		GENMASK(31, 24)
 
 #define PMC_PLL_ACR	0x18
 #define		PMC_PLL_ACR_DEFAULT_UPLL	0x12020010UL
@@ -35,9 +35,6 @@
 #define		PMC_PLL_UPDT_UPDATE		BIT(8)
 
 #define PMC_PLL_ISR0	0xec
-#define	PMC_PLL_CTRL0_DIV_MSK	GENMASK(7, 0)
-#define	PMC_PLL_CTRL1_MUL_MSK	GENMASK(31, 24)
-#define	PMC_PLL_CTRL1_FRACR_MSK	GENMASK(21, 0)
 
 #define PLL_DIV_MAX		(FIELD_GET(PMC_PLL_CTRL0_DIV_MSK, UINT_MAX) + 1)
 #define UPLL_DIV		2