Conflicts:
	arch/arm/mach-sa1100/assabet.c
	arch/arm/mach-sa1100/collie.c
	arch/arm/mach-sa1100/generic.c
	arch/arm/mach-sa1100/lart.c
	arch/arm/mach-sa1100/shannon.c

Conflicts:
	arch/arm/mach-sa1100/assabet.c

Remove the new unused DMA controller definitions from mach/SA-1100.h.
These are now private to the SA-11x0 DMA engine driver and contained
within the driver.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Now that all users are converted over to using the DMA engine API,
we can get rid of the old platform dependent DMA driver.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Conflicts:
	arch/arm/common/sa1111.c
	arch/arm/mach-sa1100/neponset.c

Fixed:
	arch/arm/mach-sa1100/assabet.c
for the neponset changes

Add the .reset method to the HCD, and update the .start method
accordingly for this change.
Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Add OHCI shutdown methods to cleanly shutdown the OHCI controller on
system shutdowns and reboots.  This avoids the controller continuing
to run should be soft-reboot the platform, potentially scribbling
over system memory.
Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Combine usb_hcd_sa1111_probe() and ohci_hcd_sa1111_drv_probe(), doing
the same for the remove methods.

Move sa1111_start_hc and sa1111_stop_hc to be located next to these
the probe/release functions, as they're only called from them.

Get rid of the /*----*/ breaker lines.
Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Use dev_dbg() instead, it's more friendly.
Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Clean up the ohci-sa1111 driver formatting to be more compliant with
current standards, and add 'static' to various function definitions
to avoid sparse complaints about undeclared functions.  Remove the
unnecessary local declaration of 'usb_disabled', which can be found
instead in linux/usb.h.
Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

The sa1111 support will ioremap() the device; there is no need for
platforms to setup a static mapping for this.  Remove the static
mapping for this device from badge4, jornada720 and neponset.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Use dev_err() to report device specific errors rather than printk().
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Move the releasing of resources out of the release function - this
allows a cleaner and more conventional arrangement of the registration
failure paths and a saner unregistration process for these devices.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

It's pointless registering the PS/2 interfaces with the dmabounce code
when there's no DMA support for these in hardware, so only setup the
DMA masks for two subdevices which support DMA - the OHCI and SAC.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Use the bus notifier to register sa1111 devices with dmabounce, rather
than after the device has been registered, potentially racing with
driver binding.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Move the USB interface register definitions into the driver, rather
than keeping them in a common place.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Move the PCMCIA interface register definitions into the driver, rather
than keeping them in a common place.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Move the PS/2 interface register definitions into the driver, rather
than keeping them in a common location.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Get rid of the unused GPIO register definitions - we access GPIO
registers through the base + offset method, and having the phys
address definitions is unnecessary duplication.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Some platforms don't want certain devices to be registered, because,
eg, the interface is not wired.  Provide a way for platforms to
prevent various devices from being registered via a devid bitmask in
the platform data.
Acked-by: NNicolas Pitre <nico@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

As the DMA engine API allows DMA channels to be reconfigured on the
fly, we can now support switching the DMA channel configuration to
support SIR transmit DMA without needing to claim an additional
physical DMA channel - thereby using up half the DMA channels just
for one driver.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Convert the sa11x0 IrDA driver to use the sa11x0 DMA engine driver
rather than our own platform specific DMA API.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Add sa11x0 DMA platform device and resources to the list of
generic platform devices for SA11x0 machines.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Add support for the SA-11x0 DMA driver, which replaces the private
API version in arch/arm/mach-sa1100/dma.c.

We model this as a set of virtual DMA channels, one for each request
signal, and assign the virtual DMA channel to a physical DMA channel
when there is work to be done.  This allows DMA users to claim their
channels, and hold them while not in use, without affecting the
availability of the physical channels.

Another advantage over this approach, compared to the private version,
is that a channel can be reconfigured on the fly without having to
release and re-request it - which for the IrDA driver, allows us to
use DMA for SIR mode transmit without eating up three physical
channels.  As IrDA is half-duplex, we actually only need one physical
channel, and this architecture allows us to achieve that.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Convert the sa11x0 framebuffer driver to obtain the base address of its
hardware registers from the platform resources, and ioremap this rather
than relying on the static mappings.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Rather than accessing GPSR and GPCR directly, use the GPIO subsystem
instead.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

The GPIO set and clear registers should only be written, rather than
read, modified, and written.  A read-modify-write will have undesired
side effects.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

The sa1100fb driver needs to set the GPIO direction and alternate
function register according to the panel that we're driving.  We've
done this in the driver by read-modify-writing the register, which
may cause problems with races.  Fix this with a minimal change.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Now that the LCD information is available while the driver is loaded,
we don't need to cache that information into our driver private data
structure.  Get rid of it.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Remove the assabet specific initialization for PAL output mode -
we call the lcd_power function before we enable the LCD controller,
which will disable the LCD panel to prevent it receiving incorrect
timings.  Therefore, this setup here is redundant.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Now that we have platform data contained within the individual board
code, we can get rid of the global function pointers, placing them
inside the platform data instead.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Move platform data out of the sa1100fb driver into the various
platform files themselves.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Move the LCD data structures to an include file which can be shared
with the board code in arch/arm/mach-sa1100.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Allow the sa1100fb_mach_info structure to carry the RGB bitfield
overrides, rather than requiring them to be separately initialized
in sa1100fb_get_machine_info().
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Use the dev_xxx() macros for driver kernel message output, rather than
open coded printk() with KERN_ levels etc.  Remove DPRINTK().
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

The rgb structures should only be read and never written.  Constify
them.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Annotate the driver structure with the .owner field, to allow the
module to be associated with the driver.
Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>