summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge ../linux-2.6Paul Mackerras2005-11-081265-20025/+40841
|\
| * Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2005-11-0738-917/+1896
| |\
| | * VINO driver version 0.0.5.Ladislav Michl2005-11-075-680/+1545
| | | | | | | | | | | | | | | Second cut of the VINO / Indycam driver for the Silicon Graphics Indy, much more feature complete and bug free.
| | * Redefine outs[wl] for ide_outs[wl].Atsushi Nemoto2005-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | Add missing bits to fix D-cache aliasing problem in the PIO IDE driver. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Delete duplicate definitions.Ralf Baechle2005-11-071-4/+0
| | | | | | | | | | | | | | | | | | This reverts 8f91ed6c2fec8cb746e4dc86a79247162b4c5a7a. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Fix return type of setup_frame variantsAtsushi Nemoto2005-11-072-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Since 2.6.13-rc1 setup_frame and its variants return int. But some bits were missed in the conversion. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * IRIX: Use schedule_timeout_interruptible.Ralf Baechle2005-11-071-2/+1
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Define MAX_UDELAY_MSAtsushi Nemoto2005-11-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | If HZ was 1000, mdelay(2) cause overflow on multiplication in __udelay. We should define MAX_UDELAY_MS properly to prevent this. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Use rtc_lock to protect RTC operationsAtsushi Nemoto2005-11-0713-4/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | Many RTC routines were not protected against each other, so there are potential races, for example, ntp-update against /dev/rtc. This patch fixes them using rtc_lock. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Remove mips_rtc_lockAtsushi Nemoto2005-11-071-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mips_rtc_lock is no longer needed because RTC operations should be protected already by other mechanism. (rtc_lock, local_irq_save, etc.) Also, locking whole rtc_get_time/rtc_set_time should be avoided while some RTC routines might take very long time (a few seconds). Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Add .gitignore files for TurbochannelRalf Baechle2005-11-071-0/+1
| | |
| | * Add .gitignore files for MIPS.Ralf Baechle2005-11-072-0/+5
| | |
| | * VPE loader janitoringRalf Baechle2005-11-071-56/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Switch to dynamic major o Remove duplicate SHN_MIPS_SCOMMON definition o Coding style: remove typedefs. o Coding style: reorder to avoid the need for forward declarations o Use kzalloc. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * PNX8550 uses a MIPS32-like processor core, not R4xx0.Ralf Baechle2005-11-073-10/+13
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * O2 parport definitionsIlya A. Volynets-Evenbakh2005-11-071-1/+25
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * OSS MIPS drivers: "extern inline" -> "static inline"Adrian Bunk2005-11-072-6/+6
| | | | | | | | | | | | | | | | | | | | | "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Add spaces to MODULE_PROC_FAMILY values.Ralf Baechle2005-11-071-19/+19
| | | | | | | | | | | | | | | | | | Only a cosmetic fix to make the output of modinfo look readable. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Turn rtlx upside down.Ralf Baechle2005-11-072-120/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | o Coding style o Race condition on open o Switch to dynamic major o Header file cleanup Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2005-11-076-98/+129
| |\ \
| | * | Input: lkkbd - miscellaneous fixesJan-Benedict Glaw2005-11-021-42/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Hide debugging code into #ifdef, which allows to simplify the large switch statement * Update macros to not reference variables not given as arguments Signed-off-by: Jan-Benedict Glaw <jbglaw@lug-owl.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: logips2pp - add support for MX3100Mirco Macrelli2005-11-021-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: locomokbd - fix wrong bustypePavel Machek2005-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: fix input device deregistrationDmitry Torokhov2005-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove main attribute group (name, phys, uniq) when unregistering input devices. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: do not register statically allocated devicesDmitry Torokhov2005-11-022-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not register statically allocated input devices to prevent OOPS when attaching input interfaces since it requires class device to be properly initialized. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: locomokbd - convert to dynamic input allocationDmitry Torokhov2005-11-021-32/+31
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: convert dmasound_awacs (OSS) to dynamic input allocationIan Wienand2005-11-021-12/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ian Wienand <ianw@gelato.unsw.edu.au> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6Linus Torvalds2005-11-07192-4890/+11317
| |\ \ \ | | | | | | | | | | | | | | | Some manual fixups for clashing kfree() cleanups etc.
| | * | | [MTD] chips: Clean up trailing white spacesThomas Gleixner2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] OneNAND: Clean up trailing white spacesThomas Gleixner2005-11-071-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] NAND: Clean up trailing white spacesThomas Gleixner2005-11-0717-695/+695
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] devices: Clean up trailing white spacesThomas Gleixner2005-11-0712-156/+156
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] maps: Clean up trailing white spacesThomas Gleixner2005-11-0761-470/+470
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] chips: Clean up trailing white spacesThomas Gleixner2005-11-0715-493/+493
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] user-abi: Clean up trailing white spacesThomas Gleixner2005-11-073-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] includes: Clean up trailing white spacesThomas Gleixner2005-11-0716-118/+118
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [LIB] reed_solomon: Clean up trailing white spacesThomas Gleixner2005-11-075-72/+72
| | | | |
| | * | | [JFFS2] Clean up trailing white spacesThomas Gleixner2005-11-0736-605/+604
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] core: Clean up trailing white spacesThomas Gleixner2005-11-0716-399/+399
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] chips cfi_cmdset_0002: Prevent timeout raceKonstantin Baidarov2005-11-071-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've noticed that sometimes "MTD do_write_buffer(): software timeout" message was printed out when writing to a Fujitsu NOR flash. It turned out that this was because of a race in the timeout handling do_write_buffer(). A small timeout of (HZ / 1000) + 1 is used there, and sometimes if the timer interrupt handling takes more than one or even two jiffies (which is 1-2 ms with HZ == 1000) and that interrupt happens just after chip_ready() call, the driver bails out from a ready polling loop despite the chip has actually become ready while all those interrupts were handled. To deal with this issue, extra check for chip ready is neccessary on timeout expiration (and the checks should better be reordered). As do_write_oneword() uses the same approach, it needs to also be changed. Signed-off-by: Konstantin Baidarov <kbaidarov@ru.mvista.com> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] maps: Add support for the "TQM834x" BoardsMarian Balakowicz2005-11-073-2/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following patch adds support for the TQ Systems TQM834x Boards. Verified on TQM8349L. This is a resubmit after integrating the suggested changes. Signed-off-by: Marian Balakowicz <m8@semihalf.com> Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] maps ixp2000: fix compile warnings in ixp2000 map driverLennert Buytenhek2005-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two compile warnings that occur because of treating two 'unsigned long's as 'void *'s. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] NAND Kconfig: Simplify dependenciesThomas Gleixner2005-11-071-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] maps/plat-ram: Avoid gcc 4.0 warningThomas Gleixner2005-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assignement of a "const char *" to a "char *" variable is emitting a warning with gcc 4.0. We cannot change mtd->name to "const char *" as we have dynamic assignements of the name. So casting is the correct solution here Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] NAND: nand_write_ecc memory and OOB corruptionTodd Poynor2005-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nathan Roberts noticed the nand_write_ecc index into oobbuf goes out of bounds when crossing an erase block boundary, causing incorrect OOB data to be written and corrupting memory. Reset the index to zero after re-preparing oobbuf for a new erase block. Signed-off-by: Todd Poynor <tpoynor@mvista.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] NAND nand_base: Fix shift for bad block check (16bit devices only)Vitaly Wool2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of an odd offset, the result was shifted by 1 instead of 8 Signed-off-by: Vitaly Wool <vwool@ru.mvista.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] OneNAND/Kconfig: Fix dependenciesThomas Gleixner2005-11-071-4/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | Revert "[PATCH] OneNAND: Add simulator"Thomas Gleixner2005-11-073-474/+0
| | | | | | | | | | | | | | | | | | | | This reverts 405c829f98d216925de00af2ee52f969f2c2891c commit.
| | * | | [MTD] maps/Kconfig: Simplify and update dependenciesSean Young2005-11-071-29/+32
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] maps/ts5500: Fix partition support. Code cleanupSean Young2005-11-071-26/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] Tidy up Tims include cleanupThomas Gleixner2005-11-073-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we are at it, reorder the includes and remove the silly /* TASK */ comment Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
OpenPOWER on IntegriCloud