Commit graph

574969 commits

Author SHA1 Message Date
Meng Wang
35b034ff27 ASoC: audio-ext-clk: avoid multiple initialization of pinctrl_info
Dynamic detection between wcd9335 and wcd934x codecs is supported on
msmcobalt. Probe sequence of the two codec drivers can occur in any
order. MCLK initialization is common for the two codecs which gets
called twice. Avoid wcd934x codec's probe sequence from resetting
wcd9335 codec's native mclk pinctrl if the pinctrl is already
initialized.

CRs-Fixed: 1066167
Change-Id: Idf65e15e08bb856d65b992b996cffa6ef2e6f974
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2016-09-15 20:49:30 -07:00
Linux Build Service Account
d2afad6a90 Merge "ext4 crypto: enable HW based encryption with ICE" 2016-09-15 07:33:11 -07:00
Linux Build Service Account
893e744eac Merge "ARM: dts: msm: Update the GDSCs for MSMfalcon" 2016-09-15 07:33:10 -07:00
Linux Build Service Account
5c84417703 Merge "ASoC: msm: Create the codec entry for wcd934x codec" 2016-09-15 07:33:09 -07:00
Linux Build Service Account
ab41a65b08 Merge "ASoC: msm: qdsp6v2: Enable support for multichannel tunnel USB" 2016-09-15 07:33:08 -07:00
Linux Build Service Account
444860e890 Merge "ASoC: wcd934x: Add API to enable standalone micbias" 2016-09-15 07:33:07 -07:00
Linux Build Service Account
b3253a1a3a Merge "msm: kgsl: Use A540 zap shader for msmcobalt" 2016-09-15 07:33:05 -07:00
Linux Build Service Account
e643ee5a1b Merge "regulator: core: Fix nested locking of supplies" 2016-09-15 07:33:05 -07:00
Linux Build Service Account
d2477562f0 Merge "qcom-charger: smb2: Only change wipower watts if defined in dtsi" 2016-09-15 07:33:04 -07:00
Linux Build Service Account
51cabc942b Merge "soc: qcom: glink: Fix list corruption for tx_info" 2016-09-15 07:33:03 -07:00
Linux Build Service Account
91aec55a16 Merge "msm: kgsl: Add WQ_SYSFS to the worker threads" 2016-09-15 07:33:02 -07:00
Linux Build Service Account
7ad50395d8 Merge "defconfig: enable spss-utils driver for msmcobalt" 2016-09-15 07:33:00 -07:00
Linux Build Service Account
5aa936716e Merge "ASoC: wcd934x: Add support for HPH idle detection" 2016-09-15 07:32:59 -07:00
Linux Build Service Account
f575e16488 Merge "msm: sps: Avoid pipe disconnect while IRQ is in progress and viceversa" 2016-09-15 07:32:59 -07:00
Linux Build Service Account
1da961163d Merge "scsi: ufs: Add support for reset controller framework" 2016-09-15 07:32:58 -07:00
Linux Build Service Account
01915cb32a Merge "input: it7258_ts_i2c: rename regulator_set_optimum_mode function" 2016-09-15 07:32:57 -07:00
Linux Build Service Account
975309a2a9 Merge "ARM: dts: msm: Add SPS node for msmtriton" 2016-09-15 07:32:56 -07:00
Linux Build Service Account
08725d1775 Merge "input: touchscreen: Correct return value check in Goodix driver" 2016-09-15 07:32:53 -07:00
Linux Build Service Account
0912959250 Merge "input: touchscreen: Clean code for i2c_read and i2c_write" 2016-09-15 07:32:52 -07:00
Linux Build Service Account
0df70d17dd Merge "input: touchscreen: Use proper conventional functions for debug" 2016-09-15 07:32:51 -07:00
Andrey Markovytch
a8059e6d39 ext4 crypto: enable HW based encryption with ICE
Numerous changes were introduced to various layers:
Block: removed dependency on selinux module for decision on bio merge
EXT4: Added feature controlled support for HW encryption
PFK: Major re-factoring, separation to eCryptfs and EXT4 sub-layers

Change-Id: I9256c8736e1c16175fe3f94733dda430ccc57980
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-15 00:36:43 -07:00
Taniya Das
32a3f7a216 ARM: dts: msm: Update the GDSCs for MSMfalcon
Remove the GDSC not present in msmfalcon and also remove few clocks which
are not required to be controlled from GDSC driver.

Change-Id: I284197693722912919c59ec26cfae5e382da787b
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-09-15 11:10:31 +05:30
Harshdeep Dhatt
85c1f18f8b msm: kgsl: Use A540 zap shader for msmcobalt
Update adreno-gpulist so that msmcobalt GPU uses A540 zap shader.

Change-Id: Ieac8951840f3313bca927f92207318d29c3f8161
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2016-09-14 16:17:24 -07:00
Lokesh Batra
e613a60ace ARM: dts: msm: Use a540_zap for msmcobalt
Update the zap shader name in msmcobalt GPU DTSI. msmcobalt
uses a540_zap.

CRs-Fixed: 1065444
Change-Id: I4093ccb753da45d04620e2af032034518da2d83b
Signed-off-by: Lokesh Batra <lbatra@codeaurora.org>
2016-09-14 16:16:52 -07:00
Dhoat Harpal
9026b491f3 soc: qcom: glink: Fix list corruption for tx_info
Inside glink_scheduler_tx tx_info is not validated after tx operation
and taking spin lock, since there are two functions which can release
the reference for tx_info while glink_scheduler_tx thread is preempted.
These functions are ch_purge_intent_lists and
ch_remove_tx_pending_remote_done.

Validate tx_info from tx_active list after tx operation and taking
spin lock.

CRs-Fixed: 1061565
Change-Id: I80c64d66625b9fe9205e8ffaa7cfc851e06fcb94
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2016-09-14 17:02:45 +05:30
Rama Krishna Phani A
db91b2eba7 msm: sps: Avoid pipe disconnect while IRQ is in progress and viceversa
Client driver may disconnect pipe while some data is still
pending on the pipe and might not need IRQ for that data. Current
implementation might result in crash in case disconnect and IRQ happens
on same pipe in parallel. Implement lock to avoid pipe disconnect
while IRQ is in progress for that pipe and viceversa.

Change-Id: Icf43c0a18cfc1644270b684a792632a6c81f1797
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2016-09-13 23:39:34 -07:00
Amir Samuelov
fb272b7bd6 defconfig: enable spss-utils driver for msmcobalt
Enable Secure Processor Subsystem (SPSS) Utilities driver.
This driver selects the firmware file for SPSS PIL.

Change-Id: Ia9e710b9c75f2d8cffee26373ec8e56a20323563
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2016-09-13 23:37:39 -07:00
Amir Samuelov
bbd9711a0d ARM: dts: msm: add spss_utils to msmcobalt
Add device tree info for Secure Processor Subsystem Utilities driver.

Change-Id: I2657705131fcbbcc63a723b3badb3f43135b4408
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2016-09-13 23:36:58 -07:00
Thierry Reding
f6a5df1fdf regulator: core: Fix nested locking of supplies
commit 70a7fb80e85a ("regulator: core: Fix nested locking of supplies")

Commit fa731ac7ea04 ("regulator: core: avoid unused variable warning")
introduced a subtle change in how supplies are locked. Where previously
code was always locking the regulator of the current iteration, the new
implementation only locks the regulator if it has a supply. For any
given power tree that means that the root will never get locked.

On the other hand the regulator_unlock_supply() will still release all
the locks, which in turn causes the lock debugging code to warn about a
mutex being unlocked which wasn't locked.

Cc: Mark Brown <broonie@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Fixes: fa731ac7ea04 ("regulator: core: avoid unused variable warning")
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 70a7fb80e85ae7f78f8e90cec3fbd862ea6a4d4b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[ashayj@codeaurora.org: Fix the regulator bug which was re-introduced by
commit f145f4]

CRs-Fixed: 1065539
Change-Id: I376a6412bb65a1e193647eab54ad993df4c2c24f
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2016-09-14 11:12:45 +05:30
Phani Kumar Uppalapati
d8e6734002 ASoC: wcd934x: Add support for HPH idle detection
WCD934X audio codec supports idle detection over headphone
path to reduce power consumption when the audio signal
level is low. Add support to enable headphone idle detection
in the wcd934x codec driver.

CRs-fixed: 1066588
Change-Id: I8d67fa4055898db31b47f87b6659484aeb08f58f
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
2016-09-13 20:16:55 -07:00
Amit Nischal
f556cace66 scsi: ufs: Add support for reset controller framework
The current api which performs the clock reset is moved to use the reset
framework, so support the changes in ufs driver for the same. The reset
framework requires to get reset handle and perform assert/deassert of the
resets.

Change-Id: I78d833639772cf541e563cbf9fae1aa75ec6a7da
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2016-09-13 18:02:30 -07:00
Walter Yang
cc0ec8435f ASoC: msm: Create the codec entry for wcd934x codec
Create codec entry for wcd934x codec so that userspace can retrieve
the codec info.

CRs-Fixed: 1063367
Change-Id: Ie846b5edf1d8aaecce5140986dad8da69d608d5a
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
2016-09-14 08:24:07 +08:00
Walter Yang
24bf042aef ASoC: wcd934x: Add codec version check for wcd934x
As there are many hardware version of wcd934x codec. Add version
check in the code so that userspace can get the version info.

CRs-Fixed: 1063367
Change-Id: Ia320380d568426c2d7a414a832980a556ff27f0f
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
2016-09-14 08:11:38 +08:00
Linux Build Service Account
9b82a4c589 Merge "qseecom: allocate sglistinfo buffer for kernel clients" 2016-09-13 05:43:56 -07:00
Linux Build Service Account
fb4fb712c9 Merge "firmware_class: Add missing change during kernel upgrade" 2016-09-13 05:43:55 -07:00
Linux Build Service Account
9ed8bfe3f2 Merge "Merge branch 'tmp-bab1564' into msm-4.4" 2016-09-13 05:43:53 -07:00
Linux Build Service Account
d58d587e95 Merge "scsi: ufs-qcom: configure ufs clocks core memory" 2016-09-13 05:43:52 -07:00
Linux Build Service Account
212c5900df Merge "ARM: dts: msm: enable aggre1 ufs hw ctl clock for msmcobalt" 2016-09-13 05:43:51 -07:00
Linux Build Service Account
48e1a69c5f Merge "icnss: Add support of monitoring vph_pwr" 2016-09-13 05:43:50 -07:00
Linux Build Service Account
44da37be57 Merge "crypto: msm: qce50: allocate iovec out of cacheable memory" 2016-09-13 05:43:49 -07:00
Linux Build Service Account
732c56a77c Merge "slim: msm: Avoid registration with notifier if service is not located" 2016-09-13 05:43:48 -07:00
Linux Build Service Account
d3747e3e27 Merge "slim: ngd: Avoid warning associated with TASK_INTERRUPTIBLE" 2016-09-13 05:43:47 -07:00
Linux Build Service Account
3ff89558ca Merge "scsi: ufs: dump hw regs on link failures" 2016-09-13 05:43:46 -07:00
Linux Build Service Account
a10e3ceacb Merge "scsi: ufs-qcom: dump additional testbus registers" 2016-09-13 05:43:44 -07:00
Linux Build Service Account
ea716e4b58 Merge "ARM: dts: msm: add stm dts support for msmfalcon" 2016-09-13 05:43:43 -07:00
Linux Build Service Account
f22aa5fe4b Merge "clk: qcom: Add gate clocks in GCC driver for MSM8996" 2016-09-13 05:43:42 -07:00
Linux Build Service Account
10a152cda4 Merge "clk: qcom: Clean up the MSM8996 Global Clock Control (GCC) driver" 2016-09-13 05:43:40 -07:00
Amir Samuelov
bc718d5081 soc: qcom: add secure processor subsystem (spss) utils driver
The spss-util driver provides utilities required for the SPSS.
It provides the fuse state for key selection.
It provides the SPSS HW version.

Change-Id: I70c37d64db351db86e3d1d5dddb810257c68d72f
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2016-09-13 04:35:26 -07:00
Abinaya P
278a037a7d input: it7258_ts_i2c: rename regulator_set_optimum_mode function
The function regulator_set_optimum_mode() has been renamed to
regulator_set_load(). So update the driver accordingly.

Change-Id: I7d69a4529368918f159a25769f497e6425838460
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-09-13 03:20:20 -07:00
Shantanu Jain
4e02797d45 input: touchscreen: Correct return value check in Goodix driver
Correct return value check of gtp_read_fw_version, called in probe
of the Goodix driver. The return value is actually the number of
registers read through gtp_i2c_read() function call.
Also change the error message of gtp_check_product_id.

Change-Id: I0b643e250a487f08a19555237802b020b0873d1a
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2016-09-13 01:47:03 -07:00