Tony Lindgren [Fri, 30 Sep 2005 07:56:34 +0000 (10:56 +0300)]
ARM: OMAP: OMAP specific parts of RMK's hardware.h and mach-types.h patch
OMAP specific parts of RMK's hardware.h and mach-types.h patch
Kevin Hilman [Wed, 28 Sep 2005 17:52:57 +0000 (10:52 -0700)]
ARM: OMAP: Fix compliation/inlining in aic23 ALSA Driver
Signed-off-by: Kevin Hilman <kevin@hilman.org>
Kevin Hilman [Tue, 27 Sep 2005 17:00:24 +0000 (10:00 -0700)]
ARM: OMAP: Fix for audio completions patch
Signed-off-by: Kevin Hilman <kevin@hilman.org>
Tony Lindgren [Mon, 26 Sep 2005 15:12:17 +0000 (18:12 +0300)]
ARM: OMAP: Undo of accidental change of default compiler
Undo of accidental change of default compiler
Tony Lindgren [Mon, 26 Sep 2005 15:03:41 +0000 (18:03 +0300)]
ARM: OMAP: Add clock framework for omap2
Add clock framework for omap2.
Based on omap2 clock framework code by Richard Woodruff.
Tony Lindgren [Mon, 26 Sep 2005 14:17:02 +0000 (17:17 +0300)]
ARM: OMAP: Add omap2 SRAM code and change io.h to work with assembly
Add omap2 SRAM code and change io.h to work with assembly.
The functions in sram-fn.S are modified from sleep.S file for omap2
from Richard Woodruff.
Tony Lindgren [Mon, 26 Sep 2005 14:07:18 +0000 (17:07 +0300)]
Merge with /home/tmlind/src/kernel/linux-omap-2.6
Tony Lindgren [Mon, 26 Sep 2005 14:04:44 +0000 (17:04 +0300)]
ARM: OMAP: Clock framework fixes to allow adding omap2 clocks
Clock framework fixes to allow adding omap2 clocks
Kevin Hilman [Fri, 23 Sep 2005 22:00:53 +0000 (15:00 -0700)]
ARM: OMAP: Touchscreen: build cleanup
Enable TSC2101 support when Touchscreen is enabled.
Fix #if in tsc2101 driver
Signed-off-by: Kevin Hilman <kevin@hilman.org>
Vladimir Barinov [Thu, 22 Sep 2005 21:03:22 +0000 (14:03 -0700)]
ARM: OMAP: audio driver: convert semaphores to completions
Signed-off-by: Vladimir Barinov <vbarinov@ru.mvista.com>
Signed-off-by: Kevin Hilman <kevin@hilman.org>
Tony Lindgren [Wed, 21 Sep 2005 11:40:44 +0000 (14:40 +0300)]
ARM: OMAP: Enabled SRAM code for omap2
Enabled SRAM code for omap2
Tony Lindgren [Wed, 21 Sep 2005 08:37:10 +0000 (11:37 +0300)]
ARM: OMAP: Fixed clock compile for CONFIG_OMAP_RESET_CLOCKS, more locking
Fixed clock compile for CONFIG_OMAP_RESET_CLOCKS, more locking
Tony Lindgren [Tue, 20 Sep 2005 14:30:44 +0000 (17:30 +0300)]
ARM: OMAP: Changed omap2 to map both L3 and L4 IO space
By mapping two 1MB sections we save some 4k table entries
and decrease TLB pressure. Recommended by Richard Woodruff.
Tony Lindgren [Tue, 20 Sep 2005 10:12:07 +0000 (13:12 +0300)]
Merge with /home/tmlind/src/kernel/linux-omap-2.6
Tony Lindgren [Tue, 20 Sep 2005 10:02:05 +0000 (13:02 +0300)]
ARM: OMAP: Modifiy common clock.h for omap2, add omap1 specific clock.h
Modifiy common clock.h for omap2, add omap1 specific clock.h
Dirk Behme [Tue, 20 Sep 2005 07:40:45 +0000 (10:40 +0300)]
Remove warnings:
arch/arm/plat-omap/dsp/dsp_core.c:760: warning: initialization from
incompatible pointer type
arch/arm/plat-omap/dsp/dsp_mem.c:1579: warning: initialization from
incompatible pointer type
Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 20 Sep 2005 07:35:03 +0000 (10:35 +0300)]
ARM: OMAP: Fix typo in SRAM detection, change to use cpu_is_omap15xx()
Fixed a typo in SRAM detection for 330 and changed the detection
to use cpu_is_omap15xx() as noted by Gonzales Laurent.
Tony Lindgren [Mon, 19 Sep 2005 11:35:06 +0000 (14:35 +0300)]
ARM: OMAP: Split clocks.c into plat-omap/clock.c and mach-omap1/clock.c
This patch contains the following changes:
- Move omap1 specific clock code into mach-omap1/clock.c leaving only
common code shared between omap1 and omap2 to plat-omap/clock.c.
- Move clock.h and sram.h header files to include/asm-arm/arch-omap/
- Change clock init to register omap1 specific functions with
plat-omap/clock.c
- Some clean-up of code
This patch makes no functional changes to omap1 clocks.
Tuukka Tikkanen [Fri, 16 Sep 2005 11:36:26 +0000 (14:36 +0300)]
[PATCH] ARM: OMAP: Clock update to support clock idling
Clock update to support clock idling
Tony Lindgren [Thu, 15 Sep 2005 12:37:04 +0000 (15:37 +0300)]
ARM: OMAP: Fixed compile for omap2
Fixed compile for omap2
Tony Lindgren [Thu, 15 Sep 2005 12:19:04 +0000 (15:19 +0300)]
ARM: OMAP: Fixed compile for omap1
Fixed compile for omap1
Tony Lindgren [Thu, 15 Sep 2005 12:10:13 +0000 (15:10 +0300)]
ARM: OMAP: Added common devices.c to plat-omap for I2C and MMC init
Added common devices.c to plat-omap for I2C and MMC init
Tony Lindgren [Thu, 15 Sep 2005 12:06:10 +0000 (15:06 +0300)]
ARM: OMAP: Fixed mux compile warning
Fixed mux compile warning
Tony Lindgren [Thu, 15 Sep 2005 11:56:38 +0000 (14:56 +0300)]
ARM: OMAP: Renamed OMAP2_MUX_CFG to MUX_CFG_24XX
OMAP2_MUX_CFG to MUX_CFG_24XX
Tony Lindgren [Thu, 15 Sep 2005 11:52:25 +0000 (14:52 +0300)]
ARM: OMAP: Split pin mux to omap1 and omap2, added support for 24xx
Split pin multiplexing tables from mux.h into mux.c files in omap1 and
omap2. Also added support for some 24xx pins.
Tony Lindgren [Thu, 15 Sep 2005 09:00:34 +0000 (12:00 +0300)]
ARM: OMAP: Move omap_serial_init() to happen after board specific map_io()
Move omap_serial_init() to happen after board specific map_io().
Patch based on Kyungmin Park's suggestion.
Romain Goyet [Thu, 15 Sep 2005 07:23:44 +0000 (10:23 +0300)]
[PATCH] ARM: OMAP: Add support for Palm Tungsten E PDA
Add support for Palm Tungsten E PDA
Fore more info, please see http://palmtelinux.sourceforge.net
Romain Goyet [Thu, 15 Sep 2005 07:17:22 +0000 (10:17 +0300)]
[PATCH] ARM: OMAP: No output from compressed image on CONFIG_MACH_OMAP_PALMTE
No output from compressed image on CONFIG_MACH_OMAP_PALMTE
Romain Goyet [Thu, 15 Sep 2005 07:14:37 +0000 (10:14 +0300)]
[PATCH] ARM: OMAP: Reset DMA channels in init and add support for 330
Reset DMA channels in init and add support for 330
Kevin Hilman [Wed, 14 Sep 2005 18:03:19 +0000 (11:03 -0700)]
Enable pin mux support for OMAP730, and configure 730 keypad pins.
Signed-off-by: Kevin Hilman <kevin@hilman.org>
Tony Lindgren [Wed, 14 Sep 2005 14:56:13 +0000 (17:56 +0300)]
ARM: OMAP: Search and replace of CONFIG_ARCH_OMAP1510 with CONFIG_ARCH_OMAP15XX
Search and replace of CONFIG_ARCH_OMAP1510 with CONFIG_ARCH_OMAP15XX
Tony Lindgren [Wed, 14 Sep 2005 14:43:50 +0000 (17:43 +0300)]
ARM: OMAP: Fixed OMAP1510 SRAM size again
According to spru602b.pdf TRM, 1510 has 192K of SRAM, not 512K
Tony Lindgren [Wed, 14 Sep 2005 14:24:25 +0000 (17:24 +0300)]
ARM: OMAP: Fixed MMC compile
Fixed MMC compile
Dirk Behme [Wed, 14 Sep 2005 14:19:56 +0000 (17:19 +0300)]
Make omap-aic23.c compile again:
CC [M] sound/arm/omap-aic23.o
sound/arm/omap-aic23.c: In function snd_omap_aic23_suspend'
Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
Dirk Behme [Wed, 14 Sep 2005 14:17:26 +0000 (17:17 +0300)]
If omap-alsa-mixer.c is compiled as module,
CONFIG_SENSORS_TLV320AIC23_MODULE is missing:
CC [M] sound/arm/omap-alsa-mixer.o
sound/arm/omap-alsa-mixer.c: In function SND_OMAP_WRITE'
sound/arm/omap-alsa-mixer.c: In function MIXER_NAME' undeclared (first
use in this function)
sound/arm/omap-alsa-mixer.c:487: error: (Each undeclared identifier is
reported only once
sound/arm/omap-alsa-mixer.c:487: error: for each function it appears in.)
Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
Btw: omap-alsa-mixer.c will not compile if CONFIG_SENSORS_TLV320AIC23 or
CONFIG_SENSORS_TLV320AIC23_MODULE aren't defined. May be this ifdef
should be removed?
Dirk Behme [Wed, 14 Sep 2005 14:14:55 +0000 (17:14 +0300)]
Make omapfb_main.c compile again and remove warnings:
CC drivers/video/omap/omapfb_main.o
drivers/video/omap/omapfb_main.c: In function omapfb_suspend'
drivers/video/omap/omapfb_main.c: At top level:
drivers/video/omap/omapfb_main.c:1645: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1646: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1702: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1704: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1704: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1705: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1728: warning: initialization from
incompatible pointer type
Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
Romain Goyet [Wed, 14 Sep 2005 13:34:50 +0000 (16:34 +0300)]
[PATCH] ARM: OMAP: Add basic cpu support for OMAP330 processor
Add basic 330 cpu support. 330 is handled as 15xx.
Tony Lindgren [Wed, 14 Sep 2005 11:33:55 +0000 (14:33 +0300)]
ARM: OMAP: Fix CLOCK_TICK_RATE for 32KHz timer for POSIX timers
POSIX timers were triggering too fast. This was caused by incorrect
CLOCK_TICK_RATE for 32KHz timer.
Imre Deak [Tue, 13 Sep 2005 11:05:35 +0000 (14:05 +0300)]
[PATCH] ARM: OMAP: Fix problem UART index != UART line, clean up serial init
This fixes the problem where UART index != UART line, because some of
the UARTs are disabled. Also cleans up serial init.
Tony Lindgren [Tue, 13 Sep 2005 10:53:36 +0000 (13:53 +0300)]
ARM: OMAP: Fixed compile for I2C
Fixed compile for I2C
Tony Lindgren [Tue, 13 Sep 2005 10:44:46 +0000 (13:44 +0300)]
ARM: OMAP: Sync with mainline
Sync with mainline
Tony Lindgren [Tue, 13 Sep 2005 10:32:45 +0000 (13:32 +0300)]
ARM: OMAP: Fixed merge conflicts
Fixed merge conflicts
Tony Lindgren [Tue, 13 Sep 2005 10:19:46 +0000 (13:19 +0300)]
Merge with ../linux-2.6
Linus Torvalds [Tue, 13 Sep 2005 03:12:09 +0000 (20:12 -0700)]
Linux 2.6.14-rc1
Two weeks after 2.6.13: starting to calm things down.
Greg Ungerer [Tue, 13 Sep 2005 01:14:08 +0000 (11:14 +1000)]
[PATCH] m68knommu: optimized local_irq_disable, and platform reboot code
Switch to a space optimized version of local_irq_disable() for ColdFire
platforms. Also add reboot support for the Freescale M5272 platform.
Patch originally submitted by Philippe De Muyter <phdm@macqel.be>.
Add reboot support for the Freescale M523x ColdFire platform. Patch originally
submitted by Jate Sujjavanich.
Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Ungerer [Tue, 13 Sep 2005 01:14:08 +0000 (11:14 +1000)]
[PATCH] m68knommu: startup code for the Drangen Engine 68328 based board
Specialized startup code for the 68328 based DragenEngine board.
It doesn't easily fit into the common 68x328 startup code framework.
It doesn't want any of the common hardware setup to be done here.
Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Ungerer [Tue, 13 Sep 2005 01:14:08 +0000 (11:14 +1000)]
[PATCH] m68knommu: implement scatter/gather support macros
Implement the scattergather support macros for m68knommu targets.
Patch originally submitted by Leon Woestenberg <leonw@mailcan.com>.
Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Ungerer [Tue, 13 Sep 2005 01:14:08 +0000 (11:14 +1000)]
[PATCH] m68knommu: fix cache actions for ColdFire 5249, 527x and 528x processors
Add better support for flushing the cache's on some ColdFire processors.
The 5249 cache code is now enabled (it was stubbed out), it really is
needed. Add support for the 527x and 528x families - we only use the
simple instruction cache on them.
Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 13 Sep 2005 03:02:18 +0000 (20:02 -0700)]
Merge /linux/kernel/git/jejb/scsi-for-linus-2.6
Linus Torvalds [Mon, 12 Sep 2005 22:55:33 +0000 (15:55 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 12 Sep 2005 22:55:09 +0000 (15:55 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 12 Sep 2005 22:54:41 +0000 (15:54 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 12 Sep 2005 22:54:23 +0000 (15:54 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Russell King [Mon, 12 Sep 2005 21:56:56 +0000 (22:56 +0100)]
[ARM SMP] Add MPCore watchdog driver
Add platform independent parts of the ARM MPCore watchdog driver.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
John W. Linville [Mon, 12 Sep 2005 21:45:08 +0000 (14:45 -0700)]
[BNX2]: Add support for ETHTOOL_GPERMADDR.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John W. Linville [Mon, 12 Sep 2005 21:44:20 +0000 (14:44 -0700)]
[TG3]: Add support for ETHTOOL_GPERMADDR.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John W. Linville [Mon, 12 Sep 2005 21:43:18 +0000 (14:43 -0700)]
[TG3]: Do not count non-error frames dropped by the hardware as rx_errors.
Instead, count them as part of rx_missed_errors.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:28:03 +0000 (14:28 -0700)]
[NETROM]: Introduct stuct nr_private
NET/ROM's virtual interfaces don't have a proper private data
structure yet. Create struct nr_private and put the statistics there.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:27:37 +0000 (14:27 -0700)]
[NETROM]: Implement G8PZT Circuit reset for NET/ROM
NET/ROM is lacking a connection reset like TCP's RST flag which at times
may result in a connecting having to slowly timing out instead of just being
reset. An earlier attempt to reset the connection by sending a
NR_CONNACK | NR_CHOKE_FLAG transport was inacceptable as it did result in
crashes of BPQ systems. An alternative approach of introducing a new
transport type 7 (NR_RESET) has be implemented several years ago in
Paula Jayne Dowie G8PZT's Xrouter.
Implement NR_RESET for Linux's NET/ROM but like any messing with the state
engine consider this experimental for now and thus control it by a sysctl
(net.netrom.reset) which for the time being defaults to off.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:26:52 +0000 (14:26 -0700)]
[ROSE]: ROSE has no ARP
ARP over ROSE does not exist so it's obviously not implemented on any
ROSE stack, so the ROSE interfaces really should default to IFF_NOARP.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:26:26 +0000 (14:26 -0700)]
[NETROM]: NET/ROM has no ARP
ARP over NET/ROM does not exist so it's obviously not implemented on any
NET/ROM stack, so the NET/ROM interfaces really should default to IFF_NOARP.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:25:57 +0000 (14:25 -0700)]
[NETROM] NET/ROM has no txqueue
NET/ROM uses virtual interfaces so setting a queue length is wrong.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:25:25 +0000 (14:25 -0700)]
[AX.25]: Reformat ax25_proto_ops initialization
Reformat iniitalization of ax25_proto_ops.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:24:55 +0000 (14:24 -0700)]
[AX.25/ROSE]: Whitespace formatting changes
Small formatting changes.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:24:24 +0000 (14:24 -0700)]
[AX.25]: Add descriptions to constants
Comment the names used for the AX.25 state machine.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:23:52 +0000 (14:23 -0700)]
[NETROM/AX.25/ROSE]: Remove useless tests
Remove error tests that have already been performed by the caller.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:23:06 +0000 (14:23 -0700)]
[NETROM]: statistics fix
Calling an incoming NET/ROM-encapsulated IP packet an error if the
interface isn't up is probably a bit over the top, so count it as
dropped instead of an error.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:22:30 +0000 (14:22 -0700)]
[AX.25]: Add more PIDs
Add a few more PID definitions. AX.25 PIDs are the equivalent to IP
protocol numbers.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:21:48 +0000 (14:21 -0700)]
[NETROM]: Fix rebuild header mess
For reason that probably nobody recalls NET/ROM does it's actual
packet transmission in nr_rebuild_header and even treats invocation of
it's hard_start_xmit method nr_xmit as a bug. Fix that by splitting
the job done by nr_rebuild_header into two halves. Along with that we
now also can get rid of the silly clone of the skb on transmit.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:21:01 +0000 (14:21 -0700)]
[AX.25]: Rename ax25_encapsulate to ax25_hard_header
Rename ax25_encapsulate to ax25_hard_header which these days more
accurately describes what the function is supposed to do.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ralf Baechle [Mon, 12 Sep 2005 21:19:26 +0000 (14:19 -0700)]
[HAMRADIO]: driver cleanups
Misc related cleanups in hamradio drivers:
o Use symbolic constants instead of magic numbers
o Don't try to handle the case where AX.25 isn't configured - the kernel
configuration doesn't permit that.
o Remove useless headers
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Arnaldo Carvalho de Melo [Mon, 12 Sep 2005 21:16:58 +0000 (14:16 -0700)]
[CCID3]: Listen socks doesn't have a private CCID block
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Nishanth Aravamudan [Mon, 12 Sep 2005 21:16:17 +0000 (14:16 -0700)]
[SPARC] drivers/sbus: fix-up schedule_timeout() usage
Use schedule_timeout_uninterruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Nishanth Aravamudan [Mon, 12 Sep 2005 21:15:34 +0000 (14:15 -0700)]
[NET]: fix-up schedule_timeout() usage
Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size. Also use
human-time conversion functions instead of hard-coded division to avoid
rounding issues.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Mon, 12 Sep 2005 20:32:56 +0000 (13:32 -0700)]
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6
Linus Torvalds [Mon, 12 Sep 2005 20:32:20 +0000 (13:32 -0700)]
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6
Linus Torvalds [Mon, 12 Sep 2005 20:31:33 +0000 (13:31 -0700)]
Merge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
Greg KH [Mon, 12 Sep 2005 19:45:04 +0000 (12:45 -0700)]
Merge ../torvalds-2.6/
Pierre Ossman [Mon, 12 Sep 2005 19:36:19 +0000 (20:36 +0100)]
[MMC] Clean up wbsd detection handling
The wbsd driver's card detection routing is a bit of a mess. This
patch cleans up the routine and makes it a bit more comprihensible.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Pierre Ossman [Mon, 12 Sep 2005 19:35:54 +0000 (20:35 +0100)]
[MMC] Remove unused timer.
Remove timer that was left from earlier cleanup.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Evgeniy Polyakov [Mon, 12 Sep 2005 13:12:43 +0000 (17:12 +0400)]
[PATCH] crc16: remove w1 specific comments.
Remove w1 comments from crc16.h and move
specific constants into w1_ds2433.c where they are used.
Replace %d with %zd.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linus Torvalds [Mon, 12 Sep 2005 19:34:45 +0000 (12:34 -0700)]
Merge /pub/scm/linux/kernel/git/aia21/ntfs-2.6
Linus Torvalds [Mon, 12 Sep 2005 19:32:31 +0000 (12:32 -0700)]
Fix fallout from ATI Xpress timer workaround
ACPI earlyquirks needs to honor the proper config variables, and include
the right header file.
(Fixes commit
66759a01adbfe8828dd063e32cf5ed3f46696181)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ian Abbott [Mon, 12 Sep 2005 11:23:25 +0000 (12:23 +0100)]
[PATCH] USB: ftdi_sio: custom baud rate fix
ftdi_sio: I messed up the baud_base for custom baud rate support in
2.6.13. The attached one-liner patch fixes it.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pete Zaitcev [Thu, 1 Sep 2005 21:35:05 +0000 (14:35 -0700)]
[PATCH] USB: Usbmon setup DMA patch
Alan Stern sent me this patch. It goes on top of the patch the adds
mon_dmapeek:
http://ftp.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/usb-usbmon-dma-areas.patch
Please be warned about ordering requirements or the build may fail.
Actually, mon_dmapeek is generic enough to support SETUP packets too.
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Sailer [Fri, 9 Sep 2005 08:43:50 +0000 (10:43 +0200)]
[PATCH] usb: fix uss720 schedule with interrupts off
This patch fixes the long standing schedule with interrupts off problem
of the uss720 driver. The problem is caused by the parport layer calling
the save and restore methods within a write_lock_irqsave guarded region.
The fix is to issue the control transaction requests required by save
and restore asynchronously.
Signed-off-by: Thomas Sailer, <sailer@ife.ee.ethz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Harald Welte [Sat, 3 Sep 2005 09:27:08 +0000 (11:27 +0200)]
[PATCH] USB: fix usbdevice_fs header breakage
[USBDEVFS] fix inclusion of <linux/compat.h> to avoud header mess
Without moving the include of compat.h down, userspace programs that use
usbdevice_fs.h end up including half the kernel includes (and eventually
fail to compile).
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Daniel Drake [Wed, 31 Aug 2005 15:38:41 +0000 (16:38 +0100)]
[PATCH] USB: usb-storage: Add unusual_devs entry for Neuros Audio MP3 player
Alan Stern wrote:
> If the device sometimes reports the correct values, then you should
> include NEED_OVERRIDE flag to prevent messages about unnecessary
> overrides showing up in the system log. Also, if bInterfaceSubclass
> is correct and only bInterfaceProtocol is wrong, then the entry should
> say US_SC_DEVICE instead of US_SC_SCSI.
Fair points, thanks.
When connected over USB2, this device reports a nonsense
bInterfaceProtocol value 6 and doesn't work with usb-storage. When
connected over USB1, the device reports the correct bInterfaceProtocol
value 0x50 (bulk) and works with no problems.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Phil Dibowitz [Tue, 30 Aug 2005 05:38:28 +0000 (22:38 -0700)]
[PATCH] USB: storage: Add unusual_dev SINGLE_LUN entries
This patch adds entries for several USB floppies that need
the US_FL_SINGLE_LUN flag. These were reported by
Sebastian Kapfer <sebastian_kapfer@gmx.net> and Olaf Hering
<olh@suse.de>, with rediffing and cleaning from me.
Reported-by: Sebastian Kapfer <sebastian_kapfer@gmx.net>
Reported-by: Olaf Hering <olh@suse.de>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pete Zaitcev [Tue, 23 Aug 2005 14:46:13 +0000 (07:46 -0700)]
[PATCH] USB Storage: unusual_devs.h request for Transcend
The stick replies to the door lock commands with a check condition (e.g.
FAIL status in a normal bulk CSW), but the subsequent REQUEST SENSE
returns all-zero sense. The situation is documented in our Bugzilla,
including usbmon traces.
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162559
The error is purely cosmetic, data integrity is not in danger.
But I thought we might as well do it. It looks nicer that way.
I discussed this with Phil and he told me to submit directly.
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Matthew Dharm [Fri, 26 Aug 2005 03:03:50 +0000 (20:03 -0700)]
[PATCH] USB: storage: Fix messed-up locking
This is patch as550 from Alan Stern.
Apparently someone changed the SCSI core so that it no longer holds the
host lock when doing a device or bus reset. usb-storage was updated at
the time, but the change was done carelessly. Some of the code depends
on that lock being held.
This patch reintroduces the host lock where needed and tries to clarify
the comments explaining why the lock is necessary. It also moves the
code that clears the TIMED_OUT and ABORTING bitflags so that it executes
as soon as the timed-out command has completed (and while the host lock
is held).
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Brownell [Wed, 31 Aug 2005 17:41:44 +0000 (10:41 -0700)]
[PATCH] USB: relax usbcore reset timings
This appears to help some folk, please merge.
This patch relaxes reset timings. There are some reports that it
helps make enumeration work better on some high speed devices.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Randy Dunlap [Fri, 9 Sep 2005 04:56:56 +0000 (21:56 -0700)]
[PATCH] USB: proc_usb_info.txt: add blank lines
Update Documentation/usb/proc_usb_info.txt:
- remove some trailing whitespace
- add a blank line before each T: line to match current kernel
and to make the text more readable.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Robert Spanton [Tue, 30 Aug 2005 22:38:23 +0000 (23:38 +0100)]
[PATCH] USB: PL2303: CA-42 Phone cable
This patch adds the product ID and vendor ID for a Nokia CA-42 USB cable
to the list of devices handled by the pl2303 driver. The patch is
against 2.6.13.
Signed-off-by: Robert Spanton <rds204@zepler.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Brownell [Wed, 31 Aug 2005 18:54:09 +0000 (11:54 -0700)]
[PATCH] USB: OHCI, pxa27x OHCI port power tweaks
Now that it's in use on other boards, a bug in the original code needs fixing.
There is no need for the PXA27x OHCI to set usb power during init, since
the hub driver in usbcore handles that. Those platform-specific power
control functions are also incorrect, and should therefore be removed.
Add a check to clear the OTG pin hold bit until such times OTG is
properly implemented.
Signed-Off-By: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Brownell [Wed, 31 Aug 2005 18:52:57 +0000 (11:52 -0700)]
[PATCH] USB: OHCI relies less on NDP register
Some OHCI implementations have differences in the way the NDP register
(in roothub_a) reports the number of ports present. This patch allows the
platform specific code to optionally supply the number of ports. The
driver just reads the value at init (if not supplied) instead of reading
it every time its needed (except for an AMD756 bug workaround).
It also sets the value correctly for the ARM pxa27x architecture.
Signed-Off-By: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Brownell [Wed, 31 Aug 2005 17:47:20 +0000 (10:47 -0700)]
[PATCH] USB: OHCI irq tweak
Evidently there are some boards which care a lot about this, but
as a rule it's been hard to notice.
OHCI_INTR_RD wasn't always cleared in the ohci irq handler. On some
systems this means certain remote wakeup scenarios could seem to hang
(in an interrupt storm, RD never clearing).
From: "William Morrow" <William.Morrow@amd.com>
Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavol Kurina [Wed, 7 Sep 2005 16:49:34 +0000 (09:49 -0700)]
[PATCH] USB gadgetfs: fixes an error on writing to endpoint file
this patch fixes an "Invalid argument" error returned by a write to an
endpoint-file after reopening it in the gadgetfs module in the kernel
2.6.12.
This was testet only with dummy_hcd module!
Signed-off-by: Pavol Kurina <kurina@gmx.net>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Nishanth Aravamudan [Mon, 15 Aug 2005 18:30:11 +0000 (11:30 -0700)]
[PATCH] drivers/usb: fix-up schedule_timeout() usage
Description: Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Brownell [Wed, 31 Aug 2005 17:45:25 +0000 (10:45 -0700)]
[PATCH] USB: get rid of minor log spamming
Routine cases like handoff-to-companion shouldn't trigger diagnostics.
This gets rid of some recently added log spamming. It's routine for
hub_port_wait_reset() to return -ENOTCONN to indicate handoff from
highspeed hubs to companions, so an error message is incorrect.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>