Commit graph

574755 commits

Author SHA1 Message Date
Linux Build Service Account
5964f2d700 Merge "ASoC: wsa881x: Add a mixer control to control gain" 2016-09-08 14:32:14 -07:00
Linux Build Service Account
332a191f05 Merge "ASoC: msm: add 384KHz playback support" 2016-09-08 14:32:12 -07:00
Linux Build Service Account
c837b886b9 Merge "ARM: dts: msm: Add initial support for msmcobalt QRD VR1 board" 2016-09-08 14:32:11 -07:00
Linux Build Service Account
1a5d40e276 Merge "qcom-charger: expose RRADC charger temp and usbin readings" 2016-09-08 14:32:11 -07:00
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
Osvaldo Banuelos
6920fd9874 ARM: dts: msm: update corner switch delay time for msmcobalt v2
Update the CPR corner switch delay time for the CPRh device
on msmcobalt v2 according to the latest hardware guidelines.

CRs-Fixed: 1064318
Change-Id: I08a385b360d9d0184fd7339194630d8f75a6676f
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-09-08 11:16:22 -07:00
Prashanth Bhatta
8080b08a6c defconfig: msmcortex: Enable CONFIG_ICNSS_DEBUG
Enable CONFIG_ICNSS_DEBUG to enable driver debugging.

CRs-fixed: 1060274
Change-Id: I0c594ca4db2a39078a480e45e422c24aa5afba04
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-09-08 11:02:55 -07:00
Prashanth Bhatta
d6f1f617d4 icnss: Separete IPC logging for register access
Hardware register access logs added for reset sequence is way too
much log but it is necessary for debugging purpose. So create
separate IPC logging buffer for register access and make it as
depends on debug feature so that it can be configured out in
production.

CRs-fixed: 1060274
Change-Id: I690e7af912ce3aee5f0a2817e20f00d6a0ec9608
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-09-08 11:02:14 -07:00
Archana Sathyakumar
930ed82d59 msm-core: debug: Update the number of supported pstates
Update the number of power-freq pair value supported in the debug
interface. Parse the arguments as uint32_t instead of uint64_t which
might cause memory corruption.

CRs-fixed: 1054344
Change-Id: I30492b79b96356177cdcc72e4e2ee656317de500
Signed-off-by: Archana Sathyakumar <asathyak@codeaurora.org>
2016-09-08 10:29:21 -06:00
Archana Sathyakumar
5f41544562 msm-core: debug: Fix the number of arguments for sysfs nodes
Ptable and enable node parses the input arguments incorrectly. Parse the
input message into exact number of arguments that are required for the
respective nodes.

CRs-fixed: 1032875
Change-Id: I881f18217b703a497efa4799288dee39a28ea8ab
Signed-off-by: Archana Sathyakumar <asathyak@codeaurora.org>
2016-09-08 10:28:08 -06:00
Ashay Jaiswal
99498f4969 ARM: dts: msm: Add stub regulator devices for msmfalcon
Add stub regulator devices for msmfalcon because RPM regulator
support is not yet in place.

CRs-Fixed: 1056821
Change-Id: I6845ed3863ab98a06829372ff1a3d460680def30
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2016-09-08 21:37:38 +05:30
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
Shiraz Hashim
41c2d7d56f defconfig: msm: Enable CONFIG_QCOM_REMOTEQDSS for 32-bit
Re-enable CONFIG_QCOM_REMOTEQDSS for all supported 32bit
targets i.e. msmcobalt and msmfalcon. It was earlier
disabled due to a build issue which is fixed by 'commit
8ecaa617d5 ("soc: qcom: remoteqdss: Fix build error
on 32bit")'.

Change-Id: I4f8302385010cf2e5c3d9baa717bd2d7d1237853
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2016-09-08 11:27:08 +05:30
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
Deepak Katragadda
4fc5e09f70 clk: msm: clock-osm: Add measurement support for CPU clocks
Add support to measure the perf and power cluster clocks
via the debug mux on MSMCOBALT.

CRs-Fixed: 1059153
Change-Id: I1682481dfe22deef300ea9bd1db558ae634c9129
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2016-09-07 09:51:14 -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
Shiraz Hashim
8ecaa617d5 soc: qcom: remoteqdss: Fix build error on 32bit
__builtin_return_address(1) results in build error on
32bit.

  drivers/soc/qcom/remoteqdss.c:
  In function 'remoteqdss_do_scm_call':
  drivers/soc/qcom/remoteqdss.c:113:363:
      warning: unsupported argument to '__builtin_return_address'
      error, forbidden warning: remoteqdss.c:113

Fix this by using __builtin_return_address(0) and passing
the caller information down to functions where it is used.

Change-Id: I535ec77009a73f6ea95e4060177ca7b8e6a2c8d1
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2016-09-07 12:06:48 +05:30