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>

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>

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

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>

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>

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>

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>

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>

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>

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

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

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

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

This MULTIOPEN feature should always be enabled.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

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

As noted by Kyungmin Park, the divisor calculation has
an unnecessary increase.
Signed-off-by: Tony Lindgren <tony@atomide.com>

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>

Set tusb host max VBUS to 100mA
Signed-off-by: Tony Lindgren <tony@atomide.com>

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>

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>

Instead of BUG(), warn on disabling clocks with no users.
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

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>