video: tegra: hdmi: enable wakeup on hotplug

Fixed bug 801542
Change-Id: I6ae1edf2a1d576a6f93ed483284e7f129aabc58c
Signed-off-by: Erik Gilling <konkers@android.com>
(cherry picked from commit b8fcb1733b0c5e6ea92c76fdb049e7b2fa2b9290)
Reviewed-on: http://git-master/r/24607
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Jessica Liao <jeliao@nvidia.com>

tegra: display: fb: fixing uninitialized values

fb_videomode_to_var doesn't fill out all the
members of fb_var_screeninfo. So, we need to
perform memset before calling the function

Bug 808273

Change-Id: I162ea2093262f074dcf5f917b40a5bbf4c79c34d
Reviewed-on: http://git-master/r/24430
Tested-by: Donghan Ryu <dryu@nvidia.com>
Reviewed-by: Jinyoung Park <jinyoungp@nvidia.com>
Reviewed-by: Jubeom Kim <jubeomk@nvidia.com>
Reviewed-by: Jessica Liao <jeliao@nvidia.com>
Tested-by: Jessica Liao <jeliao@nvidia.com>
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@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

Reviewed-on: http://git-master/r/22044
(cherry picked from commit 946380dfcffa007b7dcb7c976642108c483f4742)

Change-Id: I81511c79f6735f1b5ab6864f622cbab05757bba0
Reviewed-on: http://git-master/r/24300
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>

i2c: buses: tegra: use new cam_i2c slave controller

Use new cam_i2c slave (i2c2) instead of the legacy one.
With old i2c slave controller, occasionally it generates
spurious slave interrupts causing disruptions in i2c transfers.

BUG 790315

Change-Id: Ibae39784340fe2ae7e8f1205fd7f8b8691e04a0b
Reviewed-on: http://git-master/r/24287
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

ARM: tegra: Power-gate PCIE at system init.

PCIE on tegra2 is diabled by default. Power-gate this block to
save power.

Bug 800450

Reviewed-on: http://git-master/r/23683
(cherry picked from commit c3996d0fb0484eefc32ecb5cd49de4555c12f26f)

Change-Id: I4f24e1de3564215b99a98b254d4c9e32a7ba6edf
Reviewed-on: http://git-master/r/24251
Reviewed-by: Ching Kuang (Roger) Hsieh <rhsieh@nvidia.com>
Tested-by: Ching Kuang (Roger) Hsieh <rhsieh@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

i2c: buses: tegra: use new i2c slave controller

tegra2 has an improved new i2c slave controller. This should be
used instead of the old i2c slave controller. With old i2c slave
controller, occasionally it generates spurious slave interrupts
causing disruptions in master i2c transfers.

BUG 788286
BUG 804545

Change-Id: I6a74d8e474ed80db097f43c215afcb0b2d1ff45e
(cherry picked from commit 198622c27396dffdf7f99635fc3c6a54b4bb2e61)
Reviewed-on: http://git-master/r/24107
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Tested-by: Yu-Huan Hsu <yhsu@nvidia.com>

Revert "[ARM] tegra: Enable pl310 data prefetching and prefetch offset"

This reverts commit 6c77fdda35688ae3c9d9029a9824f7cf941f348d.

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

ARM: defconfig: enable correct ARM errata for Tegra.

Only Enable following ARM errata for Tegra because
AP20 is r1p1.

CONFIG_ARM_ERRATA_720789

Reverting other ARM errata added by
http://git-master/r/#change,23557

Change-Id: Ia8d64931431b19c0fb0c82491a66586c63f56121
Reviewed-on: http://git-master/r/23749
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

i2c-tegra: Using suspend_noirq()/resume_noirq() for suspend/resume.

I2C driver needs to be suspended late and resumed early than other drivers.
So, I2C driver uses the suspend_noirq/resume_noirq callbacks of struct dev_pm_ops
for early/late power management system.

Change-Id: I79747c374e7e5e3754c0a6fad8d78aa8e71dc6aa
Reviewed-on: http://git-master/r/23494
Tested-by: Jubeom Kim <jubeomk@nvidia.com>
Reviewed-by: Jinyoung Park <jinyoungp@nvidia.com>
Reviewed-by: Daehyoung Ko <dko@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

ARM: defconfig: enable ARM errata for Tegra.

Enable following errata for Tegra.

CONFIG_ARM_ERRATA_742231
CONFIG_ARM_ERRATA_720789
CONFIG_ARM_ERRATA_743622

Change-Id: I5963f3f1d68cca9f8f9fcef4e91302b3d8e859e9
Reviewed-on: http://git-master/r/23557
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

ARM: tegra: ventana: Fixed backlight toggling.

Ventana has both an internal panel (on fb0) and external HDMI (on
fb1). One of the devices might be blanked while another is unblanked.
In order for the backlight blanking logic to know whether to turn off
the backlight for a particular framebuffer's blanking notification, it
needs to be able to check if a given framebuffer device corresponds to
the backlight.

This implement the check_fb pwm_backlight hook to make the internal
panel's backlight only toggle on fb0 blank changes.

Making equivalent commit from http://git-master/r/21717

Fixed bug 798863

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

usb: ehci: tegra: sysfs ehci on/off interface permissions

Changing the sysfs ehci permissons as per new requirments.

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

[ARM]: tegra: fix APB DMA transfer timeout

In one bug report, the APB readl DMA transfer took up to 300mS. And
after apb_readl() has the timeout, the kernel crashed due to the NULL
pointer dereference.

In the apb_readl(), after the timeout the tegra_dma_req is destroyed at
the function return. But the DMA interrupt handler later will try to
delete the same destroyed DMA request link list node which will cause
the kernel crash.

Fix this by dequeue the DMA request if the DMA transfer timeout happens.

Change-Id: Ie1bd0082e1eb507b7f5098d5206797ff6110fe34
Reviewed-on: http://git-master/r/23413
Reviewed-by: Xin Xie <xxie@nvidia.com>
Tested-by: Xin Xie <xxie@nvidia.com>
Reviewed-by: Venkata (Muni) Anda <vanda@nvidia.com>
Reviewed-by: Shail Dave <sdave@nvidia.com>

usb: gadget: 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

Reviewed-on: http://git-master/r/21890
(cherry picked from commit 12969307ec39ddaf913b84628d1c192eb2e59dc8)

Change-Id: Idc98a816afd539acfd5add334535c1f298f58ff6
Reviewed-on: http://git-master/r/23127
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>

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

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

bug 804545

Reviewed-on: http://git-master/r/22133
(cherry picked from commit c59573a1ef6311fb6e864a3c6d6e64adf4859c9c)

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

ARM: tegra: ventana: camera: Set LDO6 to 1.8V

By default ldo6 is set to 2.85V. Ventana camera require it
 to set to 1.8V.

Bug 799890

Change-Id: Ib14d1b96de1c838834da171e4f3c1f85e5db2281
(cherry picked from commit 83fe26dfcb2b89076105a2d6c5dc84c87f9e1465)
Reviewed-on: http://git-master/r/23184
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
Tested-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

video: pwm_backlight: Add check_fb hook

In systems with multiple framebuffer devices, one of the devices might
be blanked while another is unblanked.  In order for the backlight
blanking logic to know whether to turn off the backlight for a
particular framebuffer's blanking notification, it needs to be able to
check if a given framebuffer device corresponds to the backlight.

This plumbs the check_fb hook from core backlight through the
pwm_backlight helper to allow platform code to plug in a check_fb hook.

Originally reviewed on http://git-master/r/21716

Change-Id: I2b2530e515227eaba246750b3cee7e61e882d14e
Reviewed-on: http://git-master/r/23100
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

backlight: add low threshold to pwm backlight

The intensity of the backlight can be varied from a range of
max_brightness to zero.  Though most, if not all the pwm based backlight
devices start flickering at lower brightness value.  And also for each
device there exists a brightness value below which the backlight appears
to be turned off though the value is not equal to zero.

If the range of brightness for a device is from zero to max_brightness.  A
graph is plotted for brightness Vs intensity for the pwm based backlight
device has to be a linear graph.

intensity
  |   /
  |  /
  | /
  |/
  ---------
 0 max_brightness

But pratically on measuring the above we note that the intensity of
backlight goes to zero(OFF) when the value in not zero almost nearing to
zero(some x%).  so the graph looks like

intensity
  |    /
  |   /
  |  /
  |  |
  ------------
 0   x  max_brightness

In order to overcome this drawback knowing this x% i.e nothing but the low
threshold beyond which the backlight is off and will have no effect, the
brightness value is being offset by the low threshold value(retaining the
linearity of the graph).  Now the graph becomes

intensity
  |     /
  |    /
  |   /
  |  /
  -------------
   0   max_brightness

With this for each and every digit increment in the brightness from zero
there is a change in the intensity of backlight.  Devices having this
behaviour can set the low threshold brightness(lth_brightness) and pass
the same as platform data else can have it as zero.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Arun Murthy <arun.murthy@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Richard Purdie <rpurdie@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: I1ee4d6a4d3cbce951a628539e740040f50ee6785
Reviewed-on: http://git-master/r/23099
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

arm: tegra: ventana: fix dc out bit depth

Set to 18bit which is what Ventana's panel expects.
Enabled ordered dithering for smoother gradients.

Bug 797698

Change-Id: Icfc7a9a9d27fc79c8b46cd1cf736d2447638e0ef
Signed-off-by: Ari Hirvonen <ahirvonen@nvidia.com>
Reviewed-on: http://git-master/r/22717
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

nvrm: 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).

Bug 519650
Bug 785525
Bug 803452

(cherry picked from commit 4069d8e67665624ad3dceb628e572980dd57acd0)

(cherry picked from commit 6e4336408588e348804a62e53386acc9abc06823)

Change-Id: I60374cb81318f9166e49aa2afca52c9d44d4a20e
Reviewed-on: http://git-master/r/23159
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

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

This reverts commit b514cec462faa2e29adc8c76e43acffcfca248f6.

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

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

This reverts commit 03bc8a7c8aec3ed2c2bbe60442df9d4789975f1f.

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

This reverts commit ea85e0c7a3a8a8b70478befb1fd7c9ff1d69821b.

Bug 791857

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

ARM: tegra: usb_phy: Setting USB_TXFILLTUNING for underrun issue

Setting the USB_TXFILLTUNING to 0x10, where as power on value
is 0x2. With this updated setting USB2 controller under run
are avoided. Setting this value after power_on and post_resume.
Bug 791857

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

Invensense MPU code update to v3.3.3

Cherry-pick changes from http://git-master/r/#change,22109

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

Invensense MPU code update to v3.3.3

Cherry-pick http://git-master/r/#change,22109

Change-Id: Ie74f9efef861c34006f1b16c162cb5c95941658f
Reviewed-on: http://git-master/r/22210
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@nvidia.com>

[ARM/tegra] : Invensense MPU code update to v3.3.3.

Update Invensense Motion Library (MPL) to production version
v3.3.3. Previous version was engineering release and is not
suitable for mass production. This version of the MPL most
notably fixes problems with suspend/resume where touch screen
would quit working during a suspend/resume cycle.

Cherry-pick from http://git-master/r/#change,22109

Change-Id: Ic2e138ee665453da4c3eaa386a1bec9abf81b7cd
Reviewed-on: http://git-master/r/22190
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@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.

original change: http://git-master/r/#change,21108
(cherry picked from commit 99282ebb0f484c1e9f5e0c78a8894adb7b6fe212)

Change-Id: I70dbd86dd164d2861583b983ff31c24e406ddcbb
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/22060
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

Change-Id: I13c78da7a2dd9d48d787e10c4b4b3e7f52f1a0cb
Reviewed-on: http://git-master/r/21666
Reviewed-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com>
Tested-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

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: I24b242425ba6d7e59ec649fe8f10b41ac3d0c091
Reviewed-on: http://git-master/r/22028
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>
Tested-by: Min-wuk Lee <mlee@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

tegra-alsa: return accurate pcm pointer position

Bug 793968

Change-Id: I257366d5e57739bbeb351b7fdf89655ad01cf6e1
Reviewed-on: http://git-master/r/21998
Tested-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Ravindra Lokhande <rlokhande@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.

Reviewed-on: http://git-master/r/20745
(cherry picked from commit fd642f7282df9b0e9ddcf0b66950dd3029910e35)

Change-Id: I6f4b5fb75daddc2418bcd9a8f392b852a9924ad0
Reviewed-on: http://git-master/r/22004
Reviewed-by: Alok Chauhan <alokc@nvidia.com>
Tested-by: Alok Chauhan <alokc@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

Reviewed-on: http://git-master/r/20850
(cherry picked from commit 38d4a5a3e53ca4a9f821bb081062da616ee9ee79)

Change-Id: Id7022d233b88ca18937b244ae9dc4a2d08f32bba
Reviewed-on: http://git-master/r/22001
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@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.

Reviewed-on: http://git-master/r/20099
(cherry picked from commit 29c5018516f0ed614d886b42d0b74787d89147fc)

Change-Id: I704a595087f94f35ecd94d706319b152d58f6093
Reviewed-on: http://git-master/r/21978
Tested-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@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.

original change: http://git-master/r/#change,21099
(cherry picked from commit 5acaf09b682e5c9e0309bae53067f2fde557bbc1)

Change-Id: I76fb13db8b7a3543f5e6d772fda2549493d22876
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/22002
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: Ic8cdd6f0056589a1ec5610944d0cd0b3bd0000f2
Reviewed-on: http://git-master/r/21997
Tested-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

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

Increased timeout values to maximum safe values
BUG 791857

Change-Id: Ib3aa2a495391b8cf1e3795759bfe3bb78598839d
Reviewed-on: http://git-master/r/21234
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Shail Dave <sdave@nvidia.com>

ventana: Changing bits per pixel to 32.

Updated bits per pixel for ventana to 32.

Fixed bug 796836

Change-Id: I2fd67b2ec5b7b9331ce56c6e66f1f6238ae24a2e
Reviewed-on: http://git-master/r/21263
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Peter Zu <pzu@nvidia.com>
Reviewed-by: Shail Dave <sdave@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: If7d46f4210fb70f2bfd47c46cdf834ec7b7b776e
Reviewed-on: http://git-master/r/21226
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Tested-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>

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

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

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

arm: tegra: ventana: Enabling suspend on USB1 & USB3

Enabling power down when device suspends for USB1 and USB3.
Also added the platform data structure which is used
when USB suspends.

Bug 770041

Reviewed-on: http://git-master/r/20030
(cherry picked from commit d7ca0c65fa2930ac60c7b85d8be6178b0f0ecc32)

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

arm: tegra: fsl: correcting the vbus status

When device resumes vbus_active status should be set.
Also, correcting the spin_lock_irqsave calls.

Bug 770041 791252

Reviewed-on: http://git-master/r/20529
(cherry picked from commit f17ce7e1a68be7410e8b7a2bde9736ffc0f4b14e)

Change-Id: I1b65a875005233a7cbce0c754b9a3ee25beb108f
Reviewed-on: http://git-master/r/20966
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>

regulator: tps6586x: delay needed for LDO/SMs to stabilise

after enabling any LDO/SM, there is a specific amount of delay
required before the regulator becomes stable.

Reviewed-on: http://git-master/r/20738
(cherry picked from commit 1d61f12a9a4cb2277503636085896a32f989fa54)

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

video: Adding support for 1080p@30Hz

Adding support for 1080p@30Hz.Disabled by default.
Fixes Bug 789164

Reviewed-on: http://git-master/r/20349
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
(cherry picked from commit dbb4aa8f2a8f6126a8b7f90447c7464dce4c66ab)

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

tegra: usb: phy: Regulator APIs for USB power rails

Added regulator APIs to control the USB power rails.
Also, added support to turn on/off vbus appropriately.

Bug 770041

Reviewed-on: http://git-master/r/20025
(cherry picked from commit 3c5b51ecb7a2135db66c40555048723c40f9ef54)

Change-Id: I9d2210d219728247aa4ce04e8c26d16d4dd32731
Reviewed-on: http://git-master/r/20971
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>

tegra bluesleep: configuring the GPIOs as wakeup.

correctly configuring the GPIOs used by bluesleep driver.

Bug 791669, 773186

Reviewed-on: http://git-master/r/20526
(cherry picked from commit b57246aa5c4921a5fc789e4adc4ef0aa9ce375ed)

Change-Id: If70bbb3f93c4822b82e3f9fe2447506e16f09fbc
Reviewed-on: http://git-master/r/20963
Tested-by: Raymond Poudrier <rapoudrier@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Anantha Idapalapati <aidapalapati@nvidia.com>
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>

video: tegra: Add support for pin output overrides

bug 773671

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

tegra: dc: Add PMx PWM control

bug 773671

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

tegra bluesleep : enabling bluetooth active power management driver.

Bluesleep driver manages the power of BT chip. now enabling the driver
in the default build of ventana.

Bug 791669, 773186

(cherry picked from commit 9e75f8c8a105bc82f280eeed4284a1bf8779b048)

Change-Id: Id5f72e1218136522a431c5f8cc099a5e060c2933
Reviewed-on: http://git-master/r/6852
(cherry picked from commit 45d7c2cddc1939e447e7bb974147cb299238c4e8)
(cherry picked from commit 4bb81ffdae9a2df688eff4197477f7801b107a25)
Reviewed-on: http://git-master/r/19879
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

tegra: usb: ehci: Enabling interrupts during resume

Fixing the hsic resuem issue by enabling the interrupts on ehci-restart.
BUG 790888

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

arm: tegra: whistler: backlight support

bug 773671

Change-Id: I4e2898b17e47b186cd7ffa64d79d38f69bcce269
Reviewed-on: http://git-master/r/19601
Tested-by: Joseph Lehrer <jlehrer@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

arm: tegra: whistler: Enable PM1 backlight

bug 773671

Change-Id: Ic1021a6a034893a512d474e2e0e80c17cbb56499
Reviewed-on: http://git-master/r/18759
Tested-by: Joseph Lehrer <jlehrer@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

video: tegra: Add PWM backlight driver

bug 773671

Change-Id: Ib93f0dcb7e22220fe297c81d403c401548f3c649
Reviewed-on: http://git-master/r/18280
Tested-by: Joseph Lehrer <jlehrer@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

arch: arm: usb_phy: support for HSIC power off

Fixing the hsic re-enumeration issue by adding missing code
in ushic_phy_power_off function.
BUG 790888

Change-Id: I56c280acee2fd6ae6719c6802d14975840ef1d53
Reviewed-on: http://git-master/r/19304
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Kaushik Sen <ksen@nvidia.com>
Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com>
Reviewed-by: Shail Dave <sdave@nvidia.com>

tegra: usb: otg: Adding suspend/resume function call

For USB, in OTG mode driver interrupt enable registers
must be saved when device goes into suspend mode and
must be retained when device resume.

Bug 791252

Change-Id: I349a629105d4f5a236c35ef5cd37aeefcd2cece7
Reviewed-on: http://git-master/r/20375
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

tegra bluesleep: Bluetooth active power management driver

A new driver is implemented to actively manage the bluetooth module
power. bluesleep also tries to manage the power of the transport used.

Two signals (GPIOs) are used to manage the power events.

BT_WAKE  : signal from HOST to BT chip to intimate BT chip can sleep.
HOST_WAKE: signal from BT chip to HOST to intimate HOST should wakeup/
activate the transport modules required for BT communication.

Bug 791669, 773186

(cherry picked from commit 111f4ccd3c4cfde2fa52ae4c0c56a2288c3af3a8)

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

[tegra alsa] headphone detection

added headphone detection logic for WM8753 on whistler

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

tegra-alsa: Cache das registers before suspend

Caching das registers before system suspend and restoring
them during system resume. Also moved das power mode calls
from tegra_pcm to tegra_i2s interface.

Bug 792879
Bug 789967

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

serial: core:  skip call set_termios/console_start when no_console_suspend

The commit 4547be7 rewrites suspend and resume functions, this
introduces a problem on the OMAP3EVM platoform. when the kernel boots
with no_console_suspend and we suspend the kernel, then resume it,
the serial console will be not usable. This problem should be common
for all platforms.
The cause for this problem is that when enter suspend, if we choose
no_console_suspend, the console_stop will be skiped. But in resume
function, the console port will be set to uninitialized state by
calling set_termios function and the console_start is called without
checking whether the no_console_suspend is set, Now fix it.

Refer
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.37.y.git;
a=commit;h=ca2e71aa8cfb0056ce720f3fd53f59f5fac4a3e1 for

cherry-pick the changes from the kernel 2.6.37, commit id as
ca2e71aa8cfb0056ce720f3fd53f59f5fac4a3e1

Bug 758845

Change-Id: Ib83494b2b13cd7179d3ae173be328c8cd776d431
Signed-off-by: puneet saxena <puneets@nvidia.com>
Reviewed-on: http://git-master/r/19590
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>

[ARM] tegra: i2s and das suspend/resume

Add APIs in das driver to get and set das register values.
ALSA driver will be using these APIs to cache das register
values during system suspend resume.
In i2s register get/set APIs caching few more registers.

Bug 789967
Bug 792879

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

wm8903: Fix wm8903_resume() implementation

In wm8903_resume() codec should be powered up after restoring cached
registers. Otherwise sequencer registers are getting overwritten after
powering up of codec which was shutting down the codec during resume.

Bug 792879
Bug 789967

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

arm: tegra: hsuart: Support for Bluetooth wakeup

Added support to tegra_hsuart driver for bluetooth wakeup.

Bug 773186

Change-Id: Id8f1face1b99942fd13949d0815a1dedd1a5a5d0
Reviewed-on: http://git-master/r/19586
Reviewed-by: Anantha Idapalapati <aidapalapati@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Anantha Idapalapati <aidapalapati@nvidia.com>

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

Conflicts:
drivers/net/wireless/bcm4329/Makefile

Change-Id: I5e6994d4db216062b9cd1673f45bd9fdcf1f96ae

[tegra: hdmi] clear stereo flag before checking edid for stereo

bug 788941

Change-Id: Ib6c3da2f30fa5e7240cbdd1d406682aca3c820a2
Reviewed-on: http://git-master/r/20144
Tested-by: Chong Zhang <chzhang@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

video: tegra: Change overlay spinlock to mutex

We call tegra_overlay_put inside the overlay lock, which can do a flip.
It's not safe to do a flip in an atomic context.

Change-Id: I4b043737a3eede0d47b8269a2d40e7c739f75df3
Reviewed-on: http://git-master/r/20087
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>

tegra: harmony: oldconfig + NVMAP_SEARCH_GLOBAL_HANDLES

Change-Id: I6c192b8276806be7bf4918b3a120cf8137be247e
Reviewed-on: http://git-master/r/18635
Tested-by: Pierre-Loup Griffais <pgriffais@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

video: tegra: nvmap: fix potential deadlock

Enabled mutex debugging reavealed potential deadlocks
introduced with compaction.

Handle spin lock replaced with mutex. Heap functions cannot be
protected with spinlock because they call kernel slab allocation
functions which cannot be called from atomic context.

nvmap_client ref_lock is also replaced with mutex. Otherwise we
cannot access heap parameters protected by mutex nvmap_handle lock.

Extra locking for handle->owner removed.

bug 793364

Change-Id: I635ce9ebf259dd7bf8802457567f93b7be5795ea
Reviewed-on: http://git-master/r/19850
Reviewed-by: Kirill Artamonov <kartamonov@nvidia.com>
Tested-by: Kirill Artamonov <kartamonov@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

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

net: wireless: bcm4329: Fix disable pno call

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

alsa: Set restrictions on period size

Restrict period size to be multiple of 8 and period count to be
integer. This is required to prevent audio breaks for playback
through BT SCO.

Bug 771510

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

arm: tegra: config: enable uid_stat proc interface

BUG 769814

Change-Id: I18159aea2de80acdfe7e8c04f9702f1c8a4830a8
Reviewed-on: http://git-master/r/19872
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

tegra bluesleep: creating a bluesleep platform device.

Based on CONFIG_BT_BLUESLEEP configuration variable, a bluesleep device
will be created and used to actively manage the BT device power.

Bug 791669, 773186

(cherry picked from commit 011a705248274804c80c12af5366693e6662829b)
Reviewed-on: http://git-master/r/6851

Change-Id: If5275ecfc920a038ec96928ea7f7f739f5051e33
(cherry picked from commit ae1bf987d38b15d6688cd2152ee4b4624211c113)
Reviewed-on: http://git-master/r/19868
Reviewed-by: Anantha Idapalapati <aidapalapati@nvidia.com>
Tested-by: Anantha Idapalapati <aidapalapati@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

usb: Adding USB CDC NCM class driver.

This driver supports devices conforming to the Communication Device
Class (CDC) Network Control Model. The CDC specifications are
available from <http://www.usb.org/>. This driver is implemented as
a minidriver for usbnet driver framework.
Bug 776360

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

arm: tegra: ventana: correcting USB1,USB3 vbus lines

Correcting the pinmux table for USB1 and USB3 vbus lines
on ventana.

Bug 770041

Change-Id: I12266cafd4720959302ccb0fb29e29115e0de114
Reviewed-on: http://git-master/r/20022
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

video: tegra: Fix handling non-zero Y offset

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

merge: tegra: DVFS: fix 1.2V core volt for USB

Original commit:
    69f118a448d4b8f1309d9acb3b78448444962a94
    ARM: tegra: DVFS: set 1.2V core voltage for USB to work

was lost during a merge, because the table format changed on our side.

Relevant merge that missed this:
    8197cb15eaf0640d13c816926f65972ca6cbba84

Change-Id: I1701281f04a658697e4e8f011b18a5c9169cc879
Reviewed-on: http://git-master/r/19668
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Cho-Che Cheng <jacheng@nvidia.com>
Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>

media: video: tegra: update ov5650 mode settings

Switch to 2080x1164 for 1080p resolution.  Add a reset to
the I2C sequences.

Bug 786227

Change-Id: I0514275c87504673a4297679bfa77d0a786f1532
Reviewed-on: http://git-master/r/19649
Reviewed-by: Nathan Lord <nlord@nvidia.com>
Tested-by: Nathan Lord <nlord@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>

merge: video: tegra: fix HDMI merge issue

tegra_hdmi_writel should be _tegra_hdmi_writel in this function

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

video: tegra: add modeset switch to trigger uevents

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

ARM: tegra: cpufreq: finer values for emc scaling

Added support for emc frequencies 75,100,25 Mhz scaling

Change-Id: Id5f170a380c3acbc7a375ab5e5018628549b992f
Reviewed-on: http://git-master/r/18340
Reviewed-by: Amit Kamath <akamath@nvidia.com>
Tested-by: Amit Kamath <akamath@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

[ARM] tegra: ventana: add 25Mhz to emc table

add emc register values for 25Mhz frequency

Change-Id: I2fc34166ab34429d48422c5927ba3cfdf7b5b3a8
Reviewed-on: http://git-master/r/16694
Reviewed-by: Amit Kamath <akamath@nvidia.com>
Tested-by: Amit Kamath <akamath@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

media: video: tegra: add ov5650 test pattern mode

Change-Id: Ie894d71f45cc08709daff3f258e0c4676b7778b0
Reviewed-on: http://git-master/r/19687
Reviewed-by: Nathan Lord <nlord@nvidia.com>
Tested-by: Nathan Lord <nlord@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

merge: USB: remove duplicated usb_hcd_map_urb_for_dma

The original commit went upstream, this is to fix a merge issue from a
slightly different version coming back.

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

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

ARM: ventana: defconfig: enable usb rndis

Bug 773058

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

ARM: ventana: enable usb rndis support

bug 773058

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

video: tegra: fix max yres in stereo hdmi case

tegra_fb_set_windowattr() has logic to adjust
window y according to yres, however when in stereo
mode, the max y allowed should be v_active, which
could be larger than yres.

bug 784597

Change-Id: I63342be8e2d87396502574f3a8dd0fb2769a47a8
Reviewed-on: http://git-master/r/17537
Reviewed-by: Chong Zhang <chzhang@nvidia.com>
Tested-by: Chong Zhang <chzhang@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

[tegra: HDMI: stereo] fix VIC for 720p stereo mode

VIC for 720p stereo mode should be 4 (60Hz) or 19 (50Hz).

bug 792143

Change-Id: I3edb468a992842ed6a3247fbab02970b0c078acb
Reviewed-on: http://git-master/r/19468
Reviewed-by: Chong Zhang <chzhang@nvidia.com>
Tested-by: Chong Zhang <chzhang@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

video: tegra: nvmap: replace mutex with spinlock

There are places where nvmap_free_handle_id is called
when interrupts are disabled and mutex cannot be used as
nvmap handle lock.

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

media: video: tegra: enable ov2710 manual exposure

Change-Id: I2b572a4fdfd83f7f9dc9b3f5b9244072cb240764
Reviewed-on: http://git-master/r/19528
Reviewed-by: Nathan Lord <nlord@nvidia.com>
Tested-by: Nathan Lord <nlord@nvidia.com>
Reviewed-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-by: Chien-Yu Chen <chichen@nvidia.com>
Reviewed-by: Patrick Shehane <pshehane@nvidia.com>
Reviewed-by: Chan Vu Truong <jtruong@nvidia.com>
Tested-by: Chan Vu Truong <jtruong@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:
drivers/net/wireless/bcm4329/Makefile

Change-Id: I13ed89657bb43ac906c6424372050df5fd681374

net: wireless: bcm4329: Get country translation from platform data

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Merge branch 'linux-tegra' into android-tegra

video: tegra: add some missing mutex locking to nvhost_cdma

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

net: wireless: Add get_country_code functionality to platform

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

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

video: tegra: hdmi stereo mode set fix

Reverting previous hdmi hotplug fix (commit
633a7967cad4454327572f85fbdf5cd88eb68b78). It doesn't
seem to fix hotplug problem on ventana, and it is
causing tegra_dc_enable() to be called before we
set up hdmi mode properly. It's no longer needed
when we set ventna_hdmi_enb=1.

The 5ms sleep time after tegra_dc_enable() is no
longer needed, as the tegra_dc_enable() is removed
from tegra_dc_hdmi_detect_worker().

bug 784597

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

[Ventana] hdmi hotplug - leave ventana_hdmi_enb to be 1 always

It seems the "ventana_hdmi_enb" has to stay 1 for hotplug_gpio
to work. Setting ventana_hdmi_enb to 0 in ventana_hdmi_disable()
will render hotplug_gpio non-functional afterwards. Removing the
gpio_set_value(ventana_hdmi_ena..) calls from both
ventana_hdmi_enable() and ventana_hdmi_disable() seems to solve
the problem. This leave ventana_hdmi_ena at its default value.

bug 784597

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

net: wireless: bcm4329: Update to version 4.218.248-23

- Add support to PNO with adaptive scan time
- Remove logic to generate Link Down based on Roaming Event
- Improve sco/esco detection method for BT COEX
- Add new function TXPOWER to reduce power if needed

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

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

video: tegra: nvmap: Fix broken optimization

An attempt had been made to reduce the number of pte operations
while patching relocs.  The optimization was incorrectly coded
and was not providing the expected speedup.

Credit for the find goes to Peter Pipkorn.

Change-Id: Ic83b20ee470e54d5053f747dbcbdf7b038b7c7c4
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>