mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 08:31:55 +00:00
49148020bc
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
145 lines
7.4 KiB
C
145 lines
7.4 KiB
C
/****************************************************************************/
|
|
|
|
/*
|
|
* mcfdma.h -- Coldfire internal DMA support defines.
|
|
*
|
|
* (C) Copyright 1999, Rob Scott (rscott@mtrob.ml.org)
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
#ifndef mcfdma_h
|
|
#define mcfdma_h
|
|
/****************************************************************************/
|
|
|
|
|
|
/*
|
|
* Get address specific defines for this Coldfire member.
|
|
*/
|
|
#if defined(CONFIG_M5206) || defined(CONFIG_M5206e)
|
|
#define MCFDMA_BASE0 0x200 /* Base address of DMA 0 */
|
|
#define MCFDMA_BASE1 0x240 /* Base address of DMA 1 */
|
|
#elif defined(CONFIG_M5272)
|
|
#define MCFDMA_BASE0 0x0e0 /* Base address of DMA 0 */
|
|
#elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
|
|
/* These are relative to the IPSBAR, not MBAR */
|
|
#define MCFDMA_BASE0 0x100 /* Base address of DMA 0 */
|
|
#define MCFDMA_BASE1 0x140 /* Base address of DMA 1 */
|
|
#define MCFDMA_BASE2 0x180 /* Base address of DMA 2 */
|
|
#define MCFDMA_BASE3 0x1C0 /* Base address of DMA 3 */
|
|
#elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407)
|
|
#define MCFDMA_BASE0 0x300 /* Base address of DMA 0 */
|
|
#define MCFDMA_BASE1 0x340 /* Base address of DMA 1 */
|
|
#define MCFDMA_BASE2 0x380 /* Base address of DMA 2 */
|
|
#define MCFDMA_BASE3 0x3C0 /* Base address of DMA 3 */
|
|
#endif
|
|
|
|
|
|
#if !defined(CONFIG_M5272)
|
|
|
|
/*
|
|
* Define the DMA register set addresses.
|
|
* Note: these are longword registers, use unsigned long as data type
|
|
*/
|
|
#define MCFDMA_SAR 0x00 /* DMA source address (r/w) */
|
|
#define MCFDMA_DAR 0x01 /* DMA destination adr (r/w) */
|
|
/* these are word registers, use unsigned short data type */
|
|
#define MCFDMA_DCR 0x04 /* DMA control reg (r/w) */
|
|
#define MCFDMA_BCR 0x06 /* DMA byte count reg (r/w) */
|
|
/* these are byte registers, use unsiged char data type */
|
|
#define MCFDMA_DSR 0x10 /* DMA status reg (r/w) */
|
|
#define MCFDMA_DIVR 0x14 /* DMA interrupt vec (r/w) */
|
|
|
|
/*
|
|
* Bit definitions for the DMA Control Register (DCR).
|
|
*/
|
|
#define MCFDMA_DCR_INT 0x8000 /* Enable completion irq */
|
|
#define MCFDMA_DCR_EEXT 0x4000 /* Enable external DMA req */
|
|
#define MCFDMA_DCR_CS 0x2000 /* Enable cycle steal */
|
|
#define MCFDMA_DCR_AA 0x1000 /* Enable auto alignment */
|
|
#define MCFDMA_DCR_BWC_MASK 0x0E00 /* Bandwidth ctl mask */
|
|
#define MCFDMA_DCR_BWC_512 0x0200 /* Bandwidth: 512 Bytes */
|
|
#define MCFDMA_DCR_BWC_1024 0x0400 /* Bandwidth: 1024 Bytes */
|
|
#define MCFDMA_DCR_BWC_2048 0x0600 /* Bandwidth: 2048 Bytes */
|
|
#define MCFDMA_DCR_BWC_4096 0x0800 /* Bandwidth: 4096 Bytes */
|
|
#define MCFDMA_DCR_BWC_8192 0x0a00 /* Bandwidth: 8192 Bytes */
|
|
#define MCFDMA_DCR_BWC_16384 0x0c00 /* Bandwidth: 16384 Bytes */
|
|
#define MCFDMA_DCR_BWC_32768 0x0e00 /* Bandwidth: 32768 Bytes */
|
|
#define MCFDMA_DCR_SAA 0x0100 /* Single Address Access */
|
|
#define MCFDMA_DCR_S_RW 0x0080 /* SAA read/write value */
|
|
#define MCFDMA_DCR_SINC 0x0040 /* Source addr inc enable */
|
|
#define MCFDMA_DCR_SSIZE_MASK 0x0030 /* Src xfer size */
|
|
#define MCFDMA_DCR_SSIZE_LONG 0x0000 /* Src xfer size, 00 = longw */
|
|
#define MCFDMA_DCR_SSIZE_BYTE 0x0010 /* Src xfer size, 01 = byte */
|
|
#define MCFDMA_DCR_SSIZE_WORD 0x0020 /* Src xfer size, 10 = word */
|
|
#define MCFDMA_DCR_SSIZE_LINE 0x0030 /* Src xfer size, 11 = line */
|
|
#define MCFDMA_DCR_DINC 0x0008 /* Dest addr inc enable */
|
|
#define MCFDMA_DCR_DSIZE_MASK 0x0006 /* Dest xfer size */
|
|
#define MCFDMA_DCR_DSIZE_LONG 0x0000 /* Dest xfer size, 00 = long */
|
|
#define MCFDMA_DCR_DSIZE_BYTE 0x0002 /* Dest xfer size, 01 = byte */
|
|
#define MCFDMA_DCR_DSIZE_WORD 0x0004 /* Dest xfer size, 10 = word */
|
|
#define MCFDMA_DCR_DSIZE_LINE 0x0006 /* Dest xfer size, 11 = line */
|
|
#define MCFDMA_DCR_START 0x0001 /* Start transfer */
|
|
|
|
/*
|
|
* Bit definitions for the DMA Status Register (DSR).
|
|
*/
|
|
#define MCFDMA_DSR_CE 0x40 /* Config error */
|
|
#define MCFDMA_DSR_BES 0x20 /* Bus Error on source */
|
|
#define MCFDMA_DSR_BED 0x10 /* Bus Error on dest */
|
|
#define MCFDMA_DSR_REQ 0x04 /* Requests remaining */
|
|
#define MCFDMA_DSR_BSY 0x02 /* Busy */
|
|
#define MCFDMA_DSR_DONE 0x01 /* DMA transfer complete */
|
|
|
|
#else /* This is an MCF5272 */
|
|
|
|
#define MCFDMA_DMR 0x00 /* Mode Register (r/w) */
|
|
#define MCFDMA_DIR 0x03 /* Interrupt trigger register (r/w) */
|
|
#define MCFDMA_DSAR 0x03 /* Source Address register (r/w) */
|
|
#define MCFDMA_DDAR 0x04 /* Destination Address register (r/w) */
|
|
#define MCFDMA_DBCR 0x02 /* Byte Count Register (r/w) */
|
|
|
|
/* Bit definitions for the DMA Mode Register (DMR) */
|
|
#define MCFDMA_DMR_RESET 0x80000000L /* Reset bit */
|
|
#define MCFDMA_DMR_EN 0x40000000L /* DMA enable */
|
|
#define MCFDMA_DMR_RQM 0x000C0000L /* Request Mode Mask */
|
|
#define MCFDMA_DMR_RQM_DUAL 0x000C0000L /* Dual address mode, the only valid mode */
|
|
#define MCFDMA_DMR_DSTM 0x00002000L /* Destination addressing mask */
|
|
#define MCFDMA_DMR_DSTM_SA 0x00000000L /* Destination uses static addressing */
|
|
#define MCFDMA_DMR_DSTM_IA 0x00002000L /* Destination uses incremental addressing */
|
|
#define MCFDMA_DMR_DSTT_UD 0x00000400L /* Destination is user data */
|
|
#define MCFDMA_DMR_DSTT_UC 0x00000800L /* Destination is user code */
|
|
#define MCFDMA_DMR_DSTT_SD 0x00001400L /* Destination is supervisor data */
|
|
#define MCFDMA_DMR_DSTT_SC 0x00001800L /* Destination is supervisor code */
|
|
#define MCFDMA_DMR_DSTS_OFF 0x8 /* offset to the destination size bits */
|
|
#define MCFDMA_DMR_DSTS_LONG 0x00000000L /* Long destination size */
|
|
#define MCFDMA_DMR_DSTS_BYTE 0x00000100L /* Byte destination size */
|
|
#define MCFDMA_DMR_DSTS_WORD 0x00000200L /* Word destination size */
|
|
#define MCFDMA_DMR_DSTS_LINE 0x00000300L /* Line destination size */
|
|
#define MCFDMA_DMR_SRCM 0x00000020L /* Source addressing mask */
|
|
#define MCFDMA_DMR_SRCM_SA 0x00000000L /* Source uses static addressing */
|
|
#define MCFDMA_DMR_SRCM_IA 0x00000020L /* Source uses incremental addressing */
|
|
#define MCFDMA_DMR_SRCT_UD 0x00000004L /* Source is user data */
|
|
#define MCFDMA_DMR_SRCT_UC 0x00000008L /* Source is user code */
|
|
#define MCFDMA_DMR_SRCT_SD 0x00000014L /* Source is supervisor data */
|
|
#define MCFDMA_DMR_SRCT_SC 0x00000018L /* Source is supervisor code */
|
|
#define MCFDMA_DMR_SRCS_OFF 0x0 /* Offset to the source size bits */
|
|
#define MCFDMA_DMR_SRCS_LONG 0x00000000L /* Long source size */
|
|
#define MCFDMA_DMR_SRCS_BYTE 0x00000001L /* Byte source size */
|
|
#define MCFDMA_DMR_SRCS_WORD 0x00000002L /* Word source size */
|
|
#define MCFDMA_DMR_SRCS_LINE 0x00000003L /* Line source size */
|
|
|
|
/* Bit definitions for the DMA interrupt register (DIR) */
|
|
#define MCFDMA_DIR_INVEN 0x1000 /* Invalid Combination interrupt enable */
|
|
#define MCFDMA_DIR_ASCEN 0x0800 /* Address Sequence Complete (Completion) interrupt enable */
|
|
#define MCFDMA_DIR_TEEN 0x0200 /* Transfer Error interrupt enable */
|
|
#define MCFDMA_DIR_TCEN 0x0100 /* Transfer Complete (a bus transfer, that is) interrupt enable */
|
|
#define MCFDMA_DIR_INV 0x0010 /* Invalid Combination */
|
|
#define MCFDMA_DIR_ASC 0x0008 /* Address Sequence Complete (DMA Completion) */
|
|
#define MCFDMA_DIR_TE 0x0002 /* Transfer Error */
|
|
#define MCFDMA_DIR_TC 0x0001 /* Transfer Complete */
|
|
|
|
#endif /* !defined(CONFIG_M5272) */
|
|
|
|
/****************************************************************************/
|
|
#endif /* mcfdma_h */
|