Commit graph

574672 commits

Author SHA1 Message Date
Linux Build Service Account
dee87523dd Merge "usb: composite: Draw 900mA on USB resume if speed is super-speed" 2016-09-08 14:32:10 -07:00
Linux Build Service Account
01c5f1d3ec Merge "msm: kgsl: Add trace for throttling counters" 2016-09-08 14:32:09 -07:00
Linux Build Service Account
256b2a6656 Merge "skb: printing port numbers with gso trace events" 2016-09-08 14:32:08 -07:00
Linux Build Service Account
7824c2f62d Merge "msm: isp: buffer queue management specific flags" 2016-09-08 14:32:08 -07:00
Linux Build Service Account
30f2efabe2 Merge "msm: camera: sensor: Add state validation for flash" 2016-09-08 14:32:06 -07:00
Linux Build Service Account
0a838df5d0 Merge "msm: sensor: Enable combo mode in 10NM CSI PHY" 2016-09-08 14:32:05 -07:00
Linux Build Service Account
dddfe573e4 Merge "ARM: dts: msm: Voter clocks for mmss_camss_jpeg0_clk for msmcobalt" 2016-09-08 14:32:05 -07:00
Linux Build Service Account
38c15f8c17 Merge "msm: camera: jpegdma: Reg values stored in array at alternate indices" 2016-09-08 14:32:04 -07:00
Vidyakumar Athota
cc4912199e ASoC: wsa881x: Add a mixer control to control gain
Add a new mixer control to control WSA881x analog gain when
compander is disabled.

Change-Id: I8fd8bf7326f1ea80df1c2fdbb08ebf73aa9e279c
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-09-08 08:35:22 -07:00
Vidyakumar Athota
9c46f74b27 ASoC: msm: add 384KHz playback support
Add 384KHz sample rate to frontend, backend DAIs
to support 384KHz playback.

CRs-Fixed: 1060019
Change-Id: Iae32df7ce1fb42e0fa8e0259612a51c76bab1cb6
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-09-08 08:34:48 -07:00
Vidyakumar Athota
36b5010d91 ASoC: add sample rate macros upto 384KHz
Add sample rate macros upto 384KHz to support
playback of 384KHz clips.

Change-Id: Id8880caae81818fe72bf02f3a3a90a5650546182
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-09-08 08:34:40 -07:00
Amit Nischal
82d4ec9778 usb: Add support for reset controller framework
The current api which performs the clock reset is moved to use the reset
framework, so support the changes in USB driver for the same. The reset
framework requires to get reset handle and perform assert/deassert of the
resets.

Change-Id: Ifcde1c6af624294cbd1944eaa9b526dd6dcc51de
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2016-09-07 21:06:22 -07:00
Harry Yang
e67aba2720 qcom-charger: expose RRADC charger temp and usbin readings
Read the charger die temperature and its threshold from RR_ADC,
and expose to the userspace through battery PSY.

Read USBIN current and voltage from RR_ADC, and expose to the
userspace through USB PSY.

CRs-Fixed: 1050042
Change-Id: I452a050298a6ab081f64aa2dcf295d2d257bcb32
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2016-09-07 13:07:30 -07:00
Oleg Perelet
e82f6a22ad msm: kgsl: Add trace for throttling counters
Trace active and idle counters and DCVS adjustement.

CRs-Fixed: 1055047
Change-Id: I60d30192c55efd8b0d5dc455343464d29648281e
Signed-off-by: Oleg Perelet <operelet@codeaurora.org>
2016-09-07 10:27:49 -07:00
Mayank Rana
e94b93aa7f usb: composite: Draw 900mA on USB resume if speed is super-speed
Per USB 3.1 specification, USB device can draw upto 900mA when
enumerated in super-speed mode and bus is resumed. Fix bug that is
requesting 500mA when bus is resumed when bus is operating in
super-speed mode.

CRs-Fixed: 1063393
Change-Id: I585f4c560f0920d3cb56cce009297b5665abb42e
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2016-09-07 10:17:23 -07:00
Linux Build Service Account
c6855ffd7f Merge "ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()" 2016-09-07 08:48:18 -07:00
Linux Build Service Account
78b791996a Merge "power_supply: add two properties for step charging" 2016-09-07 08:48:17 -07:00
Linux Build Service Account
7d231bbeff Merge "msm: ipa: add dma test suite" 2016-09-07 08:48:17 -07:00
Linux Build Service Account
686b78cf2c Merge "PM / devfreq: bw_hwmon: Add HW offload support to governor" 2016-09-07 08:48:16 -07:00
Linux Build Service Account
31a7c9379d Merge "msm: vidc: Enhance debug capabilities of video driver" 2016-09-07 08:48:15 -07:00
Linux Build Service Account
391e79976f Merge "input: ft5x06: defer touch resume to workqueue" 2016-09-07 08:48:14 -07:00
Linux Build Service Account
86c1a9bea1 Merge "clk: msm: Select appropriate clock flags for 32-bit" 2016-09-07 08:48:13 -07:00
Linux Build Service Account
c9796e05e9 Merge "ARM: dts: msm: Update debug uart support for msmfalcon" 2016-09-07 08:48:13 -07:00
Linux Build Service Account
26745af012 Merge "ASoC: wcd934x: Adjust DMIC clock based on sample rate" 2016-09-07 03:21:49 -07:00
Linux Build Service Account
4565d3476b Merge "msm: ipa: fix skb recycle logic" 2016-09-07 03:21:49 -07:00
Linux Build Service Account
1836f9b5a7 Merge "msm: qdsp6v2: update CVD version" 2016-09-07 03:21:48 -07:00
Linux Build Service Account
f1bc206236 Merge "ASoC: sound: soc: fix incorrect max value" 2016-09-07 03:21:46 -07:00
Linux Build Service Account
73ae7e2aaf Merge "mmc: host: Add check for post tuning in HS400" 2016-09-07 03:21:45 -07:00
Linux Build Service Account
54ac6d78ba Merge "slim-msm: Differentiate SSR from Noise during power up" 2016-09-07 03:21:45 -07:00
Linux Build Service Account
2507a887d6 Merge "soc: qcom: rpm-smd: wait till all active set acks are cleared" 2016-09-07 03:21:44 -07:00
Linux Build Service Account
7773787201 Merge "usb: gsi: Queue control notification on gsi_resume" 2016-09-07 03:21:42 -07:00
Linux Build Service Account
894d547ff7 Merge "ASoC: wcd-mbhc: disable fake electrical interrupts" 2016-09-07 03:21:41 -07:00
Theodore Ts'o
86098795a0 ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()
We aren't checking to see if the in-inode extended attribute is
corrupted before we try to expand the inode's extra isize fields.

This can lead to potential crashes caused by the BUG_ON() check in
ext4_xattr_shift_entries().

Upstream commit: 9e92f48c34eb2b9af9d12f892e2fe1fce5e8ce35
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Change-Id: Ia66e005d04bf9eccb7febd8cb0733a67f9a4faf4
Git-commit: 1f002539e6da1e03cede84fb3416c58dae2f6f66
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:20:17 -07:00
Kirill Tkhai
92d978db31 ext4 crypto: fix memleak in ext4_readdir()
When ext4_bread() fails, fname_crypto_str remains
allocated after return. Fix that.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
CC: Dmitry Monakhov <dmonakhov@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@google.com>
Change-Id: Id3fc6ad39f771a0dbcab0c46a2df4f29cdb398f0
Git-commit: 7bf19038854f2bda589db4224124dee11968cdf3
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:19:12 -07:00
Theodore Ts'o
1a96d6dcbf ext4 crypto: revalidate dentry after adding or removing the key
Add a validation check for dentries for encrypted directory to make
sure we're not caching stale data after a key has been added or removed.

Also check to make sure that status of the encryption key is updated
when readdir(2) is executed.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Theodore Ts'o <tytso@google.com>
Git-commit: b4fd46149cbb118c6c2fa29f24391e79b87862b7
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Change-Id: I64ea95854de3c633b17bea0b63ab658e1524befb
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:18:38 -07:00
Harry Yang
192d510128 power_supply: add two properties for step charging
STEP_CHARGING_ENABLED indicates if step charging is enabled or not.
STEP_CHARGING_STEP reflects step charging phase.

Both properties are added for the purpose of testing and debugging.

CRs-Fixed: 1052854
Change-Id: I7d7517ab3f172016bb2f1c23fb2788bbd2d01086
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2016-09-07 00:45:05 -07:00
Ghanim Fodi
9f71cc9ade msm: ipa: add dma test suite
Add IPA DMA test suite to IPA driver. Different
tests are being added to cover different IPA
DMA functionalities.

CRs-Fixed: 1060507
Change-Id: Icf927ce1eb7107007e1cc5c7b5f0a63814510398
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2016-09-07 00:43:38 -07:00
Asish Bhattacharya
8702e196da ASoC: qdsp6v2: Add proper dependency for audio driver
Add qdspv6v2 and snd_soc_compress dependencies for
audio driver to fix compilation issues on msmfalcon_32.

CRs-Fixed: 1061427
Change-Id: Iac276eeec710a11e5feeb6899da121ca6324e19b
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
2016-09-07 11:58:22 +05:30
Neeraj Upadhyay
8378bbb518 defconfig: msm: Add MSMTRITON in defconfigs
Add support for ARCH_MSMTRITON in msmfalcon arm64
defconfigs.

Change-Id: Ic83fe1607d5f62e0ceefd4497aae0c111a2727d7
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2016-09-07 11:09:09 +05:30
Neeraj Upadhyay
63708968cc ARM: dts: msm: Add initial device tree files for msmtriton
Add device tree files necessary to support msmtriton SoC.
Also, add support for Rumi platform.

Change-Id: Ia18a2f53fc3bf7ca459182dc197ad6a2078c7f5c
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2016-09-07 11:08:59 +05:30
Dhoat Harpal
7f3a28a11d ARM: dts: msm: Add missing glink_pkt devices for MSMFALCON
Glink_pkt devices expose access to certain SMD resources to userspace.

Add missing glink_pkt devices.

CRS-Fixed: 1063482
Change-Id: I7ba2ef7baba673d4c06225e61df7a0922b82ba81
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2016-09-06 15:23:57 +05:30
Meng Wang
81b7a0a0e0 ASoC: msm: qdsp6v2: check if index is out of range before use
Index can be assigned as -EINVAL which could be
out of array index. Check if index is valid value
before use.

CRs-Fixed: 1046606
Change-Id: Ib1af53ab52a65cca2ed9b3489359813e690b1cd6
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2016-09-05 23:25:27 -07:00
Meng Wang
fdb43addbf ASoC: msm: qdsp6v2: check if buf is null before using it
buf returned from q6asm_shared_io_buf could be null and
it could cause crash. Check if buf is null before using
it to avoid crash.

CRs-Fixed: 1046606
Change-Id: Ia988b11ff7d03edc4ddd959571da1378da62077c
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2016-09-06 14:24:05 +08:00
Meng Wang
0981a7c54f ALSA: timer: check if timer->card is null before using it
NULL check timer->card before use to prevent dereferencing
a NULL pointer.

CRs-Fixed: 1046606
Change-Id: I8e359864508cc2307d9e9619f36c7c08cc3842f9
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2016-09-05 23:13:23 -07:00
Meng Wang
c1a7f6ff7b ASoC: wcd9xxx: check impedance index before use
Impedance index may be out of range. Check if impedance index
is out of range before use.

CRs-Fixed: 1046606
Change-Id: Ia490d15a51ad70759c917fbe7e84fdadaa140e20
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2016-09-05 23:12:20 -07:00
zhaoyuan
5c6da5653e input: ft5x06: defer touch resume to workqueue
During device resume, the touch resume function is called after display's
resume. In this case, the ft5x06's resume function needs to wait for
200ms because of reset requirement. Defer the touch resume to a workqueue
to reduce the total device resume time. For this an optional DT property
is added to enable this on targets that need this feature.

Change-Id: Ib0677ca792aea83ece1caf8a0afff341302747fb
Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
2016-09-05 22:01:46 -07:00
Linux Build Service Account
11d6060fff Merge "ASoC: wcd934x: Update codec master clock configuration" 2016-09-05 16:21:42 -07:00
Linux Build Service Account
eb09c5c879 Merge "ASoC: wcd934x: Fix register default for MAD buffer interval" 2016-09-05 16:21:41 -07:00
Skylar Chang
bd09eb993a msm: ipa: fix skb recycle logic
skbs are recycled on LAN pipe. This changes
fixes a bug where the skb was freed before recycle.

Change-Id: I35734cd41aee8bdd2764d6307f76bedcb916a07b
CRs-Fixed: 1060534
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-09-05 01:35:20 -07:00
Osvaldo Banuelos
86d9f4aea4 ARM: dts: msm: increase VDD_APC CPR LowSVS/SVS ceiling for MSMCOBALTV2
Increase VDD_APC LowSVS and SVS ceiling voltages to match the
latest hardware characterization guidelines.

CRs-Fixed: 1062365
Change-Id: I9a8439d1f38a328a08590d2c5b11a611f11b4836
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-09-02 17:59:26 -07:00