Revert "ENGR00171026 SGTL5000: remove mono support"

This reverts commit d6612bf5c36d7f93552921fcf09e29ad2b323413.
(cherry picked from commit 1af57a1e6d9473a4de0c3708cfa50d9741d3d9b7)
Enable headphone jack by default on sgtl5000.

This patch reverts a change introduced by commit eec23c400e5c39ae338b9112031a302230220294

Conflicts:
	sound/soc/imx/imx-sgtl5000.c
(cherry picked from commit 39405bfab671b5dbfc3ff7b41b77a0fc954b7824)
Fix compile break when sound is compiled as modules: ssi and esai were both compiled into the same module
and both contain a module_init().

The fix is cleaning up sound/soc/imx/Makefile.

A result is that HDMI config is not assumed always enabled.
(cherry picked from commit 96b71a9a30690f3e4f8fed7e7b92dcbf7fc10a08)
sound/soc/imx: Make SGTL5000 selectable for any machine

Previously the SGTL5000 was selectable only when certain machines were
being built.  Remove this option and make it manually selectable.
Fix compile break when OTG is used as gadget peripheral controller
(cherry picked from commit 59d6b4294f5f43c75a9cf4b3cc12bca9bf122e24)
Fix compile break in arch/arm/plat-mxc/dvfs_core.c when SMP is configured without CPU_FREQ

Conflicts:
	arch/arm/plat-mxc/dvfs_core.c
(cherry picked from commit 1195fac5d0324c267660b706f5e347e003728d13)
[RFC PATCH] i2c-imx.c: Add support for I2C bus fault recovery

In the event that a I2C bus is disturbed, for instance by a slave missing
a clock pulse, it is desirable to have a way to get the bus back working
other than by power-cycling the whole system. This patch makes it possible to
to have a special function in board support code issue an I2C reset, since
the IMX peripheral is not capable of doing this, and it needs to be done
by bit-banging the corresponding pins in GPIO mode.
The reset function needs to check if the bus is hung by checking the state
of SDA and issue a reset by pulsing SCL a few times as long as SDA is low.

Signed-off-by: David Jander <david@xxxxxxxxxxx>

Conflicts:
	drivers/i2c/busses/i2c-imx.c
(cherry picked from commit c1c409c8e9f96e1bd16717733c7456497b42d558)
brcmfmac: Handling the interrupt in ISR directly for non-OOB

In case of inband interrupts, if we handle the interrupt in dpc thread,
two level of thread switching takes place to process wifi interrupts.
One in SDHCI driver and the other in Wifi driver. This may cause the system
instability.
Because the SDHCI calls sdio_irq_thread() to handle the irq, this thread locks
mmc host and calls wifi handler. It expects WiFi handler to be quick and
enables sdio interrupt from card at end. If wifi handler defers this work for
a different thread, sdio_irq_thread() will be stuck on next wifi interrupt
since mmc lock is not freed.

Handling the interrupt in ISR directly will prevent thread context switching in
wifi driver. It can fix the instability problems.

Signed-off-by: Wei Ni <wni@nvidia.com>
(cherry picked from commit c782ec69711573ee082fa78b80dae3897269266e)
Revert "ENGR00225875-2 i.MX6Q/Solo Sabreauto Bluetooth H4 fix uart rx timeouts."

This commit breaks Bluetooth UART connection on the WandBoard.

This reverts commit e21b0b06f4b99a22f9cf5d63641c00a6d83d433a.
(cherry picked from commit 7cdaeabf2df37efc5bc7d84319c58af8df6345a6)
kernel header missing during installation

Some video application require the "usb/video.h" header.
So here the patch to add it during the kernel header installation :
(cherry picked from commit c97d13e34c4f3d466cb3404e83a782ca11d3cf41)
Don't touch iMX6 SATA clock on other than iMX6Q.

The IOMUXC_GPR13 control register has different functionality on iMX6S/iMX6DL
(cherry picked from commit 2a118bb2c07da80ad8906387d75c0b083ec9e619)
Add support for AUO 97G070 LVDS panel
(cherry picked from commit 81a8ff3743ae3dd21b5a0225f1ecf6bc798cbad4)
Fix signal type for AUO 97G070 LVDS panel
Set iMX6DQ/DL max speed back to 1GHz

Commits 13c1310c and 7361e1f0 attempt to read undocumented memory
bits (as of TRM released 2013-05-30) to determine CPU speed rating.
This calculation appears to disable 1GHz mode for (some?) iMX6 Solo
and DualLite CPUs sold by Freescale as 1GHz parts.

This patch reverts the changes and hard-hacks the maximum speed to
1GHz for all iMX6 parts until more information is available.
(cherry picked from commit 177c82740df1a817ccbe978ca687246e77a0718b)
Enable to reserve GPU Memory in higher memory to avoid to shrink DMA zone
(cherry picked from commit 26c6d7b49f9d59d43ec166a97eb2cb8d519d1441)
Fix build when spdif support is not enabled
(cherry picked from commit 65bdd402ba6967518794f3379339fb0a469a976c)
Use 2GiB constant as memory limit for GPU
(cherry picked from commit 1c1fd4c1721b3c778a583c41daaf6eaef86fc2f4)
Fix uninitialized variables warnings
Fix compilation when mipi-csi option is disabled
Adapt video memory limit according to wandboard version
(cherry picked from commit 11a509c6d0958741af52fd85661c08975d1e271d)