Commit graph

572398 commits

Author SHA1 Message Date
Linux Build Service Account
3a2dd33cfb Merge "sched/core: Fix null-pointer dereference" 2016-07-19 18:47:55 -07:00
Linux Build Service Account
83e5e75fab Merge "ARM: dts: msm: Remove SMD device for DSPS edge for MSMCOBALT" 2016-07-19 18:47:54 -07:00
Linux Build Service Account
67f5028611 Merge "ARM: dts: msm: Remove SMD device for ADSP edge for MSMCOBALT" 2016-07-19 18:47:53 -07:00
Linux Build Service Account
0520f0ab44 Merge "ARM: dts: msm: Remove SMD device for Modem edge for MSMCOBALT" 2016-07-19 18:47:53 -07:00
Linux Build Service Account
f0d75197a8 Merge "WLAN subsystem: Sysctl support for key TCP/IP parameters" 2016-07-19 18:47:51 -07:00
David Dai
445a76b790 ARM: dts: msm: Add GDSC data for mnoc fab for msmcobalt
Add gdsc_mdss, gdsc_camss_top, gdsc_venus references in order
to enable client side clocks during QoS configuration. Also
include mmssnoc_axi reference so that we can guarantee bus clock
to be on at the time of QoS configuration in the event
that the initial bandwidth vote from client is 0.

CRs-Fixed: 1043729
Change-Id: If8e08112d065e1327fd54d7b0daf511632aa059f
Signed-off-by: David Dai <daidavid1@codeaurora.org>
2016-07-19 17:28:04 -07:00
Amit Pundir
400dd9ed77 netfilter: xt_qtaguid: seq_printf fixes
Update seq_printf() usage in xt_qtaguid to align
with changes from mainline commit 6798a8caaf
"fs/seq_file: convert int seq_vprint/seq_printf/etc...
returns to void".

Change-Id: Iecda872c6eae372988ff20a44164fb4a57db0f82
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 7c79aca516
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:58 -07:00
Amit Pundir
98056556c7 Revert "net: activity_stats: Stop using obsolete create_proc_read_entry api"
This reverts commit 7c121720fa.

Change-Id: Ib2ce5e7153756f03d48c94a5afbd32d4ae4c5c83
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 5c0d8ae10a
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:56 -07:00
Amit Pundir
ddd333bdb3 Revert "misc: uidstat: avoid create_stat() race and blockage."
This reverts commit f7a8121740.

Change-Id: I3f003d5d1b8f3e9068f467723256932f29009915
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: cded5596a3
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:53 -07:00
Amit Pundir
ef8f8484c1 Revert "misc: uidstat: Remove use of obsolete create_proc_read_entry api"
This reverts commit fccab646d3.

Change-Id: I48bee6e92e4210059aa6e82db4badf24c1cb1546
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 1ada37dc07
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:50 -07:00
Amit Pundir
859dc4e658 Revert "misc seq_printf fixes for 4.4"
This reverts commit 5c7566a29b.

This patch revert some changes in net/netfilter/xt_qtaguid.c as well.
I'll submit another patch to restore those changes.

Change-Id: I2d9251867235a6566b4c676de0546ce046848c91
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: cdb6973ae1
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:47 -07:00
Bryse Flowers
9b9d994aa4 defconfig: um: Disable activity stats
Temporarily disable modules while stability issues are resolved.

Change-Id: I9c21883988e3da494c3a0a815fd3eee4c1a70a0f
CRs-Fixed: 1035969
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:42 -07:00
Puja Gupta
06ab5bc8cf soc: qcom: code cleanup for service-locator
Module parameter already exists to control enabling service-locator,
which is enabled by default using kernel command line. Hence removing
sysfs entry 'service_locator_status'.

CRs-Fixed: 1025447
Change-Id: Ie302e79ff838837f214ac50ebfaa6e11f0055915
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2016-07-19 16:17:37 -07:00
Devdutt Patnaik
4e2ea2e9dc usb: phy: qusb: Add support for host mode phy init seq
Update QUSB2 HS PHY init sequence in host mode to fix
enumeration issues due to port reset operation failure.

Change-Id: I95daf3e3a833f9daeac6190daa33191f9db8cf26
Signed-off-by: Devdutt Patnaik <dpatnaik@codeaurora.org>
2016-07-19 15:40:12 -07:00
Skylar Chang
80b2de9c6e msm: ipa: do not use delay in SSR
In some rare race condition during SSR, modem might
programmed commands to IPA to lock the pipe, and AP will
enable delay on this pipe which will prevent IPA to read
unlock command. In this case IPA HW will be stalled as it
is locked forever on this pipe.

CRs-Fixed: 1040724
Change-Id: Ifc874c9e881eb1b3ccea321679bb272cd427fabb
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-07-19 11:51:46 -07:00
Nicholas Troast
081d5841c7 qcom-charger: smb138x-charger: change power supply type to usb parallel
Currently the type of the parallel power supply is
POWER_SUPPLY_TYPE_BATTERY. Change it to POWER_SUPPLY_TYPE_USB_PARALLEL.

Change-Id: Ic7652e43781f39d3137fb55f2fec2423e457fac4
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2016-07-19 09:09:12 -07:00
Nicholas Troast
6f50a62d39 ARM: dts: msm: update min voltage for pmcobalt s5 and s7
PMCOBALT S5 is an always on regulator that sources the internal
infrastructure for XO. It's minimum operating voltage is 1904 mV.
PMCOBALT S7 has a 900 mV minimum operating voltage.
Update the minimum voltage for PMCOBALT S5 and S7.

Change-Id: I4ec609b45f5313d7c19ff6201742b0c5daf54174
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2016-07-19 09:06:34 -07:00
Linux Build Service Account
7ebe256eaa Merge "ASoC: msm: Add support for 192KHZ sampling rate on mi2s rx ports" 2016-07-19 03:39:57 -07:00
Linux Build Service Account
7e2261a267 Merge "ASoC: msm: Implementing Tx mute in ASM loopback" 2016-07-19 03:39:56 -07:00
Deepak Kushwah
12d028e02f msm: vidc: Add support for setting packed QP range
Add support for setting packed QP range for clients
to set different QP Range for I, P, B frames.

CRs-Fixed: 1043369
Change-Id: I3765506f1d703f47e481719296ab890b1f3dc106
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2016-07-19 03:32:47 -07:00
Deepak Kushwah
816c3cbc37 msm: vidc: add support for maximum bitrate rate control mode
Add support for maximum bitrate rate control mode which will be
enabled by low bitrate applications to get better Video quality.

CRs-Fixed: 1043369
Change-Id: I20253a0f0762982fe7d7cb0bde9f64f58a8068fb
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2016-07-19 03:32:33 -07:00
Yeleswarapu Nagaradhesh
8aa9aba222 qcom: wcd934x: add pinctrl driver for wcd934x
WCD934X audio codec has a GPIO controller which can support
5 GPIO's, add pinctrl driver to handle GPIO's of wcd934x.

CRs-Fixed: 1041199
Change-Id: I0489f9149cfd6ec7af056d074cb1869a705f9eff
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2016-07-19 10:58:13 +05:30
Yeleswarapu Nagaradhesh
00f153a5b1 ARM: dts: msm: add sound node for msmcobalt
Add sound node and lnbbclk2 node for msmcobalt
to enable audio functionality.

CRs-Fixed: 1041199
Change-Id: If6066a42b8aa5a820263a88627e2405df5e227b7
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2016-07-19 10:56:54 +05:30
Abdulla Anam
8ce0856ed3 msm: vidc: check for venus_hfi_device state in resume
Now since resume is called to ensure venus is in power on state
during scale clocks, an issue is seen when client responds to an
error notification with stream_off. This causes scale clocks to
be called which powers_on venus and enable regulators. But an
earlier sys_error deinited all resources and hence a null pointer
exception is seen causing kernel panic.

CRs-Fixed: 1040026
Change-Id: Ibb660397f8e7e3e0cd0a5e672924925e605b2eb7
Signed-off-by: Abdulla Anam <abdullahanam@codeaurora.org>
2016-07-18 22:22:58 -07:00
Chinmay Sawarkar
dd5ea1bc0f msm: vidc: Increase output port buffer size for VP9 decode
For some VP9 Decode bitstreams, current buffer size is not
sufficient. Hence increasing to the full YUV size supported
by HW.

CRs-Fixed: 986311
Change-Id: Ie7720001edbbaed8b202655445707b2b49a69cb1
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
2016-07-18 18:47:03 -07:00
Hemant Kumar
ebf3241b7b sound: usb: Update USB audio QMI data structure
Updating USB audio qmi data structure as per new
definitions. Also update the USB audio QMI driver
appropriately.

Change-Id: I93ed98a17daa1c65944dd260c7004f7198741aad
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-07-18 17:53:37 -07:00
Gautham Mayyuri
11611bb2ca msm: jpegdma: Remove even number check for crop left and top
Remove even number check for crop left and top dimensions as
crop left and top can be odd numbers.

CRs-Fixed: 1038370
Change-Id: Ia3b2aa484f764fb948680357ba6a89bc57b92b24
Signed-off-by: Gautham Mayyuri <gmayyuri@codeaurora.org>
2016-07-18 16:38:06 -07:00
Nicholas Troast
adb003dad0 qcom-charger: smb-lib: fix secure register writes
Currently the entire address is compared to a known secure boundary
offset leading to the address always being larger than the offset.
Mask the address such that only the offsets are compared.

Change-Id: I388d7f809f670c6db45b933d44d15168ae84f061
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2016-07-18 13:44:59 -07:00
Linux Build Service Account
c4873787c3 Merge "ASoC: aud-ext-clk: enable lnbbclk2 for tavil" 2016-07-18 13:05:23 -07:00
Linux Build Service Account
5effe5f433 Merge "ASoC: wcd934x: enable recording for wcd934x audio codec" 2016-07-18 13:05:19 -07:00
Linux Build Service Account
3a95a76597 Merge "ASoC: wcd934x: add wcd934x audio codec driver" 2016-07-18 13:05:18 -07:00
Linux Build Service Account
d60cc82391 Merge "clk: msm: Add MSM clock config for MSM clock controller" 2016-07-18 08:07:52 -07:00
Shiraz Hashim
b47b524659 ARM: dts: msm: add ion heaps for msmfalcon
Add device tree configuration corresponding to all
supported ion heaps for msmfalcon.

Change-Id: I639e8bfb1275a1b8c8fa5bff3a46f9b34fe49ffe
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2016-07-18 12:53:07 +05:30
Shiraz Hashim
552bf6df75 ARM: dts: msm: Add initial memory map for msmfalcon
Add carve-outs, firmware regions and other cma areas as
part of initial memory map configuration for msmfalcon.

Change-Id: I2b0d35bf90b92f7fbd4256f339c1567d539e17b2
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2016-07-18 12:51:25 +05:30
Yeleswarapu Nagaradhesh
a78205449c ASoC: wcd934x: enable recording for wcd934x audio codec
Add support for Analog MIC and Digital MIC recording
for wcd934x codec.

CRs-Fixed: 1041199
Change-Id: I79e07682661fea99baaa29f8807eaf2f684f65be
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2016-07-17 12:00:16 +05:30
Linux Build Service Account
8665552e83 Merge "clk: msm: clock-gcc-cobalt: Remove support for gcc_bimc_hmss_axi_clk" 2016-07-16 16:26:57 -07:00
Linux Build Service Account
fd57dc5180 Merge "qcom-charger: update parallel charging states after boot" 2016-07-16 16:26:56 -07:00
Olav Haugan
bf25090979 sched/core: Fix uninitialized variable used for tracepoint
When predictive dcvs is enabled a tracepoint will log a value that is
garbage due to being uninitialized. Fix this.

CRs-fixed: 1042660
Change-Id: I2b94e78f2470dbc2fd469b5cab287d643e8f3227
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2016-07-16 11:38:59 -07:00
Olav Haugan
e3473cacaa sched/core: Fix null-pointer dereference
Turning on sched_use_pelt causes a null-pointer dereference in
scheduler. Add correct checking of varable.

CRs-fixed: 1042656
Change-Id: I6e6a57e24b41e4b3d049bfcf694b9ad7e2144dd5
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2016-07-16 10:41:32 -07:00
Linux Build Service Account
5562490ff2 Merge "ASoC: msm: qdsp6v2: Increase PCM capture period size" 2016-07-16 07:34:17 -07:00
Linux Build Service Account
190a8d14b0 Merge "ARM: dts: msm: Add Temperature sensor support for msmfalcon" 2016-07-16 07:34:16 -07:00
Linux Build Service Account
b10e74ee0a Merge "thermal: tsens: Enable TSENS for msmfalcon" 2016-07-16 07:34:15 -07:00
Linux Build Service Account
3b90c4c60e Merge "drivers: mfd: do not modify reset gpio if codec is identified" 2016-07-16 07:34:14 -07:00
Linux Build Service Account
3130ca5e45 Merge "ASoC: wcd9335: Update decimator filter cutoff frequency" 2016-07-16 07:34:14 -07:00
Linux Build Service Account
be98f7ea2f Merge "defconfig: msm: build dtb appended zImage for msmfalcon" 2016-07-16 07:34:13 -07:00
Linux Build Service Account
7d225628d1 Merge "arch: arm: select ARM_GIC even for targets with gic-v3" 2016-07-16 07:34:12 -07:00
Linux Build Service Account
d0a8f8d774 Merge "clk: Add support to set custom flags with clk_set_flags" 2016-07-16 07:34:11 -07:00
Linux Build Service Account
8d4ffba5f0 Merge "msm: pcie: change the logging type for dumping PARF registers" 2016-07-16 07:34:10 -07:00
Linux Build Service Account
4e24c748ee Merge "ARM: dts: msm: peripheral_mem carveout for msmcobalt" 2016-07-15 20:03:32 -07:00
Yeleswarapu Nagaradhesh
5bd34e1e58 ASoC: aud-ext-clk: enable lnbbclk2 for tavil
Tavil is sourced from lnbbclk2 and hence enable
this clock for tavil codec.

CRs-Fixed: 1041199
Change-Id: I5409b0f4ed58fefdd25abbe79f144de7e693c1a1
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2016-07-16 07:07:24 +05:30