ASoC: tegra: whistler boot failure

whistler not booting because switch device required
by jack driver not initialised

Change-Id: I447a9fd179f08f38fc9e2444650ce7511d2092ee
Reviewed-on: http://git-master/r/22993
Tested-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

video: tegra: dsi: Added dsi support.

Bug 793366
Bug 794499

Change-Id: Id49d86dd7760b75ef4947f5bdab9e37f0333391d
Reviewed-on: http://git-master/r/#change,18950
Reviewed-on: http://git-master/r/22508
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

video:tegra:nvmap: Allow mapping uc/wc memory as wb.

Bug 786016
Change-Id: Ic72c57b710a305851dfea3dda3eb217156683b39
Reviewed-on: http://git-master/r/17795
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

spi: tegra: slink reset for error

Whenever the error or timeout happen,
slink controller needs to be reset.
This is applied when tegra spi is
used as slave.

This change will disable rx/tx path, then,
clear BSY bit by slink controller reset
in case time out happens.

Bug 775644

Change-Id: I966ab1979b4934aebf163c59db7839c0d838cfd3
Reviewed-on: http://git-master/r/22928
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>
Tested-by: Min-wuk Lee <mlee@nvidia.com>
Reviewed-by: Amit Kamath <akamath@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

crypto: tegra-aes: enable/disable irq per request

Change-Id: I7d8fe24ab5aa914fc2753f256eec261fcbf746bc
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/22594
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

Revert "Revert "crypto: tegra-aes: performance improvements""

This reverts commit 8bc4f710e981d53a9bd161c6c054241231e09149.

Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Change-Id: I0497afd3ec54e7b835de37e9941b2418e3dad4e3
Reviewed-on: http://git-master/r/22963
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

[arch/arm] whistler: Add KEY_MENU support

BUG 780067

Map row 2, column 1 to KEY_MENU

Change-Id: I120ea7714111e129c3ec330c70592cc292dbba7a
Reviewed-on: http://git-master/r/21737
Reviewed-by: Wen Yi <wyi@nvidia.com>
Tested-by: Wen Yi <wyi@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

[ARM] tegra: Enable EMC scaling

Frequency tables added for memory.
Enabled memory tables used for EMC scaling.

Bug 786376

Change-Id: I8f9713dac7950db4a42dac4f32d8908434c18be1
Reviewed-on: http://git-master/r/22578
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

merge: Update USB naming from upstream

Change-Id: Ib6484eb5dbc4f05acb8db4762c0d156bb211b351
Reviewed-on: http://git-master/r/22166
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

[ARM] tegra: set pm_power_off to whistler routine

for whistler, implement pm_power_off with max8907c's power off routine.

Bug 799957
Bug 800602 (Cold boot)

Change-Id: I003547d55a4203f2d04ba0086199b61d05936563
Reviewed-on: http://git-master/r/22388
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

ARM: ventana: Support mic jack detection

Configured wm8903 codec on Ventana board to enalbe mic jack detection.
Instead of interrupt, set GPIO4 as a generic gpio pin to output Mic Bias
Current Detection result.

fixes bug 766757

Change-Id: I9062d06c594dc9f9b2eea76eaefc83c26107117f
Reviewed-on: http://git-master/r/22038
Reviewed-by: Chao Jiang <chaoj@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>

[tegra ALSA] Enable mic jack detection

Added support on Mic jack detection on Tegra.

- External mic jack detection could be probed by trigger an interrupt
  via specific gpio or pull-up a generic gpio pin. The patch enabled the
  later option.

- Tegra reference boards have gpio to switch external mic and internal
  mic. The switching is done in the patch automatically once jack
  happened.

fixes bug 766757

Change-Id: If530f237d4564d1de6c019b206910f2a0ffe4163
Reviewed-on: http://git-master/r/22033
Reviewed-by: Chao Jiang <chaoj@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>

Revert "mfd: tps6586x: add suspend/resume handlers"

This reverts commit d64db664f2e8d6f4d08db249135011e32d54bc7a.

Change-Id: I8de61440cbbe5a12f8cf2d045e7035b9a0ab7369
Reviewed-on: http://git-master/r/22775
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

[tegra/ventana] Enable PPP and USB serial driver

This is served as an integration of follow commit:
d4d4296df579488a0df39266ce43b5b5c61d7b5d

Enable PPP and USB serial driver used by huawei EM700 modem.

Bug 721467
Reviewed-on: http://git-master/r/8471

Change-Id: I3f21bdbf031f31520d7526528c8bc64478e8d681
Reviewed-on: http://git-master/r/22437
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>

misc: tegra-crypto: do not specify any key when using ssk

if no key is specified then tegra-aes uses ssk by default

Change-Id: Ia8f806a6822813d05f4d310b95676b058fd0c8cc
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/22163
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

[ARM]: tegra: add support for mc/emc bandwidth statistics

provide a mechanism to perform statistical sampling of the
memory controller usage on a client-by-client basis,
and report the log through sysfs

original work by: gking@nvidia.com

Change-Id: I5d7f357af0353c55e14026b036ccf7e448df643b
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-on: http://git-master/r/20383
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

Revert "crypto: tegra-aes: performance improvements"

This reverts commit a8dbfda58a6980976de60ba46f22a5f0b2ecab5f.

Change-Id: I70407c45cc5605ad9924a5a1145e18371dc9d2ef
Reviewed-on: http://git-master/r/22554
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

[ARM]: tegra: add a clock entry for h/w statistics monitor

Add a PERIPH_CLK for hardware statistics monitor of Tegra2.
This will enable to call standard clk* APIs to enable/disable/reset
the statistics monitor.

Change-Id: Ic7050ba8af6c7ed39744b65dfb953ba029deb2ea
Reviewed-on: http://git-master/r/17674
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Amit Kamath <akamath@nvidia.com>
Tested-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

mfd: max8907c: Add api to power off max8907c

Add an api to power off max8907c by setting power off bit in RESET_CNFG reg.

Bug 799957
Bug 800602 (Cold boot)

Change-Id: Ie0206d684a86fecc75273c1d3b087bb2d47b4c56
Reviewed-on: http://git-master/r/22385
Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

crypto: tegra-aes: performance improvements

- set the key only at the start of encrypt/decrypt operations
- avoid using mutex in handle_req, since it is already serialised
- sanity checks while setting the iv

Change-Id: I026e138f59d661cd705db6820bed63e5e15f02c5
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/22162
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

fix build: max1749.c was erroring during a local make

If built with android, which uses the O=... option, this file compiles
fine, but if you try to just use 'make', there was a build error.

Change-Id: I09f0233c2bf933278c34a7ec5e7fcc17cabc1ede
Reviewed-on: http://git-master/r/22274
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

sdhci-tegra: use tasklet for card detection

If remove/insert sdcard continuously, kernel panic happened
due to lock up at sdhci_card_detect_callback(). The problem
was that sdhci_card_detect_callback() being called from
interrupt context. This code uses interfaces that cannot be
called while the kernel is atomic (no scheduling). With
using tasklet rather than directly call, detection call will
be scheduled. So tasklet will make sure of serialization for
card detection interrupt calls.

Bug 783446

Reviewed-on: http://git-master/r/16884
(cherry picked from commit a991cb2311799116f17504e137d0672650643ea6)

Change-Id: I4249e9e7becd9b5c0a4594b5cca6e5b5dc2184a4
Reviewed-on: http://git-master/r/21741
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

whistler: enable GPIO mode for GPIO_PC6

This is to fix touch interrupt storm issue to get LP2 back.

Change-Id: I440ba3af5d4c935642cc4aa63b1ca55bc24997c2
Reviewed-on: http://git-master/r/22332
Reviewed-by: Peter Zu <pzu@nvidia.com>
Tested-by: Peter Zu <pzu@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

merge: Fix merge

See:
commit 1c7ef350b68445758966f6acf0f4f8a62f4a8e75
Author: Erik Gilling <konkers@android.com>
Date:   Fri Feb 18 16:24:37 2011 -0800

    video: tegra: de-assert reset after clocks are turned on

    In underflow recovery, if the clocks are not enabled when the dc is brought
    out of reset writes to the DC will sometimes hang.

Change-Id: I6f741962e74cb076dccc60e0f444d66067fa570c
Reviewed-on: http://git-master/r/22308
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>

ARM: defconfig: Update whistler power features

EMC Scaling will need the proper memory tables, but those will be added
later.

Change-Id: Ic452a704ea2a345381c70b4f0c70ac289ed5c073
Reviewed-on: http://git-master/r/22136
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Peter Zu <pzu@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

[ARM] tegra: pinmux: Correct driving strength programming offset

Offset of driving strength for DRVUP is 20 instead of 12.

Change-Id: If886a8604ea43f57a8ae11d3deabb022fb8d3efd
Reviewed-on: http://git-master/r/22133
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

video: tegra: dc: Increasing the Pixel clock to achieve 60 FPS.

Bug: 792248

Change-Id: I4094a203e376fedfc35d3e983e9e44ef3bba2b1e
Reviewed-on: http://git-master/r/21649
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

ARM: ventana: Support built-in speaker

Set up the gpio pin to drive amplifier. Internal speaker is functional
by adding the configuration.

fixes bug 766757

Change-Id: I0f5221fc766e99715ed0dcca8872fb5d78f9680a
Reviewed-on: http://git-master/r/21986
Reviewed-by: Chao Jiang <chaoj@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>

crypto: tegra-aes: do not track ssk slot

ssk slot is write-locked so the driver should not
track in its free slot pool.

Change-Id: Ibf04a949a2894ef2c41851e7e92c13901c873bf2
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/22161
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

merge: trivial updates resolved from upstream

* Move include/linux/tegra_usb.h to
  include/linux/platform_data/tegra_usb.h

Change-Id: I5b7799c5af8029b15ad206978718b337afac8814
Reviewed-on: http://git-master/r/22165
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>

crypto: tegra-aes: set vde clock to max in _probe

Change-Id: I41ba8dfc193b346eda522eadfb0f9035f4d838f8
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/22160
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

[ARM/tegra] pinmux: improve code generation

Move offset addition to improve code generation for pg_readl and
pg_writel.  The IO_TO_VIRT macro ideally wants a constant argument.

Change-Id: I439aa7a91270ab7139dac6e6b83126fe2077878b
Reviewed-on: http://git-master/r/4545
(cherry picked from commit 28e16c0b27d120ae789ece0f4ddd84f54e05828d)
Reviewed-on: http://git-master/r/21740
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

ARM: tegra: ventana: Add power management to cameras.

Before this change, the Ventana code was lacking power management support for camera.

bug 782390

(cherry picked from commit 70b959550092afb17da3be33be7daef562b23baa)

Change-Id: I00c4c0a5c4f032c8539de61d43647e512b2aa0e6
Reviewed-on: http://git-master/r/22111
Reviewed-by: Narendra Damahe <ndamahe@nvidia.com>
Tested-by: Joseph Lehrer <jlehrer@nvidia.com>
Reviewed-by: Patrick Shehane <pshehane@nvidia.com>
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

cleanup: Change source file permissions to 0644

Change-Id: Id030cc94db62c9dcaa79a2ddd7c034ac9f9adc61
Reviewed-on: http://git-master/r/21803
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

video: tegra: Clean up nvhdcp from upstream merge

Change-Id: I8d396047e663995651c7e60253294d95c61e325b
Reviewed-on: http://git-master/r/21295
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

ARM: Tegra: Ventana: Add config data for wm8903

Set up gpio pins for WM8903. In these pins, GPIO_3 will be used to drive
the amplifier for internal speaker.

fixes bug 766757

Change-Id: I99c63c50cf184633c8c78987187bb823d3d813fd
Reviewed-on: http://git-master/r/21197
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

tegra hsuart: Clean tx_bytes in tegra_flush_buffer

tx_bytes might contain amount of bytes which should
be transmitted after next "tx empty" interrupt.
If we clear xmit circular buffer, tx_bytes should
also be set to 0, otherwise it will lead to crash
in fill_tx_fifo.

Bug 794635

Change-Id: Ia34aba33dd09730c8f91d19e5c103cf1060a357e
Reviewed-on: http://git-master/r/21844
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

usb: fsl_udc: update vbus status before clock is disabled

When the device cable is disconnected, vbus status
must be updated before disabling the clock.

Bug 796339 779952

Change-Id: Ib310028c5ae357a6fae63594892efca2352cff7a
Reviewed-on: http://git-master/r/21890
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

[tegra ALSA] Support built-in speaker

Added support for built-in speaker. Although audio subsystem on
different boards have various topology, Tegra boards usually have
amplifier connected to codec. The patch added a control interface to
expose speaker control widget to user space. Amplifier could be driven
automatically if internal speaker turned on.

fixes bug 766757

Change-Id: Ic6b8d0c58830a71ff8d6c09d1268cbd97982d08b
Reviewed-on: http://git-master/r/21985
Reviewed-by: Chao Jiang <chaoj@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>

[ARM]: tegra: ventana: correct MCLK1 source from OSC to PLLA_OUT.

Current MCLK is output with 12Mhz rather than 11.2896Mhz. Fix it by
pinmux modification.

Bug 796690

Change-Id: I20399ad14c4a8a5e14ac82f31325523a0bac9727
Reviewed-on: http://git-master/r/22044
Reviewed-by: Ching Kuang (Roger) Hsieh <rhsieh@nvidia.com>
Tested-by: Ching Kuang (Roger) Hsieh <rhsieh@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>

ARM: Tegra: Defined ARCH_NR_GPIOS for tegra chip

The default value of ARCH_NR_GPIOS is defined to 256. That is not enough
for Tegra based board such as ventana. Ventana has 224 gpios on Tegra
soc and other gpio expanders like PMU and audio codecs. Extended GPIO
numbers to make external gpio pins work.

fixes bug 766757

Change-Id: Iaa4dba1881bc9824151e99976308d7dadba752d2
Reviewed-on: http://git-master/r/21199
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

[ARM] tegra: ventana: use emc chips while initializing emc

tegra_init_emc() has been updated to use emc chips to support
generic memory vendor matching. Convert current emc tables to
use emc chips.

Change-Id: Idfee6b903352669d7b04dae897cb848c6a8c26a6
Reviewed-on: http://git-master/r/22042
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Amit Kamath <akamath@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

spi: tegra: Fixing misc issues.

Following are the fixes;
- Supportng half duplex.
- Only using SW based CS.
- Write to readback with command register does not work. Fixing issue.
- Using cpu based transfer for smaller size and dma based for larger size.
- reading proper transfer status after every transaction.

bug 791149
bug 791780

Change-Id: I293b3f1b571276f5d8fe4ad4da67f827926e4b73
Reviewed-on: http://git-master/r/20581
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Amit Kamath <akamath@nvidia.com>

ARM: Tegra: Ventana: Add WM8903 gpios for ventana

Add gpio-pin definition for ventana board.

Change-Id: I7ad80fcc630a837ad022faa8bd3cf88dd7aa9c83
Reviewed-on: http://git-master/r/20894
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Chao Jiang <chaoj@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>

[tegra] huawei EM770 modem support

Added EM770 vendor and product id in usb serial driver.

Bug 721467

Reviewed-on: http://git-master.nvidia.com/r/8385
(cherry picked from commit 7e5e54136472ab0170eeb5d9c1992ffed9bb0920)

Change-Id: Ib23a5f8f6a0eb9659cc8c58b55d6f73500b17918
Reviewed-on: http://git-master/r/21739
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

[ARM] defconfig: update tegra defconfigs

This is identical to the current tegra_defconfig, but in 'make
savedefconfig' format.

I'm also updating tegra_android_defconfig, which is already in this
format. We should be moving android development to this file, and
leaving tegra_defconfig without android options selected.

Change-Id: Iab52d4cd5181a84ca0b3047c7af4d17907f134d4
Reviewed-on: http://git-master/r/21777
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Janne Kiviluoto <jkiviluoto@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>

Invensense: simplify Kconfig

This change makes the choices optional, and removes redundant entries.
With this change, the minimal defconfig format doesn't want to always
build the mpu3050 as a module.

Change-Id: Ic6dc65e982bc59671e27adbce257bf14bc97777c
Reviewed-on: http://git-master/r/21776
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@nvidia.com>

[Ventana/Whistler] Correct initial PLL_A freq

Initial PLL_A frequency setting was wrong in Ventana and Whistler
board files. It was working because bootloader initialized PLL_A
already.

Tested on Ventana, bug 798828

Change-Id: I3d0cf9d3afe336a1c8dd4b3144bab313beca011a
Reviewed-on: http://git-master/r/21603
Reviewed-by: David Schalig <dschalig@nvidia.com>
Tested-by: David Schalig <dschalig@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36

Conflicts:
arch/arm/mach-tegra/include/mach/system.h
arch/arm/mach-tegra/include/mach/usb_phy.h
arch/arm/mach-tegra/usb_phy.c
drivers/usb/host/ehci-tegra.c
drivers/video/tegra/dc/dc.c
drivers/video/tegra/dc/hdmi.c
include/linux/tegra_usb.h

Change-Id: Ic1f4f2b360893e8de6b867a8ecc239aca02367da

ASoC: WM8903: Ignore no-touched pin explicitly

Ignore no-touched pins. This will help to set up gpio pins safely.

Change-Id: Iff9f3249b9e3594ede5c75cce59f38c2ad432f92
Reviewed-on: http://git-master/r/20895
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

ASoC: WM8903: Expose gpio pins via GPIOLIB

Exposed gpio pins on wm8903 via GPIOLIB. This will help ALSA control
drivers to manipulate the codec much more easier.

Change-Id: I070eafa6e9a533cc0c285c1780d1b8393105def1
Reviewed-on: http://git-master/r/20883
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

ASoC: WM8903: Add debugfs entries for wm8903

Added debugfs entries for wm8903.

Change-Id: I2b2801381a2e82fc4b8929853ba9653569059e33
Reviewed-on: http://git-master/r/20880
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

ARM: tegra: ventana: disable regulators kept on by the bootloader

Linux kernel has a standard way to handle this, which is to
call regulator_has_full_constraints(), which will make the
regulator core at late_init time disable any regulators that
don't have a reference count and are enabled in hardware.

Change-Id: Ibd6d87be7ef0bf0218ab948806ddb1e7beffb251
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/21108
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

bluetooth: Fixed ld mismatched symbols

The driver data structure referenced a function point which is defined
as __init data. This caused symbol mismatch error. This could be fixed
by defined driver data with __init macro, otherwise, by cancel __init on
probe function. Have this done in a safe way.

This file is removed in upstream. It seems that is the only chance to
fix it in our own repository.

Change-Id: I3eba3578c84d8ec67707a276841d72f98c47267d
Reviewed-on: http://git-master/r/20931
Reviewed-by: David Schalig <dschalig@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>

Kernel driver for SSL3250A flash/torch camera device.

Change-Id: Id5cb40c9823c7fcfd26e45e4608c45b16a2d431a
Reviewed-on: http://git-master/r/21351
Reviewed-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com>
Tested-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-by: George Bauernschmidt <georgeb@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

Revert "[ARM] tegra: HACK Enable uart and clocks in uncompress.h"

This reverts commit a8ba61048eb502231d9cd7cd20f4223941c9510f.

UART enable request should be handled by bootloader.

bug 775099

Change-Id: Ide7edf12daba80f831918e6e2d6e253667cf4820
Reviewed-on: http://git-master/r/21330
Tested-by: Peter Zu <pzu@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>

[tegra alsa] reset vmid and bias for wm8903

reset vimd and bias registers for wm8903 codec when codec bias level
is off.
fix for bug 773327

Change-Id: Iad67afef69f8c016b5f732947ad991c400cb7fd4
Reviewed-on: http://git-master/r/20934
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Tested-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

ARM: tegra: add generic memory vendor matching

Update tegra_init_emc to provide generic memory
vendor matching.  Read values from EMC_MRR_0, to
uniquely identify memory types and compare them
to table of memory passed in.

Change-Id: Ie116fa6f497076149c87ff6c0ae0621309bac65f
Signed-off-by: James Wylder <james.wylder@motorola.com>

ARM: tegra: Use readl/writel_relaxed for reset

tegra_assert_system_reset is called after the cache is disabled.
Calling writel will cause the PL310 store buffers to be drained,
which requires taking a spinlock.  Taking a spinlock is not safe
after the caches are disabled.  Convert to readl_relaxed and
writel_relaxed.

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

Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36

Revert "tegra: host: move stale wait checking into the kernel"

This reverts commit 2d49bf33f3885aab293f12d54447f66e911e3226.

video: tegra: dc: Fix hang in dc reset

When DC(Display controller) meets underflow,
DC needs to be reset to recover this,
but in several resets, it hangs.
To avoid this,
- Set DC STOP mode ahead of DC reset assert
- Off read host bus by DC ahead of DC reset
- In DC0 reset period, to avoid DC1 access
and vice versa
- In reset worker, do not try to off host1x

Bug 785529
Bug 789567

Change-Id: I26f40240cd60b83133309b36f61223336e9b3a41
Reviewed-on: http://git-master/r/20769
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

tegra-alsa: return accurate pcm pointer position

Bug 793968

Change-Id: Ia4ee5a83d18b409dd223f70fb1a5a78fad16a08e
Reviewed-on: http://git-master/r/20403
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

usb: fix the order of the device id defined in the ncm driver

Bug 776360

Change-Id: I78bb82071a21ef314285a50dd753652d7925cbb7
Reviewed-on: http://git-master/r/20493
Tested-by: Szming Lin <stlin@nvidia.com>
Reviewed-by: Udaykumar Rameshchan Raval <uraval@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

video: tegra: flush flip work queue upon controller disable

When display controller is being disabled, some scheduled flips
may still be pending in a work queue. Do not lose them.

Change-Id: I043fce583d44bb962494e6625a5c28675498fb55
Reviewed-on: http://git-master/r/20580
Reviewed-by: Jihoon Bang <jbang@nvidia.com>
Tested-by: Jihoon Bang <jbang@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Michael Frydrych <mfrydrych@nvidia.com>

ventana: Changing bits per pixel to 32.

Updated bits per pixel for ventana to 32.

Fixed bug 796836

Change-Id: I8b4dfff8e0e8a9179e4b345168e661db9b955f3f
Reviewed-on: http://git-master/r/21015
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>

[arm]:tegra: Add the code to change driver strength

Add the code to change drive strength of individual pin group and
increase the drive strength to max for i2c pin group. Change the
i2c pin to pull up.

Change-Id: I9ab84717a9ff6df78fa6c242420744d05ce09723
Reviewed-on: http://git-master/r/20745
Tested-by: Alok Chauhan <alokc@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

mfd: tps6586x: add suspend/resume handlers

if the system is woken by an alarm, tps' irq handler
gets called and it tries to communicate on i2c. i2c adapters
resume later which causes communication failures in tps' irq
handler. the right way is to disable tps' irq while suspending
in order to avoid such i2c communication failures.

Change-Id: I8487c8b9039d2736acf66e8b02463658428bd5a3
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/21099
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

arm: tegra: dma: Api for getting transfer count

Adding api for getting the amount of data trsnaferred by dma.

Change-Id: I348b8a2f0f855165fb1bf74f0d9013faa97056e7
Reviewed-on: http://git-master/r/20377
Tested-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

max8907c rtc: support wake alarms

This change allows rtc alarms to wake the system.

Change-Id: I2a7212fe7cc02b08893fe3a37824b0d39a9f5386
Reviewed-on: http://git-master/r/20101
Tested-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

max8907c mfd: Add wake irq capability

This change allows the max8907c to wake the system when receiving an
irq.  It also masks all non-wake conditions from causing an irq when
going into suspend and unmasks these conditions when resuming to not
cause spurious wake-up events.

Change-Id: I5eadb929ff4aded8a6ec11426ab424f0f692c042
Reviewed-on: http://git-master/r/20100
Tested-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

[arm/tegra] Check null pointer in suspend.c

In tegra_suspend_enter, we need to check mask() and unmask() for null
before calling them, since there is no guarantee irq chips other than
tegra will implement these functions.

Change-Id: Ia6cb2c234983722bbe1202ec84eaceaf22a13450
Reviewed-on: http://git-master/r/20099
Tested-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

fsl_udc: Enable zlp for control endpoint

Fix for sending zero length packet on control endpoint when
transfer size is multiples of MAX packet size.

Bug 793731

Change-Id: I0839f81e575f79515d14abe54ca7b30b7139e63d
Reviewed-on: http://git-master/r/20850
Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com>
Tested-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com>
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Shail Dave <sdave@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36

tegra: host: move stale wait checking into the kernel

The kernel now receives wait tracking data (similar to gathers and
relocs) and compares the current syncpt with the threshold value.

If it's old, it gets a kernel mapping and rewrites the method data
to use a kernel reserved syncpt that is always 0 (so trivially pops
when seen by the HW).

Patch has dependency to the user-space patches

Submitted on behalf of: Chris Johnson <cjohnson@nvidia.com>
original work by: Chris Johnson <cjohnson@nvidia.com>

Change-Id: I4d4e5d3b49cab860485c4172f87247f5b4f5ea6e

Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

tegra: usb: ehci: Handling for hsic phy rx error

Increased timeout values to maximum safe values
BUG 791857

Change-Id: I15b19338660b402b5d797dba9680f19176ca684d
Reviewed-on: http://git-master/r/21233
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>

usb: host: Renamed USB_TEGRA_HCD -> USB_EHCI_TEGRA

Change-Id: I2eec79186d6dc258caa2f3c8f3cd071222d1c5c7
Signed-off-by: Benoit Goby <benoit@android.com>

ARM: tegra: select USB_ARCH_HAS_EHCI

usb_phy now depends on USB_ULPI_VIEWPORT

Change-Id: I5f3c996b41b50e74aa2b53eb246e100926108bff
Signed-off-by: Benoit Goby <benoit@android.com>

usb: do not force select has_ehci for tegra

Change-Id: If6219a3ba9671a2c4c10b35461e1cc2ffe50ab0a
Signed-off-by: Benoit Goby <benoit@android.com>

ARM: tegra: use generic ulpi operations

Change-Id: I5b56a8a1b10532683accfe885387afb309b26b19
Signed-off-by: Benoit Goby <benoit@android.com>

usb: otg: Add ulpi viewport access ops

Add generic access ops for controllers with a ulpi viewport register
(e.g. Chipidea based controller).

Change-Id: I53d50857d4716f8df708af199ad1def1ff9d4beb
Signed-off-by: Benoit Goby <benoit@android.com>

usb: host: tegra: Cleanup before sending upstream

Change-Id: I846d43b1ecbe6c726f024b6a0fb318d6300a3746
Signed-off-by: Benoit Goby <benoit@android.com>

ARM: tegra: usb_phy: Fix return values

Changed frequency table into a struct

Change-Id: I202f808b912ce61e1f804103ea6d1197a57c1e62
Signed-off-by: Benoit Goby <benoit@android.com>

ARM: tegra: usb_phy: Cleanup before sending upstream

Change-Id: I2548ca931f8ae37757115b7753d520d576bb173d
Signed-off-by: Benoit Goby <benoit@android.com>

usb: otg: tegra: Moved tegra_usb.h to include/linux/platform_data

Change-Id: I201b6476979f6e1ef8ffadb4398b99a1728f3083
Signed-off-by: Benoit Goby <benoit@android.com>

usb: host: Moved tegra_usb.h to include/linux/platform_data

Change-Id: Ic093d07858eb6e27aae9cd04d4c59407b5b1d76d
Signed-off-by: Benoit Goby <benoit@android.com>

Revert "usb: host: ehci-hcd: add controller_resets_phy quirk"

This reverts commit 2c7d591aa11086ba841f8712b7cee33e245b62f6.

Change-Id: Ic9994dafc424e16d5d8251c287f8be65832b611b

serial: tegra_hsuart: Clean-up FIFO flush and set baudrate operations.

Do necessary waits and fifo clear according to NV. Also use 115200
as the rate set while bringing-up rx dma during init, to decrease
start-up time.

Change-Id: I5211c75607cf2880ab2b1c22ab30f2c265534a1c
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>

tegra: usb: ehci: Error handling for hsic phy rx error

Implementation of recover function for hsic phy rx error.
BUG 791857

Change-Id: I9d8f52335d70aa592ce509974e0e2d8cc7b83329
Reviewed-on: http://git-master/r/21202
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36

Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/fuse.h
arch/arm/mach-tegra/kfuse.c
arch/arm/mach-tegra/tegra2_clocks.c
drivers/video/tegra/dc/Makefile
drivers/video/tegra/dc/hdmi.c
drivers/video/tegra/dc/hdmi.h
drivers/video/tegra/dc/nvhdcp.c

Change-Id: I60a025d9e23e0699afcfaf9e3e42a98263cd7de8

Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Change-Id: Ie01fff1ceddfbada480ef2928ac4791853787a49

video: tegra: hdmi: enable wakeup on hotplug

Change-Id: Idbb3f81c3c2d8a4f7f6b76736e11dd07cdd3a413
Signed-off-by: Erik Gilling <konkers@android.com>

video: tegra: hdcp: move call to hdcp suspend out of atomic context

Change-Id: I62a9d810637df221862898536f990eda77e50644
Signed-off-by: Erik Gilling <konkers@android.com>

video: tegra: hdmi: fix vic detection for avi infoframe

typeo was causing 1080p VICs to never be populated

Change-Id: Idde037cf0d4b71370cff7e65a2135b8c60a91fa0
Signed-off-by: Erik Gilling <konkers@android.com>

video: tegra: de-assert reset after clocks are turned on

In underflow recovery, if the clocks are not enabled when the dc is brought
out of reset writes to the DC will sometimes hang.

Change-Id: If37de79f755196550018f94080ab2beed84ca326
Signed-off-by: Erik Gilling <konkers@android.com>

Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

ARM: tegra: fuse: Fix bug in get_spare_fuse

get_spare_fuse was calling tegra_apb_readl and passing an
offset, but tegra_apb_readl requires a physical address.
Fix it by calling tegra_fuse_readl instead, which takes
an offset.

Fixes a crash booting on A03 parts, where get_spare_fuse
is used to determine the difference between A03 and A03
prime.

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

Merge remote branch android-2.6.36 into android-tegra-2.6.36

Change-Id: I1d7f83e8eb433df8076a9d636ff03e174a3ff581