Blackfin: unify duplicated power masks

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

2 files changed, 0 insertions, 81 deletions

diff --git a/arch/blackfin/mach-bf538/include/mach/blackfin.h b/arch/blackfin/mach-bf538/include/mach/blackfin.h
index 278e8942eef..08b5eabb1ed 100644
--- a/arch/blackfin/mach-bf538/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf538/include/mach/blackfin.h
@@ -37,10 +37,4 @@
 #define OFFSET_SCR              0x1C    /* SCR Scratch Register                 */
 #define OFFSET_GCTL             0x24    /* Global Control Register              */
 
-/* PLL_DIV Masks                                                                                                        */
-#define CCLK_DIV1 CSEL_DIV1     /*          CCLK = VCO / 1                                  */
-#define CCLK_DIV2 CSEL_DIV2     /*          CCLK = VCO / 2                                  */
-#define CCLK_DIV4 CSEL_DIV4     /*          CCLK = VCO / 4                                  */
-#define CCLK_DIV8 CSEL_DIV8     /*          CCLK = VCO / 8                                  */
-
 #endif
diff --git a/arch/blackfin/mach-bf538/include/mach/defBF539.h b/arch/blackfin/mach-bf538/include/mach/defBF539.h
index 312686a5194..5375819b614 100644
--- a/arch/blackfin/mach-bf538/include/mach/defBF539.h
+++ b/arch/blackfin/mach-bf538/include/mach/defBF539.h
@@ -1422,81 +1422,6 @@
 /* System MMR Register Bits and Macros */
 /******************************************************************************* */
 
-/* ********************* PLL AND RESET MASKS ************************ */
-/* PLL_CTL Masks */
-#define PLL_CLKIN                       0x0000  /* Pass CLKIN to PLL */
-#define PLL_CLKIN_DIV2          0x0001  /* Pass CLKIN/2 to PLL */
-#define DF                                      0x0001   /* 0: PLL = CLKIN, 1: PLL = CLKIN/2 */
-#define PLL_OFF                         0x0002  /* Shut off PLL clocks */
-
-#define STOPCK                          0x0008  /* Core Clock Off                */
-#define PDWN                            0x0020  /* Put the PLL in a Deep Sleep state */
-#define IN_DELAY                        0x0014  /* EBIU Input Delay Select */
-#define OUT_DELAY                       0x00C0  /* EBIU Output Delay Select */
-#define BYPASS                          0x0100  /* Bypass the PLL */
-#define MSEL                    0x7E00  /* Multiplier Select For CCLK/VCO Factors */
-
-/* PLL_CTL Macros                                */
-#ifdef _MISRA_RULES
-#define SET_MSEL(x)             (((x)&0x3Fu) << 0x9)    /* Set MSEL = 0-63 --> VCO = CLKIN*MSEL */
-#define SET_OUT_DELAY(x)        (((x)&0x03u) << 0x6)
-#define SET_IN_DELAY(x)         ((((x)&0x02u) << 0x3) | (((x)&0x01u) << 0x2))
-#else
-#define SET_MSEL(x)             (((x)&0x3F) << 0x9)     /* Set MSEL = 0-63 --> VCO = CLKIN*MSEL */
-#define SET_OUT_DELAY(x)        (((x)&0x03) << 0x6)
-#define SET_IN_DELAY(x)         ((((x)&0x02) << 0x3) | (((x)&0x01) << 0x2))
-#endif /* _MISRA_RULES */
-
-/* PLL_DIV Masks */
-#define SSEL                            0x000F  /* System Select */
-#define CSEL                            0x0030  /* Core Select */
-#define CSEL_DIV1               0x0000  /*              CCLK = VCO / 1 */
-#define CSEL_DIV2               0x0010  /*              CCLK = VCO / 2 */
-#define CSEL_DIV4               0x0020  /*              CCLK = VCO / 4 */
-#define CSEL_DIV8               0x0030  /*              CCLK = VCO / 8 */
-
-#define SCLK_DIV(x)                     (x)             /* SCLK = VCO / x */
-
-/* PLL_DIV Macros                                                        */
-#ifdef _MISRA_RULES
-#define SET_SSEL(x)                     ((x)&0xFu)      /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */
-#else
-#define SET_SSEL(x)                     ((x)&0xF)       /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */
-#endif /* _MISRA_RULES */
-
-/* PLL_STAT Masks                                                                                */
-#define ACTIVE_PLLENABLED       0x0001  /* Processor In Active Mode With PLL Enabled */
-#define FULL_ON                         0x0002  /* Processor In Full On Mode */
-#define ACTIVE_PLLDISABLED      0x0004  /* Processor In Active Mode With PLL Disabled */
-#define PLL_LOCKED                      0x0020  /* PLL_LOCKCNT Has Been Reached */
-
-/* VR_CTL Masks                                                                          */
-#define FREQ                    0x0003  /* Switching Oscillator Frequency For Regulator */
-#define HIBERNATE               0x0000  /*              Powerdown/Bypass On-Board Regulation */
-#define FREQ_333                0x0001  /*              Switching Frequency Is 333 kHz */
-#define FREQ_667                0x0002  /*              Switching Frequency Is 667 kHz */
-#define FREQ_1000               0x0003  /*              Switching Frequency Is 1 MHz */
-
-#define GAIN                    0x000C  /* Voltage Level Gain */
-#define GAIN_5                  0x0000  /*              GAIN = 5 */
-#define GAIN_10                 0x0004  /*              GAIN = 10 */
-#define GAIN_20                 0x0008  /*              GAIN = 20 */
-#define GAIN_50                 0x000C  /*              GAIN = 50 */
-
-#define VLEV                    0x00F0  /* Internal Voltage Level - Only Program Values Within Specifications */
-#define VLEV_100                0x0090  /*      VLEV = 1.00 V (See Datasheet for Regulator Tolerance) */
-#define VLEV_105                0x00A0  /*      VLEV = 1.05 V (See Datasheet for Regulator Tolerance) */
-#define VLEV_110                0x00B0  /*      VLEV = 1.10 V (See Datasheet for Regulator Tolerance) */
-#define VLEV_115                0x00C0  /*      VLEV = 1.15 V (See Datasheet for Regulator Tolerance) */
-#define VLEV_120                0x00D0  /*      VLEV = 1.20 V (See Datasheet for Regulator Tolerance) */
-#define VLEV_125                0x00E0  /*      VLEV = 1.25 V (See Datasheet for Regulator Tolerance) */
-#define VLEV_130                0x00F0  /*      VLEV = 1.30 V (See Datasheet for Regulator Tolerance) */
-
-#define WAKE                    0x0100  /* Enable RTC/Reset Wakeup From Hibernate */
-#define CANWE                   0x0200  /* Enable CAN Wakeup From Hibernate */
-#define MXVRWE                  0x0400  /* Enable MXVR Wakeup From Hibernate */
-#define SCKELOW                 0x8000  /* Do Not Drive SCKE High During Reset After Hibernate */
-
 /* SWRST Mask */
 #define SYSTEM_RESET    0x0007  /* Initiates A System Software Reset */
 #define DOUBLE_FAULT    0x0008  /* Core Double Fault Causes Reset */