musb_hdrc: MUSB plat_uds.c fix

Fix plat_uds.c for proper registers to be cleared for disabling
interrupts

Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

musb_hdrc: MUSB HOST support on 2430SDP

Fix Mentor controller DMA for OMAP2430/3430

Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Nishant Kamat <nskamat@ti.com>
Acked-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

OMAP: DSP: Fix DSP build for omap1

OMAP2430 builds/boots ok for me, but as Khem just pointed out,
OMAP1 builds are broken.

This patch gets OMAP1 building again:

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP3430 base defines

Add symbolic constants for OMAP3430 base addresses; include that file
in hardware.h.  Remove #error in omap24xx.h on unknown architecture
type.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP3430 Power/Reset Management register bit defines

Add symbolic constants for Power/Reset Management register bits for
the OMAP3430 architecture.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP3430 Clock Management register bit defines

Add symbolic constants for Clock Management register bits for the OMAP3430
architecture.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP3430 Power/Reset Management register defines to prm.h

Add symbolic constants to prm.h for Power/Reset Management registers
on the OMAP3430.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP3430 Clock Management register defines to cm.h

Add symbolic constants to cm.h for Clock Management registers for the
OMAP3430.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP3430 register bit defines shared between CM and PRM

Add OMAP3430 register bit defines that are shared between the Clock
Management and Power/Reset Management registers.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP3430 modules to prcm_common.h

Add 3430-specific module offset defines to prcm_common.h.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: remove prcm-regs.h

All of the users of prcm-regs.h have been patched - remove prcm-regs.h.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: remove remaining prcm-regs.h includes

Remove remaining prcm-regs.h includes.  Most of these files don't
use prcm-regs.h anyway.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert DSP code to use new PRCM functions & defines

Convert the OMAP2-specific code in plat-omap/dsp to use the new PRCM
read/write functions and symbolic constants for registers and register
bits.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert clock.h to use symbolic register bit defines

Convert magic numbers in the enable_bit member of the struct clk
definitions in clock.h to use the new-style register bit defines from
{prm,cm}_regbits_24xx.h.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert clock.h to use symbolic register defines

Convert the symbolic constants in the enable_reg member of the struct
clk definitions in clock.h to use the new-style register defines from
{prm,cm}.h.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert sram-fn.S to use OMAP2_{PRM,CM}_BASE rather than OMAP2_PRCM_BASE

Use OMAP2_PRM_BASE and OMAP2_CM_BASE in sram-fn.s to prepare for the
OMAP3430 conversion.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert prcm.c to use symbolic register & register bit constants

Replace magic numbers and prcm-regs.h-sourced defines, for readability
and in preparation to remove prcm-regs.h.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert clock.c to use new PRCM functions and symbolic constants

Replace magic numbers, prcm-regs.h-sourced defines, and local defines
with the new PRCM register and register bit defines.  Also convert
register read/write code to use {cm,prm}_{read,write}_{,mod}_reg().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert pm.c to use new PRCM functions and symbolic constants

Replace magic numbers, prcm-regs.h-sourced defines, and local defines
with the new PRCM register and register bit defines.  Also convert
register read/write code to use {cm,prm}_{read,write}_{,mod}_reg().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP24XX Power/Reset Management register bit defines

Add symbolic constants for Power/Reset Management register bits for
the OMAP2420 and OMAP2430 architectures.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP24XX Clock Management register bit defines

Add symbolic constants for Clock Management register bits for the OMAP2420
and OMAP2430 architectures.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add Power/Reset Management shared register bit defines to prm.h

Add Power/Reset Management register bit defines to prm.h that are
shared between OMAP24XX and OMAP3430.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP24XX Power/Reset Management register defines

Add symbolic constants for OMAP24XX Power/Reset Management registers,
along with read/write functions.  The registers are divided into two
groups: global registers and module registers.  Global registers appear
only once on the chip, and are used with prm_{read,write}_reg().  Module
registers generally appear more than once, in different OMAP modules,
and have similar functions in each module.  They are used with
prm_{read,write}_mod_reg().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add Clock Management shared register bit defines to cm.h

Add Clock Management register bit defines to cm.h that are shared between
OMAP24XX and OMAP3430.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP24XX Clock Management register defines

Add symbolic constants for OMAP24XX Clock Management registers,
along with read/write functions.  The registers are divided into two
groups: global registers and module registers.  Global registers appear
only once on the chip, and are used with cm_{read,write}_reg().  Module
registers generally appear more than once, in different OMAP modules,
and have similar functions in each module.  They are used with
cm_{read,write}_mod_reg().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP2_PRM_BASE/OMAP2_CM_BASE #defines

Add symbolic constants for OMAP2_PRM_BASE and OMAP2_CM_BASE addresses.
On the 2420 and 2430 these are the same, but on later OMAP
architectures, they are different.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP24XX register bit defines shared between CM and PRM

Add OMAP24XX register bit defines that are shared between the Clock
Management and Power/Reset Management registers.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add OMAP24XX and OMAP2/3 modules to prcm_common.h

Add 24XX-specific module offset defines to prcm_common.h.  Also add
module offsets that are shared between OMAP2/3.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: remove SDRC register defines from prcm-regs.h

Remove SDRC registers from prcm-regs.h, since they are now located in
sdrc.h.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: convert existing SDRC register users to use sdrc.h

Convert files that use SDRC registers in mach-omap2/ to use sdrc.h
symbolic constants and sdrc_{read,write}_reg().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: add SDRC register defines

Create sdrc.h, containing symbolic constants for SDRC registers and
sdrc_{read,write}_reg() to read and write those registers.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: use OMAP2_CTRL_BASE in place of OMAP24XX_CTRL_BASE

Change users of OMAP24XX_CTRL_BASE to use OMAP2_CTRL_BASE.  Remove the
OMAP24XX_CTRL_BASE define.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: use OMAP2_SDRC_BASE in place of OMAP24XX_SDRC_BASE

Change users of OMAP24XX_SDRC_BASE to use OMAP2_SDRC_BASE.  Remove the
OMAP24XX_SDRC_BASE define.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: use OMAP2_PRCM_BASE in place of OMAP24XX_PRCM_BASE

Change users of OMAP24XX_PRCM_BASE to use OMAP2_PRCM_BASE.  Remove
the OMAP24XX_PRCM_BASE define.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: use OMAP2_32KSYNCT_BASE in place of OMAP24XX_32KSYNCT_BASE

Change users of OMAP24XX_32KSYNCT_BASE to use OMAP2_32KSYNCT_BASE, in
preparation to remove OMAP24XX_32KSYNCT_BASE.  Convert the 32K sync timer
reference in pm.c to use a symbolic constant rather than a magic number.
Remove the OMAP24XX_32KSYNCT_BASE define.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2: modify omap24xx.h to improve constant names and prepare for multi-arch kernels

Redo the defines in omap24xx.h to fix poorly-named defines, such as
OMAP24XX_SDRC_BASE, which is different between 2420 and 2430.  Also,
prepare for future multi-architecture kernels by removing the
architecture prefixes from several of the defines.  (Presumably in the
future these will be assigned to 'static void __iomem *'s by runtime
init code depending on the CPU type.)

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: 2430SDP: Use ads7846 for touchscreen driver

Removes the tsc2046 specific driver, and changes the 2430SDP platform
code to use the ads7846 instead.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2_mcspi fixes + cleanups

McSPI functional updates:

 - Implement the spi_transfer.delay_usecs mechanism (previously omitted).

 - Remove strange per-device <asm/arch/mcspi.h> hookery ... it's not even
   correct as a per-device config.  We *always* want "single channel" mode
   (in "keep chipselect active" mode); and if we used "turbo", it would
   be a per-transfer option (as an rx-only double buffering tweak).

 - When enabling/disabling a channel, old value is irrelevant; don't read.

 - Sanity check spi->mode bits, and reject ones we don't support.

 - Streamline DMA channel selection:  do it once during probe(), using static
   tables; smaller, faster.  OMAP 2430 still needs changes here, minimally for
   the third SPI controller.  (Board init should change too, to not assume
   all SPI controllers are used on every board...)

 - Remove #ifdefs around doing reset on driver startup ... enable clocks
   so we can do that (!), and turn on auto-idle.

 - Waste less time enabling/disabling the clocks while working the queue.

 - Flag DMA channels as freed when we do so ... so they can't get reused
   later (when another driver may own them).

 - Minor PIO fix: don't need to verify TX side completed except for TX_ONLY
   mode, since RX completed implies TX completed.

 - Remove bogus code which always dropped chipselect after the last RX_ONLY
   word (rather than leaving it enabled).

 - Move error checks out of work loop into setup() and transfer(), so that
   they're reported ASAP rather than as mysterious transfer errors).

Plus a handful of cleanups:  whitespace fixes, comments.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

omap2_mcspi fixes + cleanups

Initial updates for McSPI driver:

 - bug fixes:
    * handle byte-wide tx pio correctly for multiple bytes
    * cleanup workqueue on module exit
    * allow modular build (and rmmod)
    * request_mem_region
    * remove wrongly exported driver symbol

 - cleanup:
    * remove needless debug strings from object file
    * remove needless init and exit sections from object file
    * remove superfluous get/put of spi_master
    * fix whitespace and indentation bugs
    * fix line-too-long bugs
    * use spi_master_*() calls not class_*() calls
    * use dev_*() messaging not printk

Combined with the next patch, this gives around a 10% shrink to the driver
footprint, improves correctness, and helps it get ready to merge upstream.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

lcd_mipid kconfig fixes

Fixes some Kconfig glitches with lcd_mipid.c ... I suspect this
driver should use SPI_MODE_0 now (but, no specs so I can't know).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

tsc2102-alsa build fixes

Various fixes needed to build the tsc2102 audio.  Several fixes
relate specifically to building it as a module.

Note that this doesn't address the need for omap-alsa-dma.c
to go into a separate module so that e.g. tsc2101 and tsc2102
modules can both be built, or the assumption that the audio
is going out over McBSP not EAC.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

tsc2101-alsa build fixes

Partial build fixes for tsc2101 audio.  It still won't link though,
it needs undefined omap_tsc2101_{read,write}() functions to access
chip registers ... and requires that e.g. tsc2102 audio isn't also
configured (they use the same exported McBSP DMA functions, which
likewise prevent use with EAC).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

fix SPI_CPHA related errors

The OMAP SPI controller drivers handle SPI_CPHA incorrectly.
It should mean:

  CPHA=0 ... sample at leading edge of clock
  CPHA=1 ... sample at trailing edge of clock

This fixes them, and the protocol drivers which depended on the wrong
meaning.  Separate ads7846 and omap_uwire patches are going upstream,
already since those drivers were already pushed there.  The tsc2102
code already had this right ... strange.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Kevin Hilman <khilman@mvista.com>

Re-add a lost TSC2102 touchscreen Kconfig entry

The TSC2102 option in drivers/input/touchscreen/Kconfig got lost
somewhere in January (although the commit is not visible in git-web),
so adding it back.  Also remove the input_dev.dev assignment due to an
upstream change.

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
From 492e5cbe39613f06b8146c12bff9500259739fd5 Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Tue, 22 May 2007 20:08:47 +0200
Subject: [PATCH] Re-add a lost TSC2102 touchscreen Kconfig entry.

The TSC2102 option in drivers/input/touchscreen/Kconfig got lost somewhere
in January (although the commit is not visible in git-web), so adding it
back.  Also remove the input_dev.dev assignment due to an upstream change.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Update the Kconfig entry for omap-bl

 - CONFIG_BACKLIGHT_DEVICE now became CONFIG_BACKLIGHT_CLASS_DEVICE.
 - Re-add OMAPBL_MAX_INTENSITY usage that was removed in last commit
and the macro became unused.

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
From feb798039e5c6e06f64556ad482dbbd021153a1b Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Tue, 22 May 2007 19:59:11 +0200
Subject: [PATCH] OMAP: Update omap-bl Kconfig entry.

 - CONFIG_BACKLIGHT_DEVICE is now CONFIG_BACKLIGHT_CLASS_DEVICE.
 - Re-add OMAPBL_MAX_INTENSITY usage that became unused after last commit.
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Fix section mismatch in OMAP2 board-generic.c

Fix section mismatch in OMAP2 board-generic.c

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

ARM: OMAP: Fix section mismatch in OMAP1 board-generic.c

Fix section mismatch in OMAP1 board-generic.c

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

ARM: OMAP: Fix section mismatch in board-2430sdp.c

Fix section mismatch in board-2430sdp.c

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

ARM: OMAP: Fix section mismatch in board-palmz71.c

Fix section mismatch in board-palmz71.c

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

ARM: OMAP: Fix section mismatch in board-palmtt.c

Fix section mismatch in board-palmtt.c

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

ARM: OMAP: Fix section mismatch in board-palmte.c

Fix section mismatch in board-palmte.c

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

ARM: OMAP: Fix section mismatch in board-sx1.c

Fix section mismatch in board-sx1.c

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

ARM: OMAP: Fix section mismatch in board-p2.c

Fix section mismatch in board-p2.c

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

ARM: OMAP: Fix section mismatch in board-n800.c

Fix section mismatch in board-n800.c

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

ARM: OMAP: Fix section mismatch in board-nokia770.c

Fix section mismatch in board-nokia770.c

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

ARM: OMAP: Fix section mismatch in board-h4.c

Fix section mismatch in board-h4.c

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

ARM: OMAP: Fix section mismatch in board-h3.c

Fix section mismatch in board-h3.c

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

ARM: OMAP: Update palmte_defconfig to enable GPIO switch

Update palmte_defconfig to enable CONFIG_OMAP_GPIO_SWITCH. Else, we get

arch/arm/mach-omap1/built-in.o: In function `omap_palmte_init':
board-palmte.c:(.init.text+0xbc0): undefined reference to
`omap_register_gpio_switches'

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

ARM: OMAP: Remove warning in tlv320aic23.c

Remove warning in tlv320aic23.c about unused variable

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

ARM: OMAP: Convert omap-alsa-sx1.c to new struct format

Convert omap-alsa-sx1.c to new struct format to make this file compile
again.

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

ARM: OMAP: Fix compilation of dsp_mem.c

Fix compilation of dsp_mem.c. omapfb_ready is only available if
CONFIG_FB_OMAP_LCDC_EXTERNAL is set, else compiler stops with error.
status is only used in case CONFIG_FB_OMAP_LCDC_EXTERNAL is set.
Compiler warns about this.

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

ARM: OMAP: Update omap_perseus2_730_defconfig

Update omap_perseus2_730_defconfig to disable broken lcd_p2.c until
this is fixed.

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

ARM: OMAP: Convert some SA interrupt flags to IRQF

Convert some SA* interrupt flags to IRQF*

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

Merge omap-drivers

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-apollon-keys.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/io.c
arch/arm/mach-omap2/pm.c
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/dsp/dsp_common.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
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/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
net/ipv4/netfilter/Kconfig

ARM: OMAP: Fix warning in lcdc.c

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>

I2C: Add high-speed support to omap-i2c

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>

Formating changes for Basic OMAP2430 High speed I2C

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>

WATCHDOG: use base address from platform resources and make 2430 boot again

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>

ARM: OMAP: Add DSP common code

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>

SPI: Add support for TSC2301 protocol driver

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>

SPI: Add TSC2102 main SPI driver

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>

SPI: Add support for TSC2101

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>

SPI: Add an SPI master driver for the OMAP2 McSPI controller

Add an SPI master driver for the OMAP2 McSPI controller

Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

MTD: Add onenand support for omap24xx

Add onenand support for omap24xx

Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>

NF: Add iptables IDLETIMER target

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>

smc91x: Add code to detect errors caused by bad memory timings

Add code to detect errors caused by bad memory timings

Signed-off-by: Tony Lindgren <tony@atomide.com>

serial: 8250 changes for omap

8250 changes for omap

Signed-off-by: Tony Lindgren <tony@atomide.com>

smc91x: Clean up omap machine type handling

Level handling is different for omap1 and omap2.

Signed-off-by: Tony Lindgren <tony@atomide.com>

Add Nokia CBUS support

Add Nokia CBUS support

Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

i2c: Merge omap i2c drivers from omap-historic

Merge omap i2c drivers from omap-historic

Signed-off-by: Tony Lindgren <tony@atomide.com>

FB: Add support for OMAP framebuffer

Add support for OMAP framebuffer

Signed-off-by: Imre Deak <imre.deak@solidboot.com>

ARM: OMAP: Add apollon gpio keys using gpio-keys input

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>

ARM: OMAP: Replace mach-omap/omap2 with mach-omap2

Update board Apollon with correct file path.

Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Merge board specific files from N800 tree

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>

ARM: OMAP: cleanup apollon board

- 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>

ARM: OMAP: Sync H4 board init with linux-omap

This patch syncs H4 board init with linux-omap tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Fix typo in board-h4.h

Replace OMAP1610 with OMAP2420.

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

ARM: OMAP: USB peripheral support on H4

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>

ARM: OMAP: Fix PRCM base register usage for 243x

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>

ARM: OMAP: Device init for OMAP24xx Enhanced Audio Controller

Device init for OMAP24xx Enhanced Audio Controller

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: 243x: Add mappings for SDRC and SMS

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>

ARM: OMAP: Merge PM code from N800 tree

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>

ARM: OMAP: Merge driver headers from N800 tree

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>

ARM: OMAP: Merge gpmc changes from N800 tree

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>

ARM: OMAP: TUSB EVM init

Add init support for the TUSB6010 EVM board, as connected to H4.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Tabify mux.c

Tabify mux.c, no functional changes.

Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Add minimal OMAP2430 support

This patch adds minimal OMAP2430 support to get the kernel booting on 2430SDP.

Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: abstract debug card setup (smc, leds)

Additional cleanup for debug boards on H2/P2/H3/H4:  move the init
code that's not board-specific into a new file where it can be easily
shared between all the different boards (avoiding code duplication,
and making it easier to support more devices).  Make H4 use that.

This should be easy to drop in to the OMAP1 boards using these debug
cards; the only difference seems to be that the p2 does an extra reset
of the smc using the fpga (probably all boards could do that, if it's
necessary) and doesn't use the gpio mux or request APIs.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: omap2/gpmc updates

GPMC updates:
 - bugfixes: wrong/missing flags, omitted write, wrong test
 - don't map memory segments starting at zero
 - improve debug messaging
 - export gpmc_get_fclk_perio]d() since it's needed to calc timings
 - expect gpmc_cs_set_timings() caller to have initialized sync vs async

Note that this API is glitchy; likely the best fix would be to add
a member to "struct gpmc_timings" to hold GPMC_CONFIG1, since that
holds one key aspect of the GPMC timings (the gpmc_fclk divisor,
and sync vs. async == whether that divisor matters).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: omap2/memory.c compile fixes

Remove some conflicting declarations in omap2/memory.c so that the
file builds again.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>