Commit graph

592775 commits

Author SHA1 Message Date
Linux Build Service Account
a5a9ec7754 Merge "power_supply: add properties for SDP current and PD voltage" into msm-4.4 2017-08-20 01:17:38 -07:00
Linux Build Service Account
a254db548d Merge "drm/msm: Free all allocated resources in case hardware init fails" into msm-4.4 2017-08-20 01:17:33 -07:00
Linux Build Service Account
d7d541d471 Merge changes I144bd8ad,Ic73cbec2 into msm-4.4
* changes:
  ASoC: msm: Quat MI2S capture dai update for 88.2 and 176.4 Khz rates
  ASoC: msm8998: Add 88.2 and 176.4 khz support for MI2S Interface
2017-08-20 01:17:30 -07:00
Linux Build Service Account
360f0c55cc Merge "usb: pd: rename enum pd_msg_type to pd_sop_type" into msm-4.4 2017-08-20 01:17:26 -07:00
Linux Build Service Account
ae637d061f Merge "deconfig: arm64: Enable laser sensor on sdm660" into msm-4.4 2017-08-20 01:17:24 -07:00
Linux Build Service Account
e060b0eda6 Merge "ASoC: msm: qdsp6v2: Increase max supported ASM sessions" into msm-4.4 2017-08-20 01:17:21 -07:00
Linux Build Service Account
cd6ebe2c6b Merge changes I63f4b61e,Ie1e65719 into msm-4.4
* changes:
  cnss2: Fix bugs for driver debugfs nodes
  cnss2: Enhance debugfs support for device boot
2017-08-20 01:17:18 -07:00
Linux Build Service Account
fd17ef2bca Merge "msm: kgsl: Add disable-wake-on-touch devicetree property" into msm-4.4 2017-08-20 01:17:16 -07:00
Linux Build Service Account
0f9dd1be13 Merge "ASoC: msm: Fix pan control param gain to accommodate Q28 format" into msm-4.4 2017-08-20 01:17:14 -07:00
Linux Build Service Account
226d13c582 Merge "power: pmic-voter: use force_val in rerun election" into msm-4.4 2017-08-20 01:17:10 -07:00
Linux Build Service Account
91e4f87419 Merge "msm: gsi: check channel state on timeout" into msm-4.4 2017-08-20 01:17:09 -07:00
Linux Build Service Account
7d8619d8fc Merge "msm: pcie: add global lock for PCIe enumeration" into msm-4.4 2017-08-20 01:17:04 -07:00
Linux Build Service Account
1c2f58fb73 Merge "msm: usb_bam: Fix failure of remove by of_platform_depopulate" into msm-4.4 2017-08-20 01:17:02 -07:00
Linux Build Service Account
a5d91019ca Merge "arm64: io.h: fix write{w,q}_relaxed_no_log() macro" into msm-4.4 2017-08-20 01:17:01 -07:00
Linux Build Service Account
9e86ebb8e2 Merge "ASoC: msm: enable app type config for transcode loopback" into msm-4.4 2017-08-20 01:16:59 -07:00
Linux Build Service Account
2f2dc26cb6 Merge "msm: ais: Avoid deadlock for vb2 operations using separate lock" into msm-4.4 2017-08-20 01:16:54 -07:00
Linux Build Service Account
b2e1a05cd3 Merge "ARM: dts: msm: Enable laser for sdm660 CDP/MTP" into msm-4.4 2017-08-20 01:16:52 -07:00
Linux Build Service Account
c72d0c4cec Merge "qpnp-smb2: use real_type to convey WIPOWER type" into msm-4.4 2017-08-20 01:16:50 -07:00
Linux Build Service Account
f252da1f0b Merge "rh850: fix mtu to CANFD size" into msm-4.4 2017-08-20 01:16:48 -07:00
Linux Build Service Account
f0e22ca5e0 Merge "ath10k: Remove dedicated p2p_device interface capability for wcn3990" 2017-08-18 21:02:12 -07:00
Linux Build Service Account
9255d9d73a Merge "ath10k: Enable pktlog for rx data packets" 2017-08-18 21:02:11 -07:00
Varun Balaraj
3838922706 ASoC: msm: qdsp6v2: Increase max supported ASM sessions
ASM max active sessions increase to 9 to allow 8 interactive and
one primary stream concurrently.

CRs-Fixed: 2093120
Change-Id: I92a51dd1937634abb472fc06edbdd879b3d152d0
Signed-off-by: Varun Balaraj <varunb@codeaurora.org>
2017-08-18 08:56:42 -07:00
Varun Balaraj
a935e0c8f8 ASoC: msm: Fix pan control param gain to accommodate Q28 format
Fix pan control gain param to accommodate Q28 format.
Convert 32bit gain to be inlined with 16bit mixer coefficients
of ADSP.

Change-Id: I85ebd11c49b4af982f34091937acabb9e6580e8f
Signed-off-by: Varun Balaraj <varunb@codeaurora.org>
2017-08-17 09:32:42 -07:00
Alex Yakavenka
d9581b145c rh850: fix mtu to CANFD size
MTU defaults to standard CAN frame, however,
since rh850 driver supports CANFD frames MTU
needs to be set accordingly.

CRs-Fixed: 2071638
Change-Id: I5015af6e61ef4b4e021a715a8dec60d42a8a9e5b
Signed-off-by: Alex Yakavenka <ayakav@codeaurora.org>
2017-08-16 21:11:05 -07:00
Abhijeet Dharmapurikar
69e20be0eb qpnp-smb2: use real_type to convey WIPOWER type
Currently we use WIPOWER as the type for dc power supply.
Instead use WIRELESS in the type and use WIPOWER in the
real_type property.

Change-Id: I9081e752e5b3ff725a6ba935d6f6df4e36fec3fa
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-16 18:35:26 -07:00
Siddartha Shaik
4ef6a54e2c ASoC: msm: enable app type config for transcode loopback
Add app type configuration support for DSP transcode
loopback to enable required PP topologies.

CRs-Fixed: 2092562
Change-Id: I60ee50d78ba3c0edc9df042a2a86e691d62f24b7
Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
2017-08-16 21:02:54 +05:30
Rakesh Pillai
d0f439e4ca ath10k: Remove dedicated p2p_device interface capability for wcn3990
p2p_find uses primary interface mac address during active
scan instead of the later created p2p interface on which
wpa_supplicant is running.

wpa_supplicant creates a p2p_device interface if the driver
exposes a dedicated p2p_device interface capability. The mac
address for the created p2p_device interface will be same as of
the primary interface registered with the netdev.

By disabling the dedicated p2p_device interface capabilty
for wcn3990, wpa_supplicant uses the interface passed to it
from commandline interface and hence will use the correct
mac address for the active scan purpose.

CRs-Fixed: 2092523
Change-Id: I42ff819bb195e5f5dd7fef9908786621996e93b7
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-08-16 17:44:04 +05:30
Wei Ding
50f8cbab1f deconfig: arm64: Enable laser sensor on sdm660
Changes to enable the laser sensor on the sdm660.

Change-Id: I2b0c8dc6454d7e99d2073acbcf58cc2f0f73148a
Signed-off-by: Wei Ding <weiding@codeaurora.org>
2017-08-16 00:09:41 -07:00
Ziqi Chen
98a667af9e msm: usb_bam: Fix failure of remove by of_platform_depopulate
If device is created by of_platform_populate and removed by
of_platform_depopulate from parent device driver, platform_data
will be released twice and lead to kernel panic.

of_platform_depopulate will free platform_data of each device driver.
Usually we use devm_kzalloc to malloc for platform_data so it can be
released during driver unregister. So if device is removed by
of_platform_depopulate and platform_data is malloced by devm_kzalloc,
platform_data will be freed twice. To fix it, move this data into
struct usb_bam_ctx_type and then store usb_bam_ctx_type into device
driver data. In this way, it can be get in remove function.

The member regs of usb_bam_ctx_type is not necessary. It is only
used for ioremap which already has been done by virt_addr of
struct sps_bam_props.

Without sps_deregister_bam_device, bam child device will not be
created again during defer probe. So deregister in remove function.

Change-Id: Ibae80745be5810d400a1c05566a99efcc2190020
Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
2017-08-15 22:03:41 -07:00
Tony Truong
365cfb4244 msm: pcie: add global lock for PCIe enumeration
Multiple root complexes can enumerate concurrently.
Add a global lock to prevent race condition when PCI
framework discovers and updates the PCIe bus
driver's global device table.

Change-Id: I9c88f12aef9fce05d95cfb2fa0f5374c6c4ab1e8
Signed-off-by: Tony Truong <truong@codeaurora.org>
2017-08-15 15:27:27 -07:00
Yue Ma
30484e039c cnss2: Fix bugs for driver debugfs nodes
Fix a bug for incorrect jumping out of a switch statement when
showing driver status debugfs node. PCIe link up/down description
is also missing for device boot debugfs node. Add them back.

Change-Id: I63f4b61e837643566cd6b802ce94191b7a96ba7e
CRs-fixed: 2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-15 09:45:54 -07:00
Siddartha Shaik
bcf5264d73 ASoC: msm: Quat MI2S capture dai update for 88.2 and 176.4 Khz rates
Quaternary MI2S capture dai update to support HDMI In
feature requirement using DSP HW transcode loopback.

CRs-Fixed: 2091424
Change-Id: I144bd8ad8b0e2f708acf78be00e8a93a25a88f2e
Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
2017-08-15 00:29:37 -07:00
Siddartha Shaik
9aa8e1cd38 ASoC: msm8998: Add 88.2 and 176.4 khz support for MI2S Interface
Extend MI2S supported sampling rates to support HDMI In
feature requirements using DSP HW transcode loopback.

CRs-Fixed: 2091424
Change-Id: Ic73cbec2473ab509f6a85bd7f6f60869b7986d7b
Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
2017-08-15 00:28:33 -07:00
Samyukta Mogily
6873c0c14e ARM: dts: msm: Enable laser for sdm660 CDP/MTP
Add the laser device with the required GPIO and
regulator configuration for sdm660 CDP and MTP.

Change-Id: I763508184eab633df0d45449addcc7d79a366e04
Signed-off-by: Samyukta Mogily <smogily@codeaurora.org>
2017-08-15 13:49:55 +08:00
Deepak Kumar
cfa0dc2093 drm/msm: Free all allocated resources in case hardware init fails
Turn off the GPU power and free all resources allocated during
GPU init in case hardware init fails in adreno_gpu_load. This is
required to make sure further tries to load the GPU again doesn't
fail because of invalid GPU state.

Change-Id: I1d0d68f62be751d76274975e098364131712ca38
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-08-14 20:18:46 +05:30
Rahul Sharma
a8782d46b5 msm: ais: Avoid deadlock for vb2 operations using separate lock
Use mutex lock for all VB2 operations, and use separatelock other
than used for stop streaming operation to avoid dead lock.

Change-Id: Ibb466f81cb2825a77073712419fd17c9759ecde4
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-08-14 02:51:29 -07:00
Rakesh Pillai
473722a7fc ath10k: Enable pktlog for rx data packets
Pktlog was not enabled for rx data packets.
Enable pktlog capture for rx data packets.

CRs-Fixed: 2091228
Change-Id: I8f489065081ba4da7ad7f5b8e271272279124abc
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-08-14 12:18:22 +05:30
Linux Build Service Account
a49bb61510 Merge "ARM: dts: msm: Remove sync-wait-broadcast for NT35597 DDIC" 2017-08-12 07:56:35 -07:00
Linux Build Service Account
dd75d0679e Merge "ath10k: Enable pktlog for WCN3990 target" 2017-08-12 02:36:03 -07:00
Linux Build Service Account
14cda0001f Merge "ARM: dts: msm: Add support for ov9282 dual camera support" 2017-08-11 16:23:55 -07:00
Linux Build Service Account
07ab04950a Merge "ARM: dts: msm: Enable auto-calibration for WLED on PM660/PMI8998" 2017-08-11 16:23:53 -07:00
Linux Build Service Account
842f75d2bb Merge "drm/msm: update HDMI AVI infoframe during HDR playback" 2017-08-11 16:23:52 -07:00
Linux Build Service Account
6949010ef3 Merge "drm/msm: update CSC matrix during HDR playback" 2017-08-11 16:23:51 -07:00
Linux Build Service Account
de1f4ef405 Merge "drm/msm: change CSC matrix selection logic for CDM block" 2017-08-11 16:23:50 -07:00
Linux Build Service Account
9a34ec62d2 Merge "ASoC: msm: qdsp6v2: assign decoder memory to ADSP" 2017-08-11 16:23:49 -07:00
Linux Build Service Account
7ed24b74a1 Merge "Revert "input: misc: hbtp_input: fix memory corruption in list"" 2017-08-11 16:23:48 -07:00
Sathish Ambley
2d9e1beb31 ARM: dts: msm: Add support for ov9282 dual camera support
Add support for ov9282 dual camera sensors with the images from
the two sensors stitched together.

Change-Id: I4ac5aecca4d7ecc4fb9d04a6fdf64c871f486cbf
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
Acked-by: Rajesh Bharathwaj <rajeshbharathwaj@codeaurora.org>
2017-08-11 12:57:19 -07:00
Sathish Ambley
19c7c24c96 ARM: dts: msm: Add support for svr835 v2 board
Add battery profile data and pinctrl changes that are specific to svr835
v2 board.

Change-Id: I85c5e7ce7e88655da5637d2e5bc14ce8593b09d0
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
Acked-by: Rajesh Bharathwaj <rajeshbharathwaj@codeaurora.org>
2017-08-11 08:35:09 -07:00
Joonwoo Park
1aac7c27a1 arm64: io.h: fix write{w,q}_relaxed_no_log() macro
Fix write{w,q}_relaxed_no_log() macro's incorrect type casting.

CRs-fixed: 728799
Change-Id: Ic4aa418d20a293d300688cc91b3998d762f023ad
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
2017-08-11 02:28:53 -07:00
Govind Singh
2e035860df ath10k: Enable pktlog for WCN3990 target
WCN3990 target uses new connect service for pktlog.
Add pktlog service request and support for pktlog
rx handling.

CRs-Fixed: 2038976
Change-Id: I6f7dbd8f8cbeadd0e53844154a9c360011e2c798
Signed-off-by: Govind Singh <govinds@codeaurora.org>
Signed-off-by: Ashutosh Kumar <askuma@codeaurora.org>
2017-08-11 10:40:40 +05:30