These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / powerpc / include / asm / mpc52xx_psc.h

diff --git a/kernel/arch/powerpc/include/asm/mpc52xx_psc.h b/kernel/arch/powerpc/include/asm/mpc52xx_psc.h
index d0ece25..ec995b2 100644 (file)
--- a/kernel/arch/powerpc/include/asm/mpc52xx_psc.h
+++ b/kernel/arch/powerpc/include/asm/mpc52xx_psc.h
@@ -150,7 +150,10 @@
 
 /* Structure of the hardware registers */
 struct mpc52xx_psc {
-       u8              mode;           /* PSC + 0x00 */
+       union {
+               u8      mode;           /* PSC + 0x00 */
+               u8      mr2;
+       };
        u8              reserved0[3];
        union {                         /* PSC + 0x04 */
                u16     status;
@@ -258,8 +261,6 @@ struct mpc52xx_psc_fifo {
 #define MPC512x_PSC_FIFO_FULL          0x2
 #define MPC512x_PSC_FIFO_ALARM         0x4
 #define MPC512x_PSC_FIFO_URERR         0x8
-#define MPC512x_PSC_FIFO_ORERR         0x01
-#define MPC512x_PSC_FIFO_MEMERROR      0x02
 
 struct mpc512x_psc_fifo {
        u32             reserved1[10];