summaryrefslogtreecommitdiffstats
path: root/arch/m68k/amiga
Commit message (Collapse)AuthorAgeFilesLines
* m68k: amiga: Add linux/irq.h to make it compile againThomas Gleixner2014-03-191-0/+1
| | | | | | | | | The removal of linux/irq.h from kernel_stat.h causes arch/m68k/amiga/cia.c:171: error: 'handle_simple_irq' undeclared Reported-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* m68k/amiga,atari: Fix specifying multiple debug= parametersGeert Uytterhoeven2013-12-081-5/+14
| | | | | | | | | | | | | | | | | | | | | Since commit d6713b4091a99fa2af2fabdcd2f3fb97f32ecf2e ("m68k: early parameter support"), the user can specify multiple debug consoles using the "debug=" kernel command line parameter. However, as there's only a single struct console object, which is reused, it would actually register the same console object multiple times, causing the following warning: WARNING: CPU: 0 PID: 0 at kernel/printk/printk.c:2233 register_console+0x36/ console 'debug0' already registered Make sure to register the console object only once, to avoid the warning. Note that still only one console (the one corresponding to the last "debug=" parameter) will be active at the same time, as the .write() method of the already registered console object is overwritten by a subsequent "debug=" parameter. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/amiga: Provide mach_random_get_entropy()Geert Uytterhoeven2013-11-261-0/+10
| | | | | | | Use the beam position registers, which provide at least 17 bits of data changing at 1.79 MHz. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>Geert Uytterhoeven2013-11-261-9/+9
| | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k/UAPI: Disintegrate arch/m68k/include/asm/bootinfo.hGeert Uytterhoeven2013-11-261-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 <geert@linux-m68k.org>
* zorro/UAPI: Use proper types (endianness/size) in <linux/zorro.h>Geert Uytterhoeven2013-11-262-7/+11
| | | | | | | | | Fix member definitions for non-native userspace handling: - All multi-byte values are big-endian, hence use __be*, - All pointers are 32-bit pointers under AmigaOS, but unused (except for cd_BoardAddr) under Linux, hence use __be32. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* zorro: ZTWO_VADDR() should return "void __iomem *"Geert Uytterhoeven2013-11-262-2/+2
| | | | | | | | | | | ZTWO_VADDR() converts from physical to virtual I/O addresses, so it should return "void __iomem *" instead of "unsigned long". This allows to drop several casts, but requires adding a few casts to accomodate legacy driver frameworks that store "unsigned long" I/O addresses. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* zorro: Do not allocate zorro_autocon[] staticallyGeert Uytterhoeven2013-11-262-5/+5
| | | | | | | | | | | | | | Currently the array of Zorro devices is allocated statically, wasting up to 4.5 KiB when running an Amiga or multi-platform kernel on a machine with no or a handful of Zorro expansion cards. Convert it to conditional dynamic memory allocation to fix this. amiga_parse_bootinfo() still needs to store some information about the detected Zorro devices, at a time even the bootmem allocator is not yet available. This is now handled using a much smaller array (typically less than 0.5 KiB), which is __initdata and thus freed later. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* m68k: Mark functions only called from setup_arch() __initGeert Uytterhoeven2013-11-261-1/+1
| | | | | | | Some functions that are only called (indirectly) from setup_arch() lack __init annotations. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.Rusty Russell2013-07-151-1/+1
| | | | | | | | | | | | Sweep of the simple cases. Cc: netdev@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-arm-kernel@lists.infradead.org Cc: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* m68k: set arch_gettimeoffset directlyStephen Warren2012-12-241-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 <funaho@jurai.org> Cc: Sam Creasey <sammy@sammy.net> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Phil Blundell <philb@gnu.org> Signed-off-by: Stephen Warren <swarren@nvidia.com>
* m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERRThomas Meyer2012-08-181-4/+1
| | | | | | | | | | | The semantic patch that makes this change is available in scripts/coccinelle/api/ptr_ret.cocci. More information about semantic patching is available at http://coccinelle.lip6.fr/ Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* 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>
OpenPOWER on IntegriCloud