summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of ↵Linus Torvalds2007-05-0830-510/+1188
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (40 commits) [netdrvr] atl1: fix build pasemi_mac: Use local-mac-address instead of mac-address if available pasemi_mac: PHY support pasemi_mac: Add msglevel support and "debug" module param pasemi_mac: Logic cleanup / rx performance improvements pasemi_mac: Minor cleanup / define fixes pasemi_mac: Add SKB reuse / copy-break pasemi_mac: Timer and interrupt fixes pasemi_mac: Abstract and fix up interrupt restart routines pasemi_mac: Move the IRQ mapping from the PCI layer to the driver tc35815: Remove unnecessary skb->dev assignment drivers/net/dm9000: Convert to generic boolean AT91RM9200 Ethernet: Fix multicast addressing AT91RM9200 Ethernet: Support additional PHYs PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code sky2: re-enable 88E8056 for most motherboards MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX ne: MIPS: Use platform_driver for ne on RBTX49XX ne: Add NEEDS_PORTLIST to control ISA auto-probe ne: Misc fixes for platform driver. ... Fix conflict in drivers/net/pasemi_mac.c (get_property() got renamed to of_get_property()) manually. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * [netdrvr] atl1: fix buildJeff Garzik2007-05-081-0/+1
| | | | | | | | | | | | We need linux/pci.h. Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Use local-mac-address instead of mac-address if availableOlof Johansson2007-05-081-1/+6
| | | | | | | | | | | | | | | | Use local-mac-address in the device tree instead. Fall back to mac-address for older firmware. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: PHY supportOlof Johansson2007-05-083-0/+133
| | | | | | | | | | | | | | PHY support for pasemi_mac. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Add msglevel support and "debug" module paramOlof Johansson2007-05-082-4/+23
| | | | | | | | | | | | | | | | Add msglevel support for pasemi_mac. Move the MODULE_* defines to the top to go together with the variable (similar to tg3). Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Logic cleanup / rx performance improvementsOlof Johansson2007-05-081-38/+37
| | | | | | | | | | | | | | Logic cleanup and some performance enhancements to the RX path. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Minor cleanup / define fixesOlof Johansson2007-05-082-10/+8
| | | | | | | | | | | | | | | | | | * Remove some unused defines * Fix a couple of wrong chip register defines, and add a few more fields that might be used in the near future. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Add SKB reuse / copy-breakOlof Johansson2007-05-081-7/+24
| | | | | | | | | | | | | | Add a copy-break and recycle the SKB in the driver for small packets. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Timer and interrupt fixesOlof Johansson2007-05-082-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | Timer and interrupt fixes: * Be pickier with what kind of interrupts are acked to avoid the device to get out of sync with the driver state * Set RX count threshhold to 1 (for NAPI interrupted mode), TX count threshold to 32. * Set timer thresholds to current max (~16ms). Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Abstract and fix up interrupt restart routinesOlof Johansson2007-05-081-3/+41
| | | | | | | | | | | | | | | | Abstract out (and fix up) the interrupt restart routines, making sure we start out in a consistent state. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: Move the IRQ mapping from the PCI layer to the driverOlof Johansson2007-05-082-9/+23
| | | | | | | | | | | | | | | | Fixes for ethernet IRQ mapping, to be done in the driver instead of in the platform setup code. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * tc35815: Remove unnecessary skb->dev assignmentAtsushi Nemoto2007-05-081-1/+0
| | | | | | | | | | | | | | | | Apply changes in commit 4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 to newly added piece of code. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * drivers/net/dm9000: Convert to generic booleanRichard Knutsson2007-05-081-7/+4
| | | | | | | | | | | | | | Convert to generic boolean. Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * AT91RM9200 Ethernet: Fix multicast addressingAndrew Victor2007-05-081-2/+2
| | | | | | | | | | | | | | | | | | The order that the two 32-bit words written to the Hash Address (Low, High) Registers for matching of multicast addresses is incorrect. Signed-off-by: Lars Reemts <Lars.Reemts@entwicklung.eq-3.de> Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * AT91RM9200 Ethernet: Support additional PHYsAndrew Victor2007-05-082-21/+73
| | | | | | | | | | | | | | | | | | | | | | | | Add support for a number of new PHY's in the AT91RM9200 Ethernet driver. - Teridian 78Q21x3 - SMSC LAN83C185 (Patch from Luca Gamma) - National Semiconductor DP83848 (Patches from Ivan Kuten & Thomas Foldesi) Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast codeKomuro2007-05-081-6/+8
| | | | | | | | | | | | | | | | | | Dear Jeff Subject: [PATCH] xirc2ps_cs: bugfix of multicast code Signed-off-by: Komuro <komurojun-mbn@nifty.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: re-enable 88E8056 for most motherboardsStephen Hemminger2007-05-081-4/+13
| | | | | | | | | | | | | | | | This fixes the regression in 2.6.21 for users with 88e8056 on motherboard. Allow all but the Gigabyte motherboard has some unresolved bus problems. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * ne: MIPS: Use platform_driver for ne on RBTX49XXAtsushi Nemoto2007-05-082-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch lets RBTX49XX boards use generic platform_driver interface for the ne driver. * Use platform_device to pass ioaddr and irq to the ne driver. * Remove unnecessary ifdefs for RBTX49XX from the ne driver. * Make the ne driver selectable on these boards regardless of CONFIG_ISA Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * ne: Add NEEDS_PORTLIST to control ISA auto-probeAtsushi Nemoto2007-05-081-3/+8
| | | | | | | | | | | | | | | | Add NEEDS_PORTLIST cpp macro to control ISA auto-probe. (I'm not sure M32R needs auto-probe but it is current behavior) Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * ne: Misc fixes for platform driver.Atsushi Nemoto2007-05-081-6/+7
| | | | | | | | | | | | | | | | | | | | Miscellaneous fixes to make ne platform driver work properly. * Make ioaddr 'unsigned long'. * Move a printk down to show dev->name assigned in register_netdev. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * ne: Add platform_driverAtsushi Nemoto2007-05-081-2/+89
| | | | | | | | | | | | | | | | Add a platform_driver interface to ne driver. (Existing legacy ports did not covered by this ne_driver for now) Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * libertas: fix for wireless Kconfig changesJohn W. Linville2007-05-081-1/+1
| | | | | | | | | | | | | | | | Need to change the libertas Kconfig entry to match changes made for other wireless drivers. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: fix whitespace damageJay Cliburn2007-05-081-11/+11
| | | | | | | | | | | | | | Remove trailing whitespace and spaces preceding tabs. Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: use dev_printk macrosJay Cliburn2007-05-084-87/+68
| | | | | | | | | | | | | | | | Use dev_printk macros for PCI related errors, warnings, debug and info console messages. Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * ehea: Fix skb header accessThomas Klein2007-05-081-3/+3
| | | | | | | | | | | | | | Adapt to new skb header access functions. Signed-off-by: Thomas Klein <tklein@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s390: qeth driver hardware specs adaptionsPeter Tiedemann2007-05-083-99/+247
| | | | | | | | | | | | | | | | | | | | | | s390: qeth driver hardware specs adaptions - according to the latest OSA hardware specification incorporate actual IPA command and return codes into qeth. - whitespaces removed from qeth_mpc.h Signed-off-by: Peter Tiedemann <ptiedem@de.ibm.com> Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s390: fix Oops when unloading module netiucvUrsula Braun2007-05-081-2/+3
| | | | | | | | | | | | | | | | | | | | don't remove an entry from iucv_connection_list in netiucv_exit(). netiucv_free_netdevice is called anyway, which takes care of entry removal. Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s390: free skbs in finite amount of time in qethUrsula Braun2007-05-083-17/+38
| | | | | | | | | | | | | | | | | | | | Free sent skbs in some finite amount of time. Affected are asynchronous queue of Hipersockets devices and the output queues of all eth-devices respectively. Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s390: qeth driver connection hangUrsula Braun2007-05-084-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frank Pavlic <fpavlic@de.ibm.com> Connection hangs when using EDDP mode because sk_protocol is NULL when skb has been copied via skb_copy. This results in dropping packets. Also keep MAC address after recovery of Virtual NICs so that traffic can flow again and duplicate statements in qeth_dev_set_route_store removed. Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Subject: natsemi: Allow users to disable workaround for DspCfg resetMark Brown2007-05-081-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The natsemi driver contains a workaround for broken hardware which can partially reset the chip at unpredictable times, detected by checking for spontaneous changes in the DspCfg register. The effects of the hardware bug appear to be variable and can range from minor problems like small numbers of corrupted packets to major ones such as the chip becoming non-functional. In the case of minor problems the chip reconfiguration required to work around the hardware can cause more problems than the bug itself. Since we have no way of automatically determining how badly the problem manifests on any given system provide an option in sysfs allowing users to disable the workaround at runtime and provides a module option to set the default. Signed-Off-By: Mark Brown <broonie@sirena.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * natsemi: Improve diagnostics for DspCfg workaroundMark Brown2007-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | The natsemi driver has a workaround for broken hardware which resets itself from time to time. There is a diagnostic message for this workaround but it is not printed by default, making the driver behavior more obscure than it needs to be. Make the message be displayed by default. Signed-Off-By: Mark Brown <broonie@sirena.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * smc91x SuperH supportNobuhiro Iwamatsu2007-05-081-0/+34
| | | | | | | | | | | | | | | | | | | | This patch supports SuperH of smc91x. smc91x installed on the board of SuperH comes to work by applying this patch. Please apply this patch . Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * DM9000: fix use of kfree() on net deviceBen Dooks2007-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | The DM9000 network driver is calling kfree() on an netdev causing the system to oops if the probe fails. The right thing to do is call free_netdev(). Thanks to Russell King for spotting this. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * skge: allow WOL except for known broken chipsStephen Hemminger2007-05-081-3/+6
| | | | | | | | | | | | | | Wake On Lan works correctly on Yukon-FE and other variants. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>a Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * myri10ge: replace the chipset whitelist with firmware autodetectionBrice Goglin2007-05-081-56/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove the aligned-completion whitelist, and replace it by using the 1.4.16 firmware's auto-detection features to choose which firmware to load. The driver now loads the aligned firmware, performs a MXGEFW_CMD_UNALIGNED_TEST, and falls back to using the unaligned firmware if: - The firmware is too old (ie, MXGEFW_CMD_UNALIGNED_TEST is an unknown command). - The MXGEFW_CMD_UNALIGNED_TEST returns MXGEFW_CMD_ERROR_UNALIGNED, meaning that it has seen an unaligned completion during the DMA test. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * myri10ge: move the DMA test code into its own functionBrice Goglin2007-05-081-53/+68
| | | | | | | | | | | | | | Move the DMA test code into its own function. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * myri10ge: fix restoring of multicast list after resetBrice Goglin2007-05-081-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't count on whatever implementation artifact preserves the multicast list across a reset cmd, and setup multicast filtering as part of our reset routine. The setting of allmulti when adopting firmware with the rx-filter broadcast bug is also moved into the multicast setup routine where it belongs. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * myri10ge: update firmware headersBrice Goglin2007-05-081-1/+13
| | | | | | | | | | | | | | Update myri10ge firmware headers to those of 1.4.16. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * myri10ge: support new firmware countersBrice Goglin2007-05-082-2/+13
| | | | | | | | | | | | | | | | Add dropped_pause, dropped_bad_phy, dropped_bad_crc32, dropped_unicast_filtered to the set of ethtool counters. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pasemi_mac: A couple of minor bugfixes.Olof Johansson2007-05-081-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bugfixes: * Move the wake_queue logic from tx_intr to clean_tx * Always do wake_queue even if queue wasn't full before clean since it's safe to do * Fix polarity in checks in pasemi_mac_close Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge branch 'drm-patches' of ↵Linus Torvalds2007-05-0813-152/+222
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6: via: Make sure we flush write-combining using a follow-up read. via: Try to improve command-buffer chaining. drm: remove old taskqueue remnant drm: rename badly named define and cleanup ioctl code spacing radeon: Don't mess up page flipping when a file descriptor is closed. drm/radeon: upgrade to 1.27 - make PCI GART more flexible
| * | via: Make sure we flush write-combining using a follow-up read.Thomas Hellstrom2007-05-081-2/+4
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | via: Try to improve command-buffer chaining.Thomas Hellstrom2007-05-082-66/+46
| | | | | | | | | | | | | | | | | | Bump driver date and patchlevel. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove old taskqueue remnantDave Airlie2007-05-081-3/+0
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: rename badly named define and cleanup ioctl code spacingDave Airlie2007-05-081-6/+4
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | radeon: Don't mess up page flipping when a file descriptor is closed.Michel Dänzer2007-05-082-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | There can still be other contexts that may use page flipping later on, so do just unilaterally 'clean it up', which could lead to the wrong page being displayed, e.g. when running 3D apps with a GLX compositing manager such as compiz using page flipping. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm/radeon: upgrade to 1.27 - make PCI GART more flexibleDave Airlie2007-05-089-48/+150
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | radeon: make PCI GART aperture size variable, but making table size variable This is precursor to getting a TTM backend for this stuff, and also allows the PCI table to be allocated at fb 0 radeon: add support for reverse engineered xpress200m The IGPGART setup code was traced using mmio-trace on fglrx by myself and Phillip Ezolt <phillipezolt@gmail.com> on dri-devel. This code doesn't let the 3D driver work properly as the card has no vertex shader support. Thanks to Matthew Garrett + Ubuntu for providing me some hardware to do this work on. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2007-05-0846-404/+402
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: move USB miscellaneous devices under drivers/input/misc Input: move USB mice under drivers/input/mouse Input: move USB gamepads under drivers/input/joystick Input: move USB touchscreens under drivers/input/touchscreen Input: move USB tablets under drivers/input/tablet Input: i8042 - fix AUX port detection with some chips Input: aaed2000_kbd - convert to use polldev library Input: drivers/usb/input - usb_buffer_free() cleanup Input: synaptics - don't complain about failed resets Input: pull input.h into uinpit.h Input: drivers/usb/input - fix sparse warnings (signedness) Input: evdev - fix some sparse warnings (signedness, shadowing) Input: drivers/joystick - fix various sparse warnings Input: force feedback - make sure effect is present before playing
| * | Input: move USB miscellaneous devices under drivers/input/miscDmitry Torokhov2007-05-0813-105/+89
| | | | | | | | | | | | | | | | | | | | | | | | This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | Input: move USB mice under drivers/input/mouseDmitry Torokhov2007-05-085-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud