Commit graph

574842 commits

Author SHA1 Message Date
Linux Build Service Account
5872e6e3e8 Merge "ARM: dts: msm: Add missing glink_pkt devices for MSMCOBALT" 2016-09-12 05:16:02 -07:00
Bingzhe Cai
4bf592770b input: touchpanel: enable protocol B for skuf CTP driver
Skuf use touch panel protocol B for touch event recognition that
needs enable this protocol in driver.

Change-Id: Ic855ed4fb0277a9bc5996bcb310db67b8ccf5c03
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org>
2016-09-12 05:03:53 -07:00
Bingzhe Cai
ed6a734b04 input: touchpanel: Add FB notifications support to GT9xx
Add support for FB notifications to trigger suspend/resume
based on FB blank/unblank events.

Change-Id: I61803e3a731e047d0641e3b1ccbae58b9bd1bd89
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org>
2016-09-12 05:03:47 -07:00
Bingzhe Cai
8b439ca7fa input: touchpanel: Add power control to GT9xx driver
Add power initialization  function to request internal and external
LDO depends on device tree configuration. Add power control function
to enable and disable device power.

Change-Id: If063900f8cd61c36c4b200d781c68e742cd6bbaf
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org>
2016-09-12 05:03:41 -07:00
Sudhakar Manapati
9d4062a965 input: touchscreen: add support for IT7260 touch controller series
IT7260 touch controllers are capacitative touch controller ICs
with multi-touch support and can detect upto 3 fingers.

Change-Id: I20a4339639a715111a340b7a607448ec7078549e
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-09-12 17:25:58 +05:30
Mohit Aggarwal
de93e6c399 memshare: Synchronize memory allocation and free operations
Currently, on Modem SSR, memshare driver receives notification
in which it free up the allocated memory. Due to timing issue,
free is happening after allocation. This patch synchronize
these operations.

Change-Id: I464d3b82f33ccdfd0988ef33fec8414d4ab4a550
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
2016-09-12 02:58:16 -07:00
Abinaya P
5d690a9685 input: Makefile: include ITE tech touch driver for compilation
Add ITE tech touch screen driver for the compilation.

Change-Id: Iee6abc583917968879a19a5e67b4db08d506c794
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-09-12 15:00:31 +05:30
Changmin Liu
79f23effb8 input: synaptics_2.6: add pinctrl support for Synaptics 2.6 driver
Add pinctrl support for Synaptics S2333 controller so that the irq and
pwr pins could be pulled up when probed and resumed. Furthermore, they
should be pulled down when suspended and removed.

Change-Id: If517747243a605eacd1f6ffd6d1f7c0d45d06c1b
Signed-off-by: Changmin Liu <changmil@codeaurora.org>
2016-09-12 14:40:02 +05:30
Bingzhe Cai
1f24ee5748 input: touchpanel: Add DT support for Goodix touchpanel driver
Add device tree parser to allow Goodix touchpanel driver to get
board dependent configuration from device tree.

Change-Id: I702400140130fd3b673e0e13a8dbdb7060bba881
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org>
2016-09-12 02:04:51 -07:00
Theodore Ts'o
63004e80c8 ext4 crypto: use dget_parent() in ext4_d_revalidate()
This avoids potential problems caused by a race where the inode gets
renamed out from its parent directory and the parent directory is
deleted while ext4_d_revalidate() is running.

Change-Id: I28a1f87f236ca97ce28e876265075f1d3bcdca6a
Fixes: 28b4c263961c
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Git-commit: 3d43bcfef5f0548845a425365011c499875491b0
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-12 01:06:21 -07:00
Theodore Ts'o
4dfa31b4af ext4 crypto: don't let data integrity writebacks fail with ENOMEM
We don't want the writeback triggered from the journal commit (in
data=writeback mode) to cause the journal to abort due to
generic_writepages() returning an ENOMEM error.  In addition, if
fsync() fails with ENOMEM, most applications will probably not do the
right thing.
So if we are doing a data integrity sync, and ext4_encrypt() returns
ENOMEM, we will submit any queued I/O to date, and then retry the
allocation using GFP_NOFAIL.

Change-Id: Ib16510f0261275a61c2b6870503e67b4b1189bee
Google-Bug-Id: 27641567
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Git-commit: c9af28fdd44922a6c10c9f8315718408af98e315
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-12 01:05:34 -07:00
Xiaonian Wang
d418cf9054 input: synaptics_dsx_2.6: not reinit when spontaneous reset is detected
There is no need to reinit device when spontaneous reset is detected,
touch will recover by itself.

Change-Id: Ifb5b134d0fbeb2f55f16af8806abb9c8e51c35e0
Signed-off-by: Xiaonian Wang <xiaonian@codeaurora.org>
2016-09-11 23:25:26 -07:00
Shantanu Jain
1919671d4d input: synaptics_dsx_2.6: correct secure_touch_init function
In synaptics_dsx_2.6 touch driver, secure_touch_init tries to get
the QUP clocks for the secure touch functionality. But as these
calls are optional and TZ might get the owenership of these clocks,
this change removes the error return statement, so that the
secure touch can be initialized properly.

Change-Id: I12b5075d484cd397bfb423479589e159a2193f31
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2016-09-12 11:52:37 +05:30
Linux Build Service Account
774736d179 Merge "ARM: dts: msm: Add support for GDSCs for MSMfalcon" 2016-09-11 23:19:25 -07:00
Linux Build Service Account
a19a2ddc92 Merge "ARM: dts: msm: Fix vconn-supply typo in PMICOBALT" 2016-09-11 23:19:25 -07:00
Linux Build Service Account
34f5a9df8f Merge "ARM: dts: msm: add parallel charger io channels for MSMCOBALT" 2016-09-11 23:19:24 -07:00
Linux Build Service Account
6179dd5c5b Merge "smb138x-charger: expose charger temperature" 2016-09-11 23:19:23 -07:00
Linux Build Service Account
55d84b4e86 Merge "ARM: dts: msm: Add bus scaling for venus PIL for MSMCOBALT" 2016-09-11 23:19:22 -07:00
Linux Build Service Account
7187b69448 Merge "ARM: dts: msm: update the sound node for msmcobalt QRD" 2016-09-11 23:19:21 -07:00
Linux Build Service Account
7f1a56302b Merge "defconfig: msm: sde: Add config for SDE rotator EVTLOG debug" 2016-09-11 23:19:20 -07:00
Linux Build Service Account
e5f0209b25 Merge "msm: sde: Add EVTLOG and REG dump support for SDE rotator" 2016-09-11 23:19:20 -07:00
Linux Build Service Account
ef33877be2 Merge "pinctrl: qcom: spmi-gpio: Correct power_source range check" 2016-09-11 23:19:15 -07:00
Linux Build Service Account
8949cdb2b0 Merge "pinctrl: qcom: spmi-gpio: Add dtest route for digital input" 2016-09-11 23:19:14 -07:00
Linux Build Service Account
f31b1001e1 Merge "pinctrl: qcom: spmi-gpio: Add support for GPIO LV/MV subtype" 2016-09-11 23:19:13 -07:00
Taniya Das
aa26c2ba43 ARM: dts: msm: Add support for GDSCs for MSMfalcon
These power domains are required by clients to be controlled before any
clock request, so add support for the same.

Change-Id: I7d600648281d2f4375307b0e0dd1bf121d0e6e4f
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-09-12 09:27:37 +05:30
Linux Build Service Account
911e592fdc Merge "icnss: Add ICNSS utility file" 2016-09-11 13:02:24 -07:00
Odelu Kukatla
d42cc76f6b clk: qcom: Add gate clocks in GCC driver for MSM8996
Add all the gate clocks which are part of msm8996 global
clock controller(GCC) and would be used by clients to
control these clocks using the clock controller framework.

Change-Id: I16238940798ab5627c04fe050a6daf75f1d54277
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2016-09-11 10:59:06 -07:00
Odelu Kukatla
702dec01d6 clk: qcom: Clean up the MSM8996 Global Clock Control (GCC) driver
Remove the RPM controlled clocks and add missing clocks.
Also clean up clock flags and parent info for few clocks.

Change-Id: I7ae55f992be29a28617070ca7792f912592c3628
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2016-09-11 23:13:42 +05:30
Linux Build Service Account
9ac6506762 Merge "ASoC: msm: qdsp6v2: Fix excessive logging from VOIP driver" 2016-09-11 09:04:06 -07:00
Linux Build Service Account
b9897566ca Merge "cfg80211: Add support for aborting an ongoing scan" 2016-09-11 09:04:05 -07:00
Linux Build Service Account
3856375d06 Merge "cfg80211: Define macro to indicate support for cfg80211 abort scan api" 2016-09-11 09:04:04 -07:00
Linux Build Service Account
4970303a87 Merge "msm: ipa: mhi: add perf vote" 2016-09-11 04:03:38 -07:00
Linux Build Service Account
885abe4b27 Merge "msm: ipa: fix memory leak on QMI" 2016-09-10 23:41:00 -07:00
Yuanyuan Liu
6b6d7f362e icnss: Add ICNSS utility file
Add ICNSS utility file, which provides APIs for getting/setting
WLAN DFS channels.

CRs-Fixed: 1060783
Change-Id: Iae89ce7b26453f9a0ff3214bd5598ee11e181857
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2016-09-10 17:39:41 -07:00
Linux Build Service Account
c2ab8cf0ae Merge "mdss: display-port: add new sysfs node for 3D mode" 2016-09-10 14:35:08 -07:00
Linux Build Service Account
8bd9feafb1 Merge "drivers: GICv3: remove the rtb logs of gic write and read" 2016-09-10 06:39:14 -07:00
Linux Build Service Account
a2d7b195ec Merge "usb: dwc3-msm: Only set vbus_draw for SDP type" 2016-09-10 06:39:13 -07:00
Linux Build Service Account
5c5e16573d Merge "sched: Move data structures under CONFIG_SCHED_HMP" 2016-09-10 06:39:12 -07:00
Linux Build Service Account
6595d9c1cd Merge "usb: pd: Fix unbalanced vconn regulator disable" 2016-09-10 06:39:12 -07:00
Linux Build Service Account
1acb54a652 Merge "video: adf: zero out mapping data on adf_buffer_map() failure" 2016-09-10 06:39:11 -07:00
Linux Build Service Account
d2286074f3 Merge "soc: qcom: pil: allow to set subsystem firmware name" 2016-09-10 06:39:10 -07:00
Linux Build Service Account
50ad11fb8b Merge "icnss: Add IO reset logic" 2016-09-10 06:39:05 -07:00
Linux Build Service Account
d2f9d1e0e5 Merge "usb: gadget: u_ether: Add missing rx work initialization" 2016-09-10 06:39:04 -07:00
Karthik Reddy Katta
287879c3be ASoC: msm: Add Buffer overflow check
The overflow check is required to ensure that user space data
in kernel may not go beyond buffer boundary.

CRs-Fixed: 1064411
Change-Id: I54c28a8942cf1a6a47a4e8272f3159b35d753ead
Signed-off-by: Karthik Reddy Katta <a_katta@codeaurora.org>
2016-09-10 04:49:15 -07:00
Runmin Wang
2a2c4f8bd9 drivers: GICv3: remove the rtb logs of gic write and read
gic_write/read use write/read_relaxed function which will create
lots of RTB logging. Change the API to no_log version to remove
those RTB logs.

Change-Id: Ide59d8c2753364840f8a2b304ef0c169870c8509
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-09-09 17:46:16 -07:00
Greg Hackmann
6cced823ba video: adf: zero out mapping data on adf_buffer_map() failure
If the following call chain fails

adf_device_post_nocopy() ->
  adf_buffer_map() ->
    dma_buf_attach(); dma_buf_map_attachment()

then the attachment returned by dma_buf_attach() will get cleaned up
twice: first during the error-handling path inside adf_buffer_map(), and
again during the error-handling path inside adf_device_post_nocopy().

Fix this by zeroing out the mapping data inside adf_buffer_map()'s
error-handling path.  When adf_device_post_nocopy() hands it back to
adf_buffer_mapping_cleanup(), it will deliberately skip over zeroed-out
data.

(The second adf_buffer_mapping_cleanup() call inside
adf_device_post_nocopy() is not a bug; it's intended to clean up after
any *other* buffers we handled as part of this request.)

CVE:CVE-2016-3811

Bug: 28025945
Bug: 28279077

Change-Id: I824d980b208da3a15d35f74970755c8f18500263
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Git-repo: https://android.googlesource.com/kernel/msm.git
Git-commit: 4436de7a92d037599e0d217f16f9c391b6ad866a
Signed-off-by: Ravi Kumar Siddojigari <rsiddoji@codeaurora.org>
2016-09-09 16:56:27 -07:00
Abhijeet Dharmapurikar
0d84417358 qcom-charger: smb-lib: support input limited state property
Add support to indicate if the switcher is acting in input limited state.
Switcher running in high duty cycle (HDC) mode should also be indicated as
input limited condition.
HDC is a 5uS pulse and sw reading the real time status register may not
indicate that it is active. Basically the presence of the pulses and the
interrupts indicate HDC and conversely their absence indicates no
HDC. Set a flag in the interrupt and clear it in a delayed work queue in
20mS. As long as the interrupts happen this flag will remain set,
indicating HDC.

Change-Id: Ia2e2d02240c36ba982f9e190b88b822b5f1b90f1
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2016-09-09 16:12:55 -07:00
Jack Pham
0057979436 ARM: dts: msm: Fix vconn-supply typo in PMICOBALT
The 'vconn' regulator is spelled with two n's, not one.

Change-Id: I118d4e1dbd1aa26c2637e5ea4f4ba5b6006bebff
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2016-09-09 15:40:54 -07:00
Jack Pham
abc22dbb35 usb: pd: Fix unbalanced vconn regulator disable
Make sure to only call regulator_disable() on VCONN only if
it was previously enabled, else it could result in an
unbalanced disable state. Subsequent enables would then be
no-ops and the regulator would not actually turn on.

Change-Id: I67a6ad6d2bc036a63714403e2eed8c0577ef0246
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2016-09-09 15:40:54 -07:00
Syed Rameez Mustafa
1389927146 sched: Move data structures under CONFIG_SCHED_HMP
Frequency-demand conversion data structures are only used under
CONFIG_SCHED_HMP. Move them out of sched.h into hmp.c to where they
actually belong after the recent refactor.

Change-Id: I3c3eebca86062f11b80af93ba3716695eb787376
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
2016-09-09 15:35:38 -07:00