Adds dm646x cpu type.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>

Interrupt priorities assignment for dm646x.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>

Adds defines for interrupt number assignments on dm646x.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>

Defines LPSC assignments for dm646x.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>

Replaces occurrence of dm6467 with dm646x.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>

Move arch/arm/mach-davinci/include/mach/hardware.h to arch/arm/mach-davinci/include/mach/dm644x.h
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>

Replaces occurrences of dm6443 with dm644x.

The cpu is decided based on the system_rev variable and it is being
compared with 6446 (Refer to arch/arm/mach-davinci/id.c for details).
So in the current tree, the function cpu_is_davinci_dm6443 will never
be true.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-davinci/Makefile
	arch/arm/mach-davinci/board-evm.c
	arch/arm/mach-davinci/devices.c
	arch/arm/mach-davinci/gpio.c
	arch/arm/mach-davinci/include/mach/gpio.h
	drivers/i2c/busses/Makefile
	drivers/ide/arm/palm_bk3710.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/Makefile
	drivers/usb/musb/davinci.c
	drivers/usb/musb/musb_core.c
	sound/oss/Makefile

A patch from Russell to sync includes with mainline tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Build fixes for "HSMMC: Improve the interface for hsmmc_init()".
The header file needs to work without MMC support enabled, and
some board files needed to include it.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

On Wed, 5 Nov 2008, Tony Lindgren wrote:

> * Paul Walmsley <paul@pwsan.com> [081105 11:39]:
> >
> > The SGX device on OMAP3 does not support retention, so remove RET from the
> > list of possible SGX power states.  Problem debugged by Richard Woodruff
> > <r-woodruff2@ti.com>.
>
> Pushing.

Just FYI, that patch prevents the kernel from booting due to a bug in
pm34xx.c; patch below.

Even with the follwoing patch, the initial power state setup code in
pm34xx.c will bail out early since it still tries to set the SGX next
power state to retention, which it does not support.

- Paul

OMAP3 PM: use list_for_each_entry_safe() when deleting list entries

From: Paul Walmsley <paul@pwsan.com>

The error path in clkdms_setup() needs to use list_for_each_entry_safe()
when deleting entries from the list, or the kernel will crash.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jouni Högander <jouni.hogander@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix one remaining user of system_rev.  This patch is needed for
3430SDP ES2 to boot after 4a4ada55.

Bisected by Timo-Pekka Launonen's <ext-timo-pekka.launonen@nokia.com>
list robot.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Timo-Pekka Launonen <ext-timo-pekka.launonen@nokia.com>
Cc: Lauri Leukkunen <lauri.leukkunen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The SGX device on OMAP3 does not support retention, so remove RET from the
list of possible SGX power states.  Problem debugged by Richard Woodruff
<r-woodruff2@ti.com>.
Signed-off-by: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Rename some hsmmc init functions to twl_mmc
Signed-off-by: Tony Lindgren <tony@atomide.com>

Improve the interface for hsmmc_init()

Based on earlier code snippet and patch by
David Brownell <dbrownell@users.sourceforge.net>.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Rename hsmmc.c into mmc-twl4030.c
Signed-off-by: Tony Lindgren <tony@atomide.com>

Misc clean-up for hsmmc init
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add support for the second controller hopefully in a generic way.
Also put the twl4030 specific voltage configuration into a separate
function.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix voltage defines, make card detect gpio controller specific
Signed-off-by: Tony Lindgren <tony@atomide.com>

Make hsmmc use omap_ctrl_read/write and existing defines
Signed-off-by: Tony Lindgren <tony@atomide.com>

Prevents idiots like me from creating an uncompilable .config
Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

system_rev is meant for board revision, this patch changes
all relevant instances to use the new omap_rev() function
liberating system_rev to be used with ATAG_REVISION as it
has been designed.
Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add glue to control the OMAP_LDP LCD as a frame buffer device
using the existing dispc.c driver under omapfb.
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

As a result of the ptebits changes, we ended up marking device mappings
as normal memory on ARMv7 CPUs, resulting in undesirable behaviour with
serial ports and the like.  While reviewing the section mapping table
entries, other errors in the memory type settings for devices were
detected and confirmed to prevent Xscale3 platforms booting.

Tested on:
	OMAP34xx (ARMv7),
	OMAP24xx (ARMv6),
	OMAP16xx (ARM926T, ARMv5),
	PXA311 (Xscale3),
	PXA272 (Xscale),
	PXA255 (Xscale),
	S3C2410 (ARM920T, ARMv4T).
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Tested-by: Mike Rapoport <mike@compulab.co.il>
Tested-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

This reverts commit 6ae3983b.

The next patch is the fixed version of this patch.
Signed-off-by: Tony Lindgren <tony@atomide.com>

* Russell King - ARM Linux <linux@arm.linux.org.uk> [081103 07:09]:
> Solving ARMv7 seems to be fairly simple, at the expense of making
> build_mem_types_table() slightly more complex.  If that was the only
> problem, then I wouldn't be mentioning the idea of dropping the
> patchset.

Well, this is the fix for ARMv7 (and a few others).  In making these
changes, I went back to DDI0100I (ARMv6 ARM), DDI0406A (ARMv7 ARM)
and the Marvell Xscale3 documentation.
...

Note that this version has a bug with xscale handling, but works
for omap. This patch will get reverted once the final patch is
available.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Merge branches 'master' and 'linus'

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-gd: re-get capacity on revalidate
  tx4938ide: Avoid underflow on calculation of a wait cycle
  tx4938ide: Do not call devm_ioremap for whole 128KB
  tx4938ide: Check minimum cycle time and SHWT range (v2)
  ide: Switch to a common address
  ide-cd: fix DMA alignment regression

We need to re-get a removable media's capacity when revalidating the
disk so that its partitions get rescanned by the block layer.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: axboe@kernel.dk
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Make 'wt' variable signed while it can be negative during calculation.
Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: sshtylyov@ru.mvista.com
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Call devm_ioremap() for CS0 and CS1 separetely.
And some style cleanups.
Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: ralf@linux-mips.org
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

SHWT value is used as address valid to -CSx assertion and -CSx to -DIOx
assertion setup time, and contrarywise, -DIOx to -CSx release and -CSx
release to address invalid hold time, so it actualy applies 4 times and
so constitutes -DIOx recovery time.  Check requirement of the recovery
time and cycle time.  Also check SHWT maximum value.
Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: ralf@linux-mips.org
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

e5318b53 ("ide: use the dma safe check for
REQ_TYPE_ATA_PC") introduced a regression which caused some ATAPI drives to
turn off DMA for REQ_TYPE_BLOCK_PC commands while burning and thus degrading
performance and ultimately causing an excessive amount of underruns.

The issue is documented also in:
http://bugzilla.kernel.org/show_bug.cgi?id=11742.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: Valerio Passini <valerio.passini@unicam.it>
[bart: fixup patch description per comments from Sergei Shtylyov]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix PCI resource mapping on sparc64
  sparc64: Kill annoying warning when building compat_binfmt_elf.o
  sparc32: kernel/trace/trace.c wants DIE_OOPS
  sparc64: Fix __copy_{to,from}_user_inatomic defines.