Commit graph

571516 commits

Author SHA1 Message Date
Linux Build Service Account
5e9b45c7ed Merge "msm: mdss: hdmi: parse High Dynamic Range (HDR) metadata" 2016-07-13 15:45:10 -07:00
Linux Build Service Account
7fe77ef84d Merge "leds: qpnp-flash-v2: Separate switch node disable sequence" 2016-07-13 15:45:08 -07:00
Linux Build Service Account
8ba1928ffc Merge "ARM: dts: msm: Add switch nodes to pmicobalt" 2016-07-13 15:45:08 -07:00
Linux Build Service Account
348d50ac21 Merge "leds: qpnp-flash-v2: Add support for multiple switch nodes" 2016-07-13 15:45:07 -07:00
Linux Build Service Account
11e4a7a8da Merge "defconfig: msmcortex: don't set default CMA region size" 2016-07-13 15:45:06 -07:00
Linux Build Service Account
f259f4445d Merge "clk: msm: clock-mmss-cobalt: Add display port pixel clocks" 2016-07-13 15:45:05 -07:00
Linux Build Service Account
10619a898d Merge "msm: kgsl: Fix the access to invalid pool" 2016-07-13 15:45:04 -07:00
Linux Build Service Account
e29c82a01c Merge "ARM: dts: msm: Attach device memory to lpass iommu on msmcobalt" 2016-07-13 15:45:03 -07:00
Linux Build Service Account
48e2ef49ba Merge "nl80211: Move ACL parsing later to avoid a possible memory leak" 2016-07-13 15:45:02 -07:00
Linux Build Service Account
33212b2155 Merge "clk: msm: clock: Call the correct init sequence during fabia PLL handoff" 2016-07-13 15:45:00 -07:00
Linux Build Service Account
43237e2edc Merge "regmap: initialize dump count to 1" 2016-07-13 15:44:59 -07:00
Linux Build Service Account
d940b64528 Merge "Revert "msm: vidc: Handle encoder input in true dynamic mode"" 2016-07-13 15:44:58 -07:00
Linux Build Service Account
cdf04650af Merge "usb: gadget: f_gsi: Set speed descriptor pointers to NULL after free" 2016-07-13 15:44:57 -07:00
Linux Build Service Account
3872c04222 Merge "defconfig: msmcortex: Enable CONFIG_INET_LRO" 2016-07-13 15:44:56 -07:00
Linux Build Service Account
7becceae23 Merge "net lro: extend LRO to use hardware assists" 2016-07-13 15:44:56 -07:00
Linux Build Service Account
153ff5473d Merge "wil6210: abort P2P search when stopping P2P device" 2016-07-13 15:44:55 -07:00
Linux Build Service Account
497384f02d Merge "sched: break the forever prev_cpu selection preference" 2016-07-13 15:44:54 -07:00
Linux Build Service Account
afc9724015 Merge "msm: camera: isp: Fix RDI stream streamoff issue" 2016-07-13 15:44:52 -07:00
Linux Build Service Account
8013c761da Merge "cnss: Refactor CNSS Platform Driver for better code maintenance" 2016-07-13 15:44:51 -07:00
Linux Build Service Account
a4e4aba7e4 Merge "msm: vidc: pm qos stability fixes for video driver" 2016-07-13 15:44:50 -07:00
Liam Mark
e6149b4829 defconfig: msmcortex: don't set default CMA region size
Configure the default CMA region size in DT instead
of using CONFIG_CMA_SIZE_MBYTES.
This is better because it allows alloc-ranges to be set and
is easier to configure per target.

CRs-Fixed: 1024204
Change-Id: Ie3bff2a43cfc2ea16543a3e9322a10f42c4bd923
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2016-07-12 11:14:58 -07:00
Devesh Jhunjhunwala
153a1225e2 leds: qpnp-flash-v2: Separate switch node disable sequence
Remove the leds_off label and move the switch node disable
sequence into a separate function. Also take this opportunity
to move the flash-led structs from header file to driver file.

CRs-Fixed: 1024187
Change-Id: I5d4eb58f5ed3ace03190f3c48b98f0d88e8b8965
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-12 11:12:16 -07:00
Devesh Jhunjhunwala
848d2fada7 ARM: dts: msm: Add switch nodes to pmicobalt
The camera driver needs to be able to independently control
the front led and the rear leds from separate camera devices.
Update the pmicobalt flash-led device to support two switch
nodes, one of which controls the two rear leds and the other
controls the front led. Also update the camera device to use
the new switch node phandle.

CRs-Fixed: 1024187
Change-Id: I13d5a64fc35ca80e928d6da689d7b19cbbdb8fe5
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-12 11:12:16 -07:00
Devesh Jhunjhunwala
74ec31a097 leds: qpnp-flash-v2: Add support for multiple switch nodes
Since multiple devices may need to use the flash module,
each will need its own switch node to be able to
independently control the different leds. Add support for
this functionality.

CRs-Fixed: 1024187
Change-Id: Ibeebaff8456d8d338ac9bebb50e205e1196ce8a6
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-12 11:12:16 -07:00
Deepak Katragadda
c2c438e4b5 clk: msm: clock-mmss-cobalt: Add display port pixel clocks
Add support for the DP pixel clocks on MSMCOBALT.

Change-Id: Iab59a45da4bbca19b2eaebc63d827768ae86eec8
CRs-Fixed: 1028725
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2016-07-12 08:32:33 -07:00
Deepak Katragadda
a1d8269396 clk: msm: clock-local: Add RCG support for DP pixel source
Add a new RCG op specific for the DP pixel clock source.

CRs-Fixed: 1028725
Change-Id: I65dcac9f4d17d30dfa1a00f4edabef33a3d75c6a
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2016-07-12 08:32:26 -07:00
Purushottam Kushwaha
888a82c476 nl80211: Move ACL parsing later to avoid a possible memory leak
No support for pbss results in a memory leak for the acl_data
(if parse_acl_data succeeds). Fix this by moving the ACL parsing later.

Cc: stable@vger.kernel.org
Fixes: 34d505193bd10 ("cfg80211: basic support for PBSS network type")
Signed-off-by: Purushottam Kushwaha <pkushwah@qti.qualcomm.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Git-repo: git://git.kernel.org/cgit/linux/kernel/git/jberg/mac80211.git
Git-commit: 6e8ef842223b90a33efd570128bb566a9ae6f5ad
CRs-fixed: 1024951
Change-Id: I5750ae9091ca349e98bba4b24c78ef9446278c5a
Signed-off-by: Purushottam Kushwaha <pkushwah@codeaurora.org>
2016-07-11 21:44:10 -07:00
Hemant Kumar
b2b3f4fb85 ARM: dts: msm: Attach device memory to lpass iommu on msmcobalt
In order to share the usb audio qmi device iova with lpass usb audio
driver, attach usb audio qmi device to lpass q6 iommu using sid 12.

Change-Id: Iec7a0d5472136f55e31723ce2f4d681a9b67c140
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-07-11 20:58:37 -07:00
Ben Romberger
400520a6e2 ASoC: msm: qdsp6v2: Fix FE id check in routing driver
Modify FE ID check to use > instead of >= since
MSM_FRONTEND_DAI_MM_MAX_ID is defined as
MSM_FRONTEND_DAI_MULTIMEDIA16 which is a valid
FE ID.

Change-Id: I0ba4d62e3723841c3dfccdca210c80cd220f78f7
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
2016-07-11 18:56:38 -07:00
Venkatesh Yadav Abbarapu
4423fd7a10 ARM: dts: msm: Add initial device tree files for falcon RUMI
Adding the device tree files for RUMI platform.

Change-Id: I980e39b8c072fc2ec35d84b8698c40c770f7f041
Signed-off-by: Venkatesh Yadav Abbarapu <vabbar@codeaurora.org>
2016-07-11 18:56:38 -07:00
Praveen Chavan
4a5b332ab4 msm: vidc: Remove forced-setting of layer-wise bitrate for HP
Layerwise bitrate with predefined distribution table is applied
if HP is enabled. This is wrong (since client may configure
custom distribution) and unnecessary (client may not configure
layerwise distribution and use cumulative).

CRs-Fixed: 1023504
Change-Id: I053587ae85b36ce0b08fdb5918c0f6b9d678dd24
Signed-off-by: Praveen Chavan <pchavan@codeaurora.org>
2016-07-11 18:56:37 -07:00
Zhen Kong
432d718f4b qseecom: make change for unload TA
When unloading a TA, the operations to check ref_cnt,
scm_call to unload TA, free app list entry should be
within one critical section. Otherwise, if another
thread comes in and tries to load TA, TA status will
be out-of-sync. so move __qseecom_cleanup_app()
and __qseecom_reentrancy_check_if_no_app_blocked()
to the beginning of qseecom_unload_app(), as these
functions may release app_access mutex for a short
period.

Change-Id: I3e961f4fe1728a32314a3acf7af719374c90d01f
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2016-07-11 18:56:36 -07:00
Bryse Flowers
245913a1bb defconfig: arm64: msm: Disable qtaguid and net activity stats
Temporarily disable modules while stability issues are resolved.

Change-Id: I6bab3370caf776de25316da58ca48fcd9fbc4b5e
CRs-Fixed: 1035969
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-11 18:56:35 -07:00
Sudheer Papothi
4d7b1c0881 ASoC: msmcobalt: Fix slimbus tx channel configuration
Slimbus tx channel configuration is not updated properly in
msmcobalt machine driver. Fix slimbus tx channel configuration
for proper functionality of audio recording usecases.

Change-Id: I96010edabd04fef0eeb3cbb0b8f1a11d178d99b5
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2016-07-11 18:56:35 -07:00
Satya Durga Srinivasu Prabhala
f6b5614ac0 arm64: defconfig: msm: enable MODULE_SIG for msm chipsets
MODULE_SIG is needed to check modules for valid signatures upon load.

CRs-Fixed: 1018761
Change-Id: Idc368aff7090bcb52ae598faae9f95c1ffe1d4cf
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2016-07-11 18:56:34 -07:00
Ram Chandrasekar
c02e00ef9d driver: thermal: Configure ARM threshold instead of low
LMH DCVSh will retain the mitigation till it clears the Low
threshold. With mitigation happening at 95C, configuring the
low threshold as 65C will hold the mitigation till it clears 65C,
which will impact the performance.

Instead of configuring the low threshold, configure the ARM threshold
from HLOS and low threshold will be configured 2C less than the
high threshold in the trust zone.

CRs-Fixed: 1024370
Change-Id: Ifb303d7266c98eb94c5eb6f806b7c5e1d95236d3
Signed-off-by: Ram Chandrasekar <rkumbako@codeaurora.org>
2016-07-11 18:56:33 -07:00
Alan Kwong
610d5d59af msm: sde: Correct rotator irq enable mismatch
This corrects rotator irq enable mismatch by moving enable/disable
sequence to resource allocation/deallocation time.  This will
eliminate race condition between regdma start and wait for done,
which causes unacknowledged rotator interrupt to continuosly trigger
MDSS main interrupt handler, ending in watchdog reset.

CRs-Fixed: 1035411
Change-Id: I597b58b478a35e9c3e3afb1a2ddd20ad87961c1a
Signed-off-by: Alan Kwong <akwong@codeaurora.org>
2016-07-11 18:56:32 -07:00
Benjamin Chan
9f7a8de9ee msm: sde: Updating linear format definition for v4l2 rotator
Providing additonal linear format support for v4l2 rotator in mdss 3.x
hardware.

CRs-Fixed: 1032294
Change-Id: Ie8a19341831d4ffaea36898a80c71ab25f5daf3c
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2016-07-11 18:56:32 -07:00
Runmin Wang
8d87a45f66 ARM: dts: msm: Add dts entry mpm2-sleep-counter for MSMCOBALT
Add dts mpm2-sleep-counter node which is used by the boot_stats driver.
This dt node gives imem offset to read boot stats written by the
bootloader.

CRs-Fixed: 1037982
Change-Id: I4f8ec495ae02908d1d8cd7e86148a6d4bd38b198
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-07-11 18:56:31 -07:00
Nicholas Troast
ae42ddae88 mfd: qcom-i2c-pmic: add option to skip irq control
Some MFD PMIC configurations do not support interrupts. Make the interrupt
controller optional to support these PMIC configrations.

Without an interrupt controller this driver simply passes a regmap to
its children.

CRs-Fixed: 1037797
Change-Id: I52b909dd226494987c79ed106ffdf9892d966ef1
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2016-07-11 18:56:30 -07:00
Runmin Wang
4680adc5e2 ARM: dts: msm: create a separate dtsi file for msmcobalt qrd
Following the convention like MTP and CDP, create a separate dtsi file
for msmcobalt qrd platform.

CRs-Fixed: 1036660
Change-Id: I8ccbbc9ef0795397614ad0644fd1f2b5e31e3780
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-07-11 18:56:30 -07:00
Archana Sathyakumar
24c67a1551 ARM: dts: msm: Update MPM interrupt mappings for cobalt
Update MPM interrupt mapping to bypass some of the interrupts as per the
HW specification.

CRs-fixed: 1032455
Change-Id: I60c60470a649eecd5bacf0b39b20dff58c910897
Signed-off-by: Archana Sathyakumar <asathyak@codeaurora.org>
2016-07-11 18:56:29 -07:00
Liam Mark
2fc88bef39 ARM: dts: msm: configure default CMA region for msmcobalt
Configure the size of the default CMA region in DT.
Configuring the default CMA region in the DT is cleaner than using
CONFIG_CMA_SIZE_MBYTES since it is easier to configure per target
and the alloc ranges can be specified in DT.

CRs-Fixed: 1024204
Change-Id: I7d999382dcb6223d84424173a1726c250520ad04
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2016-07-11 18:56:28 -07:00
Liam Mark
43c6ba1a72 ARM: dts: msm: return unused pIMEM Vault memory for msmcobalt
Not all of the pIMEM Vault memory carveout is being used in msmcobalt.
Return unused portion of the pIMEM Vault carveout memory to HLOS.

CRs-Fixed: 1024170
Change-Id: Ie0cfab09192ca6b09ec4fe171aaf544e3fb5f08f
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2016-07-11 18:56:28 -07:00
Hemant Kumar
0f1c796421 sound: usb: Add support to share iova with remote processor
ISOC data transfer for audio device is offloaded to remote
usb audio driver entity. This requires remote entity to access
device context info, event ring, transfer rings and transfer
buffers allocated by APPS XHCI device. Hence add a platform
device which maps the XHCI device physical memory to virtual
memory and shares with remote processor's iommu. All the memory
info is then sent over QMI to remote entity.

Change-Id: I1abc80652a167cefa667b914b3a80a87326c3d44
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-07-11 18:56:27 -07:00
Hemant Kumar
c73c7f1d9a sound: usb: Add support for usb audio qmi service
Upon usb audio device enumeration remote entity
communicates with usb audio qmi server to enable
or disable particular audio stream on usb audio
device. This off loades ISOC data transfer
operations to remote entity and allows APQ to go
to power collapse more frequently for better
power saving.

Change-Id: I2c9b0ba0837f8fec5c320e3117aa3b2f553db6b2
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-07-11 18:56:26 -07:00
Aravind Venkateswaran
aade9051eb ARM: dts: msm: add proxy vote for DSI supplies for msmcobalt
When continuous splash screen feature is enabled, the display needs to
be kept alive during the kernel boot up. Add proxy vote for all the
regulator supplies needed to keep the display panel alive over the DSI
interface until the display driver hand off can be executed.

CRs-Fixed: 1037857
Change-Id: I95544aaf607887ae34eace8a9b1f18a1375c5c6d
Signed-off-by: Aravind Venkateswaran <aravindh@codeaurora.org>
2016-07-11 18:56:25 -07:00
Deepak Katragadda
533b2558a1 clk: msm: clock-mmss-cobalt: Add display port clock support
Add support for the DP link and crypto clocks on MSMCOBALT.

CRs-Fixed: 1028725
Change-Id: I6cdb366499f9589dff9a42491c7ff357e98d65c5
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2016-07-11 18:56:25 -07:00
Devesh Jhunjhunwala
477a0ded2e ARM: dts: msm: Add regulator node to flash-led for pmicobalt
The flash-led switch node must vote on the pmicobalt BoB
regulator. Hence, add this regulator node to that.

CRs-Fixed: 1024187
Change-Id: Ic4ec03e4fd545d44118c2225a3f8e26901ca1d81
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-11 18:56:24 -07:00
Devesh Jhunjhunwala
94d2a9fd5d leds: qpnp-flash-v2: add regulator support
Add support to control regulators required for
flash-led. The pmicobalt_bob regulator is one
such regulator required by the flash-led device.

CRs-Fixed: 1024187
Change-Id: I1515fba2fb04c0b4d21828af3cea6d322262ab14
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-11 18:56:23 -07:00