Commit graph

574766 commits

Author SHA1 Message Date
Linux Build Service Account
9c8924dbaa Merge "input: synaptics_2.6: add pinctrl support for Synaptics 2.6 driver" 2016-09-12 05:16:04 -07:00
Linux Build Service Account
bc7a35be18 Merge "ASoc: msm: qdsp6v2: Fix timestamp glitch during gapless transition" 2016-09-12 05:16:03 -07:00
Linux Build Service Account
5872e6e3e8 Merge "ARM: dts: msm: Add missing glink_pkt devices for MSMCOBALT" 2016-09-12 05:16:02 -07:00
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
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
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
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
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
Prashanth Bhatta
39e464dffc icnss: Add IO reset logic
Add IO reset logic without which hardware IO freezes.

CRs-fixed: 1062502
Change-Id: I58b05ae64706865a16cc52a1f81e484c396cc6f0
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-09-09 14:34:27 -07:00
Prashanth Bhatta
b0aac0da3d icnss: Enhance debugging capabilities
There are instances of QMI message timeout and because of this
stability issues are seen way after the QMI message failure. To
aid the debugging, enhance the debug capabilities by adding
ASSERT in case of failure.
Also update the logs properly to indicate which message really
failed.

CRs-fixed: 1060274
Change-Id: Ie817970cb10c879d04ffe5e2a853ada8bf8a1f88
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-09-09 14:34:09 -07:00
Amir Samuelov
5a5b5183aa soc: qcom: pil: allow to set subsystem firmware name
Allow the PIL client to set the firmware file name
for a specific subsystem.

Change-Id: Ib410cae212afb067f5df2e5d25f4f23f583ed1f2
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2016-09-09 12:54:32 -07:00
Puja Gupta
d672fbc329 ARM: dts: msm: Add bus scaling for venus PIL for MSMCOBALT
Add bus scaling support for venus PIL for MSMCOBALT. Also reduce
proxy-timeout value so that video can start playing sooner.

CRs-Fixed: 1063752
Change-Id: Icb72c488c30ee7c2414409b93fd40f3862b11f77
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2016-09-09 12:29:14 -07:00
Linux Build Service Account
2590d5faf4 Merge "ARM: dts: msm: update corner switch delay time for msmcobalt v2" 2016-09-09 11:53:18 -07:00
Linux Build Service Account
5ea20de3a5 Merge "clk: msm: clock-osm: update register initialization for msmcobalt v2" 2016-09-09 11:53:17 -07:00
Linux Build Service Account
8aca8d3631 Merge "ARM: dts: msm: Add stub regulator devices for msmfalcon" 2016-09-09 11:53:16 -07:00
Linux Build Service Account
e454f66b6b Merge "diag: Clear masks upon logging exit" 2016-09-09 11:53:16 -07:00
Linux Build Service Account
b4d91ec2d2 Merge "msm-core: debug: Update the number of supported pstates" 2016-09-09 11:53:14 -07:00
Linux Build Service Account
1a563680c4 Merge "msm-core: debug: Fix the number of arguments for sysfs nodes" 2016-09-09 11:53:14 -07:00
Linux Build Service Account
a2fa0f0d22 Merge "input: ft5x06: check return value of kobject_create_and_add" 2016-09-09 11:53:12 -07:00