Fix Kconfig sequencing:  the 2430 SDP keeps getting stuffed
in the middle of H4 dependencies, so the various H4-specific
config options aren't displayed as depending on H4.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Enable the new TSC2101 driver.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

H2 / H3 boards use this chip, update their board files.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The new driver is functionally the same as the old
drivers/ssi/omap-tsc2101 driver.
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>

Fix old interrupt handler function in omap2-onenand
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add some ugly looking comments into OMAP24xx EAC driver
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add support for OMAP24xx Enhanced Audio Controller
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.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>

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/Makefile
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/mailbox.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/mailbox.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dsp/Kconfig
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/dsp/dsp_common.h
	arch/arm/plat-omap/dsp/omap1_dsp.h
	arch/arm/plat-omap/mailbox.c
	arch/arm/plat-omap/mailbox.h
	drivers/Makefile
	drivers/cbus/tahvo-usb.c
	drivers/spi/omap2_mcspi.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/mailbox.h
	include/asm-arm/arch-omap/omap24xx.h

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

Used in Nokia N800.
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

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

This was changed in the generic FB code, but not updated in the HWA742
specific part.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>

These were changed in the generic FB code, but not updated for the OMAP1
specific parts.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>

- support for per window scaling / color format attribute in
  window updates
- save / restore registers over a suspend / resume, do a full screen
  background update after resume to start with a clean state
Signed-off-by: Imre Deak <imre.deak@solidboot.com>

Different DPLL multiplier / divider pairs can result in frequencies
that are not exact matches of the values given by TI. When looking up
the table of known L4 / DSS1 values allow for a small difference.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>

- dynamic relocation of FB mem to SRAM, SDRAM
- extended capability query for separate plane / window attributes
  and supported color formats
Signed-off-by: Imre Deak <imre.deak@solidboot.com>

- dynamic relocation of FB mem to SRAM, SDRAM
- support for per window resizing in window updates
- fix locking in plane reconfiguration
- extended capability query for separate plane / window attributes,
  and supported color formats
Signed-off-by: Imre Deak <imre.deak@solidboot.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>

CBUS is the bus that Energy Management ASICs are connected to on
some Nokia mobile devices. Added support for CBUS and two EM ASIC
drivers.

Also added board config structures for some of the Nokia 770 drivers.
Signed-off-by: Juha Yrjölä <juha.yrjola@nokia.com>

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

Import framebuffer support for omap from linux-omap-historic
branch.

NOTE: This patch needs to be split and prepared for upstream
and then moved to omap-drivers branch.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

Add onennand board specific support for N800
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

These were left out from the board file when merging these drivers,
add them here.

Call GPIO init from the board file as well, since the platform device init
code uses the GPIO API.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The SoSSI driver should already take care of this by enabling / disabling
its clock when necessary, so this legacy callout from the PM idle code
is not needed any more.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Clocks with the follow parent rate mode were not updating their
children at propagate rate time.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This is needed, so that disabling the SoSSI clock during idle can
be prevented.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- in addition to fixed FB regions - as passed by the bootloader -
  allow dynamic allocations
- do some more checking against overlapping / reserved regions
- move the FB specific parts out from sram.c to fb.c
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

Sync framebuffer headers with N800 tree
Signed-off-by: Tony Lindgren <tony@atomide.com>

Convert interrupt flags SA_* to IRQF_*
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP2: Fix warning in pm.c:

arch/arm/mach-omap2/pm.c: In function 'omap2_pm_init':
arch/arm/mach-omap2/pm.c:854: warning: ignoring return value
of 'subsys_create_file', declared with attribute
warn_unused_result

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.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.
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: Tony Lindgren <tony@atomide.com>

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