Commit graph

572507 commits

Author SHA1 Message Date
Linux Build Service Account
45e147179a Merge "usb: dwc3: Fix NULL ptr dereference in ep disable ops" 2016-07-27 19:26:43 -07:00
Linux Build Service Account
258941eed9 Merge "clk: msm: hdmi: fix value of constant for minimum VCO rate" 2016-07-27 19:26:42 -07:00
Linux Build Service Account
729208c0c4 Merge "msm: mdss: Update backlight filter for AD" 2016-07-27 19:26:41 -07:00
Linux Build Service Account
6ae89be87e Merge "coresight-etm4x: avoid reading trace-id from ETM hardware block" 2016-07-27 19:26:40 -07:00
Linux Build Service Account
354d219f20 Merge "smb-lib: account for Jeita while distributing FCC" 2016-07-27 19:26:39 -07:00
Linux Build Service Account
27cb1fcd0a Merge "ARM: dts: msm: Update QUSB PHY device node compatible property on msmcobalt" 2016-07-27 19:26:36 -07:00
Linux Build Service Account
03fb272768 Merge "msm: jpegdma: Remove even number check for crop left and top" 2016-07-27 19:26:35 -07:00
Linux Build Service Account
b2371f9f83 Merge "netfilter: xt_qtaguid: seq_printf fixes" 2016-07-27 19:26:32 -07:00
Linux Build Service Account
8015befcec Merge "Revert "net: activity_stats: Stop using obsolete create_proc_read_entry api"" 2016-07-27 19:26:32 -07:00
Linux Build Service Account
0442f202ea Merge "Revert "misc: uidstat: avoid create_stat() race and blockage."" 2016-07-27 19:26:31 -07:00
Linux Build Service Account
0d6f04e288 Merge "Revert "misc: uidstat: Remove use of obsolete create_proc_read_entry api"" 2016-07-27 19:26:31 -07:00
Linux Build Service Account
43dfbdc98a Merge "defconfig: um: Disable activity stats" 2016-07-27 19:26:30 -07:00
Linux Build Service Account
08cbc2ba00 Merge "msm: ipa: do not use delay in SSR" 2016-07-27 19:26:29 -07:00
Linux Build Service Account
e0ae1fb68b Merge "qcom-charger: smb-lib: fix secure register writes" 2016-07-27 19:26:28 -07:00
Linux Build Service Account
049656ac1a Merge "ARM: dts: msm: set default mem_type for ETR device on msmcobalt" 2016-07-27 19:26:27 -07:00
Linux Build Service Account
2099e8d754 Merge "coresight-tmc: add support to set default mem_type" 2016-07-27 19:26:26 -07:00
Linux Build Service Account
16a0e9dfe3 Merge "msm: camera: isp: Add isp version" 2016-07-27 19:26:25 -07:00
Linux Build Service Account
b241a4901e Merge "qcom-charger: qpnp-smb2: update battery charging status on input suspend" 2016-07-27 19:26:22 -07:00
Linux Build Service Account
a71ebff89c Merge "ARM: dts: msm: Revert add HDMI support for 8996 mtp" 2016-07-27 19:26:21 -07:00
Shashank Mittal
f97da07418 Revert "coresight-tpdm: fix dsb edge ctrl mask interface"
This reverts commit 82d3e9f63a ("coresight-tpdm: fix dsb edge ctrl mask
interface").

This change is breaking dsb_edge_ctrl_mask interface for some tools.

Change-Id: I3b477df30b1b1578ce677abd83d9db40e7b91cbf
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2016-07-27 15:57:28 -07:00
Subbaraman Narayanamurthy
1653a12ec9 defconfig: msmcortex: Enable FG_GEN3 driver
FG_GEN3 driver supports the new FG GEN3 peripheral in pmicobalt.
Enable the support for it.

Change-Id: I0f1408099b0736ac510987c3a17ab798d84fbdff
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-07-27 14:52:07 -07:00
Subbaraman Narayanamurthy
5a3dc17283 power: qcom-charger: fix possible out of bounds access for GEN3 FG driver
Fix the following things in fg-util.c which is included by GEN3
FG driver:

- Possible out of bounds access in fg_sram_dfs_reg_write() when
  using bytes_read from sscanf
- Fix uninitialized usage of variable in write_next_line_to_log()

Change-Id: If9e7ba5632d1b5f99d91bda6276d9123c37e4dc7
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-07-27 14:51:48 -07:00
Siddartha Mohanadoss
727563f0d8 thermal: tsens: Remove registering for Critical trip zone
The handle_critical_trips() api in thermal_core gets
invoked during the system resume path on 4.4 kernel.
If a thermal driver has registered for the critical trip
zone the handle_critical_trips() reads the current temperature
and checks against the critical threshold. If the
temperature value is greater than the critical threshold
the device is shutdown.

Remove registering the critical trip zone since its not
used by thermal sys clients. The driver will continue
to use it internally to set thresholds and monitor
the state of the TSENS (temperature sensor) controller.

Change-Id: Ie2024498224f078de77dd006d77cdfa99bb90eee
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2016-07-27 14:46:34 -07:00
Dilip Kota
97442af04a slim-msm: Synchronize SSR callbacks
Subsystem will restart within short timeframe.
Synchronise subsytem up/down callback notifications
to avoid functionality failures.
Use mutex locks to achieve synchronization.

Change-Id: I5881c7d468507bb8402a2e9f8178b9c31e57e8a5
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
2016-07-27 13:41:16 -07:00
Dilip Kota
067b2cf5fd slim-msm-ngd:Avoid using stale pipe handle
Make sure to use pipe handle from the TX
endpoint rather than using a stored handle.
The stored handle may become invalid if SSR
happens between storing of that handle
and locking the mutex.

Change-Id: I53e8f860c2d50061b6c4e6ce2f944c1e2ed8dff2
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
2016-07-27 13:40:53 -07:00
Viswanadha Raju Thotakura
5bcf983060 msm: camera: Add support for reading new property tag
Add support to read new current property tag from PMIC LED.
This parameter is used as default value.

CRs-Fixed: 1021009
Change-Id: Ib9f5d395d4b1381827d7129ef74fa05437571803
Signed-off-by: Viswanadha Raju Thotakura <viswanad@codeaurora.org>
2016-07-27 11:35:24 -07:00
Skylar Chang
1aeba1b25e msm: ipa3: add mapping for IPA SMEM to SMMU
IPA modem driver uses shared-mem for IPA tables.
This change adds the needed mapping to AP context bank SMMU.

CRs-Fixed: 1046501
Change-Id: I185aaa38c3365336997a6a158311e67e7ffd26ad
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-07-27 11:25:15 -07:00
Skylar Chang
d106457a60 msm: ipa3: add support for additional mappings to smmu
Add support for getting additional mappings from dtsi in
order to create a mapping on IPA SMMU context bank.

CRs-Fixed: 1046501
Change-Id: Ife4779ee6c20662e2c4d8ffcd16999a675461470
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-07-27 11:25:10 -07:00
Linux Build Service Account
8702ef5194 Merge "input: it7258_ts_i2c: clean up the it7258_ts_i2c driver" 2016-07-27 06:32:38 -07:00
Linux Build Service Account
d8b7811315 Merge "msm: vidc: Fix limit for LTR mode control" 2016-07-27 06:32:37 -07:00
Linux Build Service Account
e3b417d1a4 Merge "msm: vidc: add h264 8x8 transform mode support" 2016-07-27 06:32:36 -07:00
Linux Build Service Account
e0f0c48d63 Merge "icnss: Update event workqueue flags" 2016-07-27 06:32:36 -07:00
Linux Build Service Account
ce3bf6addf Merge "ARM: dts: msm: add FG GEN3 device on pmicobalt" 2016-07-27 06:32:34 -07:00
Linux Build Service Account
c97e71cae5 Merge "msm: ipa3: changes to IPA USB APIs to support SMMU" 2016-07-27 06:32:33 -07:00
Linux Build Service Account
3d3db56d8a Merge "icnss: Add state check before calling wlan suspend/resume" 2016-07-27 06:32:32 -07:00
Linux Build Service Account
00823f13c1 Merge "ARM: dts: msm: Add IPC Router devices for MSMFALCON" 2016-07-27 06:32:31 -07:00
Linux Build Service Account
fff9f1b6a1 Merge "ARM: dts: msm: Add glink_pkt devices for MSMFALCON" 2016-07-27 06:32:30 -07:00
Linux Build Service Account
61c62cd0e1 Merge "ARM: dts: msm: add pinctrl settings for DP GPIOs for msmcobalt" 2016-07-27 06:32:27 -07:00
Linux Build Service Account
03572cfd65 Merge "net: Revert upstream changes which break routing in tunnel scenarios" 2016-07-27 06:32:23 -07:00
Linux Build Service Account
57f8a1b6ce Merge "iommu/iommu-debug: Make debug driver 32 bit compatible" 2016-07-27 06:32:22 -07:00
Linux Build Service Account
8f41dee21d Merge "usb: pd: Don't notify EXTCON_USB unless type is SDP or CDP" 2016-07-27 06:32:21 -07:00
Linux Build Service Account
4c7861ccd6 Merge "defconfig: arm64: msm: Enable ESP transformation" 2016-07-27 06:32:20 -07:00
Surendar karka
eb70f96d7e ASoC: msm: qdsp6v2: Add support to set volume in ASM loopback
Allow to set volume in ASM for the loopback driver. Without the
get() function the corresponding volume mixer control is
failing to set volume.

CRs-Fixed: 1034862
Change-Id: I621dd9de3a8d4a0f4102227989e1dd17638c20ea
Signed-off-by: Surendar karka <sukark@codeaurora.org>
2016-07-27 18:34:34 +05:30
Alexandra Chin
7112993181 input: touchscreen: synaptics v1.1
- Add fwu_go_nogo function in synaptics_fw_update.c
- Add BTN_TOUCH support in synaptics_i2c_rmi4.c
- Add List check in synaptics_i2c_rmi4.c

Change-Id: I8cb776d5b3d20bdee5036cfe0dbcb9bbaa8bf6bd
[amaloche@codeaurora.org: Subject modified from "v1.1"
 - Removed reg_access & fw_updater files due to improper license
 - Modified commit text to reflect file changes]
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
(cherry picked from commit 6ec6c2cb2b8fce021f48dbfaf326cdd99c9fd9d5)
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-07-27 15:45:49 +05:30
Srinivas Ramana
3e79e51d69 crypto: msm: enable hw crypto driver for msmfalcon
Update Kconfig to enable qcom hw crypto driver for msmfalcon.

Change-Id: I0a4ea56d48d5133083975365228b3ea2dcc2f539
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2016-07-27 14:56:19 +05:30
Srinivas Ramana
bb8aea098d soc: qcom: build kryo perf events only for MSM8996
kryo perf events are specific to MSM8996 soc. So build
this file only when MSM8996 is enabled.

Change-Id: I95aacab201d51ffb4eb8e94d2e400578cab37fc8
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2016-07-27 14:56:00 +05:30
Linux Build Service Account
8c5c49fdb2 Merge "ASoC: open ASM session with 24 bit for 24 bit playback" 2016-07-26 23:34:43 -07:00
Linux Build Service Account
7613d2de29 Merge "scsi: ufs: Crash the system on unrecoverable state" 2016-07-26 23:34:42 -07:00
Linux Build Service Account
13679785f5 Merge "msm: cpp: Query buffer from buffer manager based on index" 2016-07-26 23:34:41 -07:00
Linux Build Service Account
3fd60d9501 Merge "usb: pd: Add vendor defined message handling" 2016-07-26 23:34:40 -07:00