mirror of
https://github.com/torvalds/linux.git
synced 2024-12-03 17:41:22 +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>
160 lines
7.1 KiB
C
160 lines
7.1 KiB
C
/****************************************************************************/
|
|
|
|
/*
|
|
* m528xsim.h -- ColdFire 5280/5282 System Integration Module support.
|
|
*
|
|
* (C) Copyright 2003, Greg Ungerer (gerg@snapgear.com)
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
#ifndef m528xsim_h
|
|
#define m528xsim_h
|
|
/****************************************************************************/
|
|
|
|
|
|
/*
|
|
* Define the 5280/5282 SIM register set addresses.
|
|
*/
|
|
#define MCFICM_INTC0 0x0c00 /* Base for Interrupt Ctrl 0 */
|
|
#define MCFICM_INTC1 0x0d00 /* Base for Interrupt Ctrl 0 */
|
|
#define MCFINTC_IPRH 0x00 /* Interrupt pending 32-63 */
|
|
#define MCFINTC_IPRL 0x04 /* Interrupt pending 1-31 */
|
|
#define MCFINTC_IMRH 0x08 /* Interrupt mask 32-63 */
|
|
#define MCFINTC_IMRL 0x0c /* Interrupt mask 1-31 */
|
|
#define MCFINTC_INTFRCH 0x10 /* Interrupt force 32-63 */
|
|
#define MCFINTC_INTFRCL 0x14 /* Interrupt force 1-31 */
|
|
#define MCFINTC_IRLR 0x18 /* */
|
|
#define MCFINTC_IACKL 0x19 /* */
|
|
#define MCFINTC_ICR0 0x40 /* Base ICR register */
|
|
|
|
#define MCFINT_VECBASE 64 /* Vector base number */
|
|
#define MCFINT_UART0 13 /* Interrupt number for UART0 */
|
|
#define MCFINT_PIT1 55 /* Interrupt number for PIT1 */
|
|
|
|
/*
|
|
* SDRAM configuration registers.
|
|
*/
|
|
#define MCFSIM_DCR 0x44 /* SDRAM control */
|
|
#define MCFSIM_DACR0 0x48 /* SDRAM base address 0 */
|
|
#define MCFSIM_DMR0 0x4c /* SDRAM address mask 0 */
|
|
#define MCFSIM_DACR1 0x50 /* SDRAM base address 1 */
|
|
#define MCFSIM_DMR1 0x54 /* SDRAM address mask 1 */
|
|
|
|
/*
|
|
* Derek Cheung - 6 Feb 2005
|
|
* add I2C and QSPI register definition using Freescale's MCF5282
|
|
*/
|
|
/* set Port AS pin for I2C or UART */
|
|
#define MCF5282_GPIO_PASPAR (volatile u16 *) (MCF_IPSBAR + 0x00100056)
|
|
|
|
/* Port UA Pin Assignment Register (8 Bit) */
|
|
#define MCF5282_GPIO_PUAPAR 0x10005C
|
|
|
|
/* Interrupt Mask Register Register Low */
|
|
#define MCF5282_INTC0_IMRL (volatile u32 *) (MCF_IPSBAR + 0x0C0C)
|
|
/* Interrupt Control Register 7 */
|
|
#define MCF5282_INTC0_ICR17 (volatile u8 *) (MCF_IPSBAR + 0x0C51)
|
|
|
|
|
|
|
|
/*********************************************************************
|
|
*
|
|
* Inter-IC (I2C) Module
|
|
*
|
|
*********************************************************************/
|
|
/* Read/Write access macros for general use */
|
|
#define MCF5282_I2C_I2ADR (volatile u8 *) (MCF_IPSBAR + 0x0300) // Address
|
|
#define MCF5282_I2C_I2FDR (volatile u8 *) (MCF_IPSBAR + 0x0304) // Freq Divider
|
|
#define MCF5282_I2C_I2CR (volatile u8 *) (MCF_IPSBAR + 0x0308) // Control
|
|
#define MCF5282_I2C_I2SR (volatile u8 *) (MCF_IPSBAR + 0x030C) // Status
|
|
#define MCF5282_I2C_I2DR (volatile u8 *) (MCF_IPSBAR + 0x0310) // Data I/O
|
|
|
|
/* Bit level definitions and macros */
|
|
#define MCF5282_I2C_I2ADR_ADDR(x) (((x)&0x7F)<<0x01)
|
|
|
|
#define MCF5282_I2C_I2FDR_IC(x) (((x)&0x3F))
|
|
|
|
#define MCF5282_I2C_I2CR_IEN (0x80) // I2C enable
|
|
#define MCF5282_I2C_I2CR_IIEN (0x40) // interrupt enable
|
|
#define MCF5282_I2C_I2CR_MSTA (0x20) // master/slave mode
|
|
#define MCF5282_I2C_I2CR_MTX (0x10) // transmit/receive mode
|
|
#define MCF5282_I2C_I2CR_TXAK (0x08) // transmit acknowledge enable
|
|
#define MCF5282_I2C_I2CR_RSTA (0x04) // repeat start
|
|
|
|
#define MCF5282_I2C_I2SR_ICF (0x80) // data transfer bit
|
|
#define MCF5282_I2C_I2SR_IAAS (0x40) // I2C addressed as a slave
|
|
#define MCF5282_I2C_I2SR_IBB (0x20) // I2C bus busy
|
|
#define MCF5282_I2C_I2SR_IAL (0x10) // aribitration lost
|
|
#define MCF5282_I2C_I2SR_SRW (0x04) // slave read/write
|
|
#define MCF5282_I2C_I2SR_IIF (0x02) // I2C interrupt
|
|
#define MCF5282_I2C_I2SR_RXAK (0x01) // received acknowledge
|
|
|
|
|
|
|
|
/*********************************************************************
|
|
*
|
|
* Queued Serial Peripheral Interface (QSPI) Module
|
|
*
|
|
*********************************************************************/
|
|
/* Derek - 21 Feb 2005 */
|
|
/* change to the format used in I2C */
|
|
/* Read/Write access macros for general use */
|
|
#define MCF5282_QSPI_QMR MCF_IPSBAR + 0x0340
|
|
#define MCF5282_QSPI_QDLYR MCF_IPSBAR + 0x0344
|
|
#define MCF5282_QSPI_QWR MCF_IPSBAR + 0x0348
|
|
#define MCF5282_QSPI_QIR MCF_IPSBAR + 0x034C
|
|
#define MCF5282_QSPI_QAR MCF_IPSBAR + 0x0350
|
|
#define MCF5282_QSPI_QDR MCF_IPSBAR + 0x0354
|
|
#define MCF5282_QSPI_QCR MCF_IPSBAR + 0x0354
|
|
|
|
/* Bit level definitions and macros */
|
|
#define MCF5282_QSPI_QMR_MSTR (0x8000)
|
|
#define MCF5282_QSPI_QMR_DOHIE (0x4000)
|
|
#define MCF5282_QSPI_QMR_BITS_16 (0x0000)
|
|
#define MCF5282_QSPI_QMR_BITS_8 (0x2000)
|
|
#define MCF5282_QSPI_QMR_BITS_9 (0x2400)
|
|
#define MCF5282_QSPI_QMR_BITS_10 (0x2800)
|
|
#define MCF5282_QSPI_QMR_BITS_11 (0x2C00)
|
|
#define MCF5282_QSPI_QMR_BITS_12 (0x3000)
|
|
#define MCF5282_QSPI_QMR_BITS_13 (0x3400)
|
|
#define MCF5282_QSPI_QMR_BITS_14 (0x3800)
|
|
#define MCF5282_QSPI_QMR_BITS_15 (0x3C00)
|
|
#define MCF5282_QSPI_QMR_CPOL (0x0200)
|
|
#define MCF5282_QSPI_QMR_CPHA (0x0100)
|
|
#define MCF5282_QSPI_QMR_BAUD(x) (((x)&0x00FF))
|
|
|
|
#define MCF5282_QSPI_QDLYR_SPE (0x80)
|
|
#define MCF5282_QSPI_QDLYR_QCD(x) (((x)&0x007F)<<8)
|
|
#define MCF5282_QSPI_QDLYR_DTL(x) (((x)&0x00FF))
|
|
|
|
#define MCF5282_QSPI_QWR_HALT (0x8000)
|
|
#define MCF5282_QSPI_QWR_WREN (0x4000)
|
|
#define MCF5282_QSPI_QWR_WRTO (0x2000)
|
|
#define MCF5282_QSPI_QWR_CSIV (0x1000)
|
|
#define MCF5282_QSPI_QWR_ENDQP(x) (((x)&0x000F)<<8)
|
|
#define MCF5282_QSPI_QWR_CPTQP(x) (((x)&0x000F)<<4)
|
|
#define MCF5282_QSPI_QWR_NEWQP(x) (((x)&0x000F))
|
|
|
|
#define MCF5282_QSPI_QIR_WCEFB (0x8000)
|
|
#define MCF5282_QSPI_QIR_ABRTB (0x4000)
|
|
#define MCF5282_QSPI_QIR_ABRTL (0x1000)
|
|
#define MCF5282_QSPI_QIR_WCEFE (0x0800)
|
|
#define MCF5282_QSPI_QIR_ABRTE (0x0400)
|
|
#define MCF5282_QSPI_QIR_SPIFE (0x0100)
|
|
#define MCF5282_QSPI_QIR_WCEF (0x0008)
|
|
#define MCF5282_QSPI_QIR_ABRT (0x0004)
|
|
#define MCF5282_QSPI_QIR_SPIF (0x0001)
|
|
|
|
#define MCF5282_QSPI_QAR_ADDR(x) (((x)&0x003F))
|
|
|
|
#define MCF5282_QSPI_QDR_COMMAND(x) (((x)&0xFF00))
|
|
#define MCF5282_QSPI_QCR_DATA(x) (((x)&0x00FF)<<8)
|
|
#define MCF5282_QSPI_QCR_CONT (0x8000)
|
|
#define MCF5282_QSPI_QCR_BITSE (0x4000)
|
|
#define MCF5282_QSPI_QCR_DT (0x2000)
|
|
#define MCF5282_QSPI_QCR_DSCK (0x1000)
|
|
#define MCF5282_QSPI_QCR_CS (((x)&0x000F)<<8)
|
|
|
|
/****************************************************************************/
|
|
#endif /* m528xsim_h */
|