OSDN Git Service
Subbaraman Narayanamurthy [Wed, 16 Aug 2017 18:55:18 +0000 (11:55 -0700)]
power: qcom-step-chg: Fix the error return path
Fix the error return path in qcom_step_chg_init() to free up the
allocated memory and registered wake source.
Change-Id: I8f93246d27f79a7c759b3afc4a4544d9ffca7a80
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Linux Build Service Account [Sat, 12 Aug 2017 14:56:36 +0000 (07:56 -0700)]
Merge "ARM: dts: msm: Remove sync-wait-broadcast for NT35597 DDIC"
Linux Build Service Account [Sat, 12 Aug 2017 09:36:04 +0000 (02:36 -0700)]
Merge "ath10k: Enable pktlog for WCN3990 target"
Linux Build Service Account [Fri, 11 Aug 2017 23:23:55 +0000 (16:23 -0700)]
Merge "ARM: dts: msm: Add support for ov9282 dual camera support"
Linux Build Service Account [Fri, 11 Aug 2017 23:23:54 +0000 (16:23 -0700)]
Merge "ARM: dts: msm: Enable auto-calibration for WLED on PM660/PMI8998"
Linux Build Service Account [Fri, 11 Aug 2017 23:23:52 +0000 (16:23 -0700)]
Merge "drm/msm: update HDMI AVI infoframe during HDR playback"
Linux Build Service Account [Fri, 11 Aug 2017 23:23:51 +0000 (16:23 -0700)]
Merge "drm/msm: update CSC matrix during HDR playback"
Linux Build Service Account [Fri, 11 Aug 2017 23:23:51 +0000 (16:23 -0700)]
Merge "drm/msm: change CSC matrix selection logic for CDM block"
Linux Build Service Account [Fri, 11 Aug 2017 23:23:49 +0000 (16:23 -0700)]
Merge "ASoC: msm: qdsp6v2: assign decoder memory to ADSP"
Linux Build Service Account [Fri, 11 Aug 2017 23:23:49 +0000 (16:23 -0700)]
Merge "Revert "input: misc: hbtp_input: fix memory corruption in list""
Sathish Ambley [Thu, 13 Jul 2017 18:37:51 +0000 (11:37 -0700)]
ARM: dts: msm: Add support for ov9282 dual camera support
Add support for ov9282 dual camera sensors with the images from
the two sensors stitched together.
Change-Id: I4ac5aecca4d7ecc4fb9d04a6fdf64c871f486cbf
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
Acked-by: Rajesh Bharathwaj <rajeshbharathwaj@codeaurora.org>
Sathish Ambley [Thu, 13 Jul 2017 17:52:01 +0000 (10:52 -0700)]
ARM: dts: msm: Add support for svr835 v2 board
Add battery profile data and pinctrl changes that are specific to svr835
v2 board.
Change-Id: I85c5e7ce7e88655da5637d2e5bc14ce8593b09d0
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
Acked-by: Rajesh Bharathwaj <rajeshbharathwaj@codeaurora.org>
Govind Singh [Tue, 7 Mar 2017 13:02:57 +0000 (18:32 +0530)]
ath10k: Enable pktlog for WCN3990 target
WCN3990 target uses new connect service for pktlog.
Add pktlog service request and support for pktlog
rx handling.
CRs-Fixed:
2038976
Change-Id: I6f7dbd8f8cbeadd0e53844154a9c360011e2c798
Signed-off-by: Govind Singh <govinds@codeaurora.org>
Signed-off-by: Ashutosh Kumar <askuma@codeaurora.org>
Linux Build Service Account [Fri, 11 Aug 2017 04:36:39 +0000 (21:36 -0700)]
Merge "power: qcom: smb-lib: optimize parallel current limiting with PD"
Linux Build Service Account [Fri, 11 Aug 2017 04:36:37 +0000 (21:36 -0700)]
Merge "ARM: dts: msm: Add fastrpc vmid flag for sdm660"
Linux Build Service Account [Fri, 11 Aug 2017 04:36:36 +0000 (21:36 -0700)]
Merge "msm: adsprpc: Separate hyp_assign call for audio remote heap protection"
Linux Build Service Account [Fri, 11 Aug 2017 04:36:36 +0000 (21:36 -0700)]
Merge "Revert "ARM: dts: msm: enable ADV7535 on MSM8996Pro Auto CDP lite platform""
Linux Build Service Account [Fri, 11 Aug 2017 04:36:35 +0000 (21:36 -0700)]
Merge "drm/msm: only set need cdm for INTF3"
Linux Build Service Account [Fri, 11 Aug 2017 04:36:34 +0000 (21:36 -0700)]
Merge "msm: camera: Avoid deadlock for vb2 operations using separate lock"
Linux Build Service Account [Fri, 11 Aug 2017 04:36:32 +0000 (21:36 -0700)]
Merge "power: qpnp-fg-gen3: adjust recharge voltage during soft JEITA charge done"
Abhinav Kumar [Fri, 28 Jul 2017 05:46:34 +0000 (22:46 -0700)]
drm/msm: update HDMI AVI infoframe during HDR playback
Add support to update the HDMI AVI infoframe to use
BT2020 encoding during HDR video playback.
This is required as per the spec to ensure that the
AVI infoframe correctly indicates the content being
shown.
Also make sure to change and restore the YCC
quantization bits in case of override.
Change-Id: Iadacc2fac6252b5f5cbfcc39a122118f738d3113
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Abhinav Kumar [Fri, 28 Jul 2017 01:31:41 +0000 (18:31 -0700)]
drm/msm: update CSC matrix during HDR playback
The CSC matrix used in the CDM block should be
updated to BT2020 format from the default value
during HDR video playback.
Add support in the SDE driver to enable switching
CSC matrix of CDM block to BT2020 during start of
HDR playback and restore it at the stop of the
playback to the default CSC.
Change-Id: Ic589380188ddef8ada2c8bbc0ca945bb1f319c85
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Abhinav Kumar [Thu, 27 Jul 2017 06:11:54 +0000 (23:11 -0700)]
drn/msm/sde: add BT709, BT2020 CSC matrix definitions
Currently only BT601 CSC matrix is available for use
in the SDE driver.
Add BT709, BT2020 CSC matrix definitions to SDE driver.
These shall be used during different use-cases such as
HDR video playback by switching the CSC matrix based on the
use-case.
Change-Id: I70a543193d08217cbdb6c4af739b3777dde4a25d
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Abhinav Kumar [Thu, 27 Jul 2017 03:11:32 +0000 (20:11 -0700)]
drm/msm: change CSC matrix selection logic for CDM block
CDM block is always using a limited quantization range
matrix.
This can be overridden to use a full range matrix if
the sink supports override capability or the mode is a
non-CEA mode.
Adjust the matrix selection logic to accommodate these
conditions.
Change-Id: I708412a923fb0d47e798f35ebe14b4c2f1a72fc9
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Guchun Chen [Thu, 10 Aug 2017 07:09:37 +0000 (00:09 -0700)]
Revert "ARM: dts: msm: enable ADV7535 on MSM8996Pro Auto CDP lite platform"
This reverts commit
9ec3ce38d73eb10ea1f3ff961641e6395eb4398f.
This change brings one NULL pointer in display kernel booting, which
will bring crash on msm8996 lite board. So revert this commit temporarily.
Change-Id: I7e11b78b47f0e2f2f5cc05a0220f1ff7f3a1addd
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
Tharun Kumar Merugu [Mon, 7 Aug 2017 05:09:56 +0000 (10:39 +0530)]
ARM: dts: msm: Add fastrpc vmid flag for sdm660
Add a device specific flag for new vmid heap shared feature.
Change-Id: I9be679f9edd0048acbb057ceff4d877c630e4258
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
Tharun Kumar Merugu [Fri, 4 Aug 2017 14:08:16 +0000 (19:38 +0530)]
msm: adsprpc: Separate hyp_assign call for audio remote heap protection
Enable audio remote heap protection for separate hyp_assign call to map
HLOS buffer to ADSP_Q6_ELF VM.
Change-Id: I91a70cb8ef2c2feb2d4c398c15c220c78c96a509
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
Linux Build Service Account [Wed, 9 Aug 2017 21:17:14 +0000 (14:17 -0700)]
Merge "msm: kgsl: Correctly update fence_name for larger timestamp"
Linux Build Service Account [Wed, 9 Aug 2017 21:17:14 +0000 (14:17 -0700)]
Merge "cnss2: Disable BDF bypass by default"
Yuan Zhao [Fri, 21 Jul 2017 09:25:43 +0000 (17:25 +0800)]
drm/msm: only set need cdm for INTF3
Only HDMI INTF3 should need cdm block, other
INTFs do not need cdm.
Change-Id: Iff355dae456ed432efd84dff72ec85b83dbb93f2
Signed-off-by: Yuan Zhao <yzhao@codeaurora.org>
Linux Build Service Account [Wed, 9 Aug 2017 10:18:21 +0000 (03:18 -0700)]
Merge "qpnp-smb2: enable/disable sw jeita using a property"
Linux Build Service Account [Wed, 9 Aug 2017 10:18:21 +0000 (03:18 -0700)]
Merge "power: power_supply: add property for sw based JEITA"
Linux Build Service Account [Wed, 9 Aug 2017 10:18:20 +0000 (03:18 -0700)]
Merge "ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver"
Abhilash Kumar [Tue, 8 Aug 2017 05:57:10 +0000 (11:27 +0530)]
msm: kgsl: Correctly update fence_name for larger timestamp
Since 'timestamp' is of unsigned int type, for larger timestamp
the format specifier %d can show negative values. Fix this by
using %u format specifier for timestamp.
Change-Id: I621dfd4843099cb27436006500fe3342d1d5ddf4
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
aranja [Tue, 8 Aug 2017 12:03:14 +0000 (05:03 -0700)]
Revert "input: misc: hbtp_input: fix memory corruption in list"
This reverts commit
e6b2b08383f6 ("input: misc: hbtp_input: fix
memory corruption in list_del_entry"). This change introduces
kernel crash during adb reboot.
Change-Id: Ia6f53e2d62344b9f08eb056d901ae39e884e3a96
Signed-off-by: Vevek Venkatesan <vevekv@codeaurora.org>
Abhijeet Dharmapurikar [Mon, 24 Jul 2017 16:43:00 +0000 (09:43 -0700)]
qpnp-smb2: enable/disable sw jeita using a property
Provide support to enable/disable sw jeita using a power supply
property.
Change-Id: Id1c2a4bcd8caece5ed7591dc5ab5bf3ac2207cba
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Ashay Jaiswal [Wed, 9 Aug 2017 04:16:31 +0000 (09:46 +0530)]
power: power_supply: add property for sw based JEITA
Add power_supply property to enable/disable software based
JEITA charging.
Change-Id: I9fca73c1de524e78c3df83b02a9f5a64488eaae0
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Yue Ma [Wed, 9 Aug 2017 00:02:27 +0000 (17:02 -0700)]
cnss2: Disable BDF bypass by default
Disable sending dummy BDF(board data file). Enforce to use real BDF
by default.
Change-Id: Ib0cf267af8ddea8a702f8ac6774063466094f52e
CRs-fixed:
2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
Linux Build Service Account [Tue, 8 Aug 2017 23:24:56 +0000 (16:24 -0700)]
Merge "power: qpnp-fg-gen3: add support for skew in capacity learning algorithm"
Linux Build Service Account [Tue, 8 Aug 2017 23:24:55 +0000 (16:24 -0700)]
Merge "usb: dwc3: initialize ep0_usb_req.request.dma to avoid crash"
Linux Build Service Account [Tue, 8 Aug 2017 23:24:55 +0000 (16:24 -0700)]
Merge "ASoC: msm: qdsp6v2: Modify name for Tertiary mi2s RX and TX"
Linux Build Service Account [Tue, 8 Aug 2017 23:24:54 +0000 (16:24 -0700)]
Merge "drm/msm: free the IRQ during GPU cleanup"
Linux Build Service Account [Tue, 8 Aug 2017 23:24:53 +0000 (16:24 -0700)]
Merge "ion: Correct argument of Set/ClearPagePrivate of secure CMA"
Linux Build Service Account [Tue, 8 Aug 2017 23:24:51 +0000 (16:24 -0700)]
Merge "defconfig: msm: Enable PAN emulation"
Linux Build Service Account [Tue, 8 Aug 2017 23:24:50 +0000 (16:24 -0700)]
Merge "cnss2: Suspend PCIe link and power off device after PCIe probe"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:19 +0000 (09:02 -0700)]
Merge "defconfig: msm: enable fstack-protector-strong"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:16 +0000 (09:02 -0700)]
Merge "Merge android-4.4@
59ff2e1 (v4.4.78) into msm-4.4"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:15 +0000 (09:02 -0700)]
Merge "defconfig: msm: Disable DEVPORT config for msm8998"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:14 +0000 (09:02 -0700)]
Merge "msm: sensor: ois: add conditional check for ioctl"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:12 +0000 (09:02 -0700)]
Merge "msm: ipa3: Fix IPA aggregation force close call"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:11 +0000 (09:02 -0700)]
Merge "USB: f_ccid: Unblock ccid_ctrl_read() during disconnect"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:10 +0000 (09:02 -0700)]
Merge "icnss: Delay Shutdown/reinit sequence for all cases"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:09 +0000 (09:02 -0700)]
Merge "qcom: qpnp-haptic: Disable haptics when enable time specified is zero"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:08 +0000 (09:02 -0700)]
Merge "drm/msm: reset TMDS clock ratio bit when disabling scrambler"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:07 +0000 (09:02 -0700)]
Merge "ARM: dts: msm: Set FDE key size to 256bit for sdm630"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:05 +0000 (09:02 -0700)]
Merge "ARM: dts: msm: Config sleep state for wlan bootstrap pin for msm8996"
Linux Build Service Account [Tue, 8 Aug 2017 16:02:04 +0000 (09:02 -0700)]
Merge "msm: ipa3: fix compatibility with ipa kernel tests"
Rashi Bindra [Fri, 4 Aug 2017 08:30:09 +0000 (14:00 +0530)]
ARM: dts: msm: Remove sync-wait-broadcast for NT35597 DDIC
When sync-wait-broadcast is enabled, panel status is read on both the
controllers. But for NT35597 DDIC, correct response is sent only on the
master controller. Thus, disabling sync-wait-broadcast to avoid reading on
slave controller for this DDIC for msm8998 and sdm660.
Change-Id: Idd4f82d20b416c871e8124b45a996df6746e6c4f
Signed-off-by: Rashi Bindra <rbindra@codeaurora.org>
Tanya Dixit [Thu, 3 Aug 2017 13:19:03 +0000 (18:49 +0530)]
ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver
Fix missing mutex unlock in LSM client driver.
CRs-fixed:
2059497
Change-Id: If5da5ab2eeb424b86c0e6476b69aa6ed36e7ea72
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
Hareesh Gundu [Mon, 7 Aug 2017 09:30:32 +0000 (15:00 +0530)]
ion: Correct argument of Set/ClearPagePrivate of secure CMA
On each sg of secure CMA buffer to set/clear page private bit,
we should use the sg_page(sg) rather than sg_page(sgt->sgl).
Change-Id: I05300d9d3a0931d2a0c113f945b45136e0dea01e
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Ghanim Fodi [Mon, 7 Aug 2017 08:40:58 +0000 (11:40 +0300)]
msm: ipa3: Fix IPA aggregation force close call
Core IPA driver passes wrong end-point index to HAL
when generating aggregation force close parameters
values. Fixed the call to pass the correct index.
CRs-Fixed:
2082839
Change-Id: Icc0fd2ce8a23bf0e3334f54b27b850ebf92b58a1
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
Vidyakumar Athota [Mon, 26 Jun 2017 21:13:06 +0000 (14:13 -0700)]
ASoC: msm: qdsp6v2: assign decoder memory to ADSP
Get the physical address of memory from ion FD and
assign it to ADSP for secure playback scenario.
Change-Id: I51019f5da6fb5fedefc81504b192f985b851ab12
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
annamraj [Tue, 8 Aug 2017 04:38:10 +0000 (10:08 +0530)]
msm: camera: Avoid deadlock for vb2 operations using separate lock
Use mutex lock for all VB2 operations, and use separatelock other
than used for stop streaming operation to avoid dead lock.
Change-Id: Idba956e5e3bce48ee57eaa5984786ded218e32d5
Signed-off-by: annamraj <annamraj@codeaurora.org>
Vidyakumar Athota [Sat, 5 Aug 2017 00:23:07 +0000 (17:23 -0700)]
soc: qcom: qdsp6v2: use hyp_assign() API for secure memory
Add a new API to call hyp_assign_phys() function to assign the
memory permissions to different subsystem like ADSP for secure
playback applications.
Change-Id: I1d13bd0cd3b5cdcbe37488800c7dad44a20f4996
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
Yue Ma [Sat, 21 Jan 2017 00:56:35 +0000 (16:56 -0800)]
cnss2: Suspend PCIe link and power off device after PCIe probe
After finishing initialization during PCIe probe, there is no need to
keep PCIe link up. Hence suspend PCIe link and power off device after
PCIe probe for QCA6290 chipset.
Change-Id: I1b07d7c9ef4c3a15ba1eb409a4c64f905e83dae4
Signed-off-by: Yue Ma <yuem@codeaurora.org>
Anirudh Ghayal [Mon, 7 Aug 2017 08:57:36 +0000 (14:27 +0530)]
qcom: qpnp-haptic: Disable haptics when enable time specified is zero
The vibrator HAL expects vibration to be disabled when the 'enable'
time specified is 0. Fix this.
CRs-Fixed:
2083994
Change-Id: I12843233da5429ed2fd53f33617952b1dd0ddcd5
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Subbaraman Narayanamurthy [Fri, 4 Aug 2017 19:25:49 +0000 (12:25 -0700)]
power: qpnp-fg-gen3: adjust recharge voltage during soft JEITA charge done
When there is an early charge termination because of soft JEITA
(warm and cool) conditions, float voltage would have been reduced
by the charger based on the compensation configuration (e.g. by
105 mV). This can be close to the recharge voltage threshold
(e.g. 4.25 V) when the recharge is configured to be based off
Vbatt. Adjust the recharge voltage threshold dynamically by
lowering it by 200 mV during soft JEITA and charge termination.
Reset it back to the original value when the condition clears
i.e. either it is out of soft JEITA or the charger is removed.
Change-Id: If4d293c10e84e414c81204784f2e7062140264b1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Abhinav Kumar [Fri, 4 Aug 2017 00:08:09 +0000 (17:08 -0700)]
drm/msm: reset TMDS clock ratio bit when disabling scrambler
Currently, when scrambler is disabled the TMDS clock ratio bit
is left untouched. Ideally the sink should reset this bit during
hot plug OR no-signal cases. However, the HDMI spec requires this
bit to be explicitly reset by the source.
Add support to reset this bit during scrambler disable.
Change-Id: I092f6cae84653940e2bdb9100df5e384084cf938
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Linux Build Service Account [Mon, 7 Aug 2017 22:48:19 +0000 (15:48 -0700)]
Merge "soc: qcom: scm: fix boot issue when compiled with clang"
Satya Durga Srinivasu Prabhala [Sat, 3 Jun 2017 02:45:35 +0000 (19:45 -0700)]
soc: qcom: scm: fix boot issue when compiled with clang
As per SMC Calling Convention, X4/W4, X5/W5 & X6/W6 registers
return state is unpredictable. But, inline assembly in scm
driver did not correctly specify output markers, which is
causing compiler to move instructions around when clang is
used to compile, which inturn causing deadlock and boot issue
during firmware loading. Add X4/W4, X5/W5 & X6/W6 registers
to output operand list to fix the deadlock during firmware
loading.
Change-Id: I1e4d51a58cd34c31fc63bcd21a20bfd15498bdc3
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
Anurag Chouhan [Mon, 7 Aug 2017 09:42:49 +0000 (15:12 +0530)]
icnss: Delay Shutdown/reinit sequence for all cases
PD down notifications reaches APPS only after WLAN HW is
reset. Because of this, there is a small window of time
in which APPS may try to access WLAN HW Copy Engine
registers and get into exception. To avoid this, FW has
implemented 2 stage reset sequence in which first HW is
halted rather than reset and then when FW PD is started
again, reset sequence is executed. Because of the 2
stage reset sequence, WLAN shutdown call back also needs
to be delayed as there may be some buffers submitted to
hardware and if they are freed then again HW exception
may be seen. Delay the shutdown call back till FW ready
happens at this time HW should be reset and clean state.
CRs-fixed:
2056443
Change-Id: Ie587f98d574f7c0a49a8480449fed44c1f4ab816
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
Linux Build Service Account [Mon, 7 Aug 2017 11:11:21 +0000 (04:11 -0700)]
Merge "msm: wlan: Update regulatory database"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:20 +0000 (04:11 -0700)]
Merge "msm: wlan: Update regulatory database"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:19 +0000 (04:11 -0700)]
Merge "ath10k: Disconnect QMI client in case of load failure"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:18 +0000 (04:11 -0700)]
Merge "leds: qpnp-flash-v2: Calculate the IRES current dynamically"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:15 +0000 (04:11 -0700)]
Merge "msm: usb_bam: replace %p with %pK"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:14 +0000 (04:11 -0700)]
Merge "drm/edid: add colorimetry block parsing support"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:14 +0000 (04:11 -0700)]
Merge "drm/edid: add support for parsing quantization select field"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:12 +0000 (04:11 -0700)]
Merge "msm: mdss: Add VIG double buffered CSC capability"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:11 +0000 (04:11 -0700)]
Merge "msm: wlan: Update regulatory database"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:10 +0000 (04:11 -0700)]
Merge "msm: kgsl: Disable VPC all flat shading optimization for A5XX"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:09 +0000 (04:11 -0700)]
Merge "msm: kgsl: Protect the event->handle with spinlock"
Linux Build Service Account [Mon, 7 Aug 2017 11:11:08 +0000 (04:11 -0700)]
Merge "msm: ais: Bound check for num_of_stream"
Mohammed Khajapasha [Mon, 7 Aug 2017 06:35:30 +0000 (12:05 +0530)]
defconfig: msm: Disable DEVPORT config for msm8998
Disable CONFIG_DEVPORT config for msm8998.
As selinux policy requires this node to be not
accessible to userspace.
Change-Id: I302d71a56764504ec246ddb6a98d8c07094846e4
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
Neeraj Soni [Mon, 7 Aug 2017 07:59:14 +0000 (13:29 +0530)]
ARM: dts: msm: Set FDE key size to 256bit for sdm630
Set FDE encryption key size to 256bit for sdm630
target.
Change-Id: I4314c1408fb6cadcdb8d81a02a4dccb55f3f9065
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Kiran Gunda [Wed, 26 Jul 2017 09:07:52 +0000 (14:37 +0530)]
leds: qpnp-flash-v2: Calculate the IRES current dynamically
Fix the out of bound ITARGET register programming by calculating the
LED_IRESOLUTION current dynamically based on the flash current requested
by the client.
CRs-Fixed:
2066263
Change-Id: Ifba232ab4af5493feef53e331bccdc55c6109246
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Linux Build Service Account [Mon, 7 Aug 2017 03:32:57 +0000 (20:32 -0700)]
Merge "power: qpnp-fg-gen3: improve cycle counter algorithm"
Linux Build Service Account [Sun, 6 Aug 2017 14:43:01 +0000 (07:43 -0700)]
Merge "msm: kgsl: Fix integer overflow in _load_gpmu_firmware"
Amir Levy [Thu, 3 Aug 2017 14:19:41 +0000 (17:19 +0300)]
msm: ipa3: fix compatibility with ipa kernel tests
Add several defines and structs to allow IPA kernel tests running.
Change-Id: I9c8f114b28aa617bdf1bfe56b44b73852a178ece
Acked-by: Dmitry Kogan <dmitryk@qti.qualcomm.com>
Signed-off-by: Amir Levy <alevy@codeaurora.org>
Linux Build Service Account [Sat, 5 Aug 2017 12:27:03 +0000 (05:27 -0700)]
Merge "power: qcom-step-chg: Add temperature based step-charging"
Sarada Prasanna Garnayak [Tue, 12 Jul 2016 09:50:27 +0000 (15:20 +0530)]
ARM: dts: msm: Config sleep state for wlan bootstrap pin for msm8996
Configure the sleep state for the wlan bootstrap pin for
msm8996. This configuration helps in power saving during
device sleep state.
CRs-Fixed:
1040537
Change-Id: Ia35f8bba901826b55722cb140c953f32b18610de
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Sarada Prasanna Garnayak [Tue, 12 Jul 2016 09:24:56 +0000 (14:54 +0530)]
ARM: dts: msm: add fixed regulator support for wlan_en for msm8996
The QCA wlan chipset uses tlmm, msm and pmic gpio for the WLAN_EN
signal pin. The tlmm or msm gpio uses pinctrl or gpio library for
configuring the sleep/active state runtime.
The pmic gpio runtime configuration is not feasible using gpio
library or pinctrl framework. Convert the pmic gpio to fixed
regulator to runtime control(enable/disable) via regulator framework.
CRs-Fixed:
1040537
Change-Id: I4963c2753b463d5852a847a20fe280107abca337
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Sarada Prasanna Garnayak [Tue, 12 Jul 2016 09:13:25 +0000 (14:43 +0530)]
net: cnss: add fixed regulator support for wlan enable pin
The QCA wlan chipset uses tlmm, msm and pmic gpio for the WLAN_EN
signal pin. The tlmm or msm gpio uses pinctrl or gpio library for
configuring the sleep/active state runtime.
The pmic gpio runtime configuration is not feasible using gpio
library or pinctrl framework. Convert the pmic gpio to fixed
regulator to runtime control(enable/disable) via regulator framework.
CRs-Fixed:
1040537
Change-Id: Ie74a659f309f248d335e03ca7a0a00244e9715b4
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Abhijeet Dharmapurikar [Thu, 3 Aug 2017 22:22:14 +0000 (15:22 -0700)]
qpnp-qnovo: skip taking ESR measurement when disabled
Currently when ptrain_done interrupt is handled, the driver invariably
issues a ESR measurement. This is not required if qnovo is disabled.
Change-Id: I8c81dadc38da69ba7248905af2d772f7ce918239
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Subbaraman Narayanamurthy [Sat, 24 Jun 2017 01:25:09 +0000 (18:25 -0700)]
power: qpnp-fg-gen3: add support for skew in capacity learning algorithm
In some cases, a skew needs to be applied on the learnt capacity
to counter the error. Add support for it.
Change-Id: I7f80088e7db4e3414d86983722c92e4fc14323e0
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Subbaraman Narayanamurthy [Fri, 9 Jun 2017 22:09:11 +0000 (15:09 -0700)]
power: qpnp-fg-gen3: improve cycle counter algorithm
Currently, when the charging status transitions to a state other
than charging, cycle counter algorithm stores the cycle count for
all the buckets for which the counting had started. This is fine
with respect to the algorithm.
However with qnovo enabled charging, this can cause issues when
charging status can go to not charging intermittently causing the
cycle count to be stored multiple times for a bucket. Modify the
logic to check for the charge termination or the presence of
input to go through all the buckets for storing the count. Also,
increment and store the counter only if battery SOC had increased
more than 2 LSBs for that SOC bucket.
While at it, run cycle_counter algorithm as a function instead
of a work. Also, keep the usage of cycle counter feature enable
flag inside the cycle counter APIs.
Change-Id: I62a92964ccbc6b965af09696deddc6fa8366a841
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Nicholas Troast [Mon, 10 Jul 2017 20:14:28 +0000 (13:14 -0700)]
power: qpnp-fg-gen3: make TTF monotonic by limiting slope
Currently if there is a spike in system load or a thermal event which
causes the battery current to change dramatically then the TTF can jump.
While a battery is charging the TTF should be monotonically decreasing.
Track the TTF starting with the first estimate and set hard bounds of -2
and -0.1 on the slope. The negative slope ensures the TTF is
monotonically decreasing and the hard bounds on the slope smooth out
significant changes in the TTF.
Change-Id: I68a934599ff25bc5a9eb67b372b28a723532a540
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Nicholas Troast [Wed, 21 Jun 2017 18:10:40 +0000 (11:10 -0700)]
power: qpnp-fg-gen3: optimize TTF for QNOVO
QNOVO provides a table of expected charge current settings across the
charge cycle. Use this table to calculate the time it will take to
charge in each step. The sum of these steps is the total time it will
take to fully charge a battery.
Change-Id: I0ed48a2a63886531e761e7ce1d175a600060eaf8
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Nicholas Troast [Thu, 6 Jul 2017 21:53:46 +0000 (14:53 -0700)]
power: qpnp-fg-gen3: prepare for QNOVO TTF
Micro resolution and 64-bit division is unnecessary; use milli
resolution instead. Measuring the IBATT and VBATT periodically during
sleep is necessary for accuracy. Don't clear the IBATT and VBATT buffers
on suspend to account for the higher charge current during suspend.
Prime the IBATT and VBATT buffers with 10 samples to get a more accurate
first estimate. Introduce a ttf mode to separate the differences in the
QNOVO version of TTF.
Change-Id: Ibc591dd5d38d4bbb712d8906755040d59181f008
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Linux Build Service Account [Fri, 4 Aug 2017 16:12:20 +0000 (09:12 -0700)]
Merge "mmc: card: Fix NULL pointer dereference in mmc_blk_ioctl_rpmb_cmd()"