summaryrefslogtreecommitdiffstats
path: root/arch/m68k/amiga
Commit message (Collapse)AuthorAgeFilesLines
* m68k/amiga: Use arch_initcall() for registering platform devicesGeert Uytterhoeven2012-04-221-1/+1
| | | | | | | | module_init() maps to device_initcall(), opening the possibility of race conditions between platform_driver_probe() and registering platform devices. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Add error checks when registering platform devicesGeert Uytterhoeven2012-04-221-32/+90
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Mark z_dev_present() __initGeert Uytterhoeven2012-04-221-1/+1
| | | | | | It's called from amiga_init_devices() only, which is __init. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* Disintegrate asm/system.h for M68KDavid Howells2012-03-282-2/+0
| | | | | | | | Disintegrate asm/system.h for M68K. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Greg Ungerer <gerg@uclinux.org> cc: linux-m68k@lists.linux-m68k.org
* treewide: convert uses of ATTRIB_NORETURN to __noreturnJoe Perches2012-01-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | Use the more commonly used __noreturn instead of ATTRIB_NORETURN. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Joe Perches <joe@perches.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Haavard Skinnemoen <hskinnemoen@gmail.com> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Ralf Baechle <ralf@linux-mips.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Chris Metcalf <cmetcalf@tilera.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* treewide: remove useless NORET_TYPE macro and usesJoe Perches2012-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | It's a very old and now unused prototype marking so just delete it. Neaten panic pointer argument style to keep checkpatch quiet. Signed-off-by: Joe Perches <joe@perches.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Haavard Skinnemoen <hskinnemoen@gmail.com> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Ralf Baechle <ralf@linux-mips.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Chris Metcalf <cmetcalf@tilera.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* m68k/irq: Remove obsolete m68k irq frameworkGeert Uytterhoeven2011-11-081-114/+0
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Optimize interrupts using chain handlersGeert Uytterhoeven2011-11-081-0/+104
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Convert Amiga to genirqGeert Uytterhoeven2011-11-081-0/+3
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Refactor amiints.cGeert Uytterhoeven2011-11-081-51/+47
| | | | | | | - Remove filename in comments, - Reorder functions so we no longer need forward declarations. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/irq: Remove obsolete IRQ_FLG_* usersGeert Uytterhoeven2011-11-081-29/+0
| | | | | | | The m68k core irq code stopped honoring these flags during the irq restructuring in 2006. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/irq: Rename {,__}m68k_handle_int()Geert Uytterhoeven2011-11-082-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 <geert@linux-m68k.org>
* m68k/irq: Add m68k_setup_irq_controller()Geert Uytterhoeven2011-11-082-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 <geert@linux-m68k.org>
* m68k/irq: Switch irq_chip methods to "struct irq_data *data"Geert Uytterhoeven2011-11-082-19/+22
| | | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Thomas Gleixner <tglx@linutronix.de>
* m68k/irq: Rename irq_controller to irq_chipGeert Uytterhoeven2011-11-082-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 <geert@linux-m68k.org> Acked-by: Thomas Gleixner <tglx@linutronix.de>
* m68k/amiga: Chip RAM - Use lookup_resource()Geert Uytterhoeven2011-07-301-11/+11
| | | | | | | Replace a custom implementation (which doesn't lock the resource tree) by a call to lookup_resource() Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDRGeert Uytterhoeven2011-07-301-1/+1
| | | | | | | Technically, the end of Chip RAM should be offset by CHIP_PHYSADDR (which is zero). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one errorGeert Uytterhoeven2011-07-301-1/+1
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Chip RAM - Change chipavail to an atomic_tGeert Uytterhoeven2011-07-301-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 <geert@linux-m68k.org>
* m68k/amiga: Chip RAM - Always allocate from the start of memoryGeert Uytterhoeven2011-07-301-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 <geert@linux-m68k.org>
* m68k/amiga: Chip RAM - Convert from printk() to pr_*()Geert Uytterhoeven2011-07-301-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 <geert@linux-m68k.org>
* m68k/amiga: Chip RAM - Use tabs for indentationGeert Uytterhoeven2011-07-301-57/+61
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Reclaim Chip RAM for PPC exception handlersGeert Uytterhoeven2011-03-161-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 <geert@linux-m68k.org>
* m68k/amiga: Fix "debug=mem"Geert Uytterhoeven2011-01-231-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 <geert@linux-m68k.org>
* m68k: amiga - RTC platform device conversionGeert Uytterhoeven2010-05-262-174/+17
| | | | | | The A2000 TOD is an Oki MSM6242B, while the A3000 TOD is a Ricoh RP5C01. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Parallel port platform device conversionGeert Uytterhoeven2010-05-261-0/+3
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Serial port platform device conversionGeert Uytterhoeven2010-05-261-0/+3
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Mouse platform device conversionGeert Uytterhoeven2010-05-261-0/+3
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Keyboard platform device conversionGeert Uytterhoeven2010-05-261-0/+5
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Amiga Gayle IDE platform device conversionGeert Uytterhoeven2010-05-261-1/+62
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - A4000T SCSI platform device conversionGeert Uytterhoeven2010-05-261-0/+11
| | | | | Acked-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - A3000 SCSI platform device conversionGeert Uytterhoeven2010-05-261-0/+11
| | | | | Acked-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Floppy platform device conversionGeert Uytterhoeven2010-05-171-0/+5
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Sound platform device conversionGeert Uytterhoeven2010-05-171-0/+5
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Frame buffer platform device conversionGeert Uytterhoeven2010-05-171-0/+15
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga - Zorro host bridge platform device conversionGeert Uytterhoeven2010-05-172-1/+59
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: Use DIV_ROUND_CLOSESTJulia Lawall2010-02-271-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 <julia@diku.dk> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: cnt reaches -1, not 0Roel Kluin2009-08-261-2/+4
| | | | | | | | | With the postfix decrement cnt reaches -1 rather than 0. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: amiga core - Kill warn_unused_result warningsGeert Uytterhoeven2009-01-123-6/+13
| | | | | | | warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* proc: move /proc/hardware to m68k-specific codeAlexey Dobriyan2008-10-231-12/+9
| | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
* m68k: Modular Amiga keyboard needs key_mapsGeert Uytterhoeven2008-10-141-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 <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architecturesAndrea Righi2008-07-241-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 [akpm@linux-foundation.org: fix drivers/media/video/uvc/uvc_queue.c] [akpm@linux-foundation.org: fix v850] [akpm@linux-foundation.org: fix powerpc] [akpm@linux-foundation.org: fix arm] [akpm@linux-foundation.org: fix mips] [akpm@linux-foundation.org: fix drivers/media/video/pvrusb2/pvrusb2-dvb.c] [akpm@linux-foundation.org: fix drivers/mtd/maps/uclinux.c] [akpm@linux-foundation.org: fix powerpc] Signed-off-by: Andrea Righi <righi.andrea@gmail.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* m68k/amiga/: possible cleanupsAdrian Bunk2008-07-201-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 <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* export amiga_vblankAdrian Bunk2008-07-201-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 <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* cleanup after APUS removalAdrian Bunk2008-02-061-2/+0
| | | | | | | | | | | | | After the APUS removal, some code can be removed. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Cc: Karsten Keil <kkeil@suse.de> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Remove pointless casts from void pointersJeff Garzik2008-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | Mostly in and around irq handlers. Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: "Luck Tony" <tony.luck@intel.com> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Dmitry Torokhov <dtor@mail.ru> Cc: Karsten Keil <kkeil@suse.de> Acked-by: "John W. Linville" <linville@tuxdriver.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: David Brownell <david-b@pacbell.net> Cc: "Antonino A. Daplas" <adaplas@pol.net> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Acked-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* m68k: kill arch/m68k/amiga/amiga_ksyms.cAdrian Bunk2008-02-056-34/+32
| | | | | | | | | | EXPORT_SYMBOL's belong to the actual code. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* m68k: ARRAY_SIZE() cleanupAlejandro Martinez Ruiz2008-02-051-1/+1
| | | | | | | | Signed-off-by: Alejandro Martinez Ruiz <alex@flawedcode.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* spelling fixes: arch/m68k/Simon Arlott2007-10-201-1/+1
| | | | | | | | Spelling fixes in arch/m68k/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
* SPIN_LOCK_UNLOCKED cleanup in arch/m68kMilind Arun Choudhary2007-05-072-3/+3
| | | | | | | | | | SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 04:08:11 +0000