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

Conflicts:

	arch/arm/mach-omap2/clock.c

gpio.c wilfully casts physical addresses to void __iomem * and then
fixes them up at runtime using:

	bank->base = IO_ADDRESS(bank->base);

where accesses prior to this fixup are via omap_read/omap_write, and
after are by __raw_read/__raw_write.  This doesn't lend itself to
static checking, nor to easy understanding of the code.

And so, OMAP_MPUIO_BASE gets to be the right type - integer like since
it's a physical address, not a MMIO pointer.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

We're now assigning/comparing void __iomem pointers with
void __iomem pointer variables.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

This patch resolves the following two sparse warnings:

sound/arm/omap/eac.c:788:12: warning: symbol 'eac_init' was not declared. Should it be static?
sound/arm/omap/eac.c:793:13: warning: symbol 'eac_exit' was not declared. Should it be static?
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Commit f228a725 breaks the build for this
driver; fix by using ioremap().
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add TWL4030 BCI Battery for 3430 LDP platform
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix following compilation error when enabling CONFIG_TWL4030_BCI_BATTERY

drivers/power/twl4030_bci_battery.c: In function 'twl4030_bci_battery_probe':
drivers/power/twl4030_bci_battery.c:911: error: dereferencing pointer to incomplete type
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Add CSI2 clock struct for handling it with clock API.

Add CSI2 clock struct for handling it with clock API when TI PM is disabled.
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The clockdomain of clkout2_src_ck was set to "core_clkdm", which does not
exist.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Clean up the Beagle NAND config a bit:  use SZ_128K instead of
an arithmetic expression for the NAND block size.  Set the
NAND_BUSWIDTH_16 flag.  Make its init routine static.

(Unrelated:  make omap3_beagle_i2c_init be part of beagle_init.
It shouldn't be called on non-beagle hardware; and beagle_init
already runs with other arch_initcall code.)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Export Beagle's "user" button through the input framework so it's
accessible using normal mechanisms.  This uses BTN_EXTRA for lack
of a more obvious choice.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Assign default roles to two of Beagle's programmable LEDs:

 - usr0 has a heartbeat to show basic activity
 - usr1 shows MMC activity

A third led is controlled by the TWL4030 LED_B signal, but the
TWL driver doesn't yet support leds...
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

This file doesn't even have a Makefile entry for building
it. Looks like it's garbage.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Missing include file broke compilation for 2430sdp.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- TSL2563 and LP5521 are found only in N810
- Fix one typo
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Riku voipio <riku.voipio@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch remove blk_register_filter and blk_unregister_filter in
gendisk, and adds them to sd.c, sr.c. and ide-cd.c

The commit abf54393 moved cmdfilter
from gendisk to request_queue. It turned out that in some subsystems
multiple gendisks share a single request_queue. So we get:

Using physmap partition information
Creating 3 MTD partitions on "physmap-flash":
0x00000000-0x01c00000 : "User FS"
0x01c00000-0x01c40000 : "booter"
kobject (8511c410): tried to init an initialized object, something is seriously wrong.
Call Trace:
[<8036644c>] dump_stack+0x8/0x34
[<8021f050>] kobject_init+0x50/0xcc
[<8021fa18>] kobject_init_and_add+0x24/0x58
[<8021d20c>] blk_register_filter+0x4c/0x64
[<8021c194>] add_disk+0x78/0xe0
[<8027d14c>] add_mtd_blktrans_dev+0x254/0x278
[<8027c8f0>] blktrans_notify_add+0x40/0x78
[<80279c00>] add_mtd_device+0xd0/0x150
[<8027b090>] add_mtd_partitions+0x568/0x5d8
[<80285458>] physmap_flash_probe+0x2ac/0x334
[<802644f8>] driver_probe_device+0x12c/0x244
[<8026465c>] __driver_attach+0x4c/0x84
[<80263c64>] bus_for_each_dev+0x58/0xac
[<802633ec>] bus_add_driver+0xc4/0x24c
[<802648e0>] driver_register+0xcc/0x184
[<80100460>] _stext+0x60/0x1bc

In the long term, we need to fix such subsystems but we need a quick
fix now. This patch add the command filter support to only sd and sr
though it might be useful for other SG_IO users (such as cciss).
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reported-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

Based on comments from Dave:

NAK.  The Apollon-specific bit should be done some other way,
and whatever silicon issue it's covering up is not specific to
that board ...
Signed-off-by: Tony Lindgren <tony@atomide.com>

In general, drivers should now use ioremap.
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

Modified version of Russell's patch 40c0133a904466ec5423d1088d3c85598ac9e030
to apply to linux-omap tree.

OMAP1_IO_ADDRESS(), OMAP2_IO_ADDRESS() and IO_ADDRESS() returns cookies
for use with __raw_{read|write}* for accessing registers.  Therefore,
these macros should return (void __iomem *) cookies, not integer values.

Doing this improves typechecking, and means we can find those places
where, eg, DMA controllers are incorrectly given virtual addresses to
DMA to, or physical addresses are thrown through a virtual to physical
address translation.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Modified version of Russell's mcbsp ioremap patch
11a44b851134a30788195a01f91ea428272d2783 for linux-omap.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

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

Also modify for the mappings in linux-omap tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

When omap_udc is also incorporated, this macro will no longer be used.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

A function to contain common code for the size of the resource we
need to allocate or free.  OMAP ports need 22 bytes rather than
the standard 8 bytes.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Make is_omap_port() take the uart_8250_port structure so it can do
whatever test it desires.  Convert the test to compare the physical
addresses rather than virtual addresses.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

This will be fixed properly in the following patch.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Modified version of Russell's patch 6ef82d2c8bf322129e45274873e62f4419aa256b
for linux-omap tree.

mcbsp is confused as to what takes a physical or virtual address.
Fix the two instances where it gets it wrong.
Signed-off-by: Tony Lindgren <tony@atomide.com>

drivers/usb/host/ohci-omap.c: In function 'ohci_omap_init':
drivers/usb/host/ohci-omap.c:228: error: 'start_hnp' undeclared (first use in this function)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/plat-omap/gpio.c: In function '_omap_gpio_init':
arch/arm/plat-omap/gpio.c:1492: error: 'omap_mpuio_device' undeclared (first use in this function)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

This reverts commit ecec3b3e.

The mcbsp in DSP memory area need handling for phys_base.
Signed-off-by: Tony Lindgren <tony@atomide.com>

As discussed on linux-omap list.

This patch is already in Russell's queue for 2.6.27 -rc series.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Use dev_set_name for omap_udc like mainline kernel is already doing.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix includes to compile
Signed-off-by: Tony Lindgren <tony@atomide.com>

This reverts commit 87bc54d6.

Redo this as #include <mach/memory.h> should be <asm/memory.h>
as pointed out by Russell King.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix includes to compile
Signed-off-by: Tony Lindgren <tony@atomide.com>

Merge branches 'master' and 'linus'

Conflicts:

	drivers/usb/gadget/omap_udc.c
	drivers/usb/musb/Kconfig
	drivers/usb/musb/Makefile
	drivers/usb/musb/cppi_dma.c
	drivers/usb/musb/davinci.c
	drivers/usb/musb/musb_core.c
	drivers/usb/musb/musb_core.h
	drivers/usb/musb/musb_debug.h
	drivers/usb/musb/musb_gadget.c
	drivers/usb/musb/musb_gadget_ep0.c
	drivers/usb/musb/musb_host.c
	drivers/usb/musb/musbhsdma.c
	drivers/usb/musb/omap2430.c
	drivers/usb/musb/omap2430.h
	drivers/usb/musb/tusb6010.c
	drivers/usb/musb/tusb6010_omap.c