musb_hdrc: Search and replace bIsSharedFifo with is_shared_fifo

Search and replace bIsSharedFifo with is_shared_fifo

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

musb_hdrc: Get rid of old unused MUSB_EpFifoDescriptor

Get rid of old unused MUSB_EpFifoDescriptor

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

musb_hdrc: Search and replace bIsHost with is_host

Search and replace bIsHost with is_host

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

musb_hdrc: Search and replace _pthis with _musb

Search and replace _pthis with musb

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

musb_hdrc: Search and replace MGC_SelectEnd with musb_ep_select

Search and replace MGC_SelectEnd with musb_ep_select

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

musb_hdrc: Search and replace Lock with lock

Search and replace Lock with lock

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

musb_hdrc: Search and replace bEnd with epnum

Search and replace bEnd with epnum

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

musb_hdrc: Search and replace bEnd0Stage with ep0_stage

Search and replace bEnd0Stage with ep0_stage

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

musb_hdrc: Search and replace bEndNumber with current_epnum

Search and replace bEndNumber with current_epnum

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

musb_hdrc: Search and replace bEndCount with nr_endpoints

Search and replace bEndCount with nr_endpoints

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

musb_hdrc: Search and replace aLocalEnd with endpoints

Search and replace aLocalEnd with endpoints

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

musb_hdrc: Search and replace bLocalEnd with epnum

Search and replace bLocalEnd with epnum

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

musb_hdrc: Search and replace wCount with len

Search and replace wCount with len

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

musb_hdrc: Search and replace wFifoCount with fifo_count

Search and replace wFifoCount with fifo_count

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

musb_hdrc: Search and replace dwCount with len

Search and replace dwCount with len

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

musb_hdrc: Search and replace pDest with dst

Search and replace pDest with dst

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

musb_hdrc: Search and replace pSource with src

Search and replace pSource with src

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

musb_hdrc: Search and replace pBase with mbase

Search and replace pBase with mbase

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

musb_hdrc: Search and replace pRegs with mregs

Search and replace pRegs with mregs

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

musb_hdrc: Search and replace pEnd with musb_ep when struct musb_hw_ep

Search and replace pEnd with musb_ep when struct musb_hw_ep

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

musb_hdrc: Search and replace pEnd with musb_ep when struct musb_ep

Search and replace pEnd with musb_ep when struct musb_ep

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

musb_hdrc: Search and replace pEndPt with hw_ep

Search and replace pEndPt with hw_ep

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

musb_hdrc: Search and replace pThis with musb

Search and replace pThis with musb

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

Revert "OMAP: Adding Support for 2K nand page support for omap2430"

This reverts commit ebd641a5ea79f88cae62e97e3dade8e646195a18.

Revert until the rest of the patches get integrated to fix
build.

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

Fix omap2430 clock build error

This fixes a build error for 2430.  fixed_div is under a 2420 only define and it should be OMAP2.

Signed-off-by: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix warning in arch/arm/mach-omap2/timer-gp.c

Fix warning in arch/arm/mach-omap2/timer-gp.c
arch/arm/mach-omap2/timer-gp.c: In function `omap2_gp_timer_set_mode':
arch/arm/mach-omap2/timer-gp.c:89: warning: enumeration value
`CLOCK_EVT_MODE_RESUME' not handled in switch

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Fix section mismatch warning

Fix

WARNING: vmlinux.o(.text+0x1554c): Section mismatch: reference to
.init.text:reserve_bootmem (between 'omapfb_reserve_sdram' and
'omap_32k_timer_set_mode')

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

ARM: OMAP: Fix warning in plat-omap/mmu.c

Fix warning

arch/arm/plat-omap/mmu.c:1277: warning: initialization from
incompatible pointer type
arch/arm/plat-omap/mmu.c:1278: warning: initialization from
incompatible pointer type

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

Revert "omap2 clock: fix incorrect rate calculation for osc_ck, sys_ck"

This reverts commit 18fc252e78d914a150e278682425303c132a688d.

As noted by Richard Woodruff, with this the system gets the
wrong osc speed and ends up setting the system speed wrongly.

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

MENELAUS: Remove unnecessary pr_err definition

Instead of defining a pr_err() macro, we can use dev_err() macro.

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

OMAP: Adding Support for 2K nand page support for omap2430

Following patches would add support for 2k Page nand with Enabled HW ECC
on omap2430 v4.0. It has been Tested with Micron Nand. The Patch is
against 2.6.22 linux-omap.git tree. As Always all the comments are welcomed.

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

ARM: OMAP2: Add camera block base address definition.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

OMAP VIDEO: Convert printk to dev_{dbg,err,info} macros

Use dev_* macros instead of direct printks. Better readability
for camera_core.c

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

VIDEO OMAP: camera_core whitespace cleanup

Whitespace removal from camera_core.[ch]

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: full-retention fix for 2430

This fixes a bug where the 2430 crashes upon entering full-retention
due to a register difference between 2420 and 2430.

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

ARM: OMAP: cleanup: remove OMAP_MCBSP Kconfig warnings

When the OMAP patches are applied and the kernel is built for a
non-ARM target, there are a handful of Kconfig warnings due to the use
of OMAP_MCBSP in arch-independent Kconfig files.

This patch simply removes the 'select OMAP_MCBSP' in these
arch-independent files since it is already 'default y' in
arch/arm/plat-omap/Kconfig

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

ARM: OMAP: Remove unnecessary N800 PM board specific file

From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>

Remove unnecessary N800 PM board specific file

- Remove unnecessary arch/arm/mach-omap2/board-n800-pm.c file, according with
Trilok's early patch [1], that moves board-n800-pm.c code to board-n800.c

[1] http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commitdiff;h=0d6d581ffec0296f429a777187945943f2127e8f

Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Remove unnecessary N800 PM board specific file

Remove 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

Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Put LCD drivers back to Makefile.

Put back references to lcd_apollon.o, lcd_2430sdp.o and lcd_mipid.o that
were lost in merge to drivers/video/omap/Makefile.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap2 clock: get rid of omap2_followparent_recalc()

omap2_followparent_recalc() just calls followparent_recalc(), so,
get rid of omap2_followparent_recalc().

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

omap2 clock: remove fixed rate from mdm_osc_ck

mdm_osc_ck has a preinitialized rate and is marked as RATE_FIXED, but rather
than using omap2_propagate_rate() as its recalc function, which accounts
for RATE_FIXED clocks, it uses omap2_followparent_recalc(), which sets the
rate to the parent clock's rate.  After reviewing the 2430 TRM, fix this
inconsistency by removing the fixed rate declarations (TRM says that this
clock is 'typically' 26MHz).

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

omap2 clock: add fixed divisor clock code

The rates of some clocks are equal to their parents' rates, divided by some
fixed integer.  This contrasts with the existing 'followparent' clocks,
which follow their parents' rates strictly; and the existing 'clksel' clocks,
which follow their parents' rates divided by a runtime-selectable divisor.
Add code to implement these clocks without resorting to specifying a
fixed rate.

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

omap2 clock: use dedicated omap2_dpll_recalc() for DPLL recalc func

dpll_ck is not a clksel clock, and so it does not really fit well into
omap2_clksel_recalc().  Split off its recalc code into its own function,
omap2_dpll_recalc().

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

omap2 clock: Use symbolic constants in clock.c

Convert most of the magic numbers remaining in mach-omap2/clock.c to
symbolic constants.

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

omap2 clock: Cleanup in clksel-related code; add sys_clkout2 divisor handling

Convert omap2_get_clksel to use void __iomem *.  Add
omap2_divisor_to_clksel(), to convert clock divisors into appropriate
register bit field values.  Use non-shifted register bit field masks
in clksel code, rather than masks that have been preshifted down to
bit 0 -- this simplifies existing code and facilitates the use of
symbolic constants from the recent PRCM cleanup.  Also add code to
properly handle divisors for sys_clkout2 on OMAP2420.  Previously
this clock's divisor settings were ignored.

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

omap2 clock: From: Paul Walmsley <paul@pwsan.com> Subject:

Clean up omap2_clk_set_parent() by bailing out early if the clock is not
parent-selectable.

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

omap2 clock: return -EINVAL if no clock enable code; fix dpll_ck enable

If the clock framework can't figure out how to enable a clock, return
-EINVAL to indicate that the clock cannot be enabled.  Previously the
code returned 0, which indicated success.

Also fix the "clock.c: Enable for dpll_ck without enable code" boot
warning by marking dpll_ck as ALWAYS_ENABLED.  This is not technically
true, since the DPLL can be bypassed; but since we currently have no
software infrastructure to control it directly, ALWAYS_ENABLED is a
sufficient fiction for dpll_ck.

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

omap2 clock: omap2 clock.c: Consolidate wait-for-lock code

omap2 clock.c contains two nearly identical wait-for-clock-enable routines.
Consolidate them into one omap2_wait_clock_ready() function.

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

omap2 clock: convert PARENT_CONTROLS_CLOCK into a clock flag

The clock framework currently uses a magic value in struct clk
.enable_bit to indicate that the clock's parent controls enabling and
disabling the clock.  There's no need to use this type of in-band
special value when there's already a good means to indicate binary
clock parameters: the clock flags field.  This patch converts the
existing PARENT_CONTROLS_CLOCK code to use a clock flag.

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

omap2 clock: vlynq_fck is missing clksel divider code

vlynq_fck is a clksel clock.  But omap2_clk_set_parent() is missing
the code to divide its parent's rate down appropriately when vlynq_fck
is set to use a core_ck parent.

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

omap2 clock: fix some clocks incorrectly marked as present on OMAP2430

Several clocks are marked as present on OMAP2430, even though they are
2420-only.  Drop CLOCK_IN_OMAP243X from those clocks' flags.

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

omap2 clock: use symbolic constants in clock.h rate_offset/src_offset fields

Convert most of the magic numbers remaining in mach-omap2/clock.h to
symbolic constants.  This primarily affects the src_offset/rate_offset
fields.

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

omap2 clock: move SDRC-related code from clock.c to memory.c

The clock framework contains two functions, omap2_dll_force_needed()
and omap2_reprogram_sdrc(), which are SDRC code, not really clock
code.  So, move these functions to memory.c.

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

omap2 clock: clean up dss2_fck clock flags

dss2_fck is not a fixed-rate clock; its rate is dependent on its parent's
rate.  So, drop the .rate assignment and drop the RATE_FIXED clock flag.
It also is a leaf clock - no clocks have it as a parent - so it can't
propagate its rate anywhere.  So, drop the RATE_PROPAGATES and fix the
recalc function pointer accordingly.

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

omap2 clock: get rid of sleep_ck

According to the 2420 TRM rev J, SLEEP_CLK doesn't have any registers
or bits associated with it, so it's outside software control.  It's
also a leaf clock - no software-controllable clocks use it as a
parent.  There's nothing we can do with it in software.  So, drop it.

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

omap2 clock: drop unnecessary variable in omap2_clk_round_rate()

Drop an unnecessary variable, valid_rate, in omap2_clk_round_rate().

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

omap2 clock: fix CodingStyle issues

Clean up some CodingStyle non-conformances in clock.c.

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

omap2 clock: vlynq_fck recalc should be clksel, not followparent

vlynq_fck is a clksel clock, so its rate is equal to its parent's
rate, divided by whichever divisor is selected.  But its definition in
clock.h specifies omap2_followparent_recalc() as its rate calculation
code, which sets the clock's rate to that of its parent without
accounting for any divisor.  Fix to use omap2_clksel_recalc() instead.
omap2_clksel_recalc() is also missing the appropriate special case to
divide the vlynq_fck rate down; add this in.

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

omap2 clock: fix clksel divisor bug

For clksel clocks, omap2_clk_set_rate() incorrectly divides the parent
clock's rate by the actual bits of the register field, rather than the
translated divisor value.  This happens to work for most clksel
clocks, since the register bit fields are equal to the divisor values.
But for some clocks, such as sys_clkout, the code gets the resulting
rate wrong.

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

omap2 clock: fix incorrect rate calculation for osc_ck, sys_ck

omap2_get_crystal_rate() calculates osc_ck and sys_ck rates
incorrectly.  osc_ck runs at the same rate as the external clock
source.  Also, sys_ck's rate derives from osc_ck's rate, divided (not
multiplied) by PRCM_CLKSRC_CTRL:SYSCLKDIV.

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

omap2 clock: drop meaningless RATE_CKCTLs

Drop the RATE_CKCTL clock flag from iva1_mpu_int_ifck, gfx_ick, ssi_l4_ick,
and dss_ick.  These clocks are not source-selectable, which is the practical
meaning of RATE_CKCTL in the 2420 clock framework.

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

ARM: OMAP: 2430SDP: turn off secondary LCD backlight on boot

There is not yet any driver for the secondary LCD, so turn off
the backlight on boot.

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

ARM: OMAP: twl4030: make power_companion_init static

This is not used outside twl4030, make it static.

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

To Cleanup TWL-Core driver

Patch to cleanup few spellings in TWL4030 Core and export TWLGPIO APIs

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

ARM: OMAP: fix suspend for twl4030

Use competions instead of manually setting scheduler state.
daemonize kernel thread and set PF_NOFREEZE.

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

ARM: OMAP: Add MMU TWL support for omap1

Table Walking Logic(TWL) is supported in omap1.

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

ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox

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

DSPGW: Use ALIGN macro instead of homemade one

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

DSPGW: Use kfifo APIs instead of homemade ones

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

Add kfifo_get_to_user to copy data to userland directly

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

DSPGW: Remove CONFIG_OMAP_DSP_TASK_MULTIOPEN

This MULTIOPEN feature should always be enabled.

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

ARM: OMAP: Fix omap mmu framework for omap1

DSPGW specific part

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

ARM: OMAP: Fix omap mmu framework for omap1

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

MMC: Remove extra diviso increase

As noted by Kyungmin Park, the divisor calculation has
an unnecessary increase.

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

TSC210x driver using the SPI framework.

This is a rework of the TSC2102 driver from linux-omap-2.6 taking TSC2101
into account with the goal of using only a single driver.

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

musb_hdrc: Set tusb host max VBUS to 100mA

Set tusb host max VBUS to 100mA

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

musb_hdrc: Fix clock usage for suspend

At least tusb implements set_clock(), and in that
case clk_disable() gets called twice. Do not call
clk_disable() if set_clock() is implemented.

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

musb_hdrc: Fixes for OPT HS A tests

If RESUME is cleared too soon, OPT HS A 6.8 tests will fail.

This patch removes the check for RESUME bit before SUSPEND
is set, and makes virthub sleep until RESUME has been held
for 20 ms. Additionally virthub waits after clearing RESUME
to allow musb to start generating SOFs before RESET.

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

ARM: OMAP: Warn on disabling clocks with no users

Instead of BUG(), warn on disabling clocks with no users.

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

Merge omap-upstream

Merge branches 'master' and 'omap-upstream'

Conflicts:

arch/arm/Kconfig
arch/arm/boot/compressed/head.S
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/gpmc.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/memory.c
arch/arm/mach-omap2/mux.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sleep.S
arch/arm/mm/proc-v7.S
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/common.c
arch/arm/plat-omap/timer32k.c
drivers/char/watchdog/omap_wdt.c
drivers/i2c/chips/Makefile
drivers/i2c/chips/menelaus.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/omap2_mcspi.c
drivers/video/omap/Kconfig
drivers/video/omap/Makefile
drivers/video/omap/blizzard.c
drivers/video/omap/dispc.c
drivers/video/omap/lcd_inn1510.c
drivers/video/omap/lcd_inn1610.c
drivers/video/omap/lcd_palmte.c
drivers/video/omap/lcd_palmtt.c
drivers/video/omap/lcd_palmz71.c
drivers/video/omap/lcd_sx1.c
drivers/video/omap/lcdc.c
drivers/video/omap/omapfb_main.c
drivers/video/omap/rfbi.c
drivers/video/omap/sossi.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/hardware.h
include/asm-arm/arch-omap/io.h
include/asm-arm/arch-omap/menelaus.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/linux/input.h
kernel/printk.c

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>

ARM: OMAP: Board Apollon update, fix boot

Update Apollon board init to initialize NAND, USB,
and LEDs. Also configure GPMC memory for smc91x Ethernet.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

ARM: OMAP: Optimize INTC register accesses and enable autoidling

Use virtual addresses directly instead of physical addresses to
avoid having to recalculate the virtual address with every
register access.

Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>