aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/atari
AgeCommit message (Collapse)AuthorFilesLines
2013-11-26m68k/UAPI: Disintegrate arch/m68k/include/asm/bootinfo.hGeert Uytterhoeven1-0/+1
Export the bootinfo definitions that are used by bootstrap loaders, and split them up in generic and platform-specific parts. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-04-16m68k/atari: USB - add platform devices for EtherNAT/NetUSBee ISP1160 HCDMichael Schmitz1-6/+129
Add platform devices used by the isp116x-hcd driver for EtherNAT and NetUSBee. Note that the NetUSBee also contains a RTL8019 Ethernet chip, so its platform device is used to cover the EtherNEC case, too. Register definitions thanks to David Galvez <[email protected]> [Geert] Conditionalize isp1160_delay() definition Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-04-16m68k/atari: EtherNAT - add interrupt chip definition for CPLD interruptsMichael Schmitz1-0/+82
Add a dedicated interrupt chip definition for the EtherNAT CPLD interrupts. SMC91C111 and ISP1160 chips have separate interrupts that can be enabled and disabled in a CPLD register at offset 0x23 from the card base. Note the CPLD interrupt control register is mapped on demand, whenever any interrupt enable/disable action is requested. The EtherNAT USB driver still needs interrupts disabled around reset and start actions. In particular, we cannot entirely rely on the irq_startup being called first. The smc91x and isp116x-hcd drivers will use this feature. Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-04-16m68k/atari: EtherNEC - add platform device supportMichael Schmitz1-1/+53
Add platform device for the Atari ROM port ethernet adapter, EtherNEC. This platform device will be used by the ne.c driver. [Geert] Conditionalize platform device data structures Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-04-16m68k/atari: EtherNAT - platform device and IRQ support codeMichael Schmitz1-0/+64
Add platform device and interrupt definitions necessary for the EtherNAT Ethernet/USB adapter for the Falcon extension port. EtherNAT interrupt numbers are 139/140 so the max. interrupt number for Atari has to be increased. [Geert] Conditionalize platform device data structures Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-04-16m68k/atari: use dedicated irq_chip for timer D interruptsMichael Schmitz1-0/+70
Add a special irq_chip for the Atari MFP timer D interrupt, which is used as a polling timer for EtherNEC and NetUSBee Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2012-12-24m68k: set arch_gettimeoffset directlyStephen Warren2-5/+5
remove m68k's mach_gettimeoffset function pointer, and instead directly set the arch_gettimeoffset function pointer. This requires multiplying all function results by 1000, since the removed m68k_gettimeoffset() did this. Also, s/unsigned long/u32/ just to make the function prototypes exactly match that of arch_gettimeoffset. Cc: Joshua Thompson <[email protected]> Cc: Sam Creasey <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Acked-by: Phil Blundell <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-04-22m68k/atari: Change VME irq numbers from unsigned long to unsigned intGeert Uytterhoeven1-2/+2
Device interrupts numbers were changed to unsigned int in 1997, the year IRQ_MACHSPEC was killed as well. Also kill a related cast while we're at it. Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: [email protected]
2012-03-28Disintegrate asm/system.h for M68KDavid Howells3-3/+0
Disintegrate asm/system.h for M68K. Signed-off-by: David Howells <[email protected]> Acked-by: Greg Ungerer <[email protected]> cc: [email protected]
2012-01-22m68k: Fix assembler constraint to prevent overeager gcc optimisationAndreas Schwab1-4/+4
Passing the address of a variable as an operand to an asm statement doesn't mark the value of this variable as used, so gcc may optimize its initialisation away. Fix this by using the "m" constraint instead. Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: [email protected]
2011-12-10m68k/atari: Move declaration of atari_SCC_reset_done to header fileGeert Uytterhoeven2-3/+0
Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Remove obsolete support for user vector interrupt fixupsGeert Uytterhoeven1-1/+1
It was used on Apollo only, before its conversion to genirq. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/atari: Remove code and comments about different irq typesGeert Uytterhoeven1-236/+0
This code was obsoleted during the irq restructuring in 2006. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Add m68k_setup_irq_controller()Geert Uytterhoeven1-1/+2
This is a wrapper around m68k_setup_irq_chip() that discards its dummy second parameter, to ease the future transition to genirq. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Switch irq_chip methods to "struct irq_data *data"Geert Uytterhoeven1-8/+22
Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Thomas Gleixner <[email protected]>
2011-11-08m68k/irq: Rename irq_controller to irq_chipGeert Uytterhoeven1-8/+7
Make it more similar to the genirq version: - Remove lock (unused as we don't do SMP anyway), - Prepend methods with irq_, - Make irq_startup() return unsigned int. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Thomas Gleixner <[email protected]>
2011-10-31m68k: Add export.h to the m68k specific files as requiredPaul Gortmaker1-0/+1
Signed-off-by: Paul Gortmaker <[email protected]>
2011-07-30m68k/atari: Reserve some ST-RAM early on for device buffer useMichael Schmitz1-285/+69
Based on an original patch from Michael Schmitz: Because mem_init() is now called before device init, devices that rely on ST-RAM may find all ST-RAM already allocated to other users by the time device init happens. In particular, a large initrd RAM disk may use up enough of ST-RAM to cause atari_stram_alloc() to resort to __get_dma_pages() allocation. In the current state of Atari memory management, all of RAM is marked DMA capable, so __get_dma_pages() may well return RAM that is not in actual fact DMA capable. Using this for frame buffer or SCSI DMA buffer causes subtle failure. The ST-RAM allocator has been changed to allocate memory from a pool of reserved ST-RAM of configurable size, set aside on ST-RAM init (i.e. before mem_init()). As long as this pool is not exhausted, allocation of real ST-RAM can be guaranteed. Other changes: - Replace the custom allocator in the ST-RAM pool by the existing allocator in the resource subsystem, - Remove mem_init_done and its hook, as memory init is now done before device init, - Remove /proc/stram, as ST-RAM usage now shows up under /proc/iomem, e.g. 005f2000-006f1fff : ST-RAM Pool 005f2000-0063dfff : atafb 0063e000-00641fff : ataflop 00642000-00642fff : SCSI Signed-off-by: Michael Schmitz <[email protected]> [Andreas Schwab <[email protected]>: Use memparse()] [Geert: Use the resource subsystem instead of a custom allocator] Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19input/atari: Use the correct mouse interrupt hookMichael Schmitz1-5/+2
The Atari keyboard driver calls atari_mouse_interrupt_hook if it's set, not atari_input_mouse_interrupt_hook. Fix below. [geert] Killed off atari_mouse_interrupt_hook completely, after fixing another incorrect assignment in atarimouse.c. Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19m68k/atari: Do not use "/" in interrupt namesGeert Uytterhoeven2-2/+2
It may trigger a warning in fs/proc/generic.c:__xlate_proc_name() when trying to add an entry for the interrupt handler to sysfs. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-31Fix common misspellingsLucas De Marchi1-1/+1
Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <[email protected]>
2011-01-23m68k/atari: Rename "scc" to "atari_scc"Geert Uytterhoeven3-10/+10
It's a way too generic name for a global #define and conflicts with a variable with the same name, causing build errors like: | drivers/staging/brcm80211/brcmfmac/../util/siutils.c: In function ‘_si_clkctl_cc’: | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1364: error: expected identifier or ‘(’ before ‘volatile’ | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1364: error: expected ‘)’ before ‘(’ token | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1421: error: incompatible types in assignment | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1422: error: invalid operands to binary & | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1423: error: invalid operands to binary & | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1424: error: invalid operands to binary | | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: incompatible type for argument 4 of ‘bcmsdh_reg_write’ | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1428: error: invalid operands to binary & | make[8]: *** [drivers/staging/brcm80211/brcmfmac/../util/siutils.o] Error 1 Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-02-09tree-wide: Assorted spelling fixesDaniel Mack1-1/+1
In particular, several occurances of funny versions of 'success', 'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address', 'beginning', 'desirable', 'separate' and 'necessary' are fixed. Signed-off-by: Daniel Mack <[email protected]> Cc: Joe Perches <[email protected]> Cc: Junio C Hamano <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2009-02-22m68k: atari - Rename "mfp" to "st_mfp"Geert Uytterhoeven5-26/+26
http://kisskb.ellerman.id.au/kisskb/buildresult/72115/: | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile' | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed This is caused by | # define mfp ((*(volatile struct MFP*)MFP_BAS)) in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in net/mac80211/ieee80211_i.h. Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define. Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2009-01-12m68k: atari core - Kill warn_unused_result warningsGeert Uytterhoeven3-6/+13
warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven <[email protected]>
2009-01-12m68k: Kill several external declarations in source filesGeert Uytterhoeven1-1/+0
- Replace external declarations by proper includes where availiable. The accesses to some symbols had to be modified, as before they were declared using e.g. "extern int _end", while asm-generic/sections.h uses e.g. "extern char _end[]" - Remove unused or superfluous external declarations Signed-off-by: Geert Uytterhoeven <[email protected]>
2008-10-23proc: move /proc/stram to m68k-specific codeAlexey Dobriyan1-6/+22
Signed-off-by: Alexey Dobriyan <[email protected]>
2008-10-23proc: move /proc/hardware to m68k-specific codeAlexey Dobriyan1-8/+7
Signed-off-by: Alexey Dobriyan <[email protected]>
2008-10-14m68k: Remove the broken Hades supportAdrian Bunk4-472/+14
This patch removes the Hades support that was marked as BROKEN 5 years ago. Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-14m68k: Define rtc_lock on AtariGeert Uytterhoeven1-0/+3
The nvram and rtc-cmos drivers use the spinlock rtc_lock to protect against concurrent accesses to the CMOS memory. As m68k doesn't support SMP or preempt yet, the spinlock calls tend to get optimized away, but not for all configurations, causing in some rare cases: | ERROR: "rtc_lock" [drivers/rtc/rtc-cmos.ko] undefined! | ERROR: "rtc_lock" [drivers/char/nvram.ko] undefined! Add the spinlock to the Atari core code to avoid this. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Michael Schmitz <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-14m68k: Remove unused atari_kbd_translate()Geert Uytterhoeven1-12/+0
If CONFIG_VT=n, I get: | arch/m68k/atari/built-in.o: In function `atari_kbd_translate': | arch/m68k/atari/atakeyb.c:640: undefined reference to `shift_state' Just remove atari_kbd_translate(), as it's unused. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Michael Schmitz <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-14m68k: use bcd2bin/bin2bcdAdrian Bunk1-17/+18
This patch changes m68k to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD/BCD2BIN/BIN2BCD macros. It also remove local bcd2bin/bin2bcd implementations in favor of the global ones. Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-09-02m68k: atari_keyb_init operator precedence fixMichael Schmitz1-3/+6
Fix operator precedence bug in atari_keyb_init, which caused a failure on CT60 Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-20m68k/atari/debug.c: possible cleanupsAdrian Bunk1-30/+7
This patch contains the following possible cleanups: - make the following needlessly global functions (always) static: - atari_mfp_console_write() - atari_scc_console_write() - atari_midi_console_write() - atari_init_mfp_port() - atari_init_scc_port() - atari_init_midi_port() - #if 0 the following unused functions: - atari_mfp_console_wait_key() - atari_scc_console_wait_key() - atari_midi_console_wait_key() - remove the following unused variables: - atari_MFP_init_done - atari_SCC_init_done Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-04-18arch: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox1-1/+0
None of these files use any of the functionality promised by asm/semaphore.h. It's possible that they rely on it dragging in some unrelated header file, but I can't build all these files, so we'll have fix any build failures as they come up. Signed-off-by: Matthew Wilcox <[email protected]>
2008-02-07Introduce flags for reserve_bootmem()Bernhard Walle1-1/+1
This patchset adds a flags variable to reserve_bootmem() and uses the BOOTMEM_EXCLUSIVE flag in crashkernel reservation code to detect collisions between crashkernel area and already used memory. This patch: Change the reserve_bootmem() function to accept a new flag BOOTMEM_EXCLUSIVE. If that flag is set, the function returns with -EBUSY if the memory already has been reserved in the past. This is to avoid conflicts. Because that code runs before SMP initialisation, there's no race condition inside reserve_bootmem_core(). [[email protected]: coding-style fixes] [[email protected]: fix powerpc build] Signed-off-by: Bernhard Walle <[email protected]> Cc: <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Vivek Goyal <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-05m68k: kill arch/m68k/atari/atari_ksyms.cAdrian Bunk8-36/+31
EXPORT_SYMBOL's belong to the actual code. Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Roman Zippel <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-05m68k: Balance ioremap and iounmap in m68k/atari/hades-pci.cRoel Kluin1-28/+26
Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Roman Zippel <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-11-26m68k: export atari_keyb_initAdrian Bunk1-1/+2
m68k: export atari_keyb_init This patch fixes the following build error: .. MODPOST 25 modules ERROR: "atari_keyb_init" [drivers/input/mouse/atarimouse.ko] undefined! ERROR: "atari_keyb_init" [drivers/input/keyboard/atakbd.ko] undefined! make[2]: *** [__modpost] Error 1 Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-10-15Atari keyboard: incorporate additional review commentsGeert Uytterhoeven1-2/+0
Atari keyboard: incorporate additional review comments: o Kill reference to source file name o Return error value from input_register_device() instead of -ENOMEM Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Michael Schmitz <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-10-13m68k: Atari keyboard ACIA driver cleanupGeert Uytterhoeven1-97/+7
m68k: Atari keyboard ACIA driver cleanup: - removed dead key autorepeat code - removed hardcoded initial keymap Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-07-20m68k: missing exportsAl Viro1-1/+8
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-05-07SPIN_LOCK_UNLOCKED cleanup in arch/m68kMilind Arun Choudhary1-1/+1
SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead Signed-off-by: Milind Arun Choudhary <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Roman Zippel <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-05-07remove unused header file: arch/m68k/atari/atasound.hRobert P. J. Day1-33/+0
Signed-off-by: Robert P. J. Day <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Cc: Roman Zippel <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-05-04m68k: early parameter supportRoman Zippel2-18/+23
Add early parameter support and convert current users to it. Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-05-04m68k: reformat various m68k filesRoman Zippel2-757/+706
Reformat various m68k files, so they actually look like Linux sources. Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-05-04m68k: Atari keyboard and mouse support.Michael Schmitz2-0/+731
Atari keyboard and mouse support. (reformating and Kconfig fixes by Roman Zippel) Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-02-14[PATCH] Scheduled removal of SA_xxx interrupt flags fixupsThomas Gleixner1-1/+1
The obsolete SA_xxx interrupt flags have been used despite the scheduled removal. Fixup the remaining users. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Ingo Molnar <[email protected]> Cc: "Luck, Tony" <[email protected]> Cc: Roman Zippel <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Wim Van Sebroeck <[email protected]> Cc: Roland Dreier <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: James Bottomley <[email protected]> Cc: Greg KH <[email protected]> Cc: Dave Airlie <[email protected]> Cc: James Simmons <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2006-12-09[PATCH] m68k/Atari: 2.6.18 Atari IDE interrupt needs SA_SHIRQMichael Schmitz1-1/+1
Atari IDE: The interrupt needs SA_SHIRQ now to get registered. Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2006-12-07[PATCH] m68k: replace kmalloc+memset with kzallocYan Burman1-2/+1
Replace kmalloc+memset with kzalloc Signed-off-by: Yan Burman <[email protected]> Cc: Roman Zippel <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.