Conflicts:

	arch/arm/mm/Kconfig

Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel

Signed-off-by: NDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

at91sam9g20 defconfig file
Signed-off-by: NSedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: NJustin Waters <justin.waters@timesys.com>
Acked-by: NAndrew Victor <linux@maxim.org.za>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Support for the at91sam9g20 : Atmel 400Mhz ARM 926ej-s SOC.

AT91sam9g20 is an evolution of the at91sam9260 with a faster clock
speed.
We created a new board for this device but based the chip support
directly on 9260 files with little updates.
Here is the chip page on Atmel wabsite:
http://atmel.com/dyn/products/product_card.asp?part_id=4337Signed-off-by: NSedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: NJustin Waters <justin.waters@timesys.com>
Acked-by: NAndrew Victor <linux@maxim.org.za>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

This patch brings support for gpio/gpiolib framework to Intel IOP3xx
platforms.
Signed-off-by: NArnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: NDan Williams <dan.j.williams@intel.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

[ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.

New timings are based on application note
"NAND Flash Support on AT91SAM9 Microcontrollers" available at
http://atmel.com/dyn/resources/prod_documents/doc6255.pdf).
Signed-off-by: NPatrice Vilchez <patrice.vilchez@atmel.com>
Acked-by: NAndrew Victor <linux@maxim.org.za>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

On Feroceon platforms that have a branch prediction unit, bit 11 of the
cp15 control register controls the BPU.  This patch keeps the old value
of this bit instead of always clearing it.
Signed-off-by: NSaeed Bishara <saeed@marvell.com>
Signed-off-by: NLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: NNicolas Pitre <nico@marvell.com>

The HP mv2120 has several LEDs that are controlled through gpio.
Export the health LED, the red SATA LEDs as well as two gpios
that control the brightness of _all_ LEDs to userland.  The
Ethernet and power LEDs can't be controlled through gpio and the
blue SATA LEDs are handled via the SATA driver.
Signed-off-by: NMartin Michlmayr <tbm@cyrius.com>
Signed-off-by: NNicolas Pitre <nico@marvell.com>

This patch adds support for the Marvell Orion-VoIP RD-88F5181L-FXO
Reference Design, and enables use of the ethernet, USB, Cardbus and
mini-PCIe ports.
Signed-off-by: NNicolas Pitre <nico@marvell.com>

This patch adds support for the Marvell Orion-VoIP RD2-88F5181L-GE
Reference Design, and enables use of the ethernet, USB, Cardbus and
mini-PCIe ports.
Signed-off-by: NLennert Buytenhek <buytenh@marvell.com>

Signed-off-by: NImre Kaloz <kaloz@openwrt.org>
Signed-off-by: NLennert Buytenhek <buytenh@marvell.com>

Update the s3c2410_defconfig for the current set of
added patches.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Minor style fixes.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Initialise the hardware register settings on boot, to allow the
device to function correctly.
Signed-off-by: NChrister Weinigel <christer@weinigel.se>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds the configuration needed for the LCD display on the n30.
Signed-off-by: NChrister Weinigel <christer@weinigel.se>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add support for the Acer N35 and related devices.
Signed-off-by: NChrister Weinigel <christer@weinigel.se>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add support for the LEDs on the Acer N30.
Signed-off-by: NChrister Weinigel <christer@weinigel.se>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add support for the GPIO buttons on the Acer N30.
Signed-off-by: NChrister Weinigel <christer@weinigel.se>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add support for the USB D+ pull up on the Acer N30.  This is needed
for the USB gadget to work properly.
Signed-off-by: NChrister Weinigel <christer@weinigel.se>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Clean up some junk from the official kernel.

The compile-command is something that's only useful for me personally
and doesn't belong in the mainstream kernel.
Signed-off-by: NChrister Weinigel <christer@weinigel.se>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Update the S3C2443 clock support to add the prediv clock
that is sourced via a divider from msysclk. Also fix the
setting of p and h clocks from this prediv clock.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add the armdiv and arm clocks to the S3C2443 clock
framework and ensure they are correctly setup.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

s3c2443_clkcon_enable_p() was reading from the correct register
S3C2443_PCLKCON, but then writing the value back to the wrong
register S3C2443_HCLKCON.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add DM9000AEP network controller support for AT2440EVB.
Signed-off-by: NRamax Lo <ramaxlo@gmail.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add basic support for AT2440EVB board based on Samsung S3C2440 SoC.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>
Signed-off-by: NRamax Lo <ramaxlo@gmail.com>

Update mach-types.  Remove invalid or incorrect entries.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

This patch adds basic mach support for the mx2 processor family, based
on the original freescale code and adapted to mainline kernel coding
style.

This part adds the global build only.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

The Phytec phyCORE-i.MX27 CPU module is delivered with the PCM970
baseboard by default. This patch adds support for the hardware.

This code is only an empty stub; it is filled up with functionality
in a later patch series.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

This patch adds support for the phyCORE-i.MX27 cpu module (aka pcm038).
It is as generic as possible in order to support any kind of baseboard.

Note: This CPU module implementation can't work without a baseboard
support. Baseboard support can be added by the PCM-970 (included in
this patch stack) or any custom variant.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

This patch adds basic support for the Freescale MX27ADS reference board.
Currently only a serial console can be used.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

Internal clock path handling for the i.MX27 CPU.

Changed against the original Freescale code (and against clocklib for example):
 - clock rate is always calculated whenever one ask for the current rate.
   (means no "rate" member in the clock structure).
   So switching the PLL base frequency will propagate immediately to all
   other clocks that are depending on this frequency.

TODO:
 - Check if the i.MX21 CPU can share the same code.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

Add basic i.MX27 CPU support
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

add support for mx2 in i.MX serial driver
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

This patch adds a few on-chip devices for i.MX21/i.MX27 procesors.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

This patch adds basic mach support for the mx2 processor family, based
on the original freescale code and adapted to mainline kernel coding
style.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

This patch adds basic mach support for the mx2 processor family, based
on the original freescale code and adapted to mainline kernel coding
style.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>

This patch adds GPIO multiplexing support for the imx1/mxc2
family of procesors.
Signed-off-by: NJuergen Beisert <j.beisert@pengutronix.de>