mirror of
https://github.com/torvalds/linux.git
synced 2024-11-20 11:01:38 +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>
114 lines
2.8 KiB
C
114 lines
2.8 KiB
C
#ifndef _MVME147HW_H_
|
|
#define _MVME147HW_H_
|
|
|
|
#include <asm/irq.h>
|
|
|
|
typedef struct {
|
|
unsigned char
|
|
ctrl,
|
|
bcd_sec,
|
|
bcd_min,
|
|
bcd_hr,
|
|
bcd_dow,
|
|
bcd_dom,
|
|
bcd_mth,
|
|
bcd_year;
|
|
} MK48T02;
|
|
|
|
#define RTC_WRITE 0x80
|
|
#define RTC_READ 0x40
|
|
#define RTC_STOP 0x20
|
|
|
|
#define m147_rtc ((MK48T02 * volatile)0xfffe07f8)
|
|
|
|
|
|
struct pcc_regs {
|
|
volatile u_long dma_tadr;
|
|
volatile u_long dma_dadr;
|
|
volatile u_long dma_bcr;
|
|
volatile u_long dma_hr;
|
|
volatile u_short t1_preload;
|
|
volatile u_short t1_count;
|
|
volatile u_short t2_preload;
|
|
volatile u_short t2_count;
|
|
volatile u_char t1_int_cntrl;
|
|
volatile u_char t1_cntrl;
|
|
volatile u_char t2_int_cntrl;
|
|
volatile u_char t2_cntrl;
|
|
volatile u_char ac_fail;
|
|
volatile u_char watchdog;
|
|
volatile u_char lpt_intr;
|
|
volatile u_char lpt_cntrl;
|
|
volatile u_char dma_intr;
|
|
volatile u_char dma_cntrl;
|
|
volatile u_char bus_error;
|
|
volatile u_char dma_status;
|
|
volatile u_char abort;
|
|
volatile u_char ta_fnctl;
|
|
volatile u_char serial_cntrl;
|
|
volatile u_char general_cntrl;
|
|
volatile u_char lan_cntrl;
|
|
volatile u_char general_status;
|
|
volatile u_char scsi_interrupt;
|
|
volatile u_char slave;
|
|
volatile u_char soft1_cntrl;
|
|
volatile u_char int_base;
|
|
volatile u_char soft2_cntrl;
|
|
volatile u_char revision_level;
|
|
volatile u_char lpt_data;
|
|
volatile u_char lpt_status;
|
|
};
|
|
|
|
#define m147_pcc ((struct pcc_regs * volatile)0xfffe1000)
|
|
|
|
|
|
#define PCC_INT_ENAB 0x08
|
|
|
|
#define PCC_TIMER_INT_CLR 0x80
|
|
#define PCC_TIMER_PRELOAD 63936l
|
|
|
|
#define PCC_LEVEL_ABORT 0x07
|
|
#define PCC_LEVEL_SERIAL 0x04
|
|
#define PCC_LEVEL_ETH 0x04
|
|
#define PCC_LEVEL_TIMER1 0x04
|
|
#define PCC_LEVEL_SCSI_PORT 0x04
|
|
#define PCC_LEVEL_SCSI_DMA 0x04
|
|
|
|
#define PCC_IRQ_AC_FAIL (IRQ_USER+0)
|
|
#define PCC_IRQ_BERR (IRQ_USER+1)
|
|
#define PCC_IRQ_ABORT (IRQ_USER+2)
|
|
/* #define PCC_IRQ_SERIAL (IRQ_USER+3) */
|
|
#define PCC_IRQ_PRINTER (IRQ_USER+7)
|
|
#define PCC_IRQ_TIMER1 (IRQ_USER+8)
|
|
#define PCC_IRQ_TIMER2 (IRQ_USER+9)
|
|
#define PCC_IRQ_SOFTWARE1 (IRQ_USER+10)
|
|
#define PCC_IRQ_SOFTWARE2 (IRQ_USER+11)
|
|
|
|
|
|
#define M147_SCC_A_ADDR 0xfffe3002
|
|
#define M147_SCC_B_ADDR 0xfffe3000
|
|
#define M147_SCC_PCLK 5000000
|
|
|
|
#define MVME147_IRQ_SCSI_PORT (IRQ_USER+0x45)
|
|
#define MVME147_IRQ_SCSI_DMA (IRQ_USER+0x46)
|
|
|
|
/* SCC interrupts, for MVME147 */
|
|
|
|
#define MVME147_IRQ_TYPE_PRIO 0
|
|
#define MVME147_IRQ_SCC_BASE (IRQ_USER+32)
|
|
#define MVME147_IRQ_SCCB_TX (IRQ_USER+32)
|
|
#define MVME147_IRQ_SCCB_STAT (IRQ_USER+34)
|
|
#define MVME147_IRQ_SCCB_RX (IRQ_USER+36)
|
|
#define MVME147_IRQ_SCCB_SPCOND (IRQ_USER+38)
|
|
#define MVME147_IRQ_SCCA_TX (IRQ_USER+40)
|
|
#define MVME147_IRQ_SCCA_STAT (IRQ_USER+42)
|
|
#define MVME147_IRQ_SCCA_RX (IRQ_USER+44)
|
|
#define MVME147_IRQ_SCCA_SPCOND (IRQ_USER+46)
|
|
|
|
#define MVME147_LANCE_BASE 0xfffe1800
|
|
#define MVME147_LANCE_IRQ (IRQ_USER+4)
|
|
|
|
#define ETHERNET_ADDRESS 0xfffe0778
|
|
|
|
#endif
|