Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"

[oweals/u-boot.git] / include / asm-m68k / immap_5253.h

diff --git a/include/asm-m68k/immap_5253.h b/include/asm-m68k/immap_5253.h
index 4e3a481555b1953b83187952feac3cc853365b92..28cd107a82a7d24ee658454d8a490995f7c22db3 100644 (file)
--- a/include/asm-m68k/immap_5253.h
+++ b/include/asm-m68k/immap_5253.h
@@ -23,10 +23,11 @@
  * MA 02111-1307 USA
  */
 
-#ifndef __IMMAP_5249__
-#define __IMMAP_5249__
+#ifndef __IMMAP_5253__
+#define __IMMAP_5253__
 
 #define MMAP_INTC              (CONFIG_SYS_MBAR + 0x00000040)
+#define MMAP_FBCS              (CONFIG_SYS_MBAR + 0x00000080)
 #define MMAP_DTMR0             (CONFIG_SYS_MBAR + 0x00000140)
 #define MMAP_DTMR1             (CONFIG_SYS_MBAR + 0x00000180)
 #define MMAP_UART0             (CONFIG_SYS_MBAR + 0x000001C0)
@@ -36,60 +37,17 @@
 #define MMAP_CAN0              (CONFIG_SYS_MBAR + 0x00010000)
 #define MMAP_CAN1              (CONFIG_SYS_MBAR + 0x00011000)
 
+#define MMAP_PAR               (CONFIG_SYS_MBAR2 + 0x0000019C)
 #define MMAP_I2C1              (CONFIG_SYS_MBAR2 + 0x00000440)
 #define MMAP_UART2             (CONFIG_SYS_MBAR2 + 0x00000C00)
 
-/*********************************************************************
-* ATA Module (ATAC)
-*********************************************************************/
+#include <asm/coldfire/ata.h>
+#include <asm/coldfire/flexbus.h>
+#include <asm/coldfire/flexcan.h>
+#include <asm/coldfire/qspi.h>
 
-/* Register read/write struct */
-typedef struct atac {
-       /* PIO */
-       u8 toff;                /* 0x00 */
-       u8 ton;                 /* 0x01 */
-       u8 t1;                  /* 0x02 */
-       u8 t2w;                 /* 0x03 */
-       u8 t2r;                 /* 0x04 */
-       u8 ta;                  /* 0x05 */
-       u8 trd;                 /* 0x06 */
-       u8 t4;                  /* 0x07 */
-       u8 t9;                  /* 0x08 */
+typedef struct canex_ctrl {
+       can_msg_t msg[32];      /* 0x80 Message Buffer 0-31 */
+} canex_t;
 
-       /* DMA */
-       u8 tm;                  /* 0x09 */
-       u8 tn;                  /* 0x0A */
-       u8 td;                  /* 0x0B */
-       u8 tk;                  /* 0x0C */
-       u8 tack;                /* 0x0D */
-       u8 tenv;                /* 0x0E */
-       u8 trp;                 /* 0x0F */
-       u8 tzah;                /* 0x10 */
-       u8 tmli;                /* 0x11 */
-       u8 tdvh;                /* 0x12 */
-       u8 tdzfs;               /* 0x13 */
-       u8 tdvs;                /* 0x14 */
-       u8 tcvh;                /* 0x15 */
-       u8 tss;                 /* 0x16 */
-       u8 tcyc;                /* 0x17 */
-
-       /* FIFO */
-       u32 fifo32;             /* 0x18 */
-       u16 fifo16;             /* 0x1C */
-       u8 rsvd0[2];
-       u8 ffill;               /* 0x20 */
-       u8 rsvd1[3];
-
-       /* ATA */
-       u8 cr;                  /* 0x24 */
-       u8 rsvd2[3];
-       u8 isr;                 /* 0x28 */
-       u8 rsvd3[3];
-       u8 ier;                 /* 0x2C */
-       u8 rsvd4[3];
-       u8 icr;                 /* 0x30 */
-       u8 rsvd5[3];
-       u8 falarm;              /* 0x34 */
-} atac_t;
-
-#endif                         /* __IMMAP_5249__ */
+#endif                         /* __IMMAP_5253__ */