Conflicts:
	arch/arm/mach-mx6/board-mx6q_arm2.c
	arch/arm/mach-mx6/board-mx6q_sabrelite.c
	arch/arm/plat-mxc/dvfs_core.c

fix build warnings on pfuze driver:

arch/arm/mach-mx6/mx6q_sabreauto_pmic_pfuze100.c:388:
  warning: initialization from incompatible pointer type
drivers/mfd/pfuze-core.c:523:
  warning: initialization from incompatible pointer type
drivers/mfd/pfuze-core.c:412:
  warning: 'pfuze_add_subdevice' defined but not used

Signed-off-by: Robin Gong <B38343@freescale.com>

Add MLB main driver for mx6q.

Signed-off-by: Terry Lv <r65388@freescale.com>

Add MLB driver platform data structure.

Signed-off-by: Terry Lv <r65388@freescale.com>

Conflicts:
	arch/arm/mach-mx6/board-mx6q_arm2.c

add pfuze core  driver for mx6
Signed-off-by: Robin Gong <B38343@freescale.com>

* Overwrite codec_name if passed as platform data
* Add codec_name in mxc_audio_platform_data
* Codec name follows the naming convention
  <codec>.<i2c-channel>-<codec i2c address> i.e. cs42888.0-0048
* For IMX6Q-ARD this name convention doesn't follow previous settings for
  imx6q platforms codec is on different i2c channel and can't be resolved
  by CONFIG macros on imx_3stack_dai data structure; So we overwrite in
  probe function by getting the correct value from plat_data->codec_name.

Signed-off-by: Adrian Alonso <aalonso@freescale.com>

* Remove hard codded gpio reset definition
* Add in mxc_audio_platform_data reset gpio reference to be able
  to pass gpio reset assignment in board definition file instead
  of a macro for each different board.
* Add plat_data null check, return EINV if no set.

Signed-off-by: Adrian Alonso <aalonso@freescale.com>

This commit intends to implement the flowchart and details
documented in the HDMI Transmitter Controller User Guide
section entitled "Programming Model".

Some input is also from the Synopsys API code.

The HDMI specification requires HDMI to set itself to VGA DVI mode
before reading the EDID.

So follow this sequence when HDMI is hotplugged:
1.  Hdmi connector is plugged in, HDMI video gets an interrupt.
2.  Clear out video mode list.  Add only VGA DVI mode to list.
3.  Request VGA DVI mode (call fb_set_var())
4.  HDMI video driver will get FB_EVENT_MODE_CHANGE callback and
    call mxc_hdmi_setup() to set up HDMI.
5.  Read the edid and add video modes from edid.  Select the video
    mode that is similar to the command line default.
6.  Request VGA DVI mode (call fb_set_var())
7.  HDMI video driver will get FB_EVENT_MODE_CHANGE callback and
    do mxc_hdmi_setup().

Also included is a workaround for an overflow condition in the HDMI.

The frame composer has an arithmetic unit that gets updated every time
we write to one of the FC registers. But sometimes, depending on the
relation between the tmds and sfr clocks, it may happen that this unit
doesn't get updated, even though the registers are holding correct
values. The workaround for this is, after completing the controller
configuration, to rewrite one of the FC registers (i.e. FC_INVIDCONF)
three or four times with the same value, and then follow it up by a SW
reset to the TMDS clock domain (MC_SWRSTZ).

We clear the overflow condition as described above every time we
change video mode.  Also an overflow interupt handler will clear the
overflow condition if it happens again.  This overflow condition is
expected (and not a problem) when we are in DVI (non-HDMI) mode, so
we do not worry about it in that case.

Signed-off-by: Alan Tull <alan.tull@freescale.com>

MTP_SEND_FILE_WITH_HEADER ioctl allows sending a file with the 12 byte header
prepended at the beginning.
This is to allow MTP to use a single packet for the data phase instead of two.

Signed-off-by: Mike Lockwood <lockwood@android.com>