Conflicts:
	arch/arm/mach-mx6/clock.c
	arch/arm/plat-mxc/devices/platform-imx-perfmon.c
	drivers/usb/gadget/arcotg_udc.c

At i.mx6x, the data line (dp and dm) are floating at device mode,
that is to say data line will be any values (0-3.6v).
So if the usb wakeup is enabled, there will be a wakeup interrupt
that causes usb to active mode.

In order to fix this problem well, we need to do below things:
- Need to discharge both dp and dm
- It needs to discharge data line when we switch to device mode and
usb cable is disconnected from the host, but not to disable discharge
after line state is SE0, the reason is that if we do not pulldown
the data line, the line state will be floating again, and possible cause
the wakeup interrupt.
- It needs to disable discharge data line when the usb cable connects at
device mode and usb device is connected at host mode, otherwise it will
affect signal quality.

Signed-off-by: Peter Chen <peter.chen@freescale.com>

Conflicts:
	arch/arm/mach-mx6/board-mx6q_arm2.c
	arch/arm/mach-mx6/board-mx6q_sabresd.c
	drivers/mmc/core/bus.c

The discharge dp function needs to be added at below situation:
- USB cable is disconnected from the PC
- When the usb mode switchs to device mode

Signed-off-by: Peter Chen <peter.chen@freescale.com>

The discharge dp function needs to be added at below situation:
- USB cable is disconnected from the PC
- When the usb mode switchs to device mode

Signed-off-by: Peter Chen <peter.chen@freescale.com>

As dp/dm is floating with no usb cable and switch host mode to
device mode situation, it do needs this discharge dp patch
But, discharge vbus doesn't be needed at suspend_irq, so
keep it removing.

This reverts commit 0924b71278650fa3891a8f6ea70f91242ca6e5fd.

Signed-off-by: Peter Chen <peter.chen@freescale.com>

This patch creates two bugs at current i.mx usb framework.
- The high speed device can't be recognized at the first time.
- The usb device can't be recognized after system resume with
usb vbus.

The reason why it creates bugs that it changes (auto)suspend/resume
process for usb core.

This reverts commit e5c4318450e1fe7c61950214e779658c6cea0da7.

Signed-off-by: Peter Chen <peter.chen@freescale.com>

device part

- implement reset_device interface for HSIC host

Signed-off-by: Tony LIU <junjie.liu@freescale.com>

This commit revert the previous workaround for hang issue
when usb is not connected and clock gated.

And fix the following issues:
* kernel hang when boot without usb cable connected
  If the usb is not connected and clock gated, do not call
  usb_gadget_connect() until usb connected.
* Android usb manager can not get correct status from driver on boot.
  Android gadget enabled on boot after usb connected, and so
  miss the USB_REQ_SET_CONFIGURATION request.
  Need a reconnect for gadget on gadget enable.
* Enable/disable ADB by UI causes system hang or not functionable
  Only when there's a connection, we call
  usb_gadget_disconnect() when disable android gadget.
  When enable gadget, do reconnect.

Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>

average UMS write speed in SATA, class 10 SD, class 4 SD card
only can archive about 3.2M/s and lower.

Found this issue is because UMS 's SYNC write mode, that will
serial USM Bluk tansfer and MMC/SATA write, like a 1-buffer write.

Fix it by add the same config that comment out the sync operation.

Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>

Conflicts:
	drivers/usb/gadget/f_mass_storage.c