Conflicts:

	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-davinci/Kconfig
	arch/arm/mach-davinci/Makefile
	arch/arm/mach-davinci/board-evm.c
	arch/arm/mach-davinci/clock.c
	arch/arm/mach-davinci/clock.h
	arch/arm/mach-davinci/gpio.c
	arch/arm/mach-davinci/id.c
	arch/arm/mach-davinci/io.c
	arch/arm/mach-davinci/irq.c
	arch/arm/mach-davinci/serial.c
	arch/arm/mach-davinci/time.c
	arch/arm/mm/Kconfig
	drivers/i2c/busses/Kconfig
	drivers/i2c/chips/Kconfig
	drivers/ide/ide-proc.c
	drivers/net/Kconfig
	drivers/rtc/Makefile
	drivers/usb/musb/plat_uds.c
	include/asm-arm/arch-davinci/common.h
	include/asm-arm/arch-davinci/debug-macro.S
	include/asm-arm/arch-davinci/dma.h
	include/asm-arm/arch-davinci/entry-macro.S
	include/asm-arm/arch-davinci/gpio.h
	include/asm-arm/arch-davinci/hardware.h
	include/asm-arm/arch-davinci/io.h
	include/asm-arm/arch-davinci/irqs.h
	include/asm-arm/arch-davinci/memory.h
	include/asm-arm/arch-davinci/system.h
	include/asm-arm/arch-davinci/timex.h
	include/asm-arm/arch-davinci/uncompress.h
	include/asm-arm/arch-davinci/vmalloc.h

There was the case that multiple users can wait for completion.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

H4 board support now lists its tsc210x touchscreen/sensor/codec chip.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

This is mostly cleanup of the tsc210x patch, but some bugs were fixed so now
it works on tsc2101 too.  Also, a few issues are now noted in the code:

 Tool-reported:
  - Address checkpatch.pl issues in the original patch
  - And also "sparse" issues

 Previously wrong:
  - Cope with CONFIG_SOUND_MODULE
  - Register accessor routines will now return error codes
  - ... many callers now abort cleanly after errors
  - Don't depend on seeing only a rev #1 tsc2102 chip!
  - Add missing EXPORT_SYMBOL declarations

 Style issues:
  - BUG_ON() is strongly to be avoided
  - So are macros that capture variables
  - And needless casting from void pointers
  - And type punning
  - Use dev_*() for messaging where practical
  - Use u16 not uint16_t, etc
  - Various other whitespace issues
  - Avoid __FUNCTION__
  - Single-lines for file-top comments; no whole paths

 Object code size and Other cleanup:
  - Compile most strings out unless -DDEBUG is configured (saving space)
  - Move some code into exit sections (then it may well vanish, saving space)
  - Add some header comments

 Open issues:
  - Hwmon needs to know VREF and the chip type, and to scale its values
  - Upstream push should exclude audio until some version is working
  - Audio will needs to export symbols to modules, too
  - Lots of the I/O calls (especially audio) still don't handle errors
  - How could board init code get board-specific temp calibration data?

Also the Kconfig is more open-ended; tsc210x might in the future include the
tsc2100 and tsc2111, it doesn't need to be limited to tsc2101 and tsc2102.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Remove duplicate Menelaus Kconfig entry (omap tree only).

Fix Menelaus build error, and remove needless "#define DEBUG" (goes upstream).
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Don't assume only non-modular builds.  Just in case someone's crazy.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Remove bogus TSC_IRQ pinmux; it's not used, there's no pin
dedicated for touchscreen (or other TSC chip) purposes, and
this doesn't even look right for P20 (0x10b not 0x108, plus
an IRQ would need to be a GPIO i.e. mux 3 not mux 0).
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Otherwise host mode will not work when OMAP idles
Signed-off-by: Tony Lindgren <tony@atomide.com>

If musb_gadget_vbus_draw() also toggles a clock like tusb does,
USB clock will stay on after rmmoding a gadget driver. This
can block omap idle states.

Also handle disconnect as b_idle so that musb_gadget_vbus_draw()
gets called.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix ambiguous else warning
Signed-off-by: Tony Lindgren <tony@atomide.com>

In OTG mode VBUS draw mA can be 8mA which can be less than
musb->min_power. When connected as OTG device, tusb does not
keep osc_ck enabled without this patch.
Signed-off-by: Tony Lindgren <tony@atomide.com>

In order to detect between tusb3.0 and 3.1, die id register
must be checked.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace channelNum with chnum
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wPacketSize with packet_sz
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bTx with tx
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wCsrVal with csr
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pRequest with request
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bRecip with recip
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bSetAddress with set_address
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bResult with result
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pControlRequest with ctrlrequest
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace MGC_pfDmaProgramChannel with dma_program_channel
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bMode with mode
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bDesiredMode with desired_mode
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bStatus with status
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace dwActualLength with actual_len
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace dwMaxLength with max_len
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pPrivateData with private_data
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pProcEntry with proc_entry
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bDelayPortPowerOff with delay_port_power_off
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pGadgetDriver with gadget_driver
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bTestMode with test_mode
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bTestModeValue with test_mode_nr
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bAddress with address
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bBulkCombine with bulk_combine
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bBulkSplit with bulk_split
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bIgnoreDisconnect with ignore_disconnect
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bIsMultipoint with is_multipoint
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pDmaController with dma_controller
Signed-off-by: Tony Lindgren <tony@atomide.com>