12 years agoMerge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
Russell King [Thu, 26 Mar 2009 23:10:11 +0000]
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

Conflicts:
arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

12 years agoMerge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Russell King [Thu, 26 Mar 2009 22:46:22 +0000]
Merge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

12 years agoMerge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Russell King [Thu, 26 Mar 2009 22:44:43 +0000]
Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

12 years agoGemini: Add support for Teltonika RUT100
Paulius Zaleckas [Thu, 26 Mar 2009 08:06:27 +0000]
Gemini: Add support for Teltonika RUT100

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

12 years agoGemini: gpiolib based GPIO support v2
Paulius Zaleckas [Thu, 26 Mar 2009 08:06:27 +0000]
Gemini: gpiolib based GPIO support v2

v2:
- update copyrights

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

12 years agoMAINTAINERS: add myself as Gemini architecture maintainer
Paulius Zaleckas [Thu, 26 Mar 2009 08:06:27 +0000]
MAINTAINERS: add myself as Gemini architecture maintainer

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

12 years agoARM: Add Gemini architecture v3
Paulius Zaleckas [Thu, 26 Mar 2009 08:06:08 +0000]
ARM: Add Gemini architecture v3

Adds support for Cortina Systems Gemini family CPUs:
http://www.cortina-systems.com/products/category/18

v3:
- fixed __io(a) to be defined as __typesafe_io(a)

v2:
- #include <asm/io.h> -> <linux/io.h>
- remove asm/system.h include
- revorked mm.c to use named initializers
- removed "empty" dma.h
- updated copyrights

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

12 years ago[ARM] OMAP: Fix compile for omap2_init_common_hw()
Tony Lindgren [Mon, 16 Mar 2009 22:28:42 +0000]
[ARM] OMAP: Fix compile for omap2_init_common_hw()

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

12 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
Russell King [Wed, 25 Mar 2009 18:31:35 +0000]
Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap-2.6 into devel

12 years agoMAINTAINERS: Add myself as Faraday ARM core variant maintainer
Paulius Zaleckas [Wed, 25 Mar 2009 11:10:20 +0000]
MAINTAINERS: Add myself as Faraday ARM core variant maintainer

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

12 years agoARM: Add support for FA526 v2
Paulius Zaleckas [Wed, 25 Mar 2009 11:10:01 +0000]
ARM: Add support for FA526 v2

Adds support for Faraday FA526 core. This core is used at least by:
Cortina Systems Gemini and Centroid family
Cavium Networks ECONA family
Grain Media GM8120
Pixelplus ImageARM
Prolific PL-1029
Faraday IP evaluation boards

v2:
- move TLB_BTB to separate patch
- update copyrights

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

12 years ago[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
Russell King [Wed, 25 Mar 2009 10:21:35 +0000]
[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

12 years ago[ARM] collie: fix two minor formatting nits
Russell King [Wed, 25 Mar 2009 10:15:00 +0000]
[ARM] collie: fix two minor formatting nits

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

12 years ago[ARM] 5431/1: scoop: completely drop old-style SCOOP GPIO accessors
Dmitry Baryshkov [Wed, 25 Mar 2009 09:16:37 +0000]
[ARM] 5431/1: scoop: completely drop old-style SCOOP GPIO accessors

Now, as all places that use Scoop GPIO have been converted to use
GPIO API, drop old-style accessors completely.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

12 years ago[ARM] 5430/1: collie_pm: use new GPIO API to control charger
Dmitry Baryshkov [Wed, 25 Mar 2009 09:15:28 +0000]
[ARM] 5430/1: collie_pm: use new GPIO API to control charger

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

12 years ago[ARM] 5429/1: collie: start scoop converton to new api
Dmitry Baryshkov [Wed, 25 Mar 2009 09:14:25 +0000]
[ARM] 5429/1: collie: start scoop converton to new api

Start converting scoop gpio access to new API instead of old
deprecated one.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

12 years agoMerge git://git.marvell.com/orion into devel
Russell King [Wed, 25 Mar 2009 10:00:08 +0000]
Merge git://git.marvell.com/orion into devel

12 years agoARM: tlbflush.h: introduce TLB_BTB flag
Paulius Zaleckas [Wed, 25 Mar 2009 08:58:47 +0000]
ARM: tlbflush.h: introduce TLB_BTB flag

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

12 years agoMerge branch 'highmem' into devel
Russell King [Tue, 24 Mar 2009 22:47:45 +0000]
Merge branch 'highmem' into devel

12 years agoMerge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
root [Tue, 24 Mar 2009 22:04:25 +0000]
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

12 years ago[ARM] Kirkwood: fail the probe if internal RTC does not work
Nicolas Pitre [Tue, 24 Mar 2009 00:42:29 +0000]
[ARM] Kirkwood: fail the probe if internal RTC does not work

Having a RTC that doesn't maintain proper time across a reboot is one
thing.  But a RTC that doesn't work at all and only causes timeouts is
another.

Tested-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

12 years agoARM OMAP3: Initial support for Nokia RX-51, v3
Lauri Leukkunen [Tue, 24 Mar 2009 01:38:17 +0000]
ARM OMAP3: Initial support for Nokia RX-51, v3

Adds board files and related headers for Nokia RX-51
Internet Tablet.

This patch has been updated with some clean-up patches
posted earlier to linux-omap list.

Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: Add support for 3430 SDP, v4
Syed Mohammed Khasim [Tue, 24 Mar 2009 01:38:16 +0000]
ARM: OMAP3: Add support for 3430 SDP, v4

Add support for 3430 SDP.

Various updates have been merged into this patch from
the linux-omap list.

Patch updated to initialize regulators by David Brownell
<dbrownell@users.sourceforge.net>.

Signed-off-by: Syed Mohammed Khasim <khasim@ti.com>
David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: Add ADS7846 touchscreen support to Overo platform, v3
Steve Sakoman [Tue, 24 Mar 2009 01:38:16 +0000]
ARM: OMAP3: Add ADS7846 touchscreen support to Overo platform, v3

An upcoming Overo expansion board includes an ADS7846 touchscreen controller.

This patch adds support via the ads7846 driver when enabled in the
kernel config.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: MUSB initialization for omap hw, v2
Felipe Balbi [Tue, 24 Mar 2009 01:34:06 +0000]
ARM: OMAP3: MUSB initialization for omap hw, v2

Create a generic board-file for initializing usb
on omap2430 and omap3 boards.

Patch modified by Tony to build the module based on
CONFIG_USB_MUSB_SOC. Also merged in a patch adding
the nop xceiv from Ajay Kumar Gupta <ajay.gupta@ti.com>.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: Add base address definitions and resources for OMAP 3 IS, v2
Tony Lindgren [Tue, 24 Mar 2009 01:23:49 +0000]
ARM: OMAP3: Add base address definitions and resources for OMAP 3 IS, v2

This replaces earlier patch from Sergio Aguirre titled "[REVIEW PATCH 03/14]
OMAP34XX: CAM: Resources fixes".

Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: mmc-twl4030 allow arbitrary slot names, v3
Adrian Hunter [Tue, 24 Mar 2009 01:23:48 +0000]
ARM: OMAP3: mmc-twl4030 allow arbitrary slot names, v3

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: mmc-twl4030 add cover switch
Adrian Hunter [Tue, 24 Mar 2009 01:23:48 +0000]
ARM: OMAP3: mmc-twl4030 add cover switch

Allow a cover switch to be used to cause a rescan of the
MMC slot.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: mmc-twl4030 fix for vmmc = 0
David Brownell [Tue, 24 Mar 2009 01:23:48 +0000]
ARM: OMAP3: mmc-twl4030 fix for vmmc = 0

Resolve longstanding issue noted by Adrian Hunter:  confusion
between settting VSEL=0 (which is 1.8V on MMC1) and poweroff.

Also, leave VSEL alone if we're just powering the regulator off.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: mmc-twl4030 add MMC3 support, v2
Grazvydas Ignotas [Tue, 24 Mar 2009 01:23:47 +0000]
ARM: OMAP3: mmc-twl4030 add MMC3 support, v2

Device connected to MMC3 is assumed to be self-powered, so
set_power() function is empty. It can't be omited because
host driver requires it.

Array size for hsmmc[] is specified to allocate to allocate
an instance for the third MMC controller.

Also fix a leak which happens if invalid controller id
is passed.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: mmc-twl4030 init passes device nodes back, v2
David Brownell [Tue, 24 Mar 2009 01:23:47 +0000]
ARM: OMAP3: mmc-twl4030 init passes device nodes back, v2

When setting up HSMMC devices, pass the device nodes back so
board code can linking them to their power supply regulators.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: mmc-twl4030 voltage cleanup
David Brownell [Tue, 24 Mar 2009 01:23:47 +0000]
ARM: OMAP3: mmc-twl4030 voltage cleanup

Correct twl4030 MMC power switching:  fix voltage ranges reported
for each slot, and handle them fully.

 Lies corrected:
  - MMC-1 doesn't support the 2.6-2.7 Volt range
  - MMC-2 can't normally support anything except 1.8V
 Omissions corrected
  - MMC-1 *does* handle the 2.8-2.9 Volt range
  - MMC-2 can handle 2.5-3.2 Volt cards, given a transceiver

Add transciever support for MMC-2; enable it for Overo and Pandora.
(Depends on something else to have set up pinmuxing for control
signals instead of as MMC2_DAT4..7 pins.)

Also shrink twl4030_hsmmc_info a smidgeon ... padding is all gone.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: mmc-twl4030 fix name buffer length, v2
Adrian Hunter [Tue, 24 Mar 2009 01:23:46 +0000]
ARM: OMAP3: mmc-twl4030 fix name buffer length, v2

Add 1 to buffer length for null terminator and use snprintf.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: Add more GPIO mux options
Tony Lindgren [Tue, 24 Mar 2009 01:23:46 +0000]
ARM: OMAP3: Add more GPIO mux options

This patch adds several new GPIO pins and updates
the pin naming comments.

The patch is based on earlier patches on linux-omap
list by Manikandan Pillai <mani.pillai@ti.com>,
Vaibhav Hiremath <hvaibhav@ti.com> and
David Brownell <dbrownell@users.sourceforge.net>.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP3: Remove unused CONFIG_I2C2_OMAP_BEAGLE
Jarkko Nikula [Tue, 24 Mar 2009 01:23:46 +0000]
ARM: OMAP3: Remove unused CONFIG_I2C2_OMAP_BEAGLE

There is no CONFIG_I2C2_OMAP_BEAGLE in mainline and it is under
removal in linux-omap also so remove this dead code now.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: get rid of OMAP_TAG_USB, v2
Felipe Balbi [Tue, 24 Mar 2009 01:07:49 +0000]
ARM: OMAP: get rid of OMAP_TAG_USB, v2

OMAP_TAGS should vanish soon since they're not generic arm tags.
Most of them can be converted to a platform_data or parsed
from a command line like e.g. serial tag.

For OMAP_TAG_USB we just let boards call omap_usb_init()
passing a pointer to omap_usb_config.

Patch updated by Tony for mainline, basically make
n770 and h4 compile. Also folded in a fix for OSK
by David Brownell <dbrownell@users.sourceforge.net>.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: Dispatch only relevant DMA interrupts
Santosh Shilimkar [Tue, 24 Mar 2009 01:07:49 +0000]
ARM: OMAP: Dispatch only relevant DMA interrupts

This fixes the spurious interrupt issue on a DMA channel.

In OMAP sDMA, contrast to the SDMA.DMA4_CSRi registers, the
SDMA.DMA4_IRQSTATUS_Lj registers are updated regardless of
the corresponding bits in the SDMA.DMA4_IRQENABLE_Lj registers.
Since there are four sDMA interrupt lines and if more than one
line is actively used by two concurrently running sDMA softwares
modules,then the spurious interrupt can be observed on the other
lines.

Fix in this patch will only dispatch the relevant and enabled
interrupts on a particular line thus perevting spurious IRQ.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Nishant Kamat <nskamat@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: Get available DMA channels from cmdline
Santosh Shilimkar [Tue, 24 Mar 2009 01:07:48 +0000]
ARM: OMAP: Get available DMA channels from cmdline

This patch set up a cmdline option for omap dma for masking the
available channels. It is needed since the OMAP DMA is a system wide
resource and can be used by another software apart from the kernel.

To reserve the omap SDMA channels for kernel dma usage, use cmdline
bootarg "omap_dma_reserve_ch=". The valid range is 1 to 32.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Nishant Kamat <nskamat@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: Add method to register additional I2C busses on the command line, v2
Jarkko Nikula [Tue, 24 Mar 2009 01:07:48 +0000]
ARM: OMAP: Add method to register additional I2C busses on the command line, v2

This patch extends command line option "i2c_bus=bus_id,clkrate" so that
it allow to register additional I2C busses that are not registered with
omap_register_i2c_bus from board initialization code.

Purpose of this is to register additional board busses which are routed
to external connectors only without any on board I2C devices.

Cc: linux-i2c@vger.kernel.org
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: Add command line option for I2C bus speed, v2
Jarkko Nikula [Tue, 24 Mar 2009 01:07:47 +0000]
ARM: OMAP: Add command line option for I2C bus speed, v2

This patch adds a new command line option "i2c_bus=bus_id,clkrate" into
I2C bus registration helper. Purpose of the option is to override the
default board specific bus speed which is supplied by the
omap_register_i2c_bus.

The default bus speed is typically set to speed of slowest I2C chip on the
bus and overriding allow to use some experimental configurations or updated
chip versions without any kernel modifications.

Cc: linux-i2c@vger.kernel.org
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: Add documentation for function omap_register_i2c_bus
Jarkko Nikula [Tue, 24 Mar 2009 01:07:46 +0000]
ARM: OMAP: Add documentation for function omap_register_i2c_bus

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: Export dmtimer functions
Timo Kokkonen [Tue, 24 Mar 2009 01:07:46 +0000]
ARM: OMAP: Export dmtimer functions

Make the dmtimer function symbols available so modules can take use of
them.

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years ago[OMAP850] Build system changes
Zebediah C. McClure [Tue, 24 Mar 2009 01:07:46 +0000]
[OMAP850] Build system changes

Build system changes.

Signed-off-by: Zebediah C. McClure <zmc@lurian.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years ago[OMAP850] IRQ related changes
Zebediah C. McClure [Tue, 24 Mar 2009 01:07:45 +0000]
[OMAP850] IRQ related changes

IRQ related changes.

Signed-off-by: Zebediah C. McClure <zmc@lurian.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years ago[OMAP850] Changes to memory subsystem
Zebediah C. McClure [Tue, 24 Mar 2009 01:07:44 +0000]
[OMAP850] Changes to memory subsystem

Changes to memory subsystem.

Signed-off-by: Zebediah C. McClure <zmc@lurian.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years ago[OMAP850] Changes to base IO subsystem, v2
Zebediah C. McClure [Tue, 24 Mar 2009 01:07:40 +0000]
[OMAP850] Changes to base IO subsystem, v2

Changes to base IO subsystem.

Signed-off-by: Zebediah C. McClure <zmc@lurian.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years ago[OMAP850] Add base support for omap850 cpu
Zebediah C. McClure [Tue, 24 Mar 2009 01:07:39 +0000]
[OMAP850] Add base support for omap850 cpu

Add base support for omap850 cpu.

Signed-off-by: Zebediah C. McClure <zmc@lurian.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: Remove remaining board-*.h includes from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:39 +0000]
ARM: OMAP: Remove remaining board-*.h includes from hardware.h

Also remove board-omap3beagle.h that is not included anywhere,
and move protoype for voiceblue_reset() from board-voiceblue.h
to system.h.

After this patch there are still board-ams-delta.h, board-sx1.h
and board-voiceblue.h that export some functions. These could
be removed if the functions were moved under drivers.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-nokia.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:38 +0000]
ARM: OMAP: No need to include board-nokia.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-overo.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:38 +0000]
ARM: OMAP: No need to include board-overo.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-ldp.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:37 +0000]
ARM: OMAP: No need to include board-ldp.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file. Also rename
OMAP34XX_ETHR_START to LDP_ETHR_START.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-h4.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:36 +0000]
ARM: OMAP: No need to include board-h4.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file. Also rename
OMAP24XX_ETHR_GPIO_IRQ to H4_ETHR_GPIO_IRQ.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-apollon.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:35 +0000]
ARM: OMAP: No need to include board-apollon.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-omap2430sdp.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:35 +0000]
ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file. Also rename
SDP2430_ETHR_GPIO_IRQ to SDP2430_ETHR_GPIO_IRQ.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-palm*.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:35 +0000]
ARM: OMAP: No need to include board-palm*.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header files.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-osk.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:34 +0000]
ARM: OMAP: No need to include board-osk.h from hardware.h

Move the defines to the board file and remove the now unnecessary
header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-innovator.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:34 +0000]
ARM: OMAP: No need to include board-innovator.h from hardware.h

Move the defines to the board file and remove the now unnecessary
header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-h3.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:33 +0000]
ARM: OMAP: No need to include board-h3.h from hardware.h

Also move board-h3.h to mach-omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-h2.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:33 +0000]
ARM: OMAP: No need to include board-h2.h from hardware.h

Also move board-h2.h to mach-omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:32 +0000]
ARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h

Move defines to the board file and remove the now
unnecessary headers.

Signed-off-by: Tony Lindgren <tony@atomide.com>

12 years agoomap mailbox: remove unnecessary header file inclusion
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:32 +0000]
omap mailbox: remove unnecessary header file inclusion

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: convert sequence bit checking to module paramter
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:31 +0000]
omap mailbox: convert sequence bit checking to module paramter

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: move mailbox.h into mailbox.c
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:26 +0000]
omap mailbox: move mailbox.h into mailbox.c

no need to keep mailbox.h separately.

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: add save_/restore_ctx() for PM
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:26 +0000]
omap mailbox: add save_/restore_ctx() for PM

To preserve the registers during off-mode

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: fix empty struct device for omap2
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:25 +0000]
omap mailbox: fix empty struct device for omap2

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: fix empty struct device for omap1
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:25 +0000]
omap mailbox: fix empty struct device for omap1

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: fix empty struct device for omap_mbox
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:24 +0000]
omap mailbox: fix empty struct device for omap_mbox

Since "mbox->dev" doesn't exist and isn't created either at
registration, this patch will create "struct device", which belongs to
"omap-mailbox" class and set this pointer for the member of
"struct omap_mbox".

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: print hardware revision at startup
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:24 +0000]
omap mailbox: print hardware revision at startup

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: add initial omap3 support
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:23 +0000]
omap mailbox: add initial omap3 support

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoomap mailbox: cleanup omap2 register definition with macro
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:23 +0000]
omap mailbox: cleanup omap2 register definition with macro

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

12 years agoLinux 2.6.29
Linus Torvalds [Mon, 23 Mar 2009 23:12:14 +0000]
Linux 2.6.29

12 years agoBuild with -fno-dwarf2-cfi-asm
Kyle McMartin [Mon, 23 Mar 2009 19:25:49 +0000]
Build with -fno-dwarf2-cfi-asm

With a sufficiently new compiler and binutils, code which wasn't
previously generating .eh_frame sections has begun to.  Certain
architectures (powerpc, in this case) may generate unexpected relocation
formats in response to this, preventing modules from loading.

While the new relocation types should probably be handled, revert to the
previous behaviour with regards to generation of .eh_frame sections.

(This was reported against Fedora, which appears to be the only distro
doing any building against gcc-4.4 at present: RH bz#486545.)

Signed-off-by: Kyle McMartin <kyle@redhat.com>
Acked-by: Roland McGrath <roland@redhat.com>
Cc: Alexandre Oliva <aoliva@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agotrivial: fix orphan dates in ext2 documentation
Jody McIntyre [Mon, 23 Mar 2009 17:13:34 +0000]
trivial: fix orphan dates in ext2 documentation

Revert the change to the orphan dates of Windows 95, DOS, compression.
Add a new orphan date for OS/2.

Signed-off-by: Jody McIntyre <scjody@sun.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years ago[ARM] orion5x: update of FPGA ID's for the TS-78xx
Alexander Clouter [Sat, 21 Mar 2009 11:09:25 +0000]
[ARM] orion5x: update of FPGA ID's for the TS-78xx

Received official word finally from Technological Systems on which
FPGA ID's they have released unto the world.  Also an additional of
a dummy entry matching the FPGA ID of the Verilog template on our
wiki.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

12 years ago[ARM] Kirkwood: Add support for QNAP TS-119/TS-219 Turbo NAS
Martin Michlmayr [Sun, 22 Mar 2009 14:22:11 +0000]
[ARM] Kirkwood: Add support for QNAP TS-119/TS-219 Turbo NAS

Add support for the QNAP TS-119 and TS-219 Turbo NAS devices.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

12 years ago[ARM] update mach-types
Nicolas Pitre [Mon, 23 Mar 2009 20:10:36 +0000]
[ARM] update mach-types

Signed-off-by: Nicolas Pitre <nico@marvell.com>

12 years ago[ARM] Kirkwood: More consistency regarding MPP naming
Martin Michlmayr [Sun, 22 Mar 2009 14:21:25 +0000]
[ARM] Kirkwood: More consistency regarding MPP naming

With the exception of UART0, all MPP names are uppercase.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

12 years ago[ARM] Kirkwood: Hook up I2C
Martin Michlmayr [Mon, 23 Mar 2009 18:13:21 +0000]
[ARM] Kirkwood: Hook up I2C

Hook up I2C on Marvell Kirkwood.  Tested on a QNAP TS-219 which has
RTC connected through I2C.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

12 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 23 Mar 2009 16:25:58 +0000]
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
  ucc_geth: Fix oops when using fixed-link support
  dm9000: locking bugfix
  net: update dnet.c for bus_id removal
  dnet: DNET should depend on HAS_IOMEM
  dca: add missing copyright/license headers
  nl80211: Check that function pointer != NULL before using it
  sungem: missing net_device_ops
  be2net: fix to restore vlan ids into BE2 during a IF DOWN->UP cycle
  be2net: replenish when posting to rx-queue is starved in out of mem conditions
  bas_gigaset: correctly allocate USB interrupt transfer buffer
  smsc911x: reset last known duplex and carrier on open
  sh_eth: Fix mistake of the address of SH7763
  sh_eth: Change handling of IRQ
  netns: oops in ip[6]_frag_reasm incrementing stats
  net: kfree(napi->skb) => kfree_skb
  net: fix sctp breakage
  ipv6: fix display of local and remote sit endpoints
  net: Document /proc/sys/net/core/netdev_budget
  tulip: fix crash on iface up with shirq debug
  virtio_net: Make virtio_net support carrier detection
  ...

12 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 23 Mar 2009 16:25:24 +0000]
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 crash with /proc/iomem
  sparc64: Reschedule KGDB capture to a software interrupt.
  sbus: Auto-load openprom module when device opened.

12 years agofix ptrace slowness
Miklos Szeredi [Mon, 23 Mar 2009 15:07:24 +0000]
fix ptrace slowness

This patch fixes bug #12208:

  Bug-Entry       : http://bugzilla.kernel.org/show_bug.cgi?id=12208
  Subject         : uml is very slow on 2.6.28 host

This turned out to be not a scheduler regression, but an already
existing problem in ptrace being triggered by subtle scheduler
changes.

The problem is this:

 - task A is ptracing task B
 - task B stops on a trace event
 - task A is woken up and preempts task B
 - task A calls ptrace on task B, which does ptrace_check_attach()
 - this calls wait_task_inactive(), which sees that task B is still on the runq
 - task A goes to sleep for a jiffy
 - ...

Since UML does lots of the above sequences, those jiffies quickly add
up to make it slow as hell.

This patch solves this by not rescheduling in read_unlock() after
ptrace_stop() has woken up the tracer.

Thanks to Oleg Nesterov and Ingo Molnar for the feedback.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Linus Torvalds [Mon, 23 Mar 2009 15:03:09 +0000]
Merge branch 'merge' of git://git./linux/kernel/git/galak/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  powerpc/mm: Fix Respect _PAGE_COHERENT on classic ppc32 SW TLB load machines

12 years agopowerpc/mm: Fix Respect _PAGE_COHERENT on classic ppc32 SW TLB load machines
Kumar Gala [Sat, 14 Mar 2009 14:23:03 +0000]
powerpc/mm: Fix Respect _PAGE_COHERENT on classic ppc32 SW TLB load machines

Grant picked up the wrong version of "Respect _PAGE_COHERENT on classic
ppc32 SW" (commit a4bd6a93c3f14691c8a29e53eb04dc734b27f0db)

It was missing the code to actually deal with the fixup of
_PAGE_COHERENT based on the CPU feature.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

12 years agoucc_geth: Fix oops when using fixed-link support
Anton Vorontsov [Mon, 23 Mar 2009 04:30:52 +0000]
ucc_geth: Fix oops when using fixed-link support

commit b1c4a9dddf09fe99b8f88252718ac5b357363dc4 ("ucc_geth: Change
uec phy id to the same format as gianfar's") introduced a regression
in the ucc_geth driver that causes this oops when fixed-link is used:

Unable to handle kernel paging request for data at address 0x00000000
Faulting instruction address: 0xc0151270
Oops: Kernel access of bad area, sig: 11 [#1]
TMCUTU
NIP: c0151270 LR: c0151270 CTR: c0017760
REGS: cf81fa60 TRAP: 0300   Not tainted  (2.6.29-rc8)
MSR: 00009032 <EE,ME,IR,DR>  CR: 24024042  XER: 20000000
DAR: 00000000, DSISR: 20000000
TASK = cf81cba0[1] 'swapper' THREAD: cf81e000
GPR00: c0151270 cf81fb10 cf81cba0 00000000 c0272e20 c025f354 00001e80
cf86b08c
GPR08: d1068200 cffffb74 06000000 d106c200 42024042 10085148 0fffd000
0ffc81a0
GPR16: 00000001 00000001 00000000 007ffeb0 00000000 0000c000 cf83f36c
cf83f000
GPR24: 00000030 cf83f360 cf81fb20 00000000 d106c200 20000000 00001e80
cf83f360
NIP [c0151270] ucc_geth_open+0x330/0x1efc
LR [c0151270] ucc_geth_open+0x330/0x1efc
Call Trace:
[cf81fb10] [c0151270] ucc_geth_open+0x330/0x1efc (unreliable)
[cf81fba0] [c0187638] dev_open+0xbc/0x12c
[cf81fbc0] [c0187e38] dev_change_flags+0x8c/0x1b0

This patch fixes the issue by removing offending (and somewhat
duplicate) code from init_phy() routine, and changes _probe()
function to use uec_mdio_bus_name().

Also, since we fully construct phy_bus_id in the _probe() routine,
we no longer need ->phy_address and ->mdio_bus fields in
ucc_geth_info structure.

I wish the patch would be a bit shorter, but it seems like the only
way to fix the issue in a sane way. Luckily, the patch has been
tested with real PHYs and fixed-link, so no further regressions
expected.

Reported-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Tested-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: David S. Miller <davem@davemloft.net>

12 years agodm9000: locking bugfix
David Brownell [Mon, 23 Mar 2009 04:28:39 +0000]
dm9000: locking bugfix

This fixes a locking bug in the dm9000 driver.  It calls
request_irq() without setting IRQF_DISABLED ... which is
correct for handlers that support IRQ sharing, since that
behavior is not guaranteed for shared IRQs.  However, its
IRQ handler then wrongly assumes that IRQs are blocked.
So the fix just uses the right spinlock primitives in the
IRQ handler.

NOTE:  this is a classic example of the type of bug which
lockdep currently masks by forcibly setting IRQF_DISABLED
on IRQ handlers that did not request that flag.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

12 years agonet: update dnet.c for bus_id removal
Stephen Rothwell [Mon, 23 Mar 2009 04:22:48 +0000]
net: update dnet.c for bus_id removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

12 years agoMAINTAINERS: update pxa910 maintainers
Eric Miao [Fri, 20 Mar 2009 04:52:24 +0000]
MAINTAINERS: update pxa910 maintainers

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years agoMAINTAINERS: update pxa168 maintainers
Eric Miao [Thu, 19 Feb 2009 13:13:21 +0000]
MAINTAINERS: update pxa168 maintainers

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Jason Chagas <jason.chagas@marvell.com>

12 years ago[ARM] pxa: add defconfig for pxa910-based platforms
Eric Miao [Fri, 20 Mar 2009 06:55:11 +0000]
[ARM] pxa: add defconfig for pxa910-based platforms

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add defconfig for pxa168-based platforms
Eric Miao [Thu, 19 Feb 2009 09:35:31 +0000]
[ARM] pxa: add defconfig for pxa168-based platforms

Instead of having various pieces of defconfig files for different
platforms, let's group them into a single one.

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add base support for pxa910-based TTC_DKB
Eric Miao [Fri, 20 Mar 2009 05:33:49 +0000]
[ARM] pxa: add base support for pxa910-based TTC_DKB

Signed-off-by: Bin Yang <bin.yang@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add base support for pxa910-based TavorEVB
Eric Miao [Fri, 20 Mar 2009 05:27:30 +0000]
[ARM] pxa: add base support for pxa910-based TavorEVB

Signed-off-by: Bin Yang <bin.yang@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add base support for Marvell PXA910
Eric Miao [Fri, 20 Mar 2009 04:50:22 +0000]
[ARM] pxa: add base support for Marvell PXA910

Signed-off-by: Bin Yang <bin.yang@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa/aspenite: add support for debug ethernet
Eric Miao [Wed, 18 Feb 2009 08:38:22 +0000]
[ARM] pxa/aspenite: add support for debug ethernet

Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa/aspenite: add support for console uart
Eric Miao [Tue, 10 Feb 2009 02:35:25 +0000]
[ARM] pxa/aspenite: add support for console uart

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: allow reuse of serial driver for pxa168
Eric Miao [Thu, 5 Feb 2009 05:42:47 +0000]
[ARM] pxa: allow reuse of serial driver for pxa168

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add MFP support for pxa168
Eric Miao [Tue, 20 Jan 2009 09:20:56 +0000]
[ARM] pxa: add MFP support for pxa168

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add GPIO support for pxa168
Eric Miao [Tue, 20 Jan 2009 06:38:24 +0000]
[ARM] pxa: add GPIO support for pxa168

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add iWMMXt support for pxa168
Eric Miao [Thu, 26 Feb 2009 01:34:35 +0000]
[ARM] pxa: add iWMMXt support for pxa168

Signed-off-by: Eric Miao <eric.miao@marvell.com>

12 years ago[ARM] pxa: add base support for Marvell's PXA168 processor line
Eric Miao [Tue, 20 Jan 2009 06:15:18 +0000]
[ARM] pxa: add base support for Marvell's PXA168 processor line

"""The MarvellĀ® PXA168 processor is the first in a family of application
processors targeted at mass market opportunities in computing and consumer
devices. It balances high computing and multimedia performance with low
power consumption to support extended battery life, and includes a wealth
of integrated peripherals to reduce overall BOM cost .... """

See http://www.marvell.com/featured/pxa168.jsp for more information.

  1. Marvell Mohawk core is a hybrid of xscale3 and its own ARM core,
     there are many enhancements like instructions for flushing the
     whole D-cache, and so on

  2. Clock reuses Russell's common clkdev, and added the basic support
     for UART1/2.

  3. Devices are a bit different from the 'mach-pxa' way, the platform
     devices are now dynamically allocated only when necessary (i.e.
     when pxa_register_device() is called). Description for each device
     are stored in an array of 'struct pxa_device_desc'. Now that:

     a. this array of device description is marked with __initdata and
        can be freed up system is fully up

     b. which means board code has to add all needed devices early in
        his initializing function

     c. platform specific data can now be marked as __initdata since
        they are allocated and copied by platform_device_add_data()

  4. only the basic UART1/2/3 are added, more devices will come later.

Signed-off-by: Jason Chagas <chagas@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>