msm: 8064: Fix up merge conflicts from LPM driver overhaul

* Fixes conflicts introduced by commit:
  I4f16008098c9525d3543ba23a5f58ddc3a8f942d

Change-Id: I00a1765cf241332ca3580cd2cfb2e6f35cdec3b1
misc: tfa9887: Add HTC TFA9887 Amp driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: I8fbeff195ff11497f9fef8b1d8196d4c76eaaa6b
misc: rt5501: Add HTC RT5501 Amp driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: I0b067aebecd6c36aa3bdeb32fad2b30aadc11f49
input: akm8963_nst: Add HTC variant of AKM8963 compass

HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Idde00c0369157833aabcc444f0338062e566d1aa
input: bma250_bosch: Add HTC variant of BMA250 sensor

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Iea33decb7b9f79396c08acfccf13c2452299edb1
msm_serial_hs_cir: Add HTC CIR serial driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: I738963154d7b29aec19190f667082f2e66578a00
msm: camera: actuators: Import Rumbas-S actuator driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Id770c018bb835c96a8f5e412e2dd95bcf3f623b9
msm: camera: actuators: Import lc898212 actuator driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Ic545ae9c10f1e0b484b268e10c535730cf729cc9
msm: camera: actuators: Import HTC TI201 actuator driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Id0e4e9c8319b2df240c2c0f37f8d3e2624af3fd0
power: pm8921-charger: Update HTC pm8921 drivers

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Idaa067e6f46de61b4ba62576142a94c45c08425b
leds: leds-pm8xxx: Update HTC leds-pm8xxx variant

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: If5c4fa4941f049b0e4be7f6b50ecf1703a444883
input: cm3629: Update CM3629 proximity/light sensor

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Iccb11b0fe343f063aab0e05ea9b0d9119fcfa1f9
input: mpu3050: Update HTC version of MPU3050 sensor

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: If99645b2d370da57c359557cdd2b3b0a3be19531
input: touchscreen: synaptics_3200: Update Synaptics 3200 driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Icfc4997d7d6f6257c8f947f2d50eb455481f8832
ARM: Add additional ATAGs

* Add ATAG_BLDR_LOG, ATAG_LAST_BLDR_LOG, ATAG_BATT_DATA

Change-Id: I09c4797c431e30778b5a1f8ae27eb812ed8d087f
msm: HTC: Add htc_4335_wl_reg driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: I6287e534c7c19978ad78df0cfaa9ba968f0d2522
msm: HTC: Update emmc partitions code

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: If4dcf8f9ae8a3a5f103641ad456606f591b6bf1d
msm: HTC: Update devices_htc.c

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Idc0477bb7d5f79baceab26ea24380f752525b775
msm: HTC: Update htc_restart_handler

HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: Icefd20bcceb28eb04fe02bde139f6e7520818d89
msm: HTC: Update HTC battery drivers

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: I69b7420a33199b5a48119d846c5fdb221abe2d65