ARM: dts: msm: Add support for ce-device number in crypto driver

Add an entry for ce-device in qcedev and qcrypto device nodes.

Change-Id: Ibaed7e8992f0773873217a7520cd9874dc4e115e
Signed-off-by: Mona Hossain <mhossain@codeaurora.org>
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
clock: msm: Add clk support for second qcrypto device

Add clock entry for a second qcrypto instance for 8974.

Change-Id: I6e4c6e32e62c5cf26992c7d0dc8b27b188c2b15c
Signed-off-by: Mona Hossain <mhossain@codeaurora.org>
ARM: dts: msm: Add support for second qcrypto device for 8974

Add entry for a second qcrypto instance that uses a different
pipe pair for data transfer to/from CE hardware. This will allow
clients to use different PIPE key register set intended for a
different use case.

Change-Id: Ibdf5ae10de63f1a26ce37ab9b74e4a60346cc105
Signed-off-by: Mona Hossain <mhossain@codeaurora.org>
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
msm: clock-8226: Update lookup table for qcrypto clocks

Change-Id: I807588fecddc0bffdff67be0ffed0c0c2bf3aca6
GCC 4.9.1: fix compile warnings

Conflicts:
	drivers/power/qpnp-bms.c

Change-Id: I0e8131dae0d7462f4cf11bb0e5bd85d6bcd22f41
cpufreq: interactive: fix compiling warnings

The gcc warns like:

  cpufreq_interactive.c:745:6: warning: operation on 'ret' may be
undefined [-Wsequence-point]

It was introduced by commit cf0fad49d17cb8273ce555dd5b7afab67d7923bf.

Since sprintf(...) just return 1 (one character) in this case, ret
should not changed.
Just discarding the result of sprintf(...) leads to the result that
the committer of cf0fad49d17cb8273ce555dd5b7afab67d7923bf wants.

Change-Id: Ifed1cef6d6a31c3ed23dad03a567b3b9eddf3a57
Signed-off-by: Chih-Wei Huang <cwhuang@android-x86.org>
Signed-off-by: Dave Daynard <nardholio@gmail.com>
Fix sizeof-pointer-memaccess warning with gcc 4.8

This patch fixes wrong memcpy size when copying ltk value to
HCI_OP_LE_LTK_REPLY command.

Change-Id: I44e5e3da15369d4b424581720ccd3bac820ef2e0
ARM: 7743/1: compressed/head.S: work around new binutils warning

commit da94a829305f1c217cfdf6771cb1faca0917e3b9 upstream.

In August 2012, Matthew Gretton-Dann checked a change into binutils
labelled "Error on obsolete & warn on deprecated registers", apparently as
part of ARMv8 support. Apparently, this was supposed to emit the message
"Warning: This coprocessor register access is deprecated in ARMv8" when
using certain mcr/mrc instructions and building for ARMv8. Unfortunately,
the message that is actually emitted appears to be '(null)', which is
less helpful in comparison.

Even more unfortunately, this is biting us on every single kernel
build with a new gas, because arch/arm/boot/compressed/head.S and some
other files in that directory are built with -march=all since kernel
commit 80cec14a8 "[ARM] Add -march=all to assembly file build in
arch/arm/boot/compressed" back in v2.6.28.

This patch reverts Russell's nice solution and instead marks the head.S
file to be built for armv7-a, which fortunately lets us build all
instructions in that file without warnings even on the broken binutils.

Without this patch, building anything results in:

arch/arm/boot/compressed/head.S: Assembler messages:
arch/arm/boot/compressed/head.S:565: Warning: (null)
arch/arm/boot/compressed/head.S:676: Warning: (null)
arch/arm/boot/compressed/head.S:698: Warning: (null)
arch/arm/boot/compressed/head.S:722: Warning: (null)
arch/arm/boot/compressed/head.S:726: Warning: (null)
arch/arm/boot/compressed/head.S:957: Warning: (null)
arch/arm/boot/compressed/head.S:996: Warning: (null)
arch/arm/boot/compressed/head.S:997: Warning: (null)
arch/arm/boot/compressed/head.S:1027: Warning: (null)
arch/arm/boot/compressed/head.S:1035: Warning: (null)
arch/arm/boot/compressed/head.S:1046: Warning: (null)
arch/arm/boot/compressed/head.S:1060: Warning: (null)
arch/arm/boot/compressed/head.S:1092: Warning: (null)
arch/arm/boot/compressed/head.S:1094: Warning: (null)
arch/arm/boot/compressed/head.S:1095: Warning: (null)
arch/arm/boot/compressed/head.S:1102: Warning: (null)
arch/arm/boot/compressed/head.S:1134: Warning: (null)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: stable@vger.kernel.org
Cc: Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
[ccross: cherry-picked to 3.4]
Change-Id: If1c4c1a9f3f721a45d9833f2a36f1b7ce58c5e9a
Signed-off-by: Colin Cross <ccross@android.com>
drivers: cm3629: Update CM3629 sensor driver

* HTC kernel package memul-3.4.0-gf8f27cb

Change-Id: I87fa708a69c06df243b1745f02bed3cd8d262ac6
usb: otg: Update HTC OTG stack

* HTC kernel package memul-3.4.0-g3ea4692

Change-Id: If6da0b10786da9920b17dea88887b4ab8c537b8d
msm: Update battery/power drivers

* HTC kernel package memul-3.4.0-g3ea4692

Change-Id: If06b01027bf4f078daf0c998d55f06f968aa5f75
msm: HTC: Add 8226 specific bits

* HTC kernel package memul-3.4.0-g3ea4692

Change-Id: I1d177f95f0878835429d1c04e673250146ececa4
msm: HTC: Import Desire 816 board files

* HTC package version: a5ul-3.4.0-g4ff7e8c

Change-Id: I8b4ea9baff503201807c2352b629ee91d66155f4
Signed-off-by: Willi Ye <williye97@gmail.com>
drivers: leds: Update TPS61310 flashlight driver

* HTC kernel package memul-3.4.0-gf8f27cb

Change-Id: Ia77b3d4a503b14492648af17184593b81824a6af
drivers: tfa9887: Update TFA9887 AMP driver

* HTC kernel package memul-3.4.0-ga072f6c

Change-Id: I26f92fb9243e25d21f8952936db42969cf7e13e0
msm: HTC: Import One Mini 2 board files

* HTC kernel package memul-3.4.0-g3ea4692

Change-Id: I5577e0a94207f223516b0cdc40ab4895d6cc6c32
ARM: dts: msm: Tune SMP block restriction for 8x26

To maximize availability of pipes for both 1080p and 1200p based
8x26 targets, reduce SMP block restriction from 4 to 3.

Change-Id: Ibb5a9d0016ea0d44b152d9c74d9f3a5cbd2acbd3
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
ASoC: msm: Allow DOLBY_DAP to be selected on MSM8226

Change-Id: Ib85d17d76ce39e8e405aa9cf1dd0dc225c183f05
drivers: touchscreen: Update Himax 825xD touchscreen driver

* HTC kernel package memul-3.4.0-gf8f27cb

Change-Id: Ib9a9f34ffc1cea576f508837582f1107c96b908f
Merge changes I807588fe,Ibdf5ae10,I6e4c6e32,Ibaed7e89 into cm-11.0

* changes:
  msm: clock-8226: Update lookup table for qcrypto clocks
  ARM: dts: msm: Add support for second qcrypto device for 8974
  clock: msm: Add clk support for second qcrypto device
  ARM: dts: msm: Add support for ce-device number in crypto driver