Commit graph

589648 commits

Author SHA1 Message Date
Linux Build Service Account
c8b9cb715e Merge "ARM: dts: msm: Update the virtual corner for SDM630" 2017-05-15 03:51:17 -07:00
Linux Build Service Account
fee8893548 Merge "clk: Move vdd voting before set rate and parent" 2017-05-15 03:51:16 -07:00
Linux Build Service Account
fc2f0e6d95 Merge "usb: gadget: f_cdev: Increase number of driver instances to 3" 2017-05-15 03:51:15 -07:00
Linux Build Service Account
286d3aa674 Merge "msm: camera: isp: Fix excessive logging in w+t" 2017-05-15 03:51:14 -07:00
Linux Build Service Account
c6d1c1699e Merge "drm/msm: make msm_drm.h uapi header safe for C++" 2017-05-13 16:25:54 -07:00
Taniya Das
1098fcc4b9 clk: Move vdd voting before set rate and parent
There could be clocks where the clock operations of set_rate_and_parent
would be defined to take care of setting rate and updating parent.
Move the vdd voting logic to ensure the vdd levels are voted prior to
updating rate and parent.

Change-Id: I57f903f95f290627d676afd567a6e6d21decf4a3
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-05-12 10:13:32 +05:30
Linux Build Service Account
ae4d972f07 Merge "Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'" 2017-05-11 11:48:48 -07:00
Linux Build Service Account
24638027f1 Merge "drm/msm: add extern C guard for the UAPI header" 2017-05-11 11:48:47 -07:00
Linux Build Service Account
8691dbd00f Merge "input: misc: fix error path for hbtp touch driver" 2017-05-11 11:48:46 -07:00
Linux Build Service Account
9ad03b1fbd Merge "ARM: dts: msm: Add SMB1381 device node for QRD SDM660" 2017-05-11 11:48:45 -07:00
Linux Build Service Account
166f9cc74b Merge "diag: Validate proper mdlog session for a PD" 2017-05-11 11:48:44 -07:00
Linux Build Service Account
aa86283c28 Merge "ota_crypto: Add NULL pointer check for new_req variable" 2017-05-11 11:48:43 -07:00
Linux Build Service Account
8de2594b01 Merge "USB: f_qdss: Fix crash issue during connect_work" 2017-05-11 11:48:41 -07:00
Linux Build Service Account
e6f467a16d Merge "soc: qcom: qpnp-haptic: add support for auto mode" 2017-05-11 11:48:40 -07:00
Linux Build Service Account
4f71440325 Merge "scsi: ufs: ufs-qcom-ice: Initialize local variable in ice_cfg_start()" 2017-05-11 11:48:39 -07:00
Linux Build Service Account
b044376188 Merge "mmc: core: Replacing sprintf() with snprintf()" 2017-05-11 11:48:38 -07:00
Linux Build Service Account
c454ad4e3e Merge "sound: usb: Fix format desc usage for BADD 3.0 devices" 2017-05-11 11:48:37 -07:00
Linux Build Service Account
a55a52a8a2 Merge "drm/msm: Allocate secure buffer objects" 2017-05-11 11:48:34 -07:00
Hemant Kumar
cbec952d17 usb: gadget: f_cdev: Increase number of driver instances to 3
This allows to instantiate two dial up network interfaces and
one NMEA interface.

Change-Id: I59f5d93a5e9360628d8004508162dcdb42f6520d
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2017-05-11 11:12:50 -07:00
Linux Build Service Account
c4a48b7ed2 Merge "mmc: host: sdhci-msm-ice: Initialize local variable in ice_cmdq_cfg()" 2017-05-11 06:48:13 -07:00
Linux Build Service Account
33a48f3f45 Merge "ath10k: cancel the event work in wlan snoc driver module remove" 2017-05-11 06:48:12 -07:00
Linux Build Service Account
f87cdfa943 Merge "qseecom: Initialize the hlos_ce_hw_instance array" 2017-05-11 06:48:11 -07:00
Linux Build Service Account
d2c35f47e8 Merge "btfm: Fix coding error with uninitialized variables" 2017-05-11 06:48:09 -07:00
Linux Build Service Account
9a95bce25c Merge "input: stm: Fix NULL dereference in laser driver" 2017-05-11 06:48:08 -07:00
Linux Build Service Account
590cfee905 Merge "msm: camera: Fixing NULL dereference in sensor code" 2017-05-11 06:48:06 -07:00
Linux Build Service Account
9fa70208d4 Merge "ARM: dts: msm: Add support for camss throttle clock on SDM660" 2017-05-11 06:48:05 -07:00
Linux Build Service Account
3757478deb Merge "msm: isp: Fix pdaf buffer drop" 2017-05-11 06:48:04 -07:00
Linux Build Service Account
5633ac9b6c Merge "msm: camera: Do not pass kptr in copy_from_user" 2017-05-11 06:48:03 -07:00
Linux Build Service Account
6ce7c8ebb5 Merge "msm: isp: Fix isp recovery mechanism" 2017-05-11 06:48:02 -07:00
Linux Build Service Account
a81797adfc Merge "msm: isp: Correct UB size for RDI" 2017-05-11 06:48:01 -07:00
Linux Build Service Account
3c272a1622 Merge "msm: camera: isp: Vote for bandwidth to avoid race condition" 2017-05-11 06:48:00 -07:00
Linux Build Service Account
1e059e00bf Merge "ARM: dts: msm: Add iris support on msm8998 and sdm660" 2017-05-11 06:47:58 -07:00
Linux Build Service Account
d598874f03 Merge "drivers: nfc: make nq-nci probe as async probe" 2017-05-11 06:47:55 -07:00
Linux Build Service Account
a71b4b38b9 Merge "ASoC: wsa881x-analog: make probe as async probes" 2017-05-11 06:47:54 -07:00
Linux Build Service Account
0690e9e093 Merge "ASoC: wsa881x-analog: fix overwrite of client->dev->driver_data" 2017-05-11 06:47:52 -07:00
Linux Build Service Account
67f2c6d9c8 Merge "mmc: sdhci-msm: make probe as async probe" 2017-05-11 06:47:50 -07:00
Shantanu Jain
c7ac4db6b5 input: misc: fix error path for hbtp touch driver
Fix error path for hbtp touch driver where error
variable is not given proper error code while bailing
out from the function.

Change-Id: I56e2654ecffb021a60dd07ea5b5afe45a70a1c85
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-05-11 03:52:50 -07:00
Taniya Das
00275fcbb5 ARM: dts: msm: Update the virtual corner for SDM630
The virtual corner mapping for 2.15GHz for speed-bin-1 was incorrectly
mapped. Update the mapping to reflect the correct corner.

Change-Id: I73b11f7a3a4346fc0118a51032148fad75db40eb
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-05-11 16:00:29 +05:30
Manoj Prabhu B
3333335b97 diag: Validate proper mdlog session for a PD
The patch updates the mdlog session to be checked
based on the active user PD logging session.

CRs-Fixed: 2045080
Change-Id: Ieac3301545970aac91efa5a6f66c44530ff251f3
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-05-11 12:32:14 +05:30
Brahmaji K
0ef4f1a1b8 ota_crypto: Add NULL pointer check for new_req variable
Add NULL pointer check before accessing the new_req
variable.

Change-Id: I8460115ccb16a2c43c45394275e9519ed3c6b045
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
2017-05-11 12:22:43 +05:30
Linux Build Service Account
3a360dc173 Merge "drm/msm/sde: avoid adding plane states in crtc atomic check" 2017-05-10 23:04:06 -07:00
Linux Build Service Account
e1fb82e224 Merge "defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE" 2017-05-10 23:04:05 -07:00
Linux Build Service Account
97f9e94154 Merge "icnss_utils: replace mutex lock by spinlock" 2017-05-10 23:04:04 -07:00
Linux Build Service Account
bdd32e7afc Merge "drm: add extern C guard for the UAPI headers" 2017-05-10 23:04:03 -07:00
Linux Build Service Account
3930cf3fa7 Merge "msm: ipa: support aggregated ipa stats query" 2017-05-10 23:04:02 -07:00
Linux Build Service Account
95836aa032 Merge "msm: ADSPRPC: close glink channel before opening again" 2017-05-10 23:04:01 -07:00
Linux Build Service Account
8e831a70d3 Merge "usb: gadget: f_mtp: Handle OS descriptors properly" 2017-05-10 23:04:00 -07:00
Linux Build Service Account
05eae98b38 Merge "drm/msm/sde: move topology name reset to release resources" 2017-05-10 23:03:59 -07:00
Linux Build Service Account
df2fff8d1d Merge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open" 2017-05-10 23:03:58 -07:00
Linux Build Service Account
abb1d6bee6 Merge "drm/msm: notify hpd status when audio codec is ready" 2017-05-10 23:03:56 -07:00