Tony Lindgren [Wed, 3 Jun 2009 16:43:14 +0000 (17:43 +0100)]
[ARM] 5536/1: Move clk_add_alias() to arch/arm/common/clkdev.c
This can be used for other arm platforms too as discussed
on the linux-arm-kernel list.
Also check the return value with IS_ERR and return PTR_ERR
as suggested by Russell King.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tony Lindgren [Wed, 10 Jun 2009 10:23:43 +0000 (13:23 +0300)]
Merge branch 'iommu' of git://git./linux/kernel/git/tmlind/linux-omap-2.6
Tony Lindgren [Wed, 10 Jun 2009 10:20:48 +0000 (13:20 +0300)]
Merge branch 'omapfb-upstream'
Tony Lindgren [Wed, 10 Jun 2009 10:19:13 +0000 (13:19 +0300)]
Merge branch 'for-next-2.6.30'
Conflicts:
arch/arm/mach-omap2/Makefile
Tony Lindgren [Wed, 10 Jun 2009 09:46:58 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset mach-omap2/Makefile to mainline for board entries
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:58 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Remove sti code
This should be submitted to mainline kernel after removing
the custom ATAG. Patches against the mainline kernel welcome
to add back any missing functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:58 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset gpmc.h to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:57 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset dma.c to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:57 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Remove omap_type()
Note that the omap_type() prototype is still in cpu.h as it
seems to be in mainline.
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:57 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset USB init code to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:56 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset keypad header to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:56 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset serial init code to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:56 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset mmc-twl4030 to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 10 Jun 2009 09:46:56 +0000 (12:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset gpmc-onenand to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 14:39:06 +0000 (17:39 +0300)]
REMOVE OMAP LEGACY CODE: Reset defconfigs to mainline
Reset defconfigs to mainline
Patches against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:58:12 +0000 (15:58 +0300)]
REMOVE OMAP LEGACY CODE: Remove omap boot tag support
This is not going to mainline as discussed on linux-arm-kernel
list several times earlier. So far it sounds like we should use
platform_data where possible for passing board data to drivers.
Any boot specific options should be passed via kernel cmdline,
which is the Linux standard. If ATAGs are needed, they should be
ARM generic.
Also using device tree could be explored as discussed in the
linux-arm-kernel list.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:49:55 +0000 (15:49 +0300)]
REMOVE OMAP LEGACY CODE: Remove twl4030-generic-scripts
This code should be submitted to mainline for drivers/mfd changes,
and the related platform_data should be submitted after those
changes.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:47:22 +0000 (15:47 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-zoom to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:46:21 +0000 (15:46 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-overo to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:42:32 +0000 (15:42 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-pandora to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:39:58 +0000 (15:39 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-ldp to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:38:40 +0000 (15:38 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-770 to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:37:48 +0000 (15:37 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-generic to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:36:11 +0000 (15:36 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-h4 to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:32:04 +0000 (15:32 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-*evm* to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:27:15 +0000 (15:27 +0300)]
EMOVE OMAP LEGACY CODE: Reset board-*sdp* to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:23:59 +0000 (15:23 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-rx51 to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:21:10 +0000 (15:21 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-omap3beagle to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 12:18:17 +0000 (15:18 +0300)]
REMOVE OMAP LEGACY CODE: Reset board-apollon to mainline
It's time to start using mainline board-*.c files. Patches
against the mainline kernel welcome to add back any missing
functionality.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 11:54:27 +0000 (14:54 +0300)]
REMOVE OMAP LEGACY CODE: Reset omap fb code to mainline
This is to be able to merge in Imre's omapfb-upstream branch.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 11:37:16 +0000 (14:37 +0300)]
REMOVE OMAP LEGACY CODE: Remove bluetooth drivers not in mainline
These should get submitted via linux-bluetooth list. Also the
hwaddress should probably be passable via cmdline, and
OMAP_TAG_NOKIA_BT should be replaces with platform_data.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 11:29:38 +0000 (14:29 +0300)]
REMOVE OMAP LEGACY CODE: Remove component-version.c
This code should be done in a generic way and the
OMAP_TAG_VERSION_STR should be ARM generic.
Patches against mainline kernel welcome!
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 11:25:42 +0000 (14:25 +0300)]
REMOVE OMAP LEGACY CODE: Remove bootreason.c
This should be handled in a generic way, and the
OMAP_TAG_BOOT_REASON should be ARM common tag.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 9 Jun 2009 10:55:05 +0000 (13:55 +0300)]
REMOVE OMAP LEGACY CODE: Remove gpio-switch code
This code is not going to mainline based on earlier comments
on LKML and from David Brownell. For more details, please see:
http://thread.gmane.org/gmane.linux.kernel/809866
So far it looks like the gpio-switch code should be split to
two parts:
- Input events should handled with gpio_keys.c
- Toggling of GPIO values from userspace should be handlled
via gpiolib
Patches against the mainline kernel are welcome as always!
Signed-off-by: Tony Lindgren <tony@atomide.com>
Imre Deak [Thu, 4 Jun 2009 14:43:50 +0000 (17:43 +0300)]
omapfb: HWA742: fix pointer to be const
Fixes the following:
warning: assignment discards qualifiers from pointer target type
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Imre Deak [Wed, 3 Jun 2009 18:59:01 +0000 (21:59 +0300)]
omapfb: Add FB manual update option to Kconfig
Also move the controller specific options up in the menu, to a more
logical spot.
Signed-off-by: Imre Deak <imre.deak@nokia.com>
arun c [Mon, 31 Mar 2008 06:52:48 +0000 (12:22 +0530)]
omapfb: Fix coding style / remove dead line
- use __iomem type attribute where appropriate
- expand (a ? : b) to (a ? a : b)
As suggested by Russell King <linux@arm.linux.org.uk>
- remove a dead line from omapfb_main.c
Signed-off-by: Arun C <arunedarath@mistralsolutions.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Jouni Högander [Fri, 28 Mar 2008 13:03:29 +0000 (15:03 +0200)]
omapfb: suspend/resume only if FB device is already initialized
Check wether fbdev is NULL in suspend / resume functions. Fbdev is
NULL, if there is no lcd or it is not enabled in configuration.
Signed-off-by: Jouni Högander <jouni.hogander@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Daniel Stone [Thu, 9 Oct 2008 10:06:43 +0000 (13:06 +0300)]
omapfb: dispc: Allow multiple external IRQ handlers
Previously, the only external (to dispc.c) IRQ handler was RFBI's
frame done handler. dispc's IRQ framework was very dumb: you could only
have one handler, and the semantics of {request,free}_irq were odd, to
say the least.
The new framework allows multiple consumers to register arbitrary IRQ
masks.
Signed-off-by: Daniel Stone <daniel.stone@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Jouni Hogander [Fri, 15 Aug 2008 09:31:24 +0000 (12:31 +0300)]
omapfb: dispc: Enable wake up capability
Without wakeup enable omap doesn't wake up on dispc interrupts. This
causes problems in a case where mpu is in sleep state and dispc
interrupt fires.
Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Jouni Hogander [Fri, 15 Aug 2008 08:56:03 +0000 (11:56 +0300)]
omapfb: dispc: Disable iface clocks along with func clocks
Leaving interface clocks enabled causes dss pwrdm to stay in active
state when mpu is in active state. This fix puts dss to sleep state
when it is not needed.
Earlier version broke framebuffer on 24xx. This is fixed by enabling
clocks before trying to access DISPC_IRQSTATUS register.
Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Imre Deak [Wed, 3 Jun 2009 18:31:03 +0000 (21:31 +0300)]
omapfb: dispc: Various typo fixes
- value and register offset was swapped in a dispc write
- DISPC_CONTROL register was used instead of DISPC_SYSCONFIG
- FIFO size bit field had incorrect length for OMAP3
Fixed-by: arun <arunedarath@mistralsolutions.com>
Fixed-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
Fixed-by: Andrzej Zaborowski <balrog@zabor.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Rodrigo Vivi [Fri, 9 Jan 2009 16:29:45 +0000 (18:29 +0200)]
omapfb: Add support for rotation on the Blizzard LCD ctrl
The LCD controller (EPSON S1D13744) supports rotation (0, 90, 180
and 270 degrees) on hardware just setting the bits 0 and 1 of 0x28
register (LCD Panel Configuration Register). Now it is possible to
use this caps only setting the angle degree on var rotate of
fb_var_screeninfo using the FBIOPUT_VSCREENINFO ioctl.
Fixed-by: Siarhei Siamashka <siarhei.siamashka@nokia.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@openbossa.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Stanley.Miao [Fri, 9 Jan 2009 00:19:01 +0000 (02:19 +0200)]
omapfb: Add support for the ZOOM MDK LCD
Add glue to control the OMAP_LDP LCD as a frame buffer device
using the existing dispc.c driver under omapfb.
Patch updated for mainline kernel. Note that the
drivers/video/omap should be updated to pass omap_lcd_config
in platform_data. The patch should also be updated to compile
if twl4030 is not selected, and eventually to use the regulator
framework.
Fixed-by: Jarkko Nikula <jarkko.nikula@gmail.com>
Fixed-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Steve Sakoman [Fri, 9 Jan 2009 00:15:15 +0000 (02:15 +0200)]
omapfb: Add support for the Gumstix Overo LCD
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Koen Kooi [Fri, 9 Jan 2009 00:11:27 +0000 (02:11 +0200)]
omapfb: Add support for the OMAP3 Beagle DVI output
The default resolution is 1024x768@24bit
This version addresses the comments from Felipe Balbi adn Arun Edarath
Fixed-by: Felipe Contreras <felipe.contreras@gmail.com>
Fixed-by: Steve Sakoman <steve@sakoman.com>
Fixed-by: Jarkko Nikula <jarkko.nikula@gmail.com>
Fixed-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Koen Kooi <koen@openembedded.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Steve Sakoman [Fri, 9 Jan 2009 00:08:03 +0000 (02:08 +0200)]
omapfb: Add support for the OMAP3 EVM LCD
Add LCD support for OMAP3 EVM
Backlight support by Arun C <arunedarath@mistralsolutions.com>
Fixed-by: Jarkko Nikula <jarkko.nikula@gmail.com>
Fixed-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Acked-by: Syed Mohammed Khasim <khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Kevin Hilman [Fri, 9 Jan 2009 12:54:55 +0000 (14:54 +0200)]
omapfb: Add support for the 3430SDP LCD
The 3430SDP uses the same panel as the 2430SDP. The main difference
are in the GPIO lines used for panel enable and backlight, and the
VAUX register/commands sent to the TWL4030 power subsystem.
Also, some misc. whitespace cleanups.
Fixed-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kevin Hilman <khilman@mvsita.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
arun c [Fri, 9 Jan 2009 13:00:49 +0000 (15:00 +0200)]
omapfb: Add support for the OMAP2EVM LCD
omap2evm LCD supports VGA and QVGA resolution, by default its in VGA mode.
Fixed-by: Jarkko Nikula <jarkko.nikula@gmail.com>
Fixed-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Arun C <arunedarath@mistralsolutions.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Hunyue Yau [Sun, 10 May 2009 21:41:34 +0000 (00:41 +0300)]
omapfb: Add support for the 2430SDP LCD
Add glue to control the 2430SDP LCD as a frame buffer device
using the existing dispc.c driver under omapfb.
Fixed-by: Kevin Hilman <khilman@mvista.com>
Fixed-by: Sergio Aguirre <saaguirre@ti.com>
Fixed-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
Fixed-by: Tony Lindgren <tony@atomide.com>
Fixed-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Hunyue Yau <hyau@mvista.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Jonathan McDowell [Fri, 4 Aug 2006 10:47:00 +0000 (13:47 +0300)]
omapfb: Add support for the Amstrad Delta LCD
This is an updated version of the LCD driver for the Amstrad Delta to
take into account the recent changes to the omapfb infrastructure. The
Delta features a 480x320 12 bit DSTN panel.
Signed-off-by: Jonathan McDowell <noodles@earth.li>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Imre Deak [Thu, 4 Jun 2009 14:36:07 +0000 (17:36 +0300)]
N770: Enable LCD MIPI-DCS in Kconfig
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Imre Deak [Sun, 10 May 2009 22:02:12 +0000 (01:02 +0300)]
omapfb: Add support for MIPI-DCS compatible LCDs
Fixed-by: Mike Wege <ext-mike.wege@nokia.com>
Fixed-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Fixed-by: Timo Savola <tsavola@movial.fi>
Fixed-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Fixed-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Kyungmin Park [Fri, 9 Jan 2009 17:22:36 +0000 (19:22 +0200)]
omapfb: Add support for the Apollon LCD
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Tony Lindgren [Wed, 3 Jun 2009 17:05:50 +0000 (10:05 -0700)]
Merge current mainline tree into linux-omap tree
Merge branches 'master' and 'linus'
Amit Kucheria [Wed, 3 Jun 2009 16:53:24 +0000 (09:53 -0700)]
twl4030: Add some error checking to twl4030 init
Check for return values of i2c read/write operations and size of scripts being
uploaded to TWL4030
(Removed the unrelated string changes based on David Brownell's comment)
Signed-off-by: Amit Kucheria <amit.kucheria@verdurent.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Linus Torvalds [Wed, 3 Jun 2009 03:07:25 +0000 (20:07 -0700)]
Linux 2.6.30-rc8
Linus Torvalds [Wed, 3 Jun 2009 01:06:10 +0000 (18:06 -0700)]
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pmac: Update PowerMac 32-bit defconfig
Grazvydas Ignotas [Tue, 2 Jun 2009 18:40:02 +0000 (11:40 -0700)]
mmc-twl4030: use correct controller in twl_mmc23_set_power
twl_mmc23_set_power() has MMC2 twl_mmc_controller hardcoded in it, which
breaks MMC3. Find the right controller to use instead.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Alan Cox [Tue, 2 Jun 2009 15:58:10 +0000 (16:58 +0100)]
parport: quickfix the proc registration bug
Ideally we should have a directory of drivers and a link to the 'active'
driver. For now just show the first device which is effectively the existing
semantics without a warning.
This is an update on the original buggy patch that I then forgot to
resubmit. Confusingly it was proposed by Red Hat, written by Etched Pixels
fixed and submitted by Intel ...
Resolves-Bug: http://bugzilla.kernel.org/show_bug.cgi?id=9749
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Alan Cox [Tue, 2 Jun 2009 11:34:31 +0000 (12:34 +0100)]
pata_netcell: LBA48 force identify bits correct
This matches Bartlomiej's patch for ide_pci_generic:
c339dfdd65b52bfd947ab29d1210314a2f6d622d
In the libata case netcell has its own mini driver. I suspect this fix is
actually only needed for some firmware revs but it does no harm either way.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Tue, 2 Jun 2009 16:49:06 +0000 (09:49 -0700)]
Merge git://git./linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup
e1000: add missing length check to e1000 receive routine
forcedeth: add phy_power_down parameter, leave phy powered up by default (v2)
Bluetooth: Remove useless flush_work() causing lockdep warnings
Linus Torvalds [Tue, 2 Jun 2009 16:47:21 +0000 (09:47 -0700)]
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: prevent deadlock in xfs_qm_shake()
xfs: fix overflow in xfs_growfs_data_private
xfs: fix double unlock in xfs_swap_extents()
Minoru Usui [Tue, 2 Jun 2009 09:17:34 +0000 (02:17 -0700)]
net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup
This patch fixes a bug which unconfigured struct tcf_proto keeps
chaining in tc_ctl_tfilter(), and avoids kernel panic in
cls_cgroup_classify() when we use cls_cgroup.
When we execute 'tc filter add', tcf_proto is allocated, initialized
by classifier's init(), and chained. After it's chained,
tc_ctl_tfilter() calls classifier's change(). When classifier's
change() fails, tc_ctl_tfilter() does not free and keeps tcf_proto.
In addition, cls_cgroup is initialized in change() not in init(). It
accesses unconfigured struct tcf_proto which is chained before
change(), then hits Oops.
Signed-off-by: Minoru Usui <usui@mxm.nes.nec.co.jp>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Tested-by: Minoru Usui <usui@mxm.nes.nec.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Neil Horman [Tue, 2 Jun 2009 08:29:58 +0000 (01:29 -0700)]
e1000: add missing length check to e1000 receive routine
Patch to fix bad length checking in e1000. E1000 by default does two
things:
1) Spans rx descriptors for packets that don't fit into 1 skb on recieve
2) Strips the crc from a frame by subtracting 4 bytes from the length prior to
doing an skb_put
Since the e1000 driver isn't written to support receiving packets that span
multiple rx buffers, it checks the End of Packet bit of every frame, and
discards it if its not set. This places us in a situation where, if we have a
spanning packet, the first part is discarded, but the second part is not (since
it is the end of packet, and it passes the EOP bit test). If the second part of
the frame is small (4 bytes or less), we subtract 4 from it to remove its crc,
underflow the length, and wind up in skb_over_panic, when we try to skb_put a
huge number of bytes into the skb. This amounts to a remote DOS attack through
careful selection of frame size in relation to interface MTU. The fix for this
is already in the e1000e driver, as well as the e1000 sourceforge driver, but no
one ever pushed it to e1000. This is lifted straight from e1000e, and prevents
small frames from causing the underflow described above
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Tested-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ed Swierk [Tue, 2 Jun 2009 07:19:52 +0000 (00:19 -0700)]
forcedeth: add phy_power_down parameter, leave phy powered up by default (v2)
Add a phy_power_down parameter to forcedeth: set to 1 to power down the
phy and disable the link when an interface goes down; set to 0 to always
leave the phy powered up.
The phy power state persists across reboots; Windows, some BIOSes, and
older versions of Linux don't bother to power up the phy again, forcing
users to remove all power to get the interface working (see
http://bugzilla.kernel.org/show_bug.cgi?id=13072). Leaving the phy
powered on is the safest default behavior. Users accustomed to seeing
the link state reflect the interface state and/or wanting to minimize
power consumption can set phy_power_down=1 if compatibility with other
OSes is not an issue.
Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Felix Blyakher [Mon, 1 Jun 2009 18:13:24 +0000 (13:13 -0500)]
xfs: prevent deadlock in xfs_qm_shake()
It's possible to recurse into filesystem from the memory
allocation, which deadlocks in xfs_qm_shake(). Add check
for __GFP_FS, and bail out if it is not set.
Signed-off-by: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Hedi Berriche <hedi@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Felix Blyakher <felixb@sgi.com>
Eric Sandeen [Sat, 23 May 2009 19:30:12 +0000 (14:30 -0500)]
xfs: fix overflow in xfs_growfs_data_private
In the case where growing a filesystem would leave the last AG
too small, the fixup code has an overflow in the calculation
of the new size with one fewer ag, because "nagcount" is a 32
bit number. If the new filesystem has > 2^32 blocks in it
this causes a problem resulting in an EINVAL return from growfs:
# xfs_io -f -c "truncate
19998630180864" fsfile
# mkfs.xfs -f -bsize=4096 -dagsize=
76288719b,size=
3905982455b fsfile
# mount -o loop fsfile /mnt
# xfs_growfs /mnt
meta-data=/dev/loop0 isize=256 agcount=52,
agsize=
76288719 blks
= sectsz=512 attr=2
data = bsize=4096 blocks=
3905982455, imaxpct=5
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0
log =internal bsize=4096 blocks=32768, version=2
= sectsz=512 sunit=0 blks, lazy-count=0
realtime =none extsz=4096 blocks=0, rtextents=0
xfs_growfs: XFS_IOC_FSGROWFSDATA xfsctl failed: Invalid argument
Reported-by: richard.ems@cape-horn-eng.com
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Felix Blyakher <felixb@sgi.com>
Felix Blyakher [Fri, 8 May 2009 00:49:45 +0000 (19:49 -0500)]
xfs: fix double unlock in xfs_swap_extents()
Regreesion from commit ef8f7fc, which rearranged the code in
xfs_swap_extents() leading to double unlock of xfs inode ilock.
That resulted in xfs_fsr deadlocking itself on platforms, which
don't handle double unlock of rw_semaphore nicely. It caused the
count go negative, which represents the write holder, without
really having one. ia64 is one of the platforms where deadlock
was easily reproduced and the fix was tested.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Felix Blyakher <felixb@sgi.com>
Benjamin Herrenschmidt [Sun, 24 May 2009 20:34:10 +0000 (20:34 +0000)]
powerpc/pmac: Update PowerMac 32-bit defconfig
This mostly adds back AppleTouch support and adds CONFIG_HIGHMEM
by default.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Andrew de Quincey [Mon, 1 Jun 2009 23:13:02 +0000 (16:13 -0700)]
Patch: Fix N770 brf6150 bluetooth driver
This driver has the same problem as the cbus drivers - mismatch
between platform_device and non-platform driver APIs.
Switching it to use platform_driver removes the random corruption and
badness I was seeing on boot.
commit
e6dce93304c6c692e187b95eaea227cfe3cb3317
Author: Andrew de Quincey <adq@lidskialf.net>
Date: Sat May 23 18:37:25 2009 +0100
Fix brf6150.c platform_device breakage
This driver has the mismatch between platform_devices and non-platform drivers.
Switch it to use platform_driver as well.
Signed-off-by: Andrew de Quincey <adq@lidskialf.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Andrew de Quincey [Mon, 1 Jun 2009 23:09:38 +0000 (16:09 -0700)]
Patch: Fix N770 MMC support
Some of the N770's MMC configuration options seem to have been
dropped. This patch adds them back in again.
Note that only the .ocr_mask change was /critical/, but I've added the
.max_freq setting back as well, as the original sources had it. Can
anyone confirm if this is unnecessary?
Secondly, there is support in the original code for a 4wire/higher
speed mode. As I don't have the requisite N770 hardware (I think it
was a rev2 N770?) to test this, I can't really add it back.
commit
b67345993d494a1dd5021e29de9611af80cbf1cd
Author: Andrew de Quincey <adq@lidskialf.net>
Date: Sat May 23 17:43:19 2009 +0100
Fix n770 MMC support
Some of the necessary configuration settings for the N770's MMC support had been
dropped. Add them back in again.
Signed-off-by: Andrew de Quincey <adq@lidskialf.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David S. Miller [Mon, 1 Jun 2009 21:32:08 +0000 (14:32 -0700)]
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-2.6
Linus Torvalds [Mon, 1 Jun 2009 16:12:44 +0000 (09:12 -0700)]
Merge git://git./linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: hash - Fix handling of sg entry that crosses page boundary
Linus Torvalds [Mon, 1 Jun 2009 15:03:09 +0000 (08:03 -0700)]
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Update documentation on fan_max
hwmon: (lm78) Add missing __devexit_p()
Linus Torvalds [Mon, 1 Jun 2009 15:02:31 +0000 (08:02 -0700)]
Merge git://git./linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix section attribute warnings.
sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK.
Linus Torvalds [Mon, 1 Jun 2009 15:02:05 +0000 (08:02 -0700)]
Merge git://git./linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
3c509: Add missing EISA IDs
MAINTAINERS: take maintainership of the cpmac Ethernet driver
net/firmare: Ignore .cis files
ath1e: add new device id for asus hardware
mlx4_en: Fix a kernel panic when waking tx queue
rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
mac8390: fix build with NET_POLL_CONTROLLER
cxgb3: link fault fixes
cxgb3: fix dma mapping regression
netfilter: nfnetlink_log: fix wrong skbuff size calculation
netfilter: xt_hashlimit does a wrong SEQ_SKIP
bfin_mac: fix build error due to net_device_ops convert
atlx: move modinfo data from atlx.h to atl1.c
gianfar: fix babbling rx error event bug
cls_cgroup: read classid atomically in classifier
netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
netfilter: nf_ct_tcp: fix accepting invalid RST segments
Linus Torvalds [Mon, 1 Jun 2009 15:01:42 +0000 (08:01 -0700)]
Merge git://git./linux/kernel/git/jaswinder/headers-check-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6:
headers_check fix: linux/net_dropmon.h
headers_check fix: linux/auto_fs.h
Christian Engelmayer [Mon, 1 Jun 2009 11:46:50 +0000 (13:46 +0200)]
hwmon: Update documentation on fan_max
Add fan_max description.
Add fan limit alarm 'max_alarm' to the alarm section.
Signed-off-by: Christian Engelmayer <christian.engelmayer@frequentis.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Mike Frysinger [Mon, 1 Jun 2009 11:46:49 +0000 (13:46 +0200)]
hwmon: (lm78) Add missing __devexit_p()
The remove function uses __devexit, so the .remove assignment needs
__devexit_p() to fix a build error with hotplug disabled.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Maciej W. Rozycki [Mon, 1 Jun 2009 10:12:04 +0000 (03:12 -0700)]
3c509: Add missing EISA IDs
Several EISA device IDs for 3c509 family network cards are missing from
the driver, making the cards unusable in their EISA mode. Here's a fix to
add them based on the EISA configuration files distributed by 3Com and our
eisa.ids database.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Florian Fainelli [Mon, 1 Jun 2009 09:43:17 +0000 (02:43 -0700)]
MAINTAINERS: take maintainership of the cpmac Ethernet driver
This patch adds me as the maintainer of the CPMAC (AR7)
Ethernet driver.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jaswinder Singh Rajput [Mon, 1 Jun 2009 06:23:25 +0000 (06:23 +0000)]
headers_check fix: linux/net_dropmon.h
fix the following 'make headers_check' warnings:
usr/include/linux/net_dropmon.h:7: found __[us]{8,16,32,64} type without #include <linux/types.h>
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Jaswinder Singh Rajput [Mon, 1 Jun 2009 06:21:13 +0000 (06:21 +0000)]
headers_check fix: linux/auto_fs.h
fix the following 'make headers_check' warnings:
usr/include/linux/auto_fs.h:17: include of <linux/types.h> is preferred over <asm/types.h>
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Herbert Xu [Sun, 31 May 2009 13:09:22 +0000 (23:09 +1000)]
crypto: hash - Fix handling of sg entry that crosses page boundary
A quirk that we've always supported is having an sg entry that's
bigger than a page, or more generally an sg entry that crosses
page boundaries. Even though it would be better to explicitly have
to sg entries for this, we need to support it for the existing users,
in particular, IPsec.
The new ahash sg walking code did try to handle this, but there was
a bug where we didn't increment the page so kept on walking on the
first page over an dover again.
This patch fixes it.
Tested-by: Martin Willi <martin@strongswan.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Linus Torvalds [Sat, 30 May 2009 22:25:30 +0000 (15:25 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide_pci_generic: add quirk for Netcell ATA RAID
Bartlomiej Zolnierkiewicz [Sat, 30 May 2009 18:06:54 +0000 (20:06 +0200)]
ide_pci_generic: add quirk for Netcell ATA RAID
We need to explicitly mark words 85-87 as valid ones since
firmware doesn't do it.
This should fix support for LBA48 and FLUSH CACHE [EXT] command
which stopped working after we applied more strict checking of
identify words in:
commit
942dcd85bf8edf38cdc3745306ca250684d99a61
("ide: idedisk_supports_lba48() -> ata_id_lba48_enabled()")
and
commit
4b58f17d7c45a8e5f4acda641bec388398b9c0fa
("ide: ide_id_has_flush_cache() -> ata_id_flush_enabled()")
Reported-and-tested-by: "Trevor Hemsley" <trevor.hemsley@ntlworld.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Linus Torvalds [Sat, 30 May 2009 15:04:15 +0000 (08:04 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix bh leak in nilfs_cpfile_delete_checkpoints function
Linus Torvalds [Sat, 30 May 2009 14:57:44 +0000 (07:57 -0700)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI, i915: build fix (v2)
acpi-cpufreq: fix printk typo and indentation
ACPI processor: remove spurious newline from warning message
drm/i915: acpi/video.c fix section mismatch warning
ACPI: video: DMI workaround broken Acer 5315 BIOS enabling display brightness
ACPI: video: DMI workaround broken eMachines E510 BIOS enabling display brightness
ACPI: sanity check _PSS frequency to prevent cpufreq crash
i7300_idle: allow testing on i5000-series hardware w/o re-compile
PCI/ACPI: fix wrong ref count handling in acpi_pci_bind()
cpuidle: fix AMD C1E suspend hang
cpuidle: makes AMD C1E work in acpi_idle
Linus Torvalds [Sat, 30 May 2009 14:57:33 +0000 (07:57 -0700)]
Merge branch 'fixes' of git://git./linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
fsldma: Fix compile warnings
fsldma: fix memory leak on error path in fsl_dma_prep_memcpy()
fsldma: snooping is not enabled for last entry in descriptor chain
fsldma: fix infinite loop on multi-descriptor DMA chain completion
fsldma: fix "DMA halt timeout!" errors
fsldma: fix check on potential fdev->chan[] overflow
fsldma: update mailling list address in MAINTAINERS
Ryusuke Konishi [Sat, 30 May 2009 12:50:58 +0000 (21:50 +0900)]
nilfs2: fix bh leak in nilfs_cpfile_delete_checkpoints function
The nilfs_cpfile_delete_checkpoints() wrongly skips brelse() for the
header block of checkpoint file in case of errors. This fixes the
leak bug.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Matt Kraai [Sat, 30 May 2009 05:06:33 +0000 (22:06 -0700)]
net/firmare: Ignore .cis files
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Greg Kroah-Hartman [Sat, 30 May 2009 05:04:54 +0000 (22:04 -0700)]
ath1e: add new device id for asus hardware
Gary Lin reports that a new device id needs to be added to the atl1e in
order to get some new Asus hardware to work properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Yevgeny Petrilin [Mon, 25 May 2009 20:57:21 +0000 (20:57 +0000)]
mlx4_en: Fix a kernel panic when waking tx queue
When the transmit queue gets full we enable interrupts for TX completions
There was a race that we handled the TX queue both from the interrupt context
and from the transmit function. Using "spin_trylock_irq()" ensures this
doesn't happen.
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Sat, 30 May 2009 04:56:19 +0000 (21:56 -0700)]
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
Len Brown [Sat, 30 May 2009 01:30:01 +0000 (21:30 -0400)]
Merge branches 'bugzilla-13121+', 'bugzilla-13233', 'redhat-bugzilla-500311', 'pci-bind-oops', 'misc-2.6.30' and 'i7300_idle' into release
Len Brown [Sat, 30 May 2009 01:11:27 +0000 (21:11 -0400)]
ACPI, i915: build fix (v2)
drivers/built-in.o: In function `intel_opregion_init':
(.text+0x9d540): undefined reference to `acpi_video_register'
v2: move under DRM_I915 from DRM_I915_KMS
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Joe Perches [Tue, 26 May 2009 21:58:39 +0000 (14:58 -0700)]
acpi-cpufreq: fix printk typo and indentation
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Frans Pop [Fri, 22 May 2009 08:23:40 +0000 (10:23 +0200)]
ACPI processor: remove spurious newline from warning message
Commit
4973b22a ("ACPI processor: reset the throttling state once it's
invalid") introduced a new warning which prints a spurious newline.
The ACPI_WARNING macro that is used already takes care of adding a
newline, after adding ACPI_CA_VERSION to the message. Remove the newline
to avoid the message getting split into two lines.
Signed-off-by: Frans Pop <elendil@planet.nl>
Signed-off-by: Len Brown <len.brown@intel.com>
Jaswinder Singh Rajput [Wed, 20 May 2009 06:26:08 +0000 (11:56 +0530)]
drm/i915: acpi/video.c fix section mismatch warning
Currently acpi_video_exit() is exported as well as using __exit which causes:
WARNING: drivers/acpi/video.o(__ksymtab+0x0): Section mismatch in reference from the variable __ksymtab_acpi_video_exit to the function .exit.text:acpi_video_exit()
The symbol acpi_video_exit is exported and annotated __exit
Fix this by removing the __exit annotation of acpi_video_exit or drop the export.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
git.openpandora.org / pandora-kernel.git / log