Merge "ASoC: dapm: Unlock mutex in error cases"
msm: camera: bugfix in actuator_init_focus func

bugfix in actuator_init_focus func added break
after write/poll case

Change-Id: I0362481fb7f4664da313670bf2187aa5e168ae6a
Signed-off-by: Vasko Kalanoski <vaskok@codeaurora.org>
Merge "ASoC: msm: qdsp6v2: Remove cmd_state from ASM header function"
Merge "msm: camera: To prevent the unbounded copy"
msm: vidc: detect mbaff information from firmware

Firmware will set the FBD flags if mbaff interface
is detected for decoded video bitstream. Previously
the mbaff information was parsed in the v4l2 video
client, but now firmware parses and sends the information.

Change-Id: Ic557cdb7bf49aab3eb29a3f3aa3e363bf7223a36
Signed-off-by: Arun Menon <avmenon@codeaurora.org>
Merge "slim_ngd: Use QMI server up notification instead of APR for probing"
Merge "ASoC: msm: Add G711 media type support for Voip call"
Merge "msm: vidc: add kzalloc success check for new HAL session"
Merge "power: qpnp-bms: do not adjust when shutdown soc is being applied"
Merge "spi: Add helper functions for setting up transfers"
Merge "USB: Enter class directory when the CCID driver is enabled"
Merge "USB: ice40-hcd: Add ICE40 FPGA based SPI to Inter-Chip USB host driver"
Merge "defconfig: msm8610: Enable USB-UICC support"
Merge "msm: 8610: gpiomux: Add SPI-USB bridge chip configs"
Merge "ARM: dts: msm: Add ICE40 FPGA based SPI-USB bridge device"
msm: socinfo: Introduce soc string

OEMs require the soc-id to be translated to a string
by the kernel and reported as a part of machine init
routines. Add support for it

Change-Id: I1ebdcd21061bde60815090a2d7de475a4e235f0a
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
ARM: Introduce arch_read_hardware_id

Moving towards device tree and arm single binary refering to
machine descriptor name for hardware id information under
/proc/cpuinfo is not suitable for certain soc vendors. Add a
hook for soc vendors to supply a per-soc hardware read method.

Change-Id: I8d6f77dbb8037c943d58e0d39fcaa9b54366650e
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
msm: socinfo: populate arch_read_hardware_id

Populate arch_read_hardware_id with msm specific implementation
to report correct hardware id under /proc/cpuinfo.

Change-Id: Ia28cad32d79945ee2c71ec1bbafa7370e49e3939
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
Signed-off-by: David Ng <dave@codeaurora.org>
msm: kgsl: Add hang interrupt and change HW fault generation

Add a sysfs property to dynamically control HW hang interrupt.
HW fault is generated for hang interrupt only.

Change-Id: Ib50c57476e54cccfef0ae18a0cbb42fce29457c1
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
spmi: qpnp-int: add irq_ack() callback and use it inside irq_mask_ack()

Add a function into the qpnp-int driver named qpnpint_irq_ack()
which performs the single step required to acknowledge a PMIC
interrupt: clearing the latched status register bit for the
interrupt.  At the same time modify the qpnpint_irq_mask_ack()
function so that it simply calls qpnpint_irq_mask() and
qpnpint_irq_ack().  This eliminates redundant code present in
both qpnpint_irq_mask() and qpnpint_irq_mask_ack().

An irq_ack() callback is required in order to utilize the
handle_edge_irq flow handler.

Change-Id: Iacb0edf01fe82f358bb6200cef1b905584eb29e5
CRs-Fixed: 630034
Signed-off-by: David Collins <collinsd@codeaurora.org>