Commit graph

578492 commits

Author SHA1 Message Date
Linux Build Service Account
60d32cc86f Merge "soc: qcom: glink: add NULL check for edge_ctx" 2016-12-06 14:33:07 -08:00
Linux Build Service Account
fec46a2e93 Merge "msm: camera: isp: Check reg update miss only for PIX stream" 2016-12-06 14:33:03 -08:00
Linux Build Service Account
dfa7baf83a Merge "msm: camera: isp: Dual camera sync feature" 2016-12-06 14:33:03 -08:00
Linux Build Service Account
a9ec3bd6f8 Merge "ARM: dts: msm: Front camera config for msmfalcon interposer" 2016-12-06 14:33:02 -08:00
Linux Build Service Account
12c33fabcb Merge "msm: mdss: dp: fix parity byte calculation" 2016-12-06 14:32:57 -08:00
Linux Build Service Account
5142c18bae Merge "msm: vidc: Align release buffers with V4L2 states" 2016-12-04 05:55:31 -08:00
Linux Build Service Account
7e4605dbeb Merge "msm: vidc: Add debug info inside queue headers" 2016-12-04 05:55:30 -08:00
Linux Build Service Account
90779a7e5d Merge "ARM: dts: msm: Set max non secure region to 0xE0000000 on msm8998" 2016-12-03 17:18:07 -08:00
Linux Build Service Account
5d923c5be1 Merge "msm: vidc: avoid repeated calls to handle_sys_error" 2016-12-03 17:18:06 -08:00
Linux Build Service Account
2f22b36e92 Merge "msm: vidc: fix lock issue in msm_comm_get_mbs_per_sec()" 2016-12-03 17:18:05 -08:00
Linux Build Service Account
09525159a6 Merge "qcom-charger: smb2: add support of PMFALCON" 2016-12-03 09:59:53 -08:00
Linux Build Service Account
45a42ee01e Merge "ARM: dts: msm: fix slave-id of charger and FG on PMFALCON" 2016-12-03 09:59:52 -08:00
Linux Build Service Account
25f0ed75e0 Merge "icnss: Add support of setting MAC address from platform driver" 2016-12-03 02:17:52 -08:00
Linux Build Service Account
c8cee748e5 Merge "ARM: dts: msm: Change camera mount angle for msm8998 QRD device" 2016-12-03 02:17:51 -08:00
Linux Build Service Account
4d0d50caa2 Merge "ARM: dts: msm: change ufs regulators for msmfalcon interposer QRD" 2016-12-02 09:02:32 -08:00
Linux Build Service Account
e107ec1742 Merge "ARM: dts: msm: Add sdhc2 regulator for QRD msmfalcon interposer" 2016-12-02 09:02:31 -08:00
Linux Build Service Account
63baba9f2b Merge "defconfig: msm: Disable CRYPTO_DEV_QCE config flag for msmfalcon" 2016-12-02 09:02:30 -08:00
Linux Build Service Account
337e994ce3 Merge "msm: kgsl: Reserve a context ID slot but don't populate immediately" 2016-12-02 09:02:28 -08:00
Linux Build Service Account
79ef4a7206 Merge "ASoC: msm: qdsp6v2: Fix an incorrect string comparison logic" 2016-12-02 09:02:27 -08:00
Linux Build Service Account
eb564015ba Merge "ASoC: msm8998: Update supported sample rates for USB backend." 2016-12-02 09:02:26 -08:00
Linux Build Service Account
89b2746b6f Merge "SoC: msm: q6dspv2: add null check for payload" 2016-12-02 09:02:24 -08:00
Linux Build Service Account
4016e041b2 Merge "ASoC: wcd934x: enable lineout path in codec" 2016-12-02 09:02:23 -08:00
Linux Build Service Account
a12941769a Merge "ASoC: soc-dapm: Invalidate DAPM path during dapm addition of routes" 2016-12-02 09:02:21 -08:00
Linux Build Service Account
4595a01ac7 Merge "misc: qcom: qdsp6v2: register ioctl calls for g711mlaw driver" 2016-12-02 09:02:16 -08:00
Linux Build Service Account
1042c91dfb Merge "ASoC: audio-ext-clk: add new audio ext clock" 2016-12-02 09:02:15 -08:00
Linux Build Service Account
b6d09323f0 Merge "ARM: dts: msm: Update ascent battery profile for GEN3 FG" 2016-12-02 09:02:14 -08:00
Linux Build Service Account
55d5ccc3e7 Merge "ARM: dts: msm: Add sdhc2 support for msmfalcon interposer" 2016-12-02 09:02:13 -08:00
Linux Build Service Account
1209c96d7b Merge "msm: kgsl: Check MMU type for memory and pagetable operations" 2016-12-02 09:02:12 -08:00
Linux Build Service Account
b08731c07c Merge "ARM: dts: msm: Remove clocks associated with GDSC for MSMfalcon/Trition" 2016-12-02 09:02:10 -08:00
Linux Build Service Account
ef10f8e77d Merge "usb: gadget: f_rmnet: Add support for configfs" 2016-12-02 09:02:08 -08:00
Ashay Jaiswal
4195f84bde qcom-charger: smb2: add support of PMFALCON
Add support of PMFALCON PMIC and enable PMIC specific
workarounds in charger driver.

Change-Id: Id21fde25b9b741b9cb570ab5348959715e53e6cb
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2016-12-02 17:16:29 +05:30
Ashay Jaiswal
3bb0627e13 ARM: dts: msm: fix slave-id of charger and FG on PMFALCON
Charger and Fuel Gauge peripherals are on slave-id 0. Update
charger and FG device node to reflect the same.

Change-Id: I99d1e47a20fd5c3304249aa4f6c64e5967874312
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2016-12-02 17:16:29 +05:30
xiaonian
08e07c9d53 ARM: dts: msm: change ufs regulators for msmfalcon interposer QRD
Change ufs regulators for msmfalcon interposer QRD. Reduce
maximum power load that can be drawn from vcc and vccq2 supply.
Add the required minimum and maximum voltages of ufs phy.

CRs-Fixed: 1093028
Change-Id: Ic534c518116c18e98bd4e421365831400ef967f4
Signed-off-by: xiaonian <xiaonian@codeaurora.org>
2016-12-02 02:33:34 -08:00
xiaonian
75bc552202 ARM: dts: msm: Add sdhc2 regulator for QRD msmfalcon interposer
Add sdhc2 regulator corresponding to HW desgin.

CRs-Fixed: 1096038
Change-Id: Ib763bf5f58155fe2c6001357aa939d8098d2ff14
Signed-off-by: xiaonian <xiaonian@codeaurora.org>
2016-12-02 02:29:08 -08:00
Brahmaji K
f3be096981 defconfig: msm: Disable CRYPTO_DEV_QCE config flag for msmfalcon
Disable CONFIG_CRYPTO_DEV_QCE flag from defconfig,
which is not required for msmfalcon.

Change-Id: I29cf58d7069d758239c2f5712e70e94be20a42d3
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
2016-12-02 15:47:02 +05:30
Shubhraprakash Das
1e796900d3 msm: camera: isp: Check reg update miss only for PIX stream
Reg updates can only miss on PIX stream since reg updates
are forced for RDI streams. This also prevents the error
check from being called multiple times for PIX streams.

CRs-Fixed: 1089937
Change-Id: Ibe0ea7efabc5a8452f05fdc2ab8b3ec7931a66e7
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:53:11 -08:00
Shubhraprakash Das
2f6c60ca4f msm: camera: isp: Fix stats recovery
Stats buffer done was not coming after device reset because the
sequence for turning on stats was not right. Follow the same
sequence which is followed on start stream for stats during
recovery. Also, for vfe 46 version fix the write master offset.

CRs-Fixed: 1089758
Change-Id: I47849097022817dc411c31e3aadf037f6cae9a72
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:53:05 -08:00
Shubhraprakash Das
02977df8b2 msm: camera: isp: Stop camif based on user input
If user requests the camif to be stopped immediately then do so.
Only user driver will know if input has already streamed off in
which case camif shopuld be stopped immediately as per the
user driver request.

CRs-Fixed: 1089754
Change-Id: I47df74cb72e41b3c00fcebaab9d709818820ed47
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:53:01 -08:00
Shubhraprakash Das
afaeeaf099 msm: camera: isp: Return success if buffer not available
If buffer is not available during stream start then do not treat
that as an error.

CRs-Fixed: 1087368
Change-Id: I8f56bbf621313676282e06449431d1961d4819eb
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:52:55 -08:00
Shubhraprakash Das
4d0a1adb96 msm: camera: isp: Reserve unified buffer(ub) space for rdi
Rdi and pix interfaces can operate on different camera and they
can start/stop independently. If once camera uses entire ub then
another camera will not get any ub resulting in overflow. Fix
this problem by reserving space for rdi interface in ub.

CRs-Fixed: 1087367
Change-Id: I66f03cec28d7e3ecda42c06f01eb18fd869c913b
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:52:48 -08:00
Shubhraprakash Das
2527a06cae msm: camera: isp: Dual camera sync feature
Add ioctl to swicth dual camera mode from sync to
unsync mode and vise versa. Also, change the logic
of frame id sync to support unsync mode.

CRs-Fixed: 1070296
Change-Id: I58e27c9ea66f1788d640bf523e7c6569cde162f7
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
2016-12-01 23:52:31 -08:00
Shubhraprakash Das
c30b1bc021 msm: camera: isp: Increment stats active counter
The stats active counter was not being incremented, fix it.

CRs-Fixed: 1084238
Change-Id: I07b3c000836955eab9cf2273ce535c4317b3f166
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:51:41 -08:00
Linux Build Service Account
b979f780bf Merge "msm: mdss: hdcp_1x: remove obsolete code" 2016-12-01 23:47:40 -08:00
Linux Build Service Account
866aa12eb4 Merge "uapi/media: add additional ubwc compressed formats" 2016-12-01 23:47:39 -08:00
Linux Build Service Account
daa2c4f942 Merge "mm: Inform KASAN when allocating pages during isolation" 2016-12-01 23:47:38 -08:00
Linux Build Service Account
e349b1b10c Merge "net: rmnet_data: Handle leaked packets when adding MAP fields in TX" 2016-12-01 23:47:37 -08:00
Shubhraprakash Das
77029f9744 msm: camera: isp: Fix recovery in dual vfe mode
In case of dual vfe overflow recovery was failing because
the dual streams were not reset on both vfe. Fix the issue
with this change.

CRs-Fxied: 1076758
Change-Id: Iee81103263d95d93947a3967b1a3dbb568f76cf1
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:41:51 -08:00
Rajesh Kemisetti
8a706cbc3d msm: kgsl: Check MMU type for memory and pagetable operations
Check MMU type for below operations to make NOMMU functional:

- adreno_iommu_set_pt_ctx() tries to set pagetable during context
  switch without really checking on type of MMU.
- skip tracking of gpuaddr in case of NoMMU during
  kgsl_mem_entry_track_gpuaddr().
- In case of nommu the function kgsl_allocate_global() should
  always allocate contiguous memory from CMA.

Change-Id: I8cb59e1475376167c7a8a60c54df0939597f5083
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
2016-12-01 23:25:18 -08:00
Taniya Das
7511463229 ARM: dts: msm: Remove clocks associated with GDSC for MSMfalcon/Trition
The clients of each GDSC would take care of any memory requirement of the
associated clocks, so remove them from GDSC.

Change-Id: Ic2df5ba83d1e7166aadc954aa137ec65ffa79133
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-12-02 09:24:35 +05:30
Taniya Das
355e6dba7d clk: msm: Remove overrides from clock header files for common clock
For clients using msm-clk-provider.h and msm-clk.h
header files, no override is expected for COMMON_CLK
framework so fixing the same by conditionally compiling
the clock header files.

Change-Id: I5f7393f3f486a884bfa881a93c01623c3cd2664d
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-12-02 09:24:34 +05:30