aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/amiga
AgeCommit message (Collapse)AuthorFilesLines
2011-11-08m68k/amiga: Refactor amiints.cGeert Uytterhoeven1-51/+47
- Remove filename in comments, - Reorder functions so we no longer need forward declarations. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Remove obsolete IRQ_FLG_* usersGeert Uytterhoeven1-29/+0
The m68k core irq code stopped honoring these flags during the irq restructuring in 2006. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Rename {,__}m68k_handle_int()Geert Uytterhoeven2-13/+13
- Rename m68k_handle_int() to generic_handle_irq(), and drop the unneeded asmlinkage, - Rename __m68k_handle_int() to do_IRQ(). Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Add m68k_setup_irq_controller()Geert Uytterhoeven2-3/+6
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 Uytterhoeven2-19/+22
Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Thomas Gleixner <[email protected]>
2011-11-08m68k/irq: Rename irq_controller to irq_chipGeert Uytterhoeven2-15/+12
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-07-30m68k/amiga: Chip RAM - Use lookup_resource()Geert Uytterhoeven1-11/+11
Replace a custom implementation (which doesn't lock the resource tree) by a call to lookup_resource() Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-07-30m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDRGeert Uytterhoeven1-1/+1
Technically, the end of Chip RAM should be offset by CHIP_PHYSADDR (which is zero). Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-07-30m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one errorGeert Uytterhoeven1-1/+1
Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-07-30m68k/amiga: Chip RAM - Change chipavail to an atomic_tGeert Uytterhoeven1-6/+9
While the core resource handling code is safe, our global counter must still be protected against concurrent modifications. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-07-30m68k/amiga: Chip RAM - Always allocate from the start of memoryGeert Uytterhoeven1-20/+15
As of commit 5df1abdbd37af2ae317a1c5b5944173284dc55d6 ('m68k/amiga: Fix "debug=mem"'), "debug=mem" no longer uses amiga_chip_alloc_res(), so we can remove the hack to prefer memory at the safe end. This allows to simplify the code and make amiga_chip_alloc() just call amiga_chip_alloc_res() internally. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-07-30m68k/amiga: Chip RAM - Convert from printk() to pr_*()Geert Uytterhoeven1-20/+8
and fix a few formattings: - resource sizes are now resource_size_t, use %pR to make it future proof, - use %lu for unsigned long. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-07-30m68k/amiga: Chip RAM - Use tabs for indentationGeert Uytterhoeven1-57/+61
Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k/amiga: Reclaim Chip RAM for PPC exception handlersGeert Uytterhoeven1-4/+0
On m68k, it doesn't make sense to reserve memory for the PPC exception handlers, and APUS support is dead. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-01-23m68k/amiga: Fix "debug=mem"Geert Uytterhoeven1-9/+7
`debug=mem' on Amiga has been broken for a while. early_param() processing is done very/too early, i.e. before amiga_identify() / amiga_chip_init(), causing amiga_savekmsg_setup() not to find any Chip RAM. As we don't plan to free this memory anyway, just steal it from the initial Chip RAM memory block instead. Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - RTC platform device conversionGeert Uytterhoeven2-174/+17
The A2000 TOD is an Oki MSM6242B, while the A3000 TOD is a Ricoh RP5C01. Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Parallel port platform device conversionGeert Uytterhoeven1-0/+3
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Serial port platform device conversionGeert Uytterhoeven1-0/+3
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Mouse platform device conversionGeert Uytterhoeven1-0/+3
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Keyboard platform device conversionGeert Uytterhoeven1-0/+5
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Amiga Gayle IDE platform device conversionGeert Uytterhoeven1-1/+62
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - A4000T SCSI platform device conversionGeert Uytterhoeven1-0/+11
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - A3000 SCSI platform device conversionGeert Uytterhoeven1-0/+11
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-17m68k: amiga - Floppy platform device conversionGeert Uytterhoeven1-0/+5
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-17m68k: amiga - Sound platform device conversionGeert Uytterhoeven1-0/+5
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-17m68k: amiga - Frame buffer platform device conversionGeert Uytterhoeven1-0/+15
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-17m68k: amiga - Zorro host bridge platform device conversionGeert Uytterhoeven2-1/+59
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-02-27m68k: Use DIV_ROUND_CLOSESTJulia Lawall1-1/+1
The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d but is perhaps more readable. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @haskernel@ @@ @depends on haskernel@ expression x,__divisor; @@ - (((x) + ((__divisor) / 2)) / (__divisor)) + DIV_ROUND_CLOSEST(x,__divisor) // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2009-08-26m68k: cnt reaches -1, not 0Roel Kluin1-2/+4
With the postfix decrement cnt reaches -1 rather than 0. Signed-off-by: Roel Kluin <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2009-01-12m68k: amiga 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]>
2008-10-23proc: move /proc/hardware to m68k-specific codeAlexey Dobriyan1-12/+9
Signed-off-by: Alexey Dobriyan <[email protected]>
2008-10-14m68k: Modular Amiga keyboard needs key_mapsGeert Uytterhoeven1-0/+9
| ERROR: "key_maps" [drivers/input/keyboard/amikbd.ko] undefined! Export key_maps in the Amiga core code, as its defined in an autogenerated file (drivers/char/defkeymap.c) Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-24PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architecturesAndrea Righi1-0/+1
On 32-bit architectures PAGE_ALIGN() truncates 64-bit values to the 32-bit boundary. For example: u64 val = PAGE_ALIGN(size); always returns a value < 4GB even if size is greater than 4GB. The problem resides in PAGE_MASK definition (from include/asm-x86/page.h for example): #define PAGE_SHIFT 12 #define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) ... #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) The "~" is performed on a 32-bit value, so everything in "and" with PAGE_MASK greater than 4GB will be truncated to the 32-bit boundary. Using the ALIGN() macro seems to be the right way, because it uses typeof(addr) for the mask. Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h. See also lkml discussion: http://lkml.org/lkml/2008/6/11/237 [[email protected]: fix drivers/media/video/uvc/uvc_queue.c] [[email protected]: fix v850] [[email protected]: fix powerpc] [[email protected]: fix arm] [[email protected]: fix mips] [[email protected]: fix drivers/media/video/pvrusb2/pvrusb2-dvb.c] [[email protected]: fix drivers/mtd/maps/uclinux.c] [[email protected]: fix powerpc] Signed-off-by: Andrea Righi <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-20m68k/amiga/: possible cleanupsAdrian Bunk1-14/+6
This patch contains the following possible cleanups: - amiints.c: add a proper prototype for amiga_init_IRQ() in include/asm-m68k/amigaints.h - make the following needlessly global code static: - config.c: amiga_model - config.c: amiga_psfreq - config.c: amiga_serial_console_write() - #if 0 the following unused functions: - config.c: amiga_serial_puts() - config.c: amiga_serial_console_wait_key() - config.c: amiga_serial_gets() - remove the following unused variable: - config.c: amiga_masterclock Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-20export amiga_vblankAdrian Bunk1-0/+2
This patch fixes the following build error: <-- snip --> .. Building modules, stage 2. MODPOST 1203 modules ERROR: "amiga_vblank" [drivers/video/amifb.ko] undefined! .. make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk <[email protected]> Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-06cleanup after APUS removalAdrian Bunk1-2/+0
After the APUS removal, some code can be removed. Signed-off-by: Adrian Bunk <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Karsten Keil <[email protected]> Cc: James Bottomley <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-06Remove pointless casts from void pointersJeff Garzik1-1/+1
Mostly in and around irq handlers. Signed-off-by: Jeff Garzik <[email protected]> Cc: Russell King <[email protected]> Cc: "Luck Tony" <[email protected]> Cc: Roman Zippel <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Cc: Karsten Keil <[email protected]> Acked-by: "John W. Linville" <[email protected]> Cc: James Bottomley <[email protected]> Cc: David Brownell <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Acked-by: Josh Boyer <[email protected]> Acked-by: Holger Schurig <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-02-05m68k: kill arch/m68k/amiga/amiga_ksyms.cAdrian Bunk6-34/+32
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: ARRAY_SIZE() cleanupAlejandro Martinez Ruiz1-1/+1
Signed-off-by: Alejandro Martinez Ruiz <[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-10-20spelling fixes: arch/m68k/Simon Arlott1-1/+1
Spelling fixes in arch/m68k/. Signed-off-by: Simon Arlott <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
2007-05-07SPIN_LOCK_UNLOCKED cleanup in arch/m68kMilind Arun Choudhary2-3/+3
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-04m68k: early parameter supportRoman Zippel1-19/+22
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 Zippel1-540/+536
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]>
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]>
2006-10-09IRQ: Use the new typedef for interrupt handler function pointersDavid Howells1-2/+2
Use the new typedef for interrupt handler function pointers rather than actually spelling out the full thing each time. This was scripted with the following small shell script: #!/bin/sh egrep -nHrl -e 'irqreturn_t[ ]*[(][*]' $* | while read i do echo $i perl -pi -e 's/irqreturn_t\s*[(]\s*[*]\s*([_a-zA-Z0-9]*)\s*[)]\s*[(]\s*int\s*,\s*void\s*[*]\s*[)]/irq_handler_t \1/g' $i || exit $? done Signed-Off-By: David Howells <[email protected]>
2006-10-07[PATCH] m68k pt_regs fixesAl Viro3-25/+24
m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2006-07-02[PATCH] irq-flags: M68K: Use the new IRQF_ constantsThomas Gleixner2-2/+2
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Benjamin Herrenschmidt <[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]>
2006-06-30Remove obsolete #include <linux/config.h>Jörn Engel4-4/+0
Signed-off-by: Jörn Engel <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
2006-06-25[PATCH] m68k: convert amiga irq codeRoman Zippel4-440/+114
Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2006-06-25[PATCH] m68k: introduce irq controllerRoman Zippel1-3/+1
Introduce irq controller and use it to manage auto vector interrupts. Introduce setup_irq() which can be used for irq setup. Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>