Revert "msm: HTC: 8960: enable standalone power collapse"

This reverts commit 7fdcae712ec897c87516447ff24382652b586eca.

Change-Id: If20a5e3ee1343b8a87911da458a7f9a6dc640c85
mmc: card: Skip secure erase on MoviNAND; causes unrecoverable corruption.

commit 3550ccdb9d8d350e526b809bf3dd92b550a74fe1 upstream.

For several MoviNAND eMMC parts, there are known issues with secure
erase and secure trim.  For these specific MoviNAND devices, we skip
these operations.

Specifically, there is a bug in the eMMC firmware that causes
unrecoverable corruption when the MMC is erased with MMC_CAP_ERASE
enabled.

References:

http://forum.xda-developers.com/showthread.php?t=1644364
https://plus.google.com/111398485184813224730/posts/21pTYfTsCkB#111398485184813224730/posts/21pTYfTsCkB

Change-Id: I0ddef16048c82b5cf320104702239065c039805a
Signed-off-by: Ian Chen <ian.cy.chen@samsung.com>
Reviewed-by: Namjae Jeon <linkinjeon@gmail.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Use hrtimers so that msleep() sleeps for the requested time

Current msleep() snoozes for at least two jiffies, causing msleep(1) to
sleep for at least 20ms on HZ=100 systems.  Using hrtimers allows
msleep() to sleep for something much closer to the requested time.

Change-Id: If06b4fa3f489eed073213c763755ec3b387129e1
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
msm_fb: use hr_msleep when timing DSI commands

Change-Id: I711e8f2343c1a4fcf164c5b8fabba08987eb1728
msm: HTC: headset_one_wire: restore use of hr_msleep

Change-Id: I0b83333e95ad5b76ce7552ae9affb0a2414ae827
msm: HTC: fighter: audio board file clean-up

This is all cosmetic while I was looking for any problems in fighter's
audio board file.

1. double entry of pm8921.h
2. tlv not used
3. system_rev = 128
4. no hdmi support
5. whitespace and #if 0 removal

Change-Id: Ifcda73f987f758c4a9843d23e2a3ea22480e7a0e
msm: HTC: 8960: clean up regulator references

Change-Id: I85dfb1a561690404147d317abbf6c505c22755c6
msm: HTC: 8960: set acpuclk-8960 as regulator consumers

Change-Id: Ia48653a34258a4f240494540ca21849be61b921d
msm: HTC: update battery drivers

HTC kernel version: evitaul-jb-crc-3.4.10-08ef01e

Change-Id: I6e3e62a8394afb38adf46cbef57f50fca98f1ccd
msm: HTC: fighter: fix panel flickering

1) fix include paths
2) include distinct behaviors of orise and non-orise panels
3) fix regulator calls

Conflicts:
	arch/arm/mach-msm/htc/fighter/display/board-fighter-panel.c
	arch/arm/mach-msm/htc/fighter/display/mipi_fighter.c

Change-Id: I5a6483b07504b56d99541076827c998a48c47d16