aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAge
* [PATCH] ppc32: add Freescale MPC885ADS board supportAndrei Konovalov2005-07-05
| | | | | | | | | | | | | | | | | | This patch adds the Freescale MPC86xADS board support. The supported devices are SMC UART and 10Mbit ethernet on SCC1. The manual for the board says that it "is compatible with the MPC8xxFADS for software point of view". That's why this patch extends FADS instead of introducing a new platform. FEC is not supported as the "combined FCC/FEC ethernet driver" driver by Pantelis Antoniou should replace the current FEC driver. Signed-off-by: Gennadiy Kurtsman <gkurtsman@ru.mvista.com> Signed-off-by: Andrei Konovalov <akonovalov@ru.mvista.com> Acked-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-07-05
|\
| * [SHAPER]: Switch to spinlocks.Christoph Hellwig2005-07-05
| | | | | | | | | | | | | | | | | | | | Dave, you were right and the sleeping locks in shaper were broken. Markus Kanet noticed this and also tested the patch below that switches locking to spinlocks. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [TG3]: Update driver version and reldate.David S. Miller2005-07-05
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * [TG3]: support for ethtool -CMichael Chan2005-07-05
| | | | | | | | | | | | | | Add support for ethtool -C with verification of user parameters. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SKGE]: Fix build on big-endianDavid S. Miller2005-07-05
| | | | | | | | | | | | Missing PCI_REV_DESC define. Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-07-05
|\ \
| * | [SPARC]: bpp: remove sleep_on usageChristoph Hellwig2005-07-04
| |/ | | | | | | | | | | | | Use schedule_timeout() instead of sleep_on + timer. Totally untested due to lack of hardware, but the changes are rather trivial. Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6Linus Torvalds2005-07-05
|\ \ | |/ |/|
| * [PATCH] gregkh-pci-pci-assign-unassigned-resources fixAndy Whitcroft2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | It seems that X86 architectures in general need the setup-bus.o not just those with HOTPLUG. This avoids the following error on X86_NUMAQ and x86_64: arch/i386/pci/built-in.o(.init.text+0x15a6): In function `pcibios_init': : undefined reference to `pci_assign_unassigned_resources' Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] pci: cleanup argument comments for pci_{save,restore}_stateJohn W. Linville2005-07-01
| | | | | | | | | | | | | | | | The buffer arguments have been removed from pci_{save,restore}_state. The comment blocks for those functions should reflect that. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] PCI: Remove newline from pci MODALIAS variableHannes Reinecke2005-07-01
| | | | | | | | | | | | | | | | the pci core sends out a hotplug event variable MODALIAS with a trailing newline. This is inconsistent with all other event variables and breaks some hotplug tools. This patch removes the said newline. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] PCI: acpi tg3 ethernet not coming back properly after S3 suspendon ↵long2005-07-01
| | | | | | | | | | | | | | | | | | | | DellM70 This patch, is based on kernel 2.6.12, provides a fix for PCIe port bus driver suspend/resume. Signed-off-by: T. Long Nguyen <tom.l.nguyen@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] PCI: Add PCI quirk for SMBus on the Asus P4B-LXJean Delvare2005-07-01
| | | | | | | | | | | | | | | | | | One more Asus motherboard requiring the SMBus quirk (P4B-LX). Original patch from Salah Coronya. Signed-off-by: Salah Coronya <salahx@yahoo.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] PCI: clean up dynamic pci id logicGreg Kroah-Hartman2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dynamic pci id logic has been bothering me for a while, and now that I started to look into how to move some of this to the driver core, I thought it was time to clean it all up. It ends up making the code smaller, and easier to follow, and fixes a few bugs at the same time (dynamic ids were not being matched everywhere, and so could be missed on some call paths for new devices, semaphore not needed to be grabbed when adding a new id and calling the driver core, etc.) I also renamed the function pci_match_device() to pci_match_id() as that's what it really does. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] PCI: pci_assign_unassigned_resources() on x86Ivan Kokshaysky2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add sanity check for io[port,mem]_resource in setup-bus.c. These resources look like "free" as they have no parents, but obviously we must not touch them. - In i386.c:pci_allocate_bus_resources(), if a bridge resource cannot be allocated for some reason, then clear its flags. This prevents any child allocations in this range, so the setup-bus code will work with a clean resource sub-tree. - i386.c:pcibios_enable_resources() doesn't enable bridges, as it checks only resources 0-5, which looks like a clear bug to me. I suspect it might break hotplug as well in some cases. From: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] PCI: handle subtractive decode pci-pci bridge betterIvan Kokshaysky2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the number of PCI bus resources increased to 8, we can handle the subtractive decode PCI-PCI bridge like a normal bridge, taking into account standard PCI-PCI bridge windows (resources 0-2). This helps to avoid problems with peer-to-peer DMA behind such bridges, poor performance for MMIO ranges outside bridge windows and prefetchable vs. non-prefetchable memory issues. To reflect the fact that such bridges do forward all addresses to the secondary bus (transparency), remaining bus resources 3-7 are linked to resources 0-4 of the primary bus. These resources will be used as fallback by resource management code if allocation from standard bridge windows fails for some reason. Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] PCI: Fix up PCI routing in parent bridgeGreg Kroah-Hartman2005-07-01
| | | | | | | | | | | | | | | | | | When the cardbus bridge is behind another bridge change the routing in the parent bridge for new cards. This fixes Cardbus on various AMD64 laptops. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-07-03
|\ \
| * | [PATCH] ARM: 2785/1: S3C24XX - serial calls request_irq() with IRQs disabledBen Dooks2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks The request_irq() function is called by s3c24xx uart driver with the local IRQs disabled. The request_irq() function can allocate memory via kmalloc(), and this may sleep causing a warning about sleeping in an invalid context. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-07-03
|\ \ \
| * | | [PATCH] Serial: Fix console port spinlock initialisationRussell King2005-07-03
| |/ / | | | | | | | | | | | | | | | | | | Initialise the spinlock for port being used by the console early, but don't re-initialise it again later. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [PATCH] drivers/ide/Makefile: kill dead CONFIG_BLK_DEV_IDE_TCQ entryAdrian Bunk2005-07-03
| | | | | | | | | | | | | | | | | | This patch kills the dead CONFIG_BLK_DEV_IDE_TCQ entry. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] amd74xx: support MCP55 device IDsRob Punkunus2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Rob Punkunus <rpunkunus@nvidia.com> Rob Punkunus recently submitted a patch to enable support for MCP51/MCP55 in the amd74xx driver. This patch was whitespace-corrupted and didn't apply to 2.6.12 since MCP51 support was merged in the 2.6.12-rc series. Gentoo would like to support this hardware for our upcoming release media, so I fixed the patch, and here it is :) Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: fix line break in ide messagesDenis Vlasenko2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | From: Denis Vlasenko <vda@ilport.com.ua> * printk("\n") is misplaced, resulting in stray empty line in kernel log * cleanups nerby: some back-to-back printks are combined, etc Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit via82cxxx.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit triflex.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit slc90e66.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit sl82c105.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit sc1200.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit opti621.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit ns87415.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit it8172.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit cy82c693.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit cs5530.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit amd74xx.cHerbert Xu2005-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | | [PATCH] ide: hotplug mark __devinit alim15x3.cHerbert Xu2005-07-03
|/ / | | | | | | | | | | | | | | | | | | | | | | From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. see the thread about the pci hotplug crash on a stratus box. http://marc.theaimsgroup.com/?l=linux-kernel&m=111930108613386&w=2 Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
* | Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2005-07-02
|\ \
| * | [PATCH] MMC: wbsd cleanupsAdrian Bunk2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the following possible cleanups: - make some needlessly global code static - remove the unneeded global function DBG_REG Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] MMC: wbsd delayed insertionPierre Ossman2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | Wait 0.5 seconds before scanning for cards after an insertion interrupt. The electrical connection needs this time to stabilise for some cards. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] MMC: Fix divdi3 reference in mmci.cRussell King2005-07-01
| |/ | | | | | | | | | | Use do_div() instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* / If ACPI doesn't find an irq listed, don't accept 0 as a valid PCI irq.Linus Torvalds2005-07-02
|/ | | | That zero just means that nothing else found any irq information either.
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-06-30
|\
| * [PATCH] ARM: 2780/1: AFS partition length calculation fixCatalin Marinas2005-06-30
| | | | | | | | | | | | | | | | | | | | | | Patch from Catalin Marinas This patch calculates the AFS partition length by expanding the image length information to the nearest erase block boundary. This eliminates the problems with JFFS2 erasing the footer. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] ARM: Acornfb: Don't claim IRQ fbcon for cursorRussell King2005-06-30
| | | | | | | | | | | | | | | | | | | | | | The generic fbcon code tries to register and use the vsync IRQ for ARM platforms with acornfb, but forgets to disable its own cursor timer. The result is a flickering flashing cursor. Remove the code from the fbcon core to register this platform private interrupt. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-06-30
|\ \
| * | [PATCH] Serial: Fix small CONFIG_SERIAL_8250_NR_UARTSRussell King2005-06-30
| |/ | | | | | | | | | | | | | | | | If CONFIG_SERIAL_8250_NR_UARTS is smaller than the array size in asm/serial.h, we trampled on memory which wasn't ours. Take our big boots away by limiting the number of ports initialised to the smaller of ...NR_UARTS and the array size. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6Linus Torvalds2005-06-30
|\ \
| * | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Greg KH2005-06-30
| |\|
| * | [PATCH] Driver core: Use klist_del() instead of klist_remove().Patrick Mochel2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use klist_del() instead of klist_remove() when unregistering devices. This will prevent a deadlock when executing a recursive unregister using device_for_each_child(). Signed-off-by Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>