mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 08:02:17 +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>
70 lines
2.2 KiB
C
70 lines
2.2 KiB
C
/*
|
|
* Q40 master Chip Control
|
|
* RTC stuff merged for compactnes..
|
|
*/
|
|
|
|
#ifndef _Q40_MASTER_H
|
|
#define _Q40_MASTER_H
|
|
|
|
#include <asm/raw_io.h>
|
|
|
|
|
|
#define q40_master_addr 0xff000000
|
|
|
|
#define IIRQ_REG 0x0 /* internal IRQ reg */
|
|
#define EIRQ_REG 0x4 /* external ... */
|
|
#define KEYCODE_REG 0x1c /* value of received scancode */
|
|
#define DISPLAY_CONTROL_REG 0x18
|
|
#define FRAME_CLEAR_REG 0x24
|
|
#define LED_REG 0x30
|
|
|
|
#define Q40_LED_ON() master_outb(1,LED_REG)
|
|
#define Q40_LED_OFF() master_outb(0,LED_REG)
|
|
|
|
#define INTERRUPT_REG IIRQ_REG /* "native" ints */
|
|
#define KEY_IRQ_ENABLE_REG 0x08 /**/
|
|
#define KEYBOARD_UNLOCK_REG 0x20 /* clear kb int */
|
|
|
|
#define SAMPLE_ENABLE_REG 0x14 /* generate SAMPLE ints */
|
|
#define SAMPLE_RATE_REG 0x2c
|
|
#define SAMPLE_CLEAR_REG 0x28
|
|
#define SAMPLE_LOW 0x00
|
|
#define SAMPLE_HIGH 0x01
|
|
|
|
#define FRAME_RATE_REG 0x38 /* generate FRAME ints at 200 HZ rate */
|
|
|
|
#if 0
|
|
#define SER_ENABLE_REG 0x0c /* allow serial ints to be generated */
|
|
#endif
|
|
#define EXT_ENABLE_REG 0x10 /* ... rest of the ISA ints ... */
|
|
|
|
|
|
#define master_inb(_reg_) in_8((unsigned char *)q40_master_addr+_reg_)
|
|
#define master_outb(_b_,_reg_) out_8((unsigned char *)q40_master_addr+_reg_,_b_)
|
|
|
|
/* RTC defines */
|
|
|
|
#define Q40_RTC_BASE (0xff021ffc)
|
|
|
|
#define Q40_RTC_YEAR (*(volatile unsigned char *)(Q40_RTC_BASE+0))
|
|
#define Q40_RTC_MNTH (*(volatile unsigned char *)(Q40_RTC_BASE-4))
|
|
#define Q40_RTC_DATE (*(volatile unsigned char *)(Q40_RTC_BASE-8))
|
|
#define Q40_RTC_DOW (*(volatile unsigned char *)(Q40_RTC_BASE-12))
|
|
#define Q40_RTC_HOUR (*(volatile unsigned char *)(Q40_RTC_BASE-16))
|
|
#define Q40_RTC_MINS (*(volatile unsigned char *)(Q40_RTC_BASE-20))
|
|
#define Q40_RTC_SECS (*(volatile unsigned char *)(Q40_RTC_BASE-24))
|
|
#define Q40_RTC_CTRL (*(volatile unsigned char *)(Q40_RTC_BASE-28))
|
|
|
|
/* some control bits */
|
|
#define Q40_RTC_READ 64 /* prepare for reading */
|
|
#define Q40_RTC_WRITE 128
|
|
|
|
/* define some Q40 specific ints */
|
|
#include "q40ints.h"
|
|
|
|
/* misc defs */
|
|
#define DAC_LEFT ((unsigned char *)0xff008000)
|
|
#define DAC_RIGHT ((unsigned char *)0xff008004)
|
|
|
|
#endif /* _Q40_MASTER_H */
|