diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-11-10 10:04:51 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-11-10 10:04:51 -0600 |
| commit | 33211469f7d7e2afacf103cc55790f734572f7a6 (patch) | |
| tree | 7c374cde48fba08b52b4f83bdf00aae89d7f85a3 /include/asm-m68k/coldfire/dspi.h | |
| parent | 1266df887781c779deaf6d05eea2ef90a470cb34 (diff) | |
| parent | 1378174a1351c0285736863a665ab758fe8d5f71 (diff) | |
| download | u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.zip u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.gz u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'include/asm-m68k/coldfire/dspi.h')
| -rw-r--r-- | include/asm-m68k/coldfire/dspi.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/asm-m68k/coldfire/dspi.h b/include/asm-m68k/coldfire/dspi.h index 8327e1b..4b7d61e 100644 --- a/include/asm-m68k/coldfire/dspi.h +++ b/include/asm-m68k/coldfire/dspi.h @@ -46,15 +46,14 @@ typedef struct dspi { u32 dirsr; u32 dtfr; u32 drfr; - u32 dtfdr0; - u32 dtfdr1; - u32 dtfdr2; - u32 dtfdr3; +#ifdef CONFIG_MCF547x_8x + u32 dtfdr[4]; u8 resv1[0x30]; - u32 drfdr0; - u32 drfdr1; - u32 drfdr2; - u32 drfdr3; + u32 drfdr[4]; +#else + u32 dtfdr[16]; + u32 drfdr[16]; +#endif } dspi_t; /* Bit definitions and macros for DMCR */ |