Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / mpc8xx.h

diff --git a/include/mpc8xx.h b/include/mpc8xx.h
index bef748f90039dd3d05759593cee88ffa3813fda4..0e0e0cb70d7c3535e39817d921c01e9e82b5a346 100644 (file)
--- a/include/mpc8xx.h
+++ b/include/mpc8xx.h
@@ -1,24 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 /*
@@ -97,7 +80,7 @@
 #define TBSCR_TBIRQ2   0x0400          /* Time Base Interrupt Request 2        */
 #define TBSCR_TBIRQ1   0x0200          /* Time Base Interrupt Request 1        */
 #define TBSCR_TBIRQ0   0x0100          /* Time Base Interrupt Request 0        */
-#if 0  /* already in asm/8xx_immap.h */
+#if 0  /* already in asm/immap_8xx.h */
 #define TBSCR_REFA     0x0080          /* Reference Interrupt Status A         */
 #define TBSCR_REFB     0x0040          /* Reference Interrupt Status B         */
 #define TBSCR_REFAE    0x0008          /* Second Interrupt Enable A            */
@@ -111,7 +94,7 @@
  */
 #undef PISCR_PIRQ                      /* TBD                                  */
 #define PISCR_PITF     0x0002          /* Periodic Interrupt Timer Freeze      */
-#if 0  /* already in asm/8xx_immap.h */
+#if 0  /* already in asm/immap_8xx.h */
 #define PISCR_PS       0x0080          /* Periodic interrupt Status            */
 #define PISCR_PIE      0x0004          /* Periodic Interrupt Enable            */
 #define PISCR_PTE      0x0001          /* Periodic Timer Enable                */
@@ -161,20 +144,6 @@
                          PLPRCR_MFI_MSK | \
                          PLPRCR_PDF_MSK)
 
-/* Older chips (MPC860/862 et al) defines */
-#define PLPRCR_MF_MSK  0xFFF00000      /* Multiplication factor bits           */
-#define PLPRCR_MF_SHIFT                20      /* Multiplication factor shift value    */
-
-#define PLPRCR_SPLSS   0x00008000      /* SPLL Lock Status Sticky bit          */
-#define PLPRCR_TMIST   0x00001000      /* Timers Interrupt Status              */
-
-#define PLPRCR_LPM_MSK 0x00000300      /* Low Power Mode mask                  */
-#define PLPRCR_LPM_NORMAL 0x00000000   /* normal power management mode         */
-#define PLPRCR_LPM_DOZE          0x00000100    /* doze power management mode           */
-#define PLPRCR_LPM_SLEEP  0x00000200   /* sleep power management mode          */
-#define PLPRCR_LPM_DEEP_SLEEP 0x00000300 /* deep sleep power mgt mode          */
-#define PLPRCR_LPM_DOWN          0x00000300    /* down power management mode           */
-
 /* Common defines */
 #define PLPRCR_TEXPS   0x00004000      /* TEXP Status                          */
 #define PLPRCR_CSRC    0x00000400      /* Clock Source                         */