Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

The current arch/arm/boot/compressed/head.S code only supports cores
to ARMv6 with the old CPU Id format. This patch adds support for the
new ARMv6 with the new CPU Id and ARMv7 cores that no longer have the
ARMv4 cache operations.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Modified DMA macros to use DMA V4 Base, to support all DMA V4 based OMAP
platforms.
Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Minor fixes to changing tusb role via sysfs
Signed-off-by: Tony Lindgren <tony@atomide.com>

Clean-up sysfs interface to show musb mode
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fixes to improve  mode switching and VBUS detection for tusb
Signed-off-by: Tony Lindgren <tony@atomide.com>

This should allow using both edge or level GPIO interrupts.
Signed-off-by: Tony Lindgren <tony@atomide.com>

At least tusb3.0 has a problem of waking up to spontaneously from idle
when WBUS wake-up events are enabled (Issue #2). This patch disables
power detection in PHY for the duration of idle.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Needed for hardware workarounds based on the tusb revision.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Remove redundant #defines
Fix LCD pixelclock to 5.4 MHz
Signed-off-by: Hunyue Yau <hyau@mvista.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2_pm_init: on 2430,  don't fail if emul_ck is not available.  It
is only available on 2420
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Various compile fixes needed after PRCM updates for PM_DEBUG
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The driver comes from 2.4 when no RTC class existed.  Currently we have
drivers/rtc/rtc-omap.c which should be preferred.  Please also update
userspace and defconfig if the old driver was being used.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Remove duplicate omap34xx.h entry
Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add Copyright header omap24xx.h
Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

GPIO7 and GPIO6 are configured as default wake-up sources for
tusb6010.

without this patch MUSB is not able to enumerate
any device that draw power from it.

After applying this patch, we're passing in almost
all OTG Electrical Tests.
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Disable old OMAP RTC driver if RTC_DRV_OMAP is enabled
Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix OMAP24XX_PRCM_REVISION and OMAP24XX_PRCM_SYSCONFIG addresses,
which were incorrectly using 3430 PRM_{REVISION,SYSCONFIG} addresses.
Bug found by Richard Woodruff <r-woodruff2@ti.com>.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

With the recent omap24xx register cleanup, the CONTROL_DEVCONF is only defined
at arch/arm/mach-omap2/pm.c.
So define 24XX_CONTROL_DEVCONF and use internal clock field in MMC
configuration.
I think it's the proper place to set mmc clock instead of  board-specific one.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
--
b/arch/arm/mach-omap2/board-apollon.c
Signed-off-by: Tony Lindgren <tony@atomide.com>

Kill warning: twl4030 keypad
struct input_dev has not moved to struct device from class_device. Kill the
re-init till this happens

Acked-by: x0khasim@ti.com
Acked-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch adds TWL4030 Real-Time Clock support for OMAP2430.
Signed-off-by: Dmitry Krivoschekov <dkrivoschekov@ru.mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- Add pr_err and CodingStyle cleanups.
Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Added back temporary I2C id
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-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-apollon-keys.c
	arch/arm/mach-omap2/board-apollon.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/board-n800.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/memory.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/sleep.S
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/dsp/dsp_common.h
	arch/arm/plat-omap/dsp/omap2_dsp.h
	arch/arm/plat-omap/timer32k.c
	drivers/Makefile
	drivers/i2c/busses/i2c-omap.c
	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/i2c/chips/twl4030_core.c
	drivers/mtd/onenand/omap2.c
	drivers/spi/Kconfig
	drivers/spi/omap2_mcspi.c
	drivers/spi/tsc2101.c
	drivers/spi/tsc2102.c
	drivers/spi/tsc2301-core.c
	drivers/video/omap/Kconfig
	drivers/video/omap/Makefile
	include/asm-arm/arch-omap/board-2430sdp.h
	include/asm-arm/arch-omap/eac.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/io.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/arch-omap/twl4030.h
	include/asm-arm/hardware/tsc2101.h
	include/linux/i2c-id.h
	include/linux/spi/tsc2102.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>