Conflicts:
	arch/arm/mach-tegra/board-ventana-power.c
	drivers/mfd/tps6586x.c

Change-Id: Ic8c46d4251d6e71fa2900b7e876f87e256299bc4

Conflicts:
	drivers/usb/gadget/composite.c

Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1

Following are changes:
- Removed the tx workqueue and start next trsnafer in tx dma
 complete callback only.
- Remove the wait for tx fifo empty before starting next transfer.
  The uart controller req dma/gen interrupt only when trigger level
  reached.

bug 765172

Change-Id: I1cc9c528451c7d0f733c16c8b64ca79cdab31d64
Reviewed-on: http://git-master/r/12697
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

commit a5880a9e5bb40fbae55de60051d69a29091053c3 upstream.

Previous baud rate setting code only has been tested with 3.5M/9600/
115200/230400/460800 bps, and recently we got a 3M bps device to test,
which needs to modify current MUL register setting, and with this
patch 2.5M/2M/1.5M/1M/0.5M should also work as they just use a MUL
value scale down from 3M's.

Also got some reference register setting from silicon guys for
different baud rates, which tries to keep the pre-scalar register value
to 16.

Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Use resources to pass data to tegra_hsuart to set
mapbase, irq.

Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>

Move the flush_work outside of stop_tx, do it during suspend and
shutdown instead.  Move the tty portion of the tx work into
the dma complete callback, and only handle polling on the fifo and
then requeuing the dma in the work function.

Change-Id: I56db6504d35e5e7019379dc8a4323b4a27c72e59
Signed-off-by: Colin Cross <ccross@android.com>