aboutsummaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAge
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-pariscLinus Torvalds2009-04-03
|\ | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc: powerpc/ps3: Add rtc-ps3 powerpc: Hook up rtc-generic, and kill rtc-ppc m68k: Hook up rtc-generic parisc: rtc: Rename rtc-parisc to rtc-generic parisc: rtc: Add missing module alias parisc: rtc: platform_driver_probe() fixups parisc: rtc: get_rtc_time() returns unsigned int
| * powerpc/ps3: Add rtc-ps3Geert Uytterhoeven2009-04-01
| | | | | | | | | | | | | | | | | | | | Create a real RTC driver for PS3, and unhook the deprecated ppc_md.[gs]et_rtc_time. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Acked-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * powerpc: Hook up rtc-generic, and kill rtc-ppcGeert Uytterhoeven2009-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PowerPC has been a long time user of the generic RTC abstraction, so hook up rtc-generic: - Create the "rtc-generic" platform device if ppc_md.get_rtc_time is set, - Kill rtc-ppc, as rtc-generic offers the same functionality in a more generic way, and supports autoloading through udev. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Acked-by: David Woodhouse <David.Woodhouse@intel.com> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * m68k: Hook up rtc-genericGeert Uytterhoeven2009-04-01
| | | | | | | | | | | | | | | | | | | | | | | | m68k has been a long time user of the generic RTC abstraction, so hook up rtc-generic: - Create the "rtc-generic" platform device if mach_hwclk is set, - Add checks for mach_hwclk, in anticipation of RTC chip drivers being moved to drivers/rtc/. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * parisc: rtc: Rename rtc-parisc to rtc-genericGeert Uytterhoeven2009-04-01
| | | | | | | | | | | | | | | | | | | | The rtc-parisc driver is not PA-RISC specific at all, as it uses the existing (but deprecated) generic RTC infrastructure ([gs]et_rtc_time()). Rename the driver from rtc-parisc to rtc-generic. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
* | mm: fix misuse of debug_kmap_atomicAkinobu Mita2009-04-03
| | | | | | | | | | | | | | | | Commit 7ca43e7564679604d86e9ed834e7bbcffd8a4a3f ("mm: use debug_kmap_atomic") introduced some debug_kmap_atomic() in wrong places. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2009-04-03
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits) m68knommu: improve compile arch switch settings m68knommu: fix 5407 ColdFire UART vector setup m68knommu: fix 5307 ColdFire UART vector setup m68knommu: fix 5249 ColdFire UART vector setup m68knommu: fix 5249 ColdFire UART setup m68knommu: fix end of uart table marker m68knommu: switch to using generic_handle_irq() m68k: merge the mmu and non-mmu versions of tlbflush.h m68knommu: introduce basic clk infrastructure m68k: merge the mmu and non-mmu versions of module.h m68knommu: add missing interrupt line definition for UART 2 m68k: merge the mmu and non-mmu versions of mmu_context.h m68k: merge the mmu and non-mmu versions of current.h m68k: merge the mmu and non-mmu versions of div64.h m68k: merge the mmu and non-mmu versions of bugs.h m68k: merge the mmu and non-mmu versions of bug.h m68k: use the mmu version of cache.h for m68knommu as well m68k: use the mmu version of bootinfo.h for m68knommu as well m68k: merge the mmu and non-mmu versions of fb.h m68k: merge the mmu and non-mmu versions of segment.h ...
| * | m68knommu: improve compile arch switch settingsGreg Ungerer2009-03-29
| | | | | | | | | | | | | | | | | | | | | Modern versions of gcc have a better range of ColdFire optimization switches for the vairous ColdFire family members. Use these when we can. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: fix 5407 ColdFire UART vector setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is a couple of problems with the UART vector setup for the 5307 ColdFire UART. The ICR register access should be 8bit, not 32bit. The address of the UIVR register is wrong, it needs to be offset into the MBAR register region. Fix these. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: fix 5307 ColdFire UART vector setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is a couple of problems with the UART vector setup for the 5307 ColdFire UART. The ICR register access should be 8bit, not 32bit. The address of the UIVR register is wrong, it needs to be offset into the MBAR register region. Fix these. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: fix 5249 ColdFire UART vector setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | The address of the IVUR register is not correct, it should be offset into the MBAR region. Without this the vector is not set to the correct number. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: fix 5249 ColdFire UART setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | The ICR registers of the 5249 ColdFire processor are 8bits, not 32bits. Fix the read/write of these register to be the correct size. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: fix end of uart table markerGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | The UART platform data structure is missing an empty struct at the end (as the end of structure marker). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: switch to using generic_handle_irq()Greg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | Switch to using generic_handle_irq() instead of the deprecated __do_IRQ(). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68k: merge the mmu and non-mmu versions of tlbflush.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | Simple merge of the mmu and non-mmu versions of tlbflush.h Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: introduce basic clk infrastructureGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | Create basic support for clk API. Recent changes to the FEC driver (used by many ColdFire family parts) need this. Initially only supports getting the master clock frequency. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68k: merge the mmu and non-mmu versions of module.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | Simple merge of the mmu and non-mmu versions of module.h Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: add missing interrupt line definition for UART 2Greg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Wu <david.wu@arcturusnetworks.com> Acked-by: Michael Durrant <mdurrant@arcturusnetworks.com> Acked-by: Oleksandr Zhadan <oleks@arcturusnetworks.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68k: merge the mmu and non-mmu versions of mmu_context.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | Simple merge of the mmu and non-mmu versions of mmu_context.h Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68k: merge the mmu and non-mmu versions of current.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of current.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of div64.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of div64.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of bugs.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of bugs.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of bug.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of bug.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use the mmu version of cache.h for m68knommu as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | The non-mmu version of cache.h is almost the same as the mmu version. Merge them. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use the mmu version of bootinfo.h for m68knommu as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | All m68k varients can use the same mmu version of bootinfo.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of fb.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of fb.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of segment.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu version of segment.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of ucontext.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | The non-mmu m68k setups can use the mm ucontext.h with no change. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: Restore correct include guards for <asm/unaligned.h>Geert Uytterhoeven2009-03-24
| | | | | | | | | | | | | | | Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68k: Use dma_addr_t for scatterlist.dma_addressGeert Uytterhoeven2009-03-24
| | | | | | | | | | | | | | | | | | | | | dma_addr_t (as was used by m68knommu) is more correct than u32. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68k: merge the mmu and non-mmu versions of pgalloc.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu version of pgalloc.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68knommu: mv definition of check_pgt_cache()Greg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | Move the definition of check_pgt_cache() to be consistent with where m68k defines it. (Will make merging of these headers easier later on). Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of page_offset.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of page_offset.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: the one hw_irq.h can be used buy all m68kGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | The mmu and non-mmu hw_irq.h are identical, revert to a single copy. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use non-mmu version of unaligned.h for all m68kGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | The non-mmu version is appropriately ifdef'ed to be used "as is" on all m68k varients. So switch to it as the only unaligned.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use mmu version of elf.h for non-mmu builds as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | Nothing specificly needed to support non-mmu m68k in elf.h, so just use the mmu one. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use mmu timex.h for non-mmu setups as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | The non-mmu timex.h can be cleaned up and ends up being identical to the mmu timex.h, just just use that. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use mmu fpu.h for non-mmu builds as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | None of the currently support m68knommu targets have an FPU. Use the mmu version of fpu.h for all m68k. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use mmu scatterlist.h for non-mmu setups as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | There is only trivial differences between the non-mmu and mmu versions of scatterlist.h. So use the mmu one and remove the non-mmu one. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: merge the mmu and non-mmu versions of mmu.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | Trivial merge of the contents of mmu and non-mmu versions of mmu.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68knommu: remove no longer used mcfpci.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | The mcfpci.h was only used by the removed (m68knommu) COMEMPCI code. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use mmu kmap_types.h for non-mmu setups as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | The mmu version of kmap_types.h is identical to the non-mmu one. Revert to a single file. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use the mc146818rtc.h for non-mmu setups as well.Greg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | The mmu varient of mc146818rtc.h can be use on the non-mmu builds as well. Revert to the single mc146818rtc.h file. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: swtich non-mmu setups to use the mmu dma-mapping.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The mmu version of dma-mapping.h (which is dma-mapping_mm.h) is clean to be used for non-mmu setups as well. Remove dma-mapping_no.h and revert dma-mapping_mm.h to dma-mapping.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68k: use the mmu pci.h for m68knommu as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The (m68knommu) COMEMPCI support has been removed from the kernel, so now the mmu pci.h can be used on non-mmu setups as well. Remove the non-mmu pci_no.h and revert the pci_mm.h to be pci.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | m68knommu: add a local dma_sync_single_for_cpu() functionGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | The onboard ethernet of many ColdFire parts uses DMA. The driver is being cleaned up to use the correct DMA handling functions, and m68knommuy currently does not implement dma_sync_single_for_cpu(). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | m68knommu: mark all RAM as ZONE_DMAGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | There is no reason not to put all RAM in ZONE_DMA for these simple m68k varients (same as the standard MMU m68k code does). With this in place the usual dma_alloc_coherent() work as expected. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-04-03
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] fix build-breaking 7a192ec commit ARM: Add SMSC911X support to Overo platform (V2) arm: update omap_ldp defconfig to use smsc911x arm: update realview defconfigs to use smsc911x arm: update pcm037 defconfig to use smsc911x arm: convert omap ldp platform to use smsc911x arm: convert realview platform to use smsc911x arm: convert pcm037 platform to use smsc911x [ARM] 5444/1: ARM: Realview: Fix event-device multiplicators in localtimer.c [ARM] 5442/1: pxa/cm-x255: fix reverse RDY gpios in PCMCIA driver [ARM] 5441/1: Use pr_err on error paths in at91 pm [ARM] 5440/1: Fix VFP state corruption due to preemption during VFP exceptions [ARM] 5439/1: Do not clear bit 10 of DFSR during abort handling on ARMv6 [ARM] 5437/1: Add documentation for "nohlt" kernel parameter [ARM] 5436/1: ARM: OMAP: Fix compile for rx51 [ARM] arch_reset() now takes a second parameter [ARM] Kirkwood: small L2 code cleanup [ARM] Kirkwood: invalidate L2 cache before enabling it
| * \ \ Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6Russell King2009-04-02
| |\ \ \
| | * | | ARM: Add SMSC911X support to Overo platform (V2)Steve Sakoman2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gumstix will soon be shipping a variant of their Summit board that includes an SMSC LAN9221 ethernet interface. This patch provides support via the smsc911x driver when enabled in kernel config. The Overo defconfig is not updated since the LAN9221 is an option not present on all systems. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Steve Glendinning <steve.glendinning@smsc.com>
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-10 16:51:51 -0500