]>
pilppa.com Git - linux-2.6-omap-h63xx.git/log
Komal Shah [Tue, 11 Oct 2005 14:59:54 +0000 (17:59 +0300)]
[PATCH] ARM: OMAP: 24xx RNG
Added OMAP24xx RNG support
Kevin Hilman [Thu, 6 Oct 2005 21:01:30 +0000 (14:01 -0700)]
ARM: OMAP: Really fix compile warning in uncompress.h
First attempt used #elifdef which is not a real directive.
Signed-off-by: Kevin Hilman <kevin@hilman.org>
Kevin Hilman [Thu, 6 Oct 2005 20:51:55 +0000 (13:51 -0700)]
ARM: OMAP: Fix compiler warning in uncompress.h
Tony Lindgren [Wed, 5 Oct 2005 12:20:42 +0000 (15:20 +0300)]
Merge with /home/tmlind/src/kernel/linux-omap-2.6
Komal Shah [Wed, 5 Oct 2005 12:17:50 +0000 (15:17 +0300)]
[PATCH] ARM: OMAP: omap2420 defconfig with MTD
2420 defconfig with MTD support.
Ladislav Michl [Wed, 5 Oct 2005 12:15:24 +0000 (15:15 +0300)]
[PATCH] ARM: OMAP: Hang while entering userspace
Umm, I forgot to delete unused variable 'flags'. Once there lets kill all
warning about unused variables in omap code :)
Tony Lindgren [Tue, 4 Oct 2005 12:03:00 +0000 (15:03 +0300)]
ARM: OMAP: Make smc91x work on H4
Make smc91x work on H4
Tony Lindgren [Tue, 4 Oct 2005 07:18:17 +0000 (10:18 +0300)]
Merge with /home/tmlind/src/kernel/linux-omap-2.6
Tony Lindgren [Tue, 4 Oct 2005 07:17:44 +0000 (10:17 +0300)]
ARM: OMAP: Tabified
Tabified
Richard Woodruff [Tue, 4 Oct 2005 07:10:29 +0000 (10:10 +0300)]
[PATCH] ARM: OMAP: Correction for recently pushed arch_reset for omap2.
Attached is a patch which does work. I went ahead and cleaned up the
bypass table entry for PRCM VIII. Before it was using a shared entry
which wasn't quite like a boot reset.
Tony Lindgren [Mon, 3 Oct 2005 13:58:12 +0000 (16:58 +0300)]
Merge HEAD from source.mvista.com:/home/git/linux-omap-2.6.git
Tony Lindgren [Mon, 3 Oct 2005 13:57:47 +0000 (16:57 +0300)]
ARM: OMAP: Fixed mach-omap2/clock.h formatting
Fixed mach-omap2/clock.h formatting
Anderson Lizardo [Mon, 3 Oct 2005 13:38:57 +0000 (16:38 +0300)]
[PATCH] ARM: OMAP: Replace last occurrences of ARCH_OMAP1510 with ARCH_OMAP15XX
The attached patch fixes a problem noticed when compiling the kernel
for the OSK 5912 board using default config:
make omap_osk_5912_defconfig
make uImage
Tony Lindgren [Mon, 3 Oct 2005 11:09:00 +0000 (14:09 +0300)]
ARM: OMAP: Update H4 defconfig for MMC
Update H4 defconfig for MMC
Tony Lindgren [Mon, 3 Oct 2005 11:07:14 +0000 (14:07 +0300)]
ARM: OMAP: Remove unnecesssary MMC debug printk
Remove unnecesssary MMC debug printk
Jarkko Lavinen [Mon, 3 Oct 2005 11:04:15 +0000 (14:04 +0300)]
[PATCH] ARM: OMAP: CMD7 failing on ATP & Transcend MMC cards
I see ATP and Transcend cards failing repeatedly in the card select command
(CMD7) due to illegal instruction after CMD2. Doing an extra status inquiry
when leaving the card identification mode seems to fix this problem.
This bug occured when opening the mmc cover with mounted card inside and
closing the cover again. This will cause detection of any new cards in
the card detection mode and ATP and Transcend cards get confused.
I don't know why only ATP and Transcend have this problem and why
doing status inquiry helps. Status inquiry command CMD13 is neutral
and is claimed to not chnage the card state in the MMC spec.
The order of commands must be CMD13 first, then CMD7. CMD13 fails
also due to illegal instruction error after CMD2 but after this the
card is back to its senses.
If CMD7 is run first, and CMD13 once CMD7 is seen failing, this fails
to bring the card back to its senses. Then the CMD7 fails repeatedly
due to command timeout before and after CMD13.
The attached patch does the extra probing in mmc_setup() during
low clock which is perhaps an overkill. One could do it also in
mmc_rescan() after switching back to higher clock.
Tony Lindgren [Mon, 3 Oct 2005 11:00:53 +0000 (14:00 +0300)]
ARM: OMAP: Add MMC support for 24xx
Add MMC support for 24xx
Tony Lindgren [Mon, 3 Oct 2005 10:48:37 +0000 (13:48 +0300)]
ARM: OMAP: Add support for 24xx Menelaus I2C PM chip
Add support for 24xx Menelaus I2C PM chip. Based on TI's 2.6.9 code.
Tony Lindgren [Mon, 3 Oct 2005 10:12:12 +0000 (13:12 +0300)]
ARM: OMAP: Clean up i2c-omap.c and make it work with 24xx
This patch cleans up i2c-omap.c more for inclusion in the mainline kernel,
and adds support for both I2C interfaces on OMAP 24xx.
Komal Shah [Mon, 3 Oct 2005 09:29:54 +0000 (12:29 +0300)]
[PATCH] ARM: OMAP: [PATCH] OMAP24xx serial.c clock update
Moved UART clock initialisation code from clock.c
to serial.c
Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Mon, 3 Oct 2005 08:46:42 +0000 (11:46 +0300)]
ARM: OMAP: Beautify include order in system.h
Beautify include order in system.h
Tony Lindgren [Mon, 3 Oct 2005 08:41:29 +0000 (11:41 +0300)]
ARM: OMAP: Moved prcm.h to include, changed system.h to use it
Moved prcm.h to include, changed system.h to use it
Tony Lindgren [Mon, 3 Oct 2005 08:29:00 +0000 (11:29 +0300)]
ARM: OMAP: Changed OMAP_GPIO_IRQ() macro to allow higher GPIO interrupts
Changed OMAP_GPIO_IRQ() macro to allow higher GPIO interrupts
Tony Lindgren [Mon, 3 Oct 2005 08:27:06 +0000 (11:27 +0300)]
ARM: OMAP: Change h4 smc91x init to use mux api
Change h4 smc91x init to use mux api
Tony Lindgren [Mon, 3 Oct 2005 08:11:00 +0000 (11:11 +0300)]
ARM: OMAP: Improved omap2 arch_reset code based on Richard's code
Improved omap2 arch_reset code based on Richard's code
Tony Lindgren [Mon, 3 Oct 2005 08:09:05 +0000 (11:09 +0300)]
Merge with /home/tmlind/src/kernel/linux-omap-2.6
Ladislav Michl [Mon, 3 Oct 2005 08:08:36 +0000 (11:08 +0300)]
[PATCH] ARM: OMAP: Re: Hang while entering userspace
Below is patch fixing soft lockup in clocks. clockfw_lock is already
held in clk_set_rate when calling omap1_clk_set_rate, no need to lock it
again.
Tony Lindgren [Mon, 3 Oct 2005 08:07:17 +0000 (11:07 +0300)]
Merge with /home/tmlind/src/kernel/linux-omap-2.6
Komal Shah [Mon, 3 Oct 2005 07:25:18 +0000 (10:25 +0300)]
[PATCH] ARM: OMAP: omap24xx Flash support
Flash support for OMAP24xx
Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Komal Shah [Fri, 30 Sep 2005 10:43:00 +0000 (13:43 +0300)]
[PATCH] ARM: OMAP: omap24xx Flash support
Flash support for OMAP24xx
Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Fri, 30 Sep 2005 08:43:17 +0000 (11:43 +0300)]
ARM: OMAP: Mux additions and clean-up for omap2
Mux additions and clean-up for omap2
Tony Lindgren [Fri, 30 Sep 2005 08:41:07 +0000 (11:41 +0300)]
ARM: OMAP: Reorganize system.h and make omap2 reboot work
Reorganize system.h and make omap2 reboot work
Tony Lindgren [Fri, 30 Sep 2005 08:40:00 +0000 (11:40 +0300)]
ARM: OMAP: Move omap2 IO defines
Move omap2 IO defines
Tony Lindgren [Fri, 30 Sep 2005 08:37:43 +0000 (11:37 +0300)]
ARM: OMAP: Set smc91x irqtype for H4
Set smc91x irqtype for H4
Tony Lindgren [Fri, 30 Sep 2005 08:35:23 +0000 (11:35 +0300)]
ARM: OMAP: Do not try to change rate on omap2 if no speed found
Do not try to change rate on omap2 if no speed found
Tony Lindgren [Fri, 30 Sep 2005 08:33:57 +0000 (11:33 +0300)]
ARM: OMAP: Enable GPIO clocks for 24xx
Enable GPIO clocks for 24xx
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 master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Linus Torvalds [Mon, 12 Sep 2005 22:55:33 +0000 (15:55 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 12 Sep 2005 22:55:09 +0000 (15:55 -0700)]
Merge master.kernel.org:/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>