Resumbmitting the patch earlier sent by girish, after fixing review comments given by paul.

This patch modifies the I2C clock nodes as per LDM, corrects usage of DPLL mask and updates the flags of 96M clock nodes
Signed-off-by: Chandra Shekhar <x0044955@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix the following warning when OMAP_RESET_CLOCKS is enabled:

WARNING: vmlinux.o(.data+0x33a0): Section mismatch: reference to .init.text:omap2_clk_disable_unused (between 'omap2_clk_functions' and 'osc_ck')

omap2_clk_disable_unused cannot be declared __init as it part of a
struct where the rest of the functions are not __init.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This reverts commit 669bbebe.

Using Kevin's resent patch instead.
Signed-off-by: Tony Lindgren <tony@atomide.com>

For the case of an isochonous endpoint, musb_write_fifo may be
called with a NULL buffer from musb_host_tx if DMA is enabled.
Remove DMA check and always supply a valid buffer as long as
the URB contains a valid buffer.
Signed-off-by: Hunyue Yau <hyau@mvista.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>

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

Fix the following warning when OMAP_RESET_CLOCKS is enabled:

WARNING: vmlinux.o(.data+0x33a0): Section mismatch: reference to .init.text:omap2_clk_disable_unused (between 'omap2_clk_functions' and 'osc_ck')

omap2_clk_disable_unused cannot be declared __init as it part of a
struct where the rest of the functions are not __init.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

As noted by Dirk Behme.
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch adds macro for identifying 3430 cpu type and silicon revision of OMAP2/3 processors as well.
Signed-off-by: Girish S G <girishsg@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch add cpu identification support for 3430 and some code clean up.
Signed-off-by: Girish S G <girishsg@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

It isn't safe to schedule from a LED brightness_set handler, so use a work queue.
Signed-off-by: Daniel Stone <daniel.stone@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- Once ov9640 is implemented using v4l2-int-device API,
this patch removes unecessary files from Makefile and Kconfig.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- Executed Lindent on camera_core.c
- Removed extra blank spaces
- Lines with more than 80 columns were broken
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch converts camera_core.c to use v4l2-int-device API.
Only read method was tested with success. MMAP method still needs
re-work and tests.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- Update gpio expander code to the corret i2c adapter id
- Due to changes on i2c binding style, the i2c adapter is 1
and not 0. (as configured on i2c_register_board_info)
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This code is based on board-h4.c and drivers/media/video/omap/h3_sensor_power.c codes.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- Executed Lindent on omap16xxcam.c
- Removed extra blank spaces
- Lines with more than 80 columns were broken
- Added KERN_* flags on printk calls
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Remove obsolete drivers/char/watchdog as noted by Iqbal.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Work around OMAP2_CTRL_BASE redefinition warnings for OMAP3430 builds.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This patch adds some of the missing IRQ entries for 24XX and 34XX and
reorders some of the entries.
Signed-off-by: Rohit Choraria <rohitkc@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

[resend with minor build fix and updated description]

Follow the lead of the TI kernels by removing PRCM #2 and adding PRCM
#3 and #4 to the rate-table entries.  According to TI, having #2 and
#3 together is known to be a bad combination.

Also, change the default divider values for the PRCM #5a setting to
match those of the TI kernel.  Using the smallest divider possible can
give significant power savings when using the data-driven idle modes.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Acked-by: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

- Make headset bias and headset button detection enable/disable functions
  reentrant. Protect also suspend/resume callbacks since they call
  retu_headset_set_bias directly.
- Don't define flag variables as bit fields since bit operations may not be
  atomic and we access one of them from interrupt. Now other flags don't
  need any additional locking since they are not accessed from interrupt
  context.
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

Few cleanups, coding style fixes and unused stuff removal.
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This fixes some build errors ... unclear how this got past earlier tests.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Fix compile problems in omap2_pm_debug()
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Based on an earlier patch by Luís Vitório Cargnini, add a dummy define
for OMAP2_CTRL_BASE. Eventually this will get fixed by setting a base
address during boot.
Signed-off-by: Tony Lindgren <tony@atomide.com>

FYI... without PATCH 1/1 the new DMA stuff doesn't compile on OMAP2.
While waiting for that fix, at least this is required to build in
current git
Signed-off-by: Tony Lindgren <tony@atomide.com>

Added support for DMA chaining.
This patch depends on patches [1-3]
"OMAP: DMA: Cleanup of DMA Request Lines",
"OMAP: DMA: Added support for OMAP3" and
"OMAP: DMA: Added utility APIs for setting DMA global parameters".
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Added DMA utility APIs for setting FIFO depth, arbitration rate and channel priority.
This patch depends on patch [2/4] "OMAP: DMA: Added support for OMAP3".
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Added DMA support for OMAP3.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix FB_OMAP dependencies so that the OMAP FB driver options are
presented correctly.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The bootloader may lock the flash device upon booting.  This requires
the use of 'flash_unlock' on each partition before using them.

However, when booting from flash the MTD driver is unable to "mark
space as dirty" since the device is locked.  This results lots of boot
warnings from the MTD layer.

The MTD driver for OMAP needs to unlock the device during init so
booting from flash can work without errors.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

omap24xxcam_device_unregister expected the argument to be its own
device structure but it's actually that of its slave.

Also get master from slave's structure in omap24xxcam_device_register.
Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Set slave's master before master's attach call.

The master also now gets its own pointer from slave's structure.
Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add watchdog timer support for TI OMAP3430.

Fix clk_put functions mismatch in the release fn which would crash the kernel if
the WDT test is run multiple times with "CONFIG_WATCHDOG_NOWAYOUT" disabled.

Fix the shutdown function.Check for wdt users before calling disable.
Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>

Updated for path change to drivers/watchdog.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Adds default config file for MISTRAL's OMAP2430 OSK Board

All Credit and Thanks to Mistral's 2430 OSK Team
Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Adds minimal booting support for MISTRAL's OMAP2430 OSK

All Credit and Thanks to Mistral's 2430 OSK Team
Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Host fixes to follow.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Misc compile fixes after updating to current mainline tree
Signed-off-by: Tony Lindgren <tony@atomide.com>

Merge branches 'master' and 'linus'

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-h3.c
	arch/arm/mach-omap1/board-nokia770.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.c
	arch/arm/mach-omap2/board-h4.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/nwfpe/entry.S
	arch/arm/plat-omap/Makefile
	drivers/char/watchdog/omap_wdt.c
	drivers/char/watchdog/omap_wdt.h
	drivers/i2c/busses/i2c-omap.c
	drivers/i2c/chips/menelaus.c
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/media/video/Kconfig
	drivers/media/video/Makefile
	drivers/media/video/tcm825x.c
	drivers/media/video/v4l2-int-device.c
	drivers/mtd/onenand/onenand_base.c
	drivers/usb/gadget/Kconfig
	drivers/video/Makefile
	include/asm-arm/arch-omap/board-2430sdp.h
	include/asm-arm/arch-omap/hardware.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/omap24xx.h
	include/linux/connector.h