This includes PXA work up to the SPI changes for the initial merge,
since e172274c depends on the SPI
tree being merged.

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig

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>

The Zylonite has an AC97 subsystem on it so register the AC97 controller
device.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NEric Miao <eric.miao@marvell.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

As well as moving all the device declarations to a single one in devices.c
this causes all platforms to register the I/O and interrupt resources for
the AC97 controller.

Cc: eric miao <eric.miao@marvell.com>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Jürgen Schindele <linux@schindele.name>
Cc: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

The pxa2xx_udc.c driver is renamed to pxa25x_udc.c (the platform
driver name changes from pxa2xx-udc to pxa25x-udc) and the
platform driver name of pxa27x_udc.c is fixed to pxa27x-udc.
pxa_device_udc in devices.c is split into pxa25x and pxa27x flavors
and the pxa27x_device_udc is enabled in pxa27x.c.
Signed-off-by: NPhilipp Zabel <philipp.zabel@gmail.com>
Acked-by: NNicolas Pitre <nico@cam.org>
Acked-by: NEric Miao <eric.miao@marvell.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Including from Ian Molton:

Fixes for mistakes left over from the PXA2{5,7}X UDC split.
Signed-off-by: NIan Molton <spyro@f2s.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

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

Provide a set of functions to control state of pins dedicated to IrDA.
Signed-off-by: NDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

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

pxa_set_cken() is now unused, remove it.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

We need to support more than one name+device for a struct clk for a
small number of peripherals.  We do this by re-using struct clk alias
to another struct clk - IOW, if we find that the entry we're using is
an alias, we return the aliased entry not the one we found.
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>

Warn people when using pxa2xx-gpio.h as it is only here for backwards
compatibility. The new mfp-pxa2[57]x.h and the relevant API should be used
instead.
Signed-off-by: NStefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>