[ This patch replaces the previous patch from me on this topic,
  "Fix cpu_is_omap343x()" ]

include/asm-arm/arch-omap/cpu.h was always returning 0 for
cpu_is_omap343x().  This caused 3430SDP to fail to boot after the
recent system control module patch.

Also, clean up the existing OMAP2/3 CPU type reporting macros to
evaluate to constants on non-multiboot kernels, and fix some
whitespace and numeric format problems with the recent DEVICE_TYPE
macro changes.

Boot-tested on N800, 2430SDP, and 3430SDP-ES1.

size:

2885444  147008   96280 3128732  2fbd9c vmlinux.3430sdp
2885416  147008   96280 3128704  2fbd80 vmlinux.3430sdp.patched
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix typo in arch/arm/mach-omap2/board-n800.h file.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Removes unnecessary arch/arm/mach-omap2/board-n800-pm.c file, according with
Trilok's early patch, that moves board-n800-pm.c code to board-n800.c file.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Make board-sx1.c file uses new board-sx1-mmc.c code.

This patch also:
- Introduces a new gpio_switch to get events when inserting and removing
  MMC/SD/SDIO cards to/from the slot.
- Enables the GPIO switch support option on sx1_defconfig to use
  multislot support:
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Proposes the new board-sx1-mmc.c file to handle all the MMC
specific code for multislot support.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch redefines CN_IDX_SX1SND and CN_VAL_SX1SND macros at include/linux/connector.h.
It is based on Komal Shah' earlier patch.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

OMAP_GPIO_SIWTCH is optional, so omap_reister_gpio_switches will be null.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

If the get_cover_state is not set, it occurs the oops.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Misc minor clean-up for upstream merge
Signed-off-by: Tony Lindgren <tony@atomide.com>

Clean up memory allocation return values
Signed-off-by: Tony Lindgren <tony@atomide.com>

Move dspgateway to drivers/dsp/dspgateway
Signed-off-by: Tony Lindgren <tony@atomide.com>

Remove arch-arm/plat-omap/dsp/dsp_common.h, and move
definitions to include/asm-arm/arch-omap/dsp_common.h.

This is done in order to prepare dsp for moving to live
under drivers. No functional changes.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Merge branches 'master' and 'linus'

Add support for 2k Page nand with Enabled HW ECC on omap2430 v4.0. and v5. It has been Tested with Micron Nand.

Signed-off-by: Shahrom Sharif-Kashani <sshahrom <at> micron.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add support for 2k Page nand with Enabled HW ECC on omap2430
v4.0. and v5. It has been Tested with Micron Nand.
Signed-off-by: Shahrom Sharif-Kashani <sshahrom@micron.com>

Moved defines from nand.h to omap2.c, cleaned up spacing and
comments a bit.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Build fixes for the tsc210x driver.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Fix init section warnings in the new i2c init code.  It's
wrong to call "__init" functions from non-__init ones.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Enables MMC/SD card support option on n800_defconfig to use MMC multislot support.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>

Refreshed to apply after Lauri's patch. Also left out
CONFIG_MMC_BLOCK_BOUNCE as omap MMC supports SG.
Signed-off-by: Tony Lindgren <tony@atomide.com>

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: reverse inline-data truncate args
  ocfs2: Fix comparison in ocfs2_size_fits_inline_data()
  ocfs2: Remove bug statement in ocfs2_dentry_iput()
  [PATCH] ocfs2: Remove expensive bitmap scanning
  ocfs2: log valid inode # on bad inode
  ocfs2: Filter -ENOSPC in mlog_errno()
  [PATCH] fs/ocfs2: Add missing "space"
  ocfs2: Reset journal parameters after s_mount_opt update

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r: Update sys_rt_sigsuspend
  m32r: Ignore warnings for unused syscalls
  m32r: Add missing syscalls

Removing duplicated and unused files from camera driver
for omap1.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

camera_device_unregister expected the argument to be its own
device structure but it's actually that of its slave.

Also get master from slave's structure in camera_device_register.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch updates the camera_core.[c,h] to use corretly the new
v4l2 videobuf API.

Also removes VIDEO_BUF reference from Kconfig and adds the correct
dependencies.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch should be dropped once the official machine type
is available in the tree.
Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Enable N810 and lzo support for jffs2.
Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Built alongside N800 sharing most of the init code through
board-n800.h. Bootloader tag array size is increased from
512 to 1024.

Many drivers are still missing or don't work correctly,
but at least serial console is functional and jffs2 works
with lzo compression.
Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fixes to make host features work again
Signed-off-by: Tony Lindgren <tony@atomide.com>

Make board-h2.c file uses new board-h2-mmc.c code.

This patch also:
- Introduces a new gpio_switch to get events when inserting and removing
  MMC/SD/SDIO cards to/from the slot.
- Enables the following options on omap_h2_1610_defconfig to use
  multislot support:
  - GPIO switch support
  - MMC/SD card support
  - VFAT fs support
  - NLS ISO 8859-1
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Anderson Briglia <anderson.briglia@indt.org.br>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: David Cohen <david.cohen@indt.org.br>
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Proposes the new board-h2-mmc.c file to handle all the mmc
specific code for multislot support.
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Anderson Briglia <anderson.briglia@indt.org.br>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: David Cohen <david.cohen@indt.org.br>
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Make board-h3.c file uses new board-h3-mmc.c code.

This patch also:
- Introduces a new gpio_switch to get events when inserting and removing
  MMC/SD/SDIO cards to/from the slot.
- Enables the following options on omap_h3_1710_defconfig to use
  multislot support:
  - GPIO switch support
  - MSDOS fs support
  - VFAT fs support
  - Codepage 437
  - NLS ISO 8859-1
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Anderson Briglia <anderson.briglia@indt.org.br>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: David Cohen <david.cohen@indt.org.br>
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Proposes the new board-h3-mmc.c file to handle all the mmc
specific code for multislot support.
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Anderson Briglia <anderson.briglia@indt.org.br>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: David Cohen <david.cohen@indt.org.br>
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Enables MMC/SD card support option on n800_defconfig to use MMC multislot support.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Modifications at board-n800-mmc.c and board-n800.c files to work with MMC multislot support.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Modifications at arch/arm/plat-omap/devices.c and include/asm-arm/arch-omap/mmc.h
to use multislot structures.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Using setup_timer() instead of init_timer on omap.c file.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

When a card is removed while it is being accessed, a command can get stuck so
that no timeout or end of command interrupt ever occurs. The command getting
stuck is almost always CDM12, but also the other commands can get stuck. Catch
a stuck command with a timer and try sending the initiliazation stream until
the controller starts running again and responds with the end of command
status.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

General code cleanup, modifications at some dev_* functions and
other hacks at mmc_omap_irq() for MMC multislot support.
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Modifications at power functions to MMC multislot support. This patch
also move board-specific code out of MMC OMAP driver.
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix the data timeout calculation for MMC multislot support.
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

New functions to support MMC multislot:
mmc_omap_release_dma() and mmc_omap_abort_xfer().
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>