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>
108 lines
3.1 KiB
C
108 lines
3.1 KiB
C
/*
|
|
** asm-m68k/amigayle.h -- This header defines the registers of the gayle chip
|
|
** found on the Amiga 1200
|
|
** This information was found by disassembling card.resource,
|
|
** so the definitions may not be 100% correct
|
|
** anyone has an official doc ?
|
|
**
|
|
** Copyright 1997 by Alain Malek
|
|
**
|
|
** This file is subject to the terms and conditions of the GNU General Public
|
|
** License. See the file COPYING in the main directory of this archive
|
|
** for more details.
|
|
**
|
|
** Created: 11/28/97 by Alain Malek
|
|
*/
|
|
|
|
#ifndef _M68K_AMIGAYLE_H_
|
|
#define _M68K_AMIGAYLE_H_
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/amigahw.h>
|
|
|
|
/* memory layout */
|
|
|
|
#define GAYLE_RAM (0x600000+zTwoBase)
|
|
#define GAYLE_RAMSIZE (0x400000)
|
|
#define GAYLE_ATTRIBUTE (0xa00000+zTwoBase)
|
|
#define GAYLE_ATTRIBUTESIZE (0x020000)
|
|
#define GAYLE_IO (0xa20000+zTwoBase) /* 16bit and even 8bit registers */
|
|
#define GAYLE_IOSIZE (0x010000)
|
|
#define GAYLE_IO_8BITODD (0xa30000+zTwoBase) /* odd 8bit registers */
|
|
|
|
/* offset for accessing odd IO registers */
|
|
#define GAYLE_ODD (GAYLE_IO_8BITODD-GAYLE_IO-1)
|
|
|
|
/* GAYLE registers */
|
|
|
|
struct GAYLE {
|
|
u_char cardstatus;
|
|
u_char pad0[0x1000-1];
|
|
|
|
u_char intreq;
|
|
u_char pad1[0x1000-1];
|
|
|
|
u_char inten;
|
|
u_char pad2[0x1000-1];
|
|
|
|
u_char config;
|
|
u_char pad3[0x1000-1];
|
|
};
|
|
|
|
#define GAYLE_ADDRESS (0xda8000) /* gayle main registers base address */
|
|
|
|
#define GAYLE_RESET (0xa40000) /* write 0x00 to start reset,
|
|
read 1 byte to stop reset */
|
|
|
|
#define gayle (*(volatile struct GAYLE *)(zTwoBase+GAYLE_ADDRESS))
|
|
#define gayle_reset (*(volatile u_char *)(zTwoBase+GAYLE_RESET))
|
|
|
|
#define gayle_attribute ((volatile u_char *)(GAYLE_ATTRIBUTE))
|
|
|
|
#if 0
|
|
#define gayle_inb(a) readb( GAYLE_IO+(a)+(((a)&1)*GAYLE_ODD) )
|
|
#define gayle_outb(v,a) writeb( v, GAYLE_IO+(a)+(((a)&1)*GAYLE_ODD) )
|
|
|
|
#define gayle_inw(a) readw( GAYLE_IO+(a) )
|
|
#define gayle_outw(v,a) writew( v, GAYLE_IO+(a) )
|
|
#endif
|
|
|
|
/* GAYLE_CARDSTATUS bit def */
|
|
|
|
#define GAYLE_CS_CCDET 0x40 /* credit card detect */
|
|
#define GAYLE_CS_BVD1 0x20 /* battery voltage detect 1 */
|
|
#define GAYLE_CS_SC 0x20 /* credit card status change */
|
|
#define GAYLE_CS_BVD2 0x10 /* battery voltage detect 2 */
|
|
#define GAYLE_CS_DA 0x10 /* digital audio */
|
|
#define GAYLE_CS_WR 0x08 /* write enable (1 == enabled) */
|
|
#define GAYLE_CS_BSY 0x04 /* credit card busy */
|
|
#define GAYLE_CS_IRQ 0x04 /* interrupt request */
|
|
|
|
/* GAYLE_IRQ bit def */
|
|
|
|
#define GAYLE_IRQ_IDE 0x80
|
|
#define GAYLE_IRQ_CCDET 0x40
|
|
#define GAYLE_IRQ_BVD1 0x20
|
|
#define GAYLE_IRQ_SC 0x20
|
|
#define GAYLE_IRQ_BVD2 0x10
|
|
#define GAYLE_IRQ_DA 0x10
|
|
#define GAYLE_IRQ_WR 0x08
|
|
#define GAYLE_IRQ_BSY 0x04
|
|
#define GAYLE_IRQ_IRQ 0x04
|
|
#define GAYLE_IRQ_IDEACK1 0x02
|
|
#define GAYLE_IRQ_IDEACK0 0x01
|
|
|
|
/* GAYLE_CONFIG bit def
|
|
(bit 0-1 for program voltage, bit 2-3 for access speed */
|
|
|
|
#define GAYLE_CFG_0V 0x00
|
|
#define GAYLE_CFG_5V 0x01
|
|
#define GAYLE_CFG_12V 0x02
|
|
|
|
#define GAYLE_CFG_100NS 0x08
|
|
#define GAYLE_CFG_150NS 0x04
|
|
#define GAYLE_CFG_250NS 0x00
|
|
#define GAYLE_CFG_720NS 0x0c
|
|
|
|
#endif /* asm-m68k/amigayle.h */
|