Commit graph

572948 commits

Author SHA1 Message Date
Linux Build Service Account
e24bca7ad0 Merge "ASoC: wcd9335: Changes to support CPE session using EC PP path" 2016-08-02 21:58:53 -07:00
Linux Build Service Account
8d5e73afc5 Merge "CHROMIUM: android: binder: Fix potential scheduling-while-atomic" 2016-08-02 21:58:52 -07:00
Linux Build Service Account
934a7620a1 Merge "android: binder: Disable preemption while holding the global binder lock." 2016-08-02 21:58:51 -07:00
Linux Build Service Account
f0f2abaefd Merge "soc: qcom: irq_helper: Add irq helper module" 2016-08-02 21:58:50 -07:00
Linux Build Service Account
0892f7eb91 Merge "ARM: dts: msm: vote IPA_cfg on msmcobalt" 2016-08-02 21:58:49 -07:00
Linux Build Service Account
e7c6403ad9 Merge "msm: ipa: Fix the memory leak on exception" 2016-08-02 21:58:48 -07:00
Linux Build Service Account
ade5764cd3 Merge "smb-lib: Add support for thermal daemon throttling fcc" 2016-08-02 21:58:47 -07:00
Linux Build Service Account
ec9fd7cc51 Merge "mfd: wcd934x: Add page 0x50 registers for wcd934x codec" 2016-08-02 06:42:44 -07:00
Linux Build Service Account
04e7ebf191 Merge "ASoC: msmcobalt: fix proxy channels index value" 2016-08-02 06:42:44 -07:00
Linux Build Service Account
eeea2ec1ce Merge "input: touchpanel: Move Goodix GT915 driver to drivers folder" 2016-08-02 06:42:43 -07:00
Linux Build Service Account
23acf72005 Merge "input: it7258_ts_i2c: replace unused variable in driver" 2016-08-02 06:42:42 -07:00
Linux Build Service Account
0747b59e11 Merge "msm: ipa3: update IPA BCR register values" 2016-08-02 06:42:41 -07:00
Linux Build Service Account
d906969dfe Merge "input: msg21xx_ts: Move the driver to proper path" 2016-08-02 06:42:40 -07:00
Linux Build Service Account
412270ed6e Merge "input: it7258_ts_i2c: add low power mode support in suspend state" 2016-08-02 06:42:36 -07:00
Linux Build Service Account
7341630e35 Merge "input: touchscreen: clean ITE tech driver probe function" 2016-08-02 06:42:36 -07:00
Linux Build Service Account
af0987f562 Merge "Merge remote-tracking branch 'msm-4.4/tmp-2bf7955' into msm-4.4" 2016-08-02 06:42:35 -07:00
Linux Build Service Account
391a76b271 Merge "msm: ipa: add support for configuring polling interval/sleep time" 2016-08-02 06:42:34 -07:00
Shiv Maliyappanahalli
f6613b21f8 ASoC: msmcobalt: fix proxy channels index value
The array index value when setting/getting the channels
of proxy is incorrect as the channel count begins from two.
Fix by setting the correct index offset.

Change-Id: I3ab9858daf6dcdbce762946cbdebeb96eaad764a
Signed-off-by: Shiv Maliyappanahalli <smaliyap@codeaurora.org>
2016-08-01 22:29:22 -07:00
Linux Build Service Account
9d9cf7636c Merge "clk: msm: clock-gpu-cobalt: Update the GPU PLL FMAXes" 2016-08-01 21:56:51 -07:00
Linux Build Service Account
160e45d7b2 Merge "ASoC: msm: Add dapm ignore suspend for front end dais" 2016-08-01 21:56:48 -07:00
Linux Build Service Account
0e0074f51e Merge "ASoC: wcd9335: Add dapm ignore suspend for backend dais" 2016-08-01 21:56:47 -07:00
Linux Build Service Account
90cc3af5c5 Merge "slim: msm: Handle slimbus HW noise during early boot-up" 2016-08-01 21:56:46 -07:00
Linux Build Service Account
6bdacafee4 Merge "iommu/arm-smmu: Don't group PCI devices" 2016-08-01 21:56:45 -07:00
Linux Build Service Account
aec1c3826b Merge "qcom-charger: qpnp-smb2: disable vbus-error IRQ trigger" 2016-08-01 21:56:45 -07:00
Linux Build Service Account
556668c60b Merge "input: touchscreen: add palm-gesture sleep feature" 2016-08-01 21:56:44 -07:00
Linux Build Service Account
aa738fdd92 Merge "msm: camera: Add support for multiple flash nodes" 2016-08-01 21:56:43 -07:00
Linux Build Service Account
1e86ba99e5 Merge "Revert "misc: uidstat: Adding uid stat driver to collect network statistics."" 2016-08-01 21:56:41 -07:00
Linux Build Service Account
b8977f5091 Merge "xt_qtaguid: Fix panic caused by processing non-full socket." 2016-08-01 21:56:41 -07:00
Linux Build Service Account
b85e6cc250 Merge "xt_qtaguid: Fix panic caused by synack processing" 2016-08-01 21:56:40 -07:00
Linux Build Service Account
598f95ba6a Merge "Revert "net: activity_stats: Add statistics for network transmission activity"" 2016-08-01 21:56:40 -07:00
Linux Build Service Account
3cfc91a2b4 Merge "Revert "coresight-tpdm: fix dsb edge ctrl mask interface"" 2016-08-01 21:56:39 -07:00
Linux Build Service Account
cf554e72cc Merge "ARM: dts: msm: Enable droop and fault detection for pmicobalt flash LED" 2016-08-01 21:56:35 -07:00
Linux Build Service Account
25070b2a8d Merge "leds: qpnp-flash-v2: Add support for led_fault_irq" 2016-08-01 21:56:34 -07:00
Linux Build Service Account
b7fb668a44 Merge "ARM: dts: msm: Add support for new flash mode on msmcobalt" 2016-08-01 21:56:33 -07:00
Linux Build Service Account
a0000b903f Merge "msm: camera: Add support for reading new property tag" 2016-08-01 21:56:32 -07:00
Linux Build Service Account
14051dfb5d Merge "smb-lib: introduce votable to disable charging" 2016-08-01 21:56:32 -07:00
Linux Build Service Account
dd6774e357 Merge "msm: kgsl: Add 5usec delay for idle check on A540" 2016-08-01 21:56:31 -07:00
Bingzhe Cai
633e973e5f input: touchpanel: Move Goodix GT915 driver to drivers folder
Goodix GT915 driver was provided by vendor and cherry-picked into
our project, it need to be placed to right location.

Change-Id: Idf191144354426233eca41727a41e26ddbf92f95
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
Signed-off-by: Pan Fang <fangpan@codeaurora.org>
2016-08-01 21:25:25 -07:00
Shantanu Jain
6527a0f4cb input: it7258_ts_i2c: replace unused variable in driver
Replace an unused variable in the ITE tech touch screen driver.

Change-Id: I49230fb6532ee02f122d5f16dfad8dbd978b368e
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2016-08-01 21:16:17 -07:00
Bhalchandra Gajare
ced88d4dfc mfd: wcd934x: Add page 0x50 registers for wcd934x codec
Registers for page 0x50 in the wcd934x audio codec are currently
not defined. These registers control WCD DSP register configuration
and setup. Add these register definitions so that codec driver can
read/write these registers.

CRs-Fixed: 1049012
Change-Id: If1162c09de8d4d7c330a97a1f133f6d46ce2fd74
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2016-08-01 19:45:39 -07:00
Runmin Wang
2f5179d09a soc: qcom: irq_helper: Add irq helper module
This module provides two APIs which are used to control a boolean
sysfs entry deploy. The irq balancer's blacklist in user space will be
controlled by this sysfs entry.

CRs-Fixed: 1013201
Change-Id: Ie6ec7211c64f3c4f53b9f590e5bcf5fa1937d594
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-08-01 17:51:42 -07:00
Sudheer Papothi
0d91aa2188 ASoC: wcd9335: Changes to support CPE session using EC PP path
One of the CPE sessions uses EC(Echo cancellation) PP(Ping-Pong)
path on WCD9335 that is connected to CPE (Codec Processing Engine)
hardware. Configure EC PP path for CPE functionality. This
requires WCD9335 codec to be out of digital core power collapse
without turning on MCLK(Master clock).

CRs-fixed: 1022917
Change-Id: I68200b12fcb316bf36f7c3af2734a094f972da9c
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-08-01 15:47:58 -07:00
Sudheer Papothi
0f8a45e521 ASoC: wcd9335: Add dapm ignore suspend for backend dais
DAPM marks back end dai as dirty during ASoC suspend
which triggers device path teardown. Add ignore suspend
to all back end dais to avoid device path teardown.

CRs-Fixed: 1031932
Change-Id: I89f83feed0702f3a3f3b6141ed73459b8878d2df
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2016-08-02 02:57:59 +05:30
Mitchel Humpherys
6fbe4a9662 iommu/arm-smmu: Don't group PCI devices
In general, the IOMMU framework likes to group PCI devices together.
This prevents someone from assigning them to separate VMs using VFIO,
for example.  The reason they shouldn't go to separate VMs is because
there could be DMA aliasing between endpoint devices, and because the
root complex device can access anything that endpoint devices can
access.

Unfortunately, this makes things difficult in the DMA layer since the
IOMMU framework freaks out if you try to attach a single device that is
also part of a group.  First instinct might be to start using
iommu_attach_group instead of iommu_attach_device in the DMA layer but
that has problems of its own (it attaches *everyone* in the group as
soon as one client attaches).  Besides all that, it's also a bit
annoying to have the root complex device in group since, in our
platform, it doesn't actually have any stream IDs assigned to it and it
doesn't do any DMA of its own, so it doesn't really make any logical
sense to attach it.

As a compromise, we can stop grouping PCI devices together by allocating
a new domain for each one.  By doing so we no longer need to call
iommu_attach_group in the DMA layer, avoid the issues described above.

It should be noted that with this patch in place we can't securely do
any direct DMA assignment of PCI endpoint devices to separate VMs.

CRs-Fixed: 1036401
Change-Id: I9528b61a695dc7840e1c6f80af18044340f5c6c4
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2016-08-01 13:48:50 -07:00
Linux Build Service Account
0fdb8c8eae Merge "ASoC: msmcobalt: Fix channel configuration on msmcobalt" 2016-08-01 08:04:24 -07:00
Linux Build Service Account
b046eabba1 Merge "ASoC: msm: Implement HFP tx mute get function" 2016-08-01 08:04:23 -07:00
Linux Build Service Account
491adb8744 Merge "ASoC: msm: qdsp6v2: Add support to set volume in ASM loopback" 2016-08-01 08:04:22 -07:00
Linux Build Service Account
83978dfbc0 Merge "ASoC: msm-cpe-lsm: add support for two CPE sessions" 2016-08-01 08:04:21 -07:00
Linux Build Service Account
09955c92f3 Merge "ASoC: msmcobalt: Add 24 bit packed support" 2016-08-01 08:04:20 -07:00
Linux Build Service Account
2566204c8d Merge "ARM: dts: msm: By default, handle FW errors as fatal on msmcobalt" 2016-08-01 03:01:57 -07:00