Commit graph

572507 commits

Author SHA1 Message Date
Linux Build Service Account
aa738fdd92 Merge "msm: camera: Add support for multiple flash nodes" 2016-08-01 21:56:43 -07:00
Linux Build Service Account
1e86ba99e5 Merge "Revert "misc: uidstat: Adding uid stat driver to collect network statistics."" 2016-08-01 21:56:41 -07:00
Linux Build Service Account
b8977f5091 Merge "xt_qtaguid: Fix panic caused by processing non-full socket." 2016-08-01 21:56:41 -07:00
Linux Build Service Account
b85e6cc250 Merge "xt_qtaguid: Fix panic caused by synack processing" 2016-08-01 21:56:40 -07:00
Linux Build Service Account
598f95ba6a Merge "Revert "net: activity_stats: Add statistics for network transmission activity"" 2016-08-01 21:56:40 -07:00
Linux Build Service Account
3cfc91a2b4 Merge "Revert "coresight-tpdm: fix dsb edge ctrl mask interface"" 2016-08-01 21:56:39 -07:00
Linux Build Service Account
cf554e72cc Merge "ARM: dts: msm: Enable droop and fault detection for pmicobalt flash LED" 2016-08-01 21:56:35 -07:00
Linux Build Service Account
25070b2a8d Merge "leds: qpnp-flash-v2: Add support for led_fault_irq" 2016-08-01 21:56:34 -07:00
Linux Build Service Account
b7fb668a44 Merge "ARM: dts: msm: Add support for new flash mode on msmcobalt" 2016-08-01 21:56:33 -07:00
Linux Build Service Account
a0000b903f Merge "msm: camera: Add support for reading new property tag" 2016-08-01 21:56:32 -07:00
Linux Build Service Account
14051dfb5d Merge "smb-lib: introduce votable to disable charging" 2016-08-01 21:56:32 -07:00
Linux Build Service Account
dd6774e357 Merge "msm: kgsl: Add 5usec delay for idle check on A540" 2016-08-01 21:56:31 -07:00
Linux Build Service Account
0fdb8c8eae Merge "ASoC: msmcobalt: Fix channel configuration on msmcobalt" 2016-08-01 08:04:24 -07:00
Linux Build Service Account
b046eabba1 Merge "ASoC: msm: Implement HFP tx mute get function" 2016-08-01 08:04:23 -07:00
Linux Build Service Account
491adb8744 Merge "ASoC: msm: qdsp6v2: Add support to set volume in ASM loopback" 2016-08-01 08:04:22 -07:00
Linux Build Service Account
83978dfbc0 Merge "ASoC: msm-cpe-lsm: add support for two CPE sessions" 2016-08-01 08:04:21 -07:00
Linux Build Service Account
09955c92f3 Merge "ASoC: msmcobalt: Add 24 bit packed support" 2016-08-01 08:04:20 -07:00
Linux Build Service Account
2566204c8d Merge "ARM: dts: msm: By default, handle FW errors as fatal on msmcobalt" 2016-08-01 03:01:57 -07:00
Linux Build Service Account
8560f5d5ea Merge "input: touchscreen: add touch to wake feature in ITEtech driver" 2016-08-01 03:01:55 -07:00
Linux Build Service Account
45e9c3f685 Merge "qseecom: validate the inputs of __qseecom_send_modfd_resp" 2016-08-01 03:01:54 -07:00
Manish Dewangan
898fd01bf2 ASoC: msmcobalt: Add 24 bit packed support
Changes to support packed 24 bit (SNDRV_PCM_FORMAT_S24_3LE)

CRs-Fixed: 1011048
Change-Id: Id927e9b8894b1bf99e57cc0f04abf126740c6d36
Signed-off-by: Manish Dewangan <manish@codeaurora.org>
2016-08-01 01:15:50 -07:00
Shantanu Jain
6145f7f671 input: touchscreen: add touch to wake feature in ITEtech driver
Add touch to wake feature in ITE tech touchscreen driver.
The touchscreen interrupt is configured as wakeable interrupt,
so TS can be used to wake the device from suspend state.

Change-Id: I8da53ab4f03237b8652cd5891eadbffa752d72d3
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2016-07-31 23:18:35 -07:00
Shantanu Jain
8b724a99b7 input: it7258_ts_i2c: add debugfs support for suspend/resume
Add debugfs support for suspend and resume test for ITE
tech touchscreen driver.

Change-Id: I5a3d55c7c8e4b8f594fd7924c61ac1e5b5ad1965
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2016-07-31 23:16:48 -07:00
Linux Build Service Account
eed72db02a Merge "ASoC: audio-ext-clk: check for null pointer de-reference" 2016-07-31 21:36:45 -07:00
Linux Build Service Account
1c1be8be73 Merge "ARM: dts: msm: add battery profiles to msmcobalt MTP" 2016-07-31 15:57:10 -07:00
Linux Build Service Account
271f251f36 Merge "ARM: dts: msm: add batterydata for itech and ascent batteries" 2016-07-31 15:57:09 -07:00
Linux Build Service Account
902583a46d Merge "ft5x06: Set input property bit to indicate a direct input device" 2016-07-31 10:19:13 -07:00
Linux Build Service Account
25d359f4e4 Merge "msm: mdss: add support to configure transfer unit for DP" 2016-07-31 10:19:10 -07:00
Linux Build Service Account
0576399f61 Merge "input: touchscreen: synaptics v1.1" 2016-07-31 10:19:09 -07:00
Himanshu Aggarwal
59a666fb58 input: touchscreen: add protocol A support to ITE tech driver
Add multi-touch protocol A support to ITE tech touchscreen
driver.

Change-Id: I49bc7e3eaa3b266fe92bb209f56ae5a1b40675e0
Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2016-07-30 22:55:58 -07:00
Shantanu Jain
a444cab639 input: touchscreen: add suspend-resume and fb support
Add suspend-resume and fb notification support for
ITE tech touchscreen driver.

Change-Id: I9a601412fb9a3935c0eadad5157bb1fd819b29dd
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2016-07-30 22:55:34 -07:00
Linux Build Service Account
7093e6ce4b Merge "usb: dwc3: Update VBUS status with USB controller" 2016-07-30 14:11:34 -07:00
Linux Build Service Account
2a298044ec Merge "usb: phy: qusb: Remove updating VBUS status from QUSB PHY driver" 2016-07-30 14:11:33 -07:00
Viswanadha Raju Thotakura
bd8d73bb72 msm: camera: Add support for multiple flash nodes
Add support for flash nodes for front and rear
camera.

CRs-Fixed: 1021009
Change-Id: I52537562214d439e9652bb6ba90f0d29e5b24fda
Signed-off-by: Viswanadha Raju Thotakura <viswanad@codeaurora.org>
2016-07-29 15:41:32 -07:00
Sudheer Papothi
32af1c5f42 ASoC: msmcobalt: Fix channel configuration on msmcobalt
Channel ids are not updated correctly in hardware params
fixup resulting in audio mute on one of the channels on headphones.
Fix the channel ids properly in msmcobalt machine driver hardware
params fixup.

CRs-Fixed: 1034829
Change-Id: If23da9ac1d2f71ad4d39371b665311f1f84b016a
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2016-07-30 03:38:00 +05:30
Zhen Kong
cfa588d94a qseecom: validate the inputs of __qseecom_send_modfd_resp
The resp_len and resp_buf_ptr of qseecom_send_modfd_listener_resp
are not checked, then an userspace application that manipulates
resp_len can corrupt the kernel memory. Thus make changes to
validate these parameters.

CRs-fixed: 1036418
Change-Id: Id43ec6b55b332d0dac09a9abb998a410f49b44f7
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2016-07-29 12:21:30 -07:00
Mayank Rana
d59b5a86d7 usb: dwc3: Update VBUS status with USB controller
It is required to update VBUS status to USB controller using qscratch
registers HS_PHY_CTRL and SS_PHY_CTRL interfacing high-speed and
super-speed PHYs. This change perfoms same from USB controller's glue
driver on starting and stopping peripheral mode based on supported
USB speed with USB gadget.

It also updates devicetree documentation explicitly mentioning required
register sets.

CRs-Fixed: 1046503
Change-Id: I92df87c0e2ff54dd7ee513d277cc075eab561019
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2016-07-29 11:39:35 -07:00
Mayank Rana
7d94325630 usb: phy: qusb: Remove updating VBUS status from QUSB PHY driver
This change removes updating VBUS status from QUSB PHY driver using
QSCRATCH register. New change would be adding same functionality from
USB controller driver.

- It also updates devicetree documentation and existing supported
MSM platforms' USB device node property to accommodate above changes.

CRs-Fixed: 1046503
Change-Id: I4573a077bb455ebe3750ab76a91d2593d7e94ea5
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2016-07-29 11:39:25 -07:00
Linux Build Service Account
77e6c75442 Merge "cfg80211: Advertise extended capabilities per interface type to userspace" 2016-07-29 11:24:31 -07:00
Linux Build Service Account
e21b49baaf Merge "msm: ipa3: add mapping for IPA SMEM to SMMU" 2016-07-29 11:24:30 -07:00
Linux Build Service Account
29e6a3b923 Merge "msm: ipa3: add support for additional mappings to smmu" 2016-07-29 11:24:29 -07:00
Linux Build Service Account
4065bfcc2f Merge "scsi: ufs: return appropriate error code" 2016-07-29 11:24:28 -07:00
Linux Build Service Account
4d639b901b Merge "ARM: dts: msm: Enable the GPU QDSS STM for msm8996" 2016-07-29 11:24:28 -07:00
Devesh Jhunjhunwala
ce47dd6134 ARM: dts: msm: Enable droop and fault detection for pmicobalt flash LED
Add device tree properties to enable detection of VPH droop,
short circuit and open circuit faults for flash LED on pmicobalt.

CRs-Fixed: 1024187
Change-Id: I13cf07b36f7bb890a71bedb9998a937e2c60ecb0
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:24:27 -07:00
Devesh Jhunjhunwala
88e140010a leds: qpnp-flash-v2: Add support for led_fault_irq
Add support to receive and process the led_fault_irq to
detect short_circuit and open_circuit faults. Also, add
support to read all led_status registers in the irq handler.

CRs-Fixed: 1024187
Change-Id: I6941660484ea8b27377c668d1e7d815d52e83d83
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:24:14 -07:00
Devesh Jhunjhunwala
ba678210c5 leds: qpnp-flash-v2: Add support for droop and fault detection
Add support for configuring the following features available
in flash LED:
	1. VPH droop detection
	2. Short circuit fault detection
	3. Open circuit fault detection

CRs-Fixed: 1024187
Change-Id: I982e51ba62f0a75d1dcd3ef30e5d1249c970ffde
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:22:30 -07:00
Devesh Jhunjhunwala
a0a1d3cd64 leds: qpnp-flash: Implement the flash_prepare API
Add the flash_prepare API to the leds-qpnp-flash driver to
maintain consistent usage of the API by the camera flash driver
across targets.

CRs-Fixed: 1043718
Change-Id: I21cc4b4556b2a4a1a918bfeb1d55ae164d4b5568
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:22:06 -07:00
Devesh Jhunjhunwala
dc12c73b37 leds: qpnp-flash-v2: Update the flash_prepare API
Update the flash prepare API to accept a led_trigger device as an
argument. Also split the leds-qpnp-flash-v2 header file to keep the
flash_prepare API in a common header file for both legacy and v2
flash drivers.

CRs-Fixed: 1043718
Change-Id: Idb4ab086740b680e101d76d882bcfb618ac4b936
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:21:23 -07:00
Subbaraman Narayanamurthy
5d12dfffb4 ARM: dts: msm: add battery profiles to msmcobalt MTP
Ascent and Itech batteries might be used with msmcobalt MTP. Add
the battery profiles to support that.

Change-Id: Icfed6881763df35a7f948f171856903de7e07a2a
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-07-29 11:10:47 -07:00
Subbaraman Narayanamurthy
064f1af82c ARM: dts: msm: add batterydata for itech and ascent batteries
Batterydata for itech 3000mah and ascent 3450mah batteries are
newly created to be used with GEN3 FG on pmicobalt. Add them.

Change-Id: I0fe51b607d44920784cc0bb8bfd442e81f3c5d3d
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-07-29 11:10:47 -07:00