Fix warnings

drivers/net/davinci_emac.c: In function 'emac_p_write_stats':
drivers/net/davinci_emac.c:2732: warning: ignoring return value of
'copy_from_user', declared with attribute warn_unused_result
drivers/net/davinci_emac.c: In function 'emac_dev_open':
drivers/net/davinci_emac.c:3517: warning: 'deprecated_irq_flag' is
deprecated (declared at include/linux/interrupt.h:66)
drivers/net/davinci_emac.c: In function 'emac_dev_probe':
drivers/net/davinci_emac.c:6804: warning: ignoring return value of
'driver_create_file', declared with attribute warn_unused_result
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>

Fix warning

arch/arm/mach-davinci/dma.c: In function 'arch_dma_init':
arch/arm/mach-davinci/dma.c:666: warning: format '%x' expects type
'unsigned int', but argument 3 has type 'volatile struct edmacc_regs *'
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>

Add cpu_is* functions to handle various TI DaVinci based CPUs.
Signed-off-by: Steve Chen <schen@mvista.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>

Update Davinci GPIO support to match the new cross-platform interfaces.
This removes some old Davinci-only calls, and changes some others.

NOTE:  this presumes the gpio_direction_output() signature change which
was merged shortly after 2.6.21-rc4 was tagged.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

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

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

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

Conflicts:

	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mm/Kconfig
	drivers/mmc/Kconfig
	drivers/mmc/Makefile
	drivers/video/Kconfig
	drivers/video/Makefile

Remove old PM_SUSPEND_DISK for omap2
Signed-off-by: Tony Lindgren <tony@atomide.com>

Merge branches 'master' and 'omap-drivers'

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-audio.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/pm.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	drivers/Makefile
	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/gpio_expander_omap.c
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/i2c/chips/twl4030_core.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/spi/Kconfig
	drivers/spi/Makefile
	drivers/video/Kconfig
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/eac.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/omap24xx.h
	include/asm-arm/arch-omap/onenand.h
	include/asm-arm/arch-omap/pm.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/Kconfig

Fix warning

drivers/video/omap/lcdc.c:878: warning: initialization from
incompatible pointer type
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Omap2430 has additional support for high-speed I2C.

This patch moves I2C speed parameter (from module) to platform data.
Also added basic High Speed support based on I2C bus speed.

This patch is tested for high speed I2C (with TWL4030 Keypad) and works as
expected.
Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Resubmitting after incorporating review comments

This patch contains the formatting changes.
Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>

Files:
 drivers/i2c/busses/i2c-omap.c
=============================================================================
Signed-off-by: Tony Lindgren <tony@atomide.com>

Modfied watchdog driver to use base address provided in platform defn
Cleaned up a bunch of statics used.
Added 2430 baseaddress defn
Addressed review comments for patch1 and 2 reported by Trilok Soni and Tony
Signed-off-by: Nishanth Menon <menon.nishanth@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add DSP common code for OMAP. This patch adds code to idle the
OMAP DSP.
Signed-off-by: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This adds a driver for TSC2301 including support for audio, keypad and
touchscreen. Patch is originally developed for Nokia N800 by Imre Deak,
Jarkko Nikula, Jarkko Oikarinen and Juha Yrjola.
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>

This adds a driver for the TSC2102 chip by Texas Instruments. This
driver is responsible for all communication with the chip and doesn't
export anything for user-space, but for other drivers controlling
devices connected to the chip.
Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

The new driver is functionally the same as the old
drivers/ssi/omap-tsc2101 driver in the linux-omap tree.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>

Add an SPI master driver for the OMAP2 McSPI controller
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

Add onenand support for omap24xx
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>

Each matching packet resets the timer associated with input and/or output
interfaces. Timer expiry causes a kobject uevent. Idle timer can be read via
sysfs.
Signed-off-by: Hiroshi DOYU <hiroshi.doyu@nokia.com>
Signed-off-by: Juha Yrjölä <juha.yrjola@nokia.com>

Updated for 2.6.21-rc1 by Arnaud Patard.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add code to detect errors caused by bad memory timings
Signed-off-by: Tony Lindgren <tony@atomide.com>

8250 changes for omap
Signed-off-by: Tony Lindgren <tony@atomide.com>

Level handling is different for omap1 and omap2.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add Nokia CBUS support
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

Merge omap i2c drivers from omap-historic
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add support for OMAP framebuffer
Signed-off-by: Imre Deak <imre.deak@solidboot.com>

Add apollon gpio keys using gpio-keys input
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Update board Apollon with correct file path.
Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch merges board specific files from N800 tree.
Nokia has published the files at:

http://repository.maemo.org/pool/maemo3.0/free/source/
kernel-source-rx-34_2.6.18.orig.tar.gz
kernel-source-rx-34_2.6.18-osso29.diff.gz
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- Add etherent gpmc handling
- Remove unused mux setting
- Add MMC switch pin comments
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch syncs H4 board init with linux-omap tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Replace OMAP1610 with OMAP2420.
Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

H4 has two peripheral ports, one for "download" and one for OTG.
The one to use is selected through Kconfig.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The PRCM base register is different on 242x and 243x.  Use
the #ifdef'd #define from omap24xx.h instead of the locally
defined one.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Device init for OMAP24xx Enhanced Audio Controller
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add mappings for SDRC ans SMS so that omap2_memory_init() works on the
2430.  This also allows the mpurate= command-line option to work.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch merges omap2 PM code from N800 tree.

Patch adds support for sleep while idle for omap2
and handy serial console debbugging code. It also
moves code from pm-domain.c to pm.c.

This code can be used as a base for developing
power management for all omap24xx boards.
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch merges omap specific driver headers from
N800 tree.
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch merges gpmc changes from N800 tree
and adds gpmc_get_fclk_period() to gpmc.h.
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>