Commit graph

594742 commits

Author SHA1 Message Date
Linux Build Service Account
31c9729a25 Merge "ARM: dts: msm: Refactor device tree of msm8996 virtual platform" 2017-10-27 08:52:16 -07:00
Linux Build Service Account
d88953de59 Merge "rtc: Disable alarm irq if alarm time is in the past" 2017-10-27 08:52:15 -07:00
Linux Build Service Account
f15c96401c Merge "drm/msm: add SRM support for HDCP 2.2" 2017-10-27 08:52:14 -07:00
Mao Jinlong
ecbfe59d65 rtc: Disable alarm irq if alarm time is in the past
If device is boot up by rtc alarm, the alarm irq will still be
enabled and the alarm time is smaller than current rtc time before
any alarm is set or canceled. If device is powered off now, it will
boot up automatically as the alarm irq is enabled.

So disable alarm irq if alarm is enabled and alarm time is in the
past.

CRs-Fixed: 2109666
Change-Id: Ie60bd1222a400cd45a6c5a385faa70190fbe7e3c
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
2017-10-27 00:02:38 -07:00
Zhiqiang Tu
8353608a98 ARM: dts: msm: Refactor device tree of msm8996 virtual platform
Refactor device tree to support multiple targets on virtual platform.

Change-Id: Id4a3519afd63b77510d824979fc71309ff6ac481
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-10-26 17:31:46 -07:00
Linux Build Service Account
4bea3d2624 Merge "uapi: Export msm_ipc.h" 2017-10-26 14:47:35 -07:00
Linux Build Service Account
cf4751b009 Merge "defconfig: arm64: fsm: Add configs for FSM platforms" 2017-10-26 14:47:34 -07:00
Linux Build Service Account
f5caf269cd Merge "soc: qcom: glink: Add downvote of transport during SSR" 2017-10-26 14:47:33 -07:00
Linux Build Service Account
2db878d52e Merge "Merge android-4.4@d6fbbe5 (v4.4.93) into msm-4.4" 2017-10-26 07:35:30 -07:00
Linux Build Service Account
dd2d19cd96 Merge "ath10k: Add radar detect width for wcn3990 interface combination" 2017-10-26 07:35:29 -07:00
Linux Build Service Account
3b637f746d Merge "drm/msm: clear deep color bits in the HDMI controller" 2017-10-26 07:35:28 -07:00
Linux Build Service Account
40530e7b4e Merge "drm/msm: reset sink hdr capabilities during bridge disable" 2017-10-26 07:35:27 -07:00
Linux Build Service Account
b6171c845c Merge "usb: gadget: Add check gadget function bind or not" 2017-10-26 07:35:26 -07:00
Dhoat Harpal
9ed4818826 soc: qcom: glink: Add downvote of transport during SSR
During SSR, down vote transport of xprt is not called.
This leads to transport not being able to go to idle state.

Downvote of transport is called in SSR path.

CRs-Fixed: 2131780
Change-Id: Ic374073187aab95b700aa3f795787819f34d3c3c
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-10-26 19:21:44 +05:30
Linux Build Service Account
4c5c6905e4 Merge "defconfig: msm: Enable USB video class support on msm-4.4 kernel" 2017-10-25 15:58:59 -07:00
Linux Build Service Account
5177652ad0 Merge "Merge android-4.4@73a2b70 (v4.4.92) into msm-4.4" 2017-10-25 15:58:58 -07:00
Linux Build Service Account
b3161dca6c Merge "ARM: dts: msm: modify interrupt flag for wled device on PMI8994" 2017-10-25 15:58:57 -07:00
vpalvai
f7ac82b8a0 defconfig: msm: Enable USB video class support on msm-4.4 kernel
Enable USB video class for USB camera support on
msm8996-auto devices

Change-Id: I2a385cf4c935d5bc2a4c1171f185baf30322ed1d
Signed-off-by: vpalvai <vpalvai@codeaurora.org>
2017-10-25 10:01:06 -07:00
Linux Build Service Account
f0ae27b1af Merge "ath10k: increase the allowed num of tx pending pkts" 2017-10-25 07:26:51 -07:00
Linux Build Service Account
2a42942814 Merge "leds: qpnp-wled: Improve auto calibration algorithm" 2017-10-25 07:26:50 -07:00
Linux Build Service Account
77383f7a13 Merge "regulator: qpnp-labibb: Allow 0 ms for IBB PWRUP_DLY1 and PWRDN_DLY2" 2017-10-25 07:26:48 -07:00
Linux Build Service Account
06c1491488 Merge "regulator: qpnp-labibb: Fix LAB PS_CTL configuration for pmi8998" 2017-10-25 07:26:47 -07:00
Linux Build Service Account
d9ec6c6960 Merge "ARM: dts: msm: enable camera on SDM636 CDP" 2017-10-25 07:26:46 -07:00
Tirupathi Reddy
473edcfeb6 ARM: dts: msm: modify interrupt flag for wled device on PMI8994
The wled driver is not statically handling interrupt flags.
Pass proper flag such as IRQ_TYPE_EDGE_RISING for wled
"sc-irq" interrupt through device node.

Change-Id: I90974bd7995949a97bb7070e86c469cde646096a
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-10-25 14:08:33 +05:30
Linux Build Service Account
59099c712f Merge "leds: qpnp-wled: Fix parameters passed to of_get_address_byname()" 2017-10-24 20:02:57 -07:00
Linux Build Service Account
9765263bbe Merge "soc: qcom: ipc_router_glink_xprt: Change wake source name" 2017-10-24 20:02:56 -07:00
Linux Build Service Account
25d590e3f8 Merge "net: restore upstream changes which break routing in tunnel scenarios" 2017-10-24 20:02:53 -07:00
Linux Build Service Account
b3ede85de2 Merge "ARM: dts: msm: add support for QBT1000 on SDM630" 2017-10-24 20:02:52 -07:00
Linux Build Service Account
13b2fc0bc3 Merge "drm: msm: fix list corruption problem" 2017-10-24 20:02:51 -07:00
Linux Build Service Account
4021b93ec3 Merge "msm: vidc: Fix the type of frame size" 2017-10-24 20:02:50 -07:00
Linux Build Service Account
458c7d15b5 Merge "ARM: dts: msm: Use system time timestamp for PPS on msm8996 CV2X" 2017-10-24 20:02:48 -07:00
Linux Build Service Account
682b7f4ae8 Merge "pps-gpio: Add new property to use system time timestamp for PPS GPIO" 2017-10-24 20:02:47 -07:00
Linux Build Service Account
0fd0ad8913 Merge "defconfig: msm: Disable USELIB and INET_LRO" 2017-10-24 20:02:46 -07:00
Linux Build Service Account
b895f07a61 Merge "scsi: ufs: Fix stack overflow read in ufs debugfs driver" 2017-10-24 20:02:45 -07:00
Abhinav Kumar
a005a1e954 drm/msm: reset sink hdr capabilities during bridge disable
Reset the HDR capabilities during the bridge disable.
The capabilities are re-programmed the next time
the userspace issues the call to populate the modes.

Change-Id: I04dbaa99c291de13b81e12cb9742cc97d9b02593
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-10-24 18:45:29 -07:00
Subbaraman Narayanamurthy
1b9a30ef0e regulator: qpnp-labibb: Allow 0 ms for IBB PWRUP_DLY1 and PWRDN_DLY2
Currently, IBB PWRUP_DLY1 and PWRDN_DLY2 settings are configured
only for values greater than 0. However, 0 ms (no delay) can be
allowed by disabling EN_PWRUP_DLY1 or EN_PWRDN_DLY2 bits. Add
support to allow this configuration.

CRs-Fixed: 2125062
Change-Id: I8ef3b5522b8d4db6befb3fb1c2e58ea24c0f5ea0
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 17:37:50 -07:00
Subbaraman Narayanamurthy
ce1d2a8266 regulator: qpnp-labibb: Fix LAB PS_CTL configuration for pmi8998
PMI8998 LAB pulse skip configuration is different from PMI8996
and earlier PMICs. Fix it by using the right configuration API
to configure LAB PS_CTL along with supporting PM660A properly.
Since the existing LAB PS configuration threshold for pmi8998 is
incorrect in device tree, update it along with this change.

Change-Id: I2686733867ec3e2909d0c071a5881d3d824c713e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 17:35:58 -07:00
Subbaraman Narayanamurthy
7d1d130a1b leds: qpnp-wled: Improve auto calibration algorithm
If CABC is enabled and auto calibration is attempted, then OVP
fault can be seen even with a valid sink configuration and a
brightness level greater than or equal to 0.4 % dimming. This is
because of the modulation done through CABC pin which if low
enough can cause the brightness level to still go further down.

Fix this by disabling CABC on all sinks before running auto
calibration and re-enable it if the feature is enabled. Also,
modify the auto calibration brightness level to 200 so that the
load increase on WLED_VOUT can bring the voltage below OVP
threshold quick enough on a valid sink configuration.

Finally, disable WLED module before switching the sink
configuration and enable it after configuring sinks.

CRs-Fixed: 2125217
Change-Id: I570dc9eba540cd96328afd7c68f4643a112c4962
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:36:59 -07:00
Subbaraman Narayanamurthy
df035333ce leds: qpnp-wled: Fix parameters passed to of_get_address_byname()
Pass NULL pointer to of_get_address_byname() for size and flags
parameters instead of an integer value 0.

Change-Id: I53984141bb8f1164c27b6a9a5d90853b4d077ee1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:35:46 -07:00
Anirudh Ghayal
11e17644b7 leds: qpnp-wled: Run auto-calibration during init
If the OVP fault is present during boot-up run
a WLED string auto-calibration.

Change-Id: I4b0e85cd64a1e8bca9bc7de17521d1f83798ed12
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-10-24 16:34:20 -07:00
Yasir Malik
1d96b7fa96 uapi: Export msm_ipc.h
Export msm_ipc.h for use by user-space.

Change-Id: I53b96c4cb0b6fe785d3e73e7f00565c68dadf411
CRs-Fixed: 2125734
Acked-by: Jennifer L Zenner <jzenner@qti.qualcomm.com>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
2017-10-24 16:48:20 -04:00
Yasir Malik
06346e6b89 defconfig: arm64: fsm: Add configs for FSM platforms
Add configuration for 64-bit FSM platforms.

Change-Id: Icd5fb7875674e537a102af3fbc7d7c8b90c59740
CRs-Fixed: 2125734
Acked-by: Jennifer L Zenner <jzenner@qti.qualcomm.com>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
2017-10-24 16:47:48 -04:00
Rakesh Pillai
28095e48ce ath10k: increase the allowed num of tx pending pkts
HL1.0 has more number of descriptors and hence we can
queue more packets for tx.

Allow a higher number of tx pending packets for better
throughput in concurrency cases.

CRs-Fixed: 2104072
Change-Id: I8dd98cee04200fbeccf655dcb1d982d037077101
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-10-24 19:01:02 +05:30
Rakesh Pillai
d2185a8c09 ath10k: Add radar detect width for wcn3990 interface combination
radar detect widths were not added for wcn3990 interface
combinations.

Add the radar detect widths for wcn3990 interface
combinations.

CRs-Fixed: 2122264
Change-Id: If212aa238944078541168fa633db64b8bb15bf44
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-10-24 05:15:21 -07:00
Abhinav Kumar
45a0076674 drm/msm: clear deep color bits in the HDMI controller
Clear the deep color bits in the HDMI controller in case
the mode does not need OR support deep color.

Otherwise it causes issues while switching across modes where
the sink supports deep color in one of the modes but not in the
other.

Change-Id: I8accf00e89868ccaa781a3f18eb9a662d9c9235c
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-10-24 01:36:18 -07:00
Guchun Chen
d0db21101b drm: msm: fix list corruption problem
When multiple worker threads compete to update event_list, with current
vblank_ctrl_worker mechanism, there is one risk which can casue list node
is deleted for twice. This is because, due to the protected scope by
the spin_lock, mutex can exit when one thread is transvering the list,
but another queue thread may continue to add new event to the list.
This brings conflict risk. This patch is to correct this.

Change-Id: Ice31462d196c57ce18d7b998c1a1f0b7feeb08fc
Signed-off-by: Xiaowen Wu <wxiaowen@codeaurora.org>
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2017-10-24 01:09:54 -07:00
Liangliang Lu
b150ef84c4 usb: gadget: Add check gadget function bind or not
For NCM gadget function, net device structure opts->net
will be freed when NCM unbind, but user space related
device node doesn't know it, will access net structre
without checking it exist or not, finally lead to crash.

Fix this by adding check gadget function bind or not.

Change-Id: I6af9e3868f71e7fa923600721e1f716508de9b55
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-10-24 13:19:10 +08:00
Sayali Lokhande
644b4b6131 scsi: ufs: Fix stack overflow read in ufs debugfs driver
When getting string from userspace by simple_write_to_buffer
in ufs_qcom_dbg_testbus_cfg_write() function, the string
copied to configuration is not terminated with '\0'. Thus
stack overflow read may occur while copying configuration to
host->testbus.select_major, which will result in information
leak later while printing error message. This change adds null
character at the end of the input string to avoid information
leak.

Change-Id: Ic9a9204def4bd6976f42f5f80ae5c0a9730afeb1
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-10-23 20:42:05 -07:00
Linux Build Service Account
9551e129dd Merge "cnss2: Decouple WLAN host driver and PCI/MHI for suspend/resume" 2017-10-23 17:16:45 -07:00
Gustavo Solaira
0b9b71635d ARM: dts: msm: Use system time timestamp for PPS on msm8996 CV2X
Use system time timestamp for the PPS GPIO driver on
msm8996 CV2X boards.

Change-Id: Ib7231d9b182c956d3c169d6979dbb5fe7f185353
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-10-23 10:36:52 -07:00