Revert "HACK: video: ti_hdmi: print warning on invalid AKSV"

This reverts commit 720b316c734cad076987063c26a1fd26beac246d.
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
OMAP4: dss2: make s6e8aa0 pixel_clock reflect reality

Change-Id: I20c7c0853275edd69497f442cb2226955b98898a
Signed-off-by: Erik Gilling <konkers@android.com>
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
power: max17040: do a sanity check in the fuel alert handler

Some max1704x devices have been seen to issue a bogus fuel alert.
When this happens, we sanity check the capacity value to make sure
that it is not a transient condition.

Added some more verbose logging when this condition occurs.

Change-Id: I537fb81ab2521469f53ee1ce6b4c16e255128dbe
Signed-off-by: Dima Zavin <dima@android.com>
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
omap4: prcm debug: Fix l4sec clkactivity bits

Change-Id: I38b298e1eaab1b8f905d916220c310a5dd2c33b6
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
misc: modem_if: link_mipi: Reset mipi phy when receive wrong packet

1. use mipi sw reset after get wrong packet for recovery.

Bug: 5852314
Change-Id: I8cd0ba82d913777d82a59284a657b42e318635ae
Signed-off-by: wonhee <wonhee48.seo@samsung.com>
misc: fsa9480: don't enable FSA IRQ when VBUS IRQ is enabled

We should never enable two detection IRQs inside the FSA9480
driver, otherwise we can get into a situation where we enable
the FSA IRQ multiple times. One way this can happen is if the
FSA IRQ fires when the VBUS IRQ is enabled and we end up
redetecting the same state (i.e. AV_365K_CHARGER).

Change-Id: Iefcf71c88451056b2be318284b0eadc16997e6d9
Signed-off-by: Simon Wilson <simonwilson@google.com>
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
omap4: tuna: Drop soft lockup detector timeout to 10 secs

To trigger prior to watchdog timer.

Change-Id: Ia9197b57ef0a288b554f2879f180d71334c65565
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
ASoC: Tuna: Reduce S/PDIF power down time

Reduce S/PDIF pmdown_time in order to prevent S/PDIF's power-down
to affect audio paths that ignore suspend during voice call.

Change-Id: I5fe32ed315e3bdbffb995a400646871fb4bcdf1c
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
usb: musb: Disable SESSREQ and VBUSERROR interrupts

Disable the SESSREQ and VBUSERROR interrupts since we don't use them.
if we receive them, the otg state machine will enter a state where it
prevents suspend.

Bug: 5696789
Change-Id: I8cb4824056230c33fee9e810c19f5557fa2840c9
Signed-off-by: Benoit Goby <benoit@android.com>
ARM: omap2: tuna: Add wlan IL locale

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Revert "ARM: omap2: tuna: Add wlan IL locale"

This reverts commit 8f8b148dfb330702abe3af4dd42915a5140a0b47.
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
ARM: omap4: tuna: Add panel configration for SM2A2 Line support.

change list.
 -. SM2A2 Panel Id value is '0xA2'.
 -. Add factory info for SM2A2 line panel.
 -. Add panel data for SM2A2.

Change-Id: I82addbf29bab4533845caf632676592d11d9950d
Signed-off-by: swin.kim <swin.kim@samsung.com>