OSDN Git Service
Linux Build Service Account [Thu, 24 May 2018 09:46:43 +0000 (02:46 -0700)]
Merge "fb: msm_dba: disable timing generator correctly during suspend"
Linux Build Service Account [Thu, 24 May 2018 09:46:41 +0000 (02:46 -0700)]
Merge "ARM: dts: msm: remove modem region reserved on APQ8096 ADP"
Linux Build Service Account [Thu, 24 May 2018 09:46:40 +0000 (02:46 -0700)]
Merge "msm: camera: Fix for Possible information leak issue"
Linux Build Service Account [Thu, 24 May 2018 09:46:38 +0000 (02:46 -0700)]
Merge "ARM: dts: msm: Configure irq flag for blsp_uart2 in 8996 gvm"
Linux Build Service Account [Thu, 24 May 2018 09:46:37 +0000 (02:46 -0700)]
Merge "power: smb-lib: Allow PD enable/disable for typeC devices only"
Linux Build Service Account [Thu, 24 May 2018 09:46:36 +0000 (02:46 -0700)]
Merge "cfg80211: Add backport flag for user cellular base hint"
Linux Build Service Account [Thu, 24 May 2018 09:46:35 +0000 (02:46 -0700)]
Merge "cfg80211: Call reg_notifier for self managed hints conditionally"
Linux Build Service Account [Thu, 24 May 2018 01:44:49 +0000 (18:44 -0700)]
Merge "msm: ipa: Fix to slab out of bounds issue"
Linux Build Service Account [Thu, 24 May 2018 01:44:47 +0000 (18:44 -0700)]
Merge "spmi: pmic-arb: support updating interrupt type flags"
Vivek Kumar [Thu, 3 May 2018 08:32:43 +0000 (14:02 +0530)]
ARM: dts: msm: Configure irq flag for blsp_uart2 in 8996 gvm
Configure irq flag as level high for blsp_uart2 wake-up
interrupt in msm8996 gvm.
Change-Id: I028ea5ea36da2a97c6878b763fcde1ebbbed9847
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
Vivek Kumar [Thu, 3 May 2018 09:14:24 +0000 (14:44 +0530)]
serial: msm_serial_hs: Configure IRQ flag
Configure irq flag for wake_up IRQ which is
passed from the DT.
Change-Id: Ib521a73a6164053c9bf846078482afb6671b76e0
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
Vivek Kumar [Mon, 21 May 2018 08:50:05 +0000 (14:20 +0530)]
ARM: dts: msm: remove modem region reserved on APQ8096 ADP
This reverts commit
bb5f7ce39ea3c49764774ff1b5ab02c0f4bc713d.
GPS uses modem memory in lahb115 for 8996 APQ.
Change-Id: I0784af084f764b64dc1acfa0236a7e4ef949193d
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
Linux Build Service Account [Tue, 22 May 2018 04:44:22 +0000 (21:44 -0700)]
Merge "soc: qcom: scm_qcpe: Fix unused variable warning"
Linux Build Service Account [Tue, 22 May 2018 04:44:21 +0000 (21:44 -0700)]
Merge "msm:ais: Remove recursive locks"
Linux Build Service Account [Mon, 21 May 2018 15:45:44 +0000 (08:45 -0700)]
Merge "arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW"
Umang Agrawal [Thu, 26 Apr 2018 10:22:40 +0000 (15:52 +0530)]
power: smb-lib: Allow PD enable/disable for typeC devices only
Currently if pd is not allowed, we force pd_active to 0 inorder
to run the legacy workaround and rerun apsd. But, this workaround
is required only for typeC devices.
Add a check to prevent PD disable for micro usb device.
Change-Id: I842166f66065c281ab366da327080b09a5e282e1
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
annamraj [Wed, 11 Apr 2018 05:12:13 +0000 (10:42 +0530)]
msm: camera: Fix for Possible information leak issue
Fix for possible information leak issue because of unintialised variable
Which can be accesed from userspace in camera fd driver
Signed-off-by: annamraj <annamraj@codeaurora.org>
Change-Id: I4552c4829e9532d848e46fd123316b26105e310e
Mohammed Javid [Tue, 10 Apr 2018 10:03:48 +0000 (15:33 +0530)]
msm: ipa: Fix to slab out of bounds issue
Add changes to verify passed value with in the allocated
max array size range or not before accessing structure.
Change-Id: If70493e937f6f0bc29bbfe08bf43738bdb4e9cf4
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Amit Blay [Mon, 21 May 2018 05:47:11 +0000 (08:47 +0300)]
soc: qcom: scm_qcpe: Fix unused variable warning
Fix an unused variable warning when GHS flag is not defined.
Change-Id: Icd5b8bbb0e1bd7bedbaa6c806889d21213cb23f2
Signed-off-by: Amit Blay <ablay@codeaurora.org>
Will Deacon [Thu, 8 Jun 2017 23:44:22 +0000 (16:44 -0700)]
arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW
Recently vDSO support for CLOCK_MONOTONIC_RAW was added in
49eea433b326 ("arm64: Add support for CLOCK_MONOTONIC_RAW in
clock_gettime() vDSO"). Noticing that the core timekeeping code
never set tkr_raw.xtime_nsec, the vDSO implementation didn't
bother exposing it via the data page and instead took the
unshifted tk->raw_time.tv_nsec value which was then immediately
shifted left in the vDSO code.
Unfortunately, by accellerating the MONOTONIC_RAW clockid, it
uncovered potential 1ns time inconsistencies caused by the
timekeeping core not handing sub-ns resolution.
Now that the core code has been fixed and is actually setting
tkr_raw.xtime_nsec, we need to take that into account in the
vDSO by adding it to the shifted raw_time value, in order to
fix the user-visible inconsistency. Rather than do that at each
use (and expand the data page in the process), instead perform
the shift/addition operation when populating the data page and
remove the shift from the vDSO code entirely.
[jstultz: minor whitespace tweak, tried to improve commit
message to make it more clear this fixes a regression]
Reported-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Daniel Mentz <danielmentz@google.com>
Acked-by: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: "stable #4 . 8+" <stable@vger.kernel.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Link: http://lkml.kernel.org/r/1496965462-20003-4-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Git-commit:
dbb236c1ceb697a559e0694ac4c9e7b9131d0b16
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: Ifa530498a6cd364ef258691ddf03cd3bc2a860b5
[vivekuma@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
Suprith Malligere Shankaregowda [Mon, 7 May 2018 09:00:20 +0000 (14:30 +0530)]
msm:ais: Remove recursive locks
We are trying to acquire the same mutex lock twice
in iotcl path and axi/stats start stream.
Removed recursive locks.
Change-Id: I331f79e5a387aa64600656f6377ba46385d11a83
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
Linux Build Service Account [Mon, 21 May 2018 02:31:52 +0000 (19:31 -0700)]
Merge "ASoC: msm: check payload size before memory allocation"
Linux Build Service Account [Mon, 21 May 2018 02:31:51 +0000 (19:31 -0700)]
Merge "ASoC: msm: qdsp6v2: return the proper LPASS status"
Linux Build Service Account [Sat, 19 May 2018 21:01:37 +0000 (14:01 -0700)]
Merge "Ath10k: enable WLAN channel switch announcement offload"
Linux Build Service Account [Sat, 19 May 2018 21:01:21 +0000 (14:01 -0700)]
Merge "Revert "usb: host: Add support for usb core indexing""
Linux Build Service Account [Sat, 19 May 2018 21:01:16 +0000 (14:01 -0700)]
Merge "ARM: dts: msm: IPA clock switches to virtual clock on msm8996 vplatform"
Linux Build Service Account [Sat, 19 May 2018 10:29:39 +0000 (03:29 -0700)]
Merge "ARM: dts: msm: Enable required USB nodes for 8996 lagvm"
Linux Build Service Account [Sat, 19 May 2018 10:29:34 +0000 (03:29 -0700)]
Merge "Revert "cfg80211: Define new API to send reg change event""
Linux Build Service Account [Sat, 19 May 2018 10:29:28 +0000 (03:29 -0700)]
Merge "Revert "reg: qcom: call reg notifier during wiphy registration""
Sarada Prasanna Garnayak [Thu, 10 May 2018 09:15:01 +0000 (14:45 +0530)]
Ath10k: enable WLAN channel switch announcement offload
The WLAN firmware supports the channel switch offload and
channel switch announcement event reporting to the WLAN driver.
In STA mode this feature adds support to wakeup the device from
the wow suspend on channel switch announcement by the connected
access point.
CRs-Fixed:
2170011
Change-Id: I68612beb0a808700a732fc858c8797200d1f4819
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
c_krikum [Thu, 17 May 2018 12:09:20 +0000 (17:39 +0530)]
ARM: dts: msm: Enable required USB nodes for 8996 lagvm
Enable required USB nodes in LA-GVM specific dts
for msm8996.
Change-Id: I6359f6b7435383019d920e97f574c23ed557a67b
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
Zhiqiang Tu [Tue, 10 Apr 2018 02:40:25 +0000 (10:40 +0800)]
ARM: dts: msm: IPA clock switches to virtual clock on msm8996 vplatform
Virtual clock driver has added support for RPM controlled clock.
So change the IPA clock which is controlled by RPM from dummy
clock to virtual clock.
Change-Id: If0a95fd0cb530c7a230105f5035373e7cac2c102
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Linux Build Service Account [Thu, 17 May 2018 19:23:36 +0000 (12:23 -0700)]
Merge "msm: mdss: Increase fbmem buf ref count before use in mdp3"
Linux Build Service Account [Thu, 17 May 2018 19:23:34 +0000 (12:23 -0700)]
Merge "diag: Add new log codes to diag mask"
Gerrit - the friendly Code Review server [Thu, 17 May 2018 19:06:46 +0000 (12:06 -0700)]
Merge changes into msm-4.4
Amar Singhal [Wed, 16 May 2018 19:20:18 +0000 (12:20 -0700)]
cfg80211: Add backport flag for user cellular base hint
Upstream commit
aced43ce780dc5e683b3de00ce9fb3db7d28e1d3 ("cfg80211: Call
reg_notifier for self managed hints conditionally") adds support
for processing user cell_base hints when wiphy is self managed. Add
backport flag for the same.
Change-Id: I44e083f4346cc95eb2f80eeec7d56f305e7ecce0
CRs-Fixed:
2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Amar Singhal [Thu, 26 Apr 2018 17:13:07 +0000 (20:13 +0300)]
cfg80211: Call reg_notifier for self managed hints conditionally
Currently the regulatory core does not call the regulatory callback
reg_notifier for self managed wiphys, but regulatory_hint_user() call is
independent of wiphy and is meant for all wiphys in the system. Even a
self managed wiphy may be interested in regulatory_hint_user() to know
the country code from a trusted regulatory domain change like a cellular
base station. Therefore, for the regulatory source
NL80211_REGDOM_SET_BY_USER and the user hint type
NL80211_USER_REG_HINT_CELL_BASE, call the regulatory notifier.
No current wlan driver uses the REGULATORY_WIPHY_SELF_MANAGED flag while
also registering the reg_notifier regulatory callback, therefore there
will be no impact on existing drivers without them being explicitly
modified to take advantage of this new possibility.
Change-Id: Ibd700eae551840c94daa8b721add74a8e744c748
CRs-Fixed:
2201959
Git-commit:
aced43ce780dc5e683b3de00ce9fb3db7d28e1d3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-testing.git
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Amar Singhal [Wed, 7 Mar 2018 19:41:48 +0000 (11:41 -0800)]
Revert "cfg80211: Define new API to send reg change event"
This reverts commit
98d5572dd2ec954f516f9fd5b55dcef2b09a1d7c. This API
no more needed since user would use existing kernel API.
Change-Id: I2d5a19fc9159da5ef7020cb1808b704b0344087e
CRs-Fixed:
2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Amar Singhal [Wed, 7 Mar 2018 20:58:55 +0000 (12:58 -0800)]
Revert "reg: qcom: call reg notifier during wiphy registration"
This reverts commit
2aa0bb3ac04d659292993423415a98a9b3cdda49. Upstream
commit
aced43ce780dc5 ("cfg80211: Call reg_notifier for self managed
hints conditionally") replaces this functionality.
Change-Id: If52d83577ab2f136540f70ba17d417718ba05ddf
CRs-Fixed:
2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Amar Singhal [Tue, 10 Apr 2018 16:35:27 +0000 (09:35 -0700)]
Revert "reg: qcom: call regulatory callback for self managed hints"
This reverts commit
31e37a680dcbb02ba41d17972dba0b298cf1983d. Upstream
commit
aced43ce780d ("cfg80211: Call reg_notifier for self managed
hints conditionally") replaces this functionality.
Change-Id: Ic0c3a235aee2dc8ccb36014c60314217b98b5b97
CRs-Fixed:
2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Linux Build Service Account [Thu, 17 May 2018 10:38:43 +0000 (03:38 -0700)]
Merge "rh850: Add support to get irq type from device tree"
Linux Build Service Account [Thu, 17 May 2018 10:38:41 +0000 (03:38 -0700)]
Merge "clk: msm: Add rpm controlled clock support for virtual clock"
Linux Build Service Account [Thu, 17 May 2018 10:38:39 +0000 (03:38 -0700)]
Merge "lpm-levels: Remove kfree for memory allocated with devm_kzalloc"
Linux Build Service Account [Thu, 17 May 2018 10:38:38 +0000 (03:38 -0700)]
Merge "dsp: codecs: use native API to configure PCM output block in multiaac"
Linux Build Service Account [Thu, 17 May 2018 10:38:37 +0000 (03:38 -0700)]
Merge "ARM: dts: msm: Add fastrpc vmid flag for sdm630"
Linux Build Service Account [Thu, 17 May 2018 10:38:35 +0000 (03:38 -0700)]
Merge "msm: camera: Update camera CDR mask setting for CPHY mode"
Linux Build Service Account [Thu, 17 May 2018 10:38:31 +0000 (03:38 -0700)]
Merge "Revert "usb: core: Add helper function to return controller id""
Linux Build Service Account [Thu, 17 May 2018 10:38:29 +0000 (03:38 -0700)]
Merge "Revert "usb: host: xhci: Add helper function to return controller id""
Linux Build Service Account [Thu, 17 May 2018 10:38:27 +0000 (03:38 -0700)]
Merge "Revert "sound: usb: Provide controller number in QMI response""
Linux Build Service Account [Thu, 17 May 2018 10:38:25 +0000 (03:38 -0700)]
Merge "ARM: dts: msm: Add speed-bin 4 support for sdm660"
Linux Build Service Account [Thu, 17 May 2018 10:38:20 +0000 (03:38 -0700)]
Merge "[drm/sde/hdmi] move scrambler setup from mode-set to pre-enable"
Manoj Prabhu B [Thu, 17 May 2018 06:38:51 +0000 (12:08 +0530)]
diag: Add new log codes to diag mask
The patch adds new requested log codes to diag mask.
Change-Id: I4124e55077ae63b9c0c349feed409851108261d3
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Linux Build Service Account [Wed, 16 May 2018 17:28:48 +0000 (10:28 -0700)]
Merge "ARM: dts: msm: support msm-pcm-dtmf on msm8996 adsp/cdp"
Linux Build Service Account [Wed, 16 May 2018 17:28:45 +0000 (10:28 -0700)]
Merge "ASoC: msm: qdsp6v2: increase max Rx DTMF duration"
Tharun Kumar Merugu [Mon, 25 Sep 2017 08:01:37 +0000 (13:31 +0530)]
ARM: dts: msm: Add fastrpc vmid flag for sdm630
Add device specific flag for new vmid heap shared feature.
Change-Id: Ie6abb5d79162d2cbb80e31922452be249f18c632
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:51:57 +0000 (10:21 +0530)]
Revert "usb: host: Add support for usb core indexing"
This reverts commit
03a86f5cb1adaa2e30a70eefd7bc1ab9509eea46.
Remove support for usb core indexing since it is no longer
required to send controller number to remote client.
Change-Id: I8021c10037a668997782327e4c151d8cac2a2ebb
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Wed, 16 May 2018 07:11:43 +0000 (12:41 +0530)]
Revert "ARM: dts: msm: Pass usb controller id for 8996"
This reverts commit
745e97d518ee7fcd0836d329747926a8201bbca4.
Remove unique core IDs of the USB controllers on MSM8996.
Change-Id: Ie929c8c11831422e32e8b673abd8c20dfbcc79c5
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Linux Build Service Account [Wed, 16 May 2018 07:29:11 +0000 (00:29 -0700)]
Merge "ARM: dts: msm: add HAB physical channels for msm8996 baseline vplatform"
Linux Build Service Account [Wed, 16 May 2018 07:29:09 +0000 (00:29 -0700)]
Merge "Revert "sound: usb: Update QMI indication message""
Linux Build Service Account [Wed, 16 May 2018 07:29:07 +0000 (00:29 -0700)]
Merge "battery: handle early/late suspend/resume of i2c bus"
Soumya Managoli [Tue, 15 May 2018 13:16:45 +0000 (18:46 +0530)]
dsp: codecs: use native API to configure PCM output block in multiaac
Usage of q6asm_enc_cfg_blk_pcm() does not trigger
PortSettingsChanged event which is required for multi aac component.
Configure the PCM output block using q6asm_enc_cfg_blk_pcm_native()
which ensures that the event gets triggered.
Change-Id: Ieefeead45435840c2ecc1c072e8095785fd4b583
Signed-off-by: Satya Krishna Pindiproli <satyak@codeaurora.org>
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
Xiaojun Sang [Tue, 15 May 2018 07:47:43 +0000 (15:47 +0800)]
ASoC: msm: check payload size before memory allocation
Buffer from mixer ctl or ADSP is composed of payload size and
actual payload. On a 32 bit platform, we could have an overflow
if payload size is below UINT_MAX while payload size + sizeof(struct)
is over UINT_MAX. Allocated memory size would be less than expected.
Check payload size against limit before memory allocation.
Change-Id: I0bf19ca7b8c93083177a21ad726122dc20f45551
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
Vijay kumar Tumati [Wed, 16 May 2018 05:17:34 +0000 (10:47 +0530)]
msm: camera: Update camera CDR mask setting for CPHY mode
Update the setting to match HPG on SDM660.
Change-Id: I12f7ac0127bf646cb7fb0095b6543a08e558fe4a
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
Camus Wong [Fri, 6 Apr 2018 00:40:15 +0000 (20:40 -0400)]
[drm/sde/hdmi] move scrambler setup from mode-set to pre-enable
when mode-set is called, HDP core is not enabled yet and scrambler
is not working. Move scrambler setup to pre-enable stage will fix
this problem.
Change-Id: I85d0ac22c6b789a9c0f6288b06cabf3225c20b45
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:51:26 +0000 (10:21 +0530)]
Revert "usb: core: Add helper function to return controller id"
This reverts commit
c611d78437adeb9299d8be3f7be78b9c153152e5.
Remove helper function to return controller id.
Change-Id: Iadc085bf1dd9553c0805511f3cbafabdec8744f5
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:50:51 +0000 (10:20 +0530)]
Revert "usb: host: xhci: Add helper function to return controller id"
This reverts commit
97618148cec392dd81aedbef03504c90b5ddaf26.
Remove helper function to return controller id.
Change-Id: I1c0f6cd5600630d77d986f9782e4b83e2919d22b
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:47:14 +0000 (10:17 +0530)]
Revert "sound: usb: Provide controller number in QMI response"
This reverts commit
9730f9cdc0874d372a3eb10680ed8622e26db2bb.
Remote entity does not require the controller number. Tunnel
mode audio will only work with the primary controller. Hence
remove support for providing controller num.
Change-Id: Ife8c0ca969334c57046a91bae428b5f89f9e0566
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:45:49 +0000 (10:15 +0530)]
Revert "sound: usb: Pass device speed instead of dcba information"
This reverts commit
8177d0955dfdcc7910a261af04d9214018e38d13.
ADSP requires dcba memory information. Hence pass it from driver.
Change-Id: Ibaf120ba130a24329ef88c7755154e50ba3a7335
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:45:01 +0000 (10:15 +0530)]
Revert "usb: core: Remove helper APIs returning dcba dma address"
This reverts commit
039bcf340ea35f1e5c4a81f290455570097d7d62.
Add back helper APIs to return dcba dma address.
Change-Id: Ia65e98691d1a3c241694f07215c12605832f574d
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:44:04 +0000 (10:14 +0530)]
Revert "usb: host: xhci: Remove helper API retuning dcba dma address"
This reverts commit
9c1d883952b8430994a302d10aab2bc8130bcd97.
Add back helper API to return dcba dma address.
Change-Id: I769c42d53f19bbefb65d491823911b39ec620751
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Linux Build Service Account [Tue, 15 May 2018 02:56:24 +0000 (19:56 -0700)]
Merge "asoc: sdm660: Add configuration for adaptive bitrate."
Linux Build Service Account [Tue, 15 May 2018 02:56:23 +0000 (19:56 -0700)]
Merge "regulator: cprh-kbss: Add speed-bin 4 support for sdm660"
Linux Build Service Account [Tue, 15 May 2018 02:56:22 +0000 (19:56 -0700)]
Merge "diag: Initialize memory device memory pools"
Linux Build Service Account [Tue, 15 May 2018 02:56:21 +0000 (19:56 -0700)]
Merge "Revert "defconfig: msm: Enable 802.11AD WiFi platform driver""
Linux Build Service Account [Tue, 15 May 2018 02:56:19 +0000 (19:56 -0700)]
Merge "ARM: dts: msm: add hab device node into the msm8996 ivi LA vplatform"
Linux Build Service Account [Tue, 15 May 2018 02:56:17 +0000 (19:56 -0700)]
Merge "ARM: dts: msm: Use peripheral nodes from QRD630 on QRD636"
Derek Chen [Thu, 5 Oct 2017 22:51:30 +0000 (18:51 -0400)]
ASoC: msm: qdsp6v2: return the proper LPASS status
Allow the LPASS status check API to return
the proper status code.
CRs-fixed:
2126725
Change-Id: I6c34036ec30c7d4ce8aaefb70d19b04b211f7355
Signed-off-by: Derek Chen <chenche@codeaurora.org>
Soumya Managoli [Tue, 8 May 2018 05:01:22 +0000 (10:31 +0530)]
asoc: sdm660: Add configuration for adaptive bitrate.
Add hostless front end DAI to trigger backend
configuration of BT backend dai required for
configuring BT ABR statistics. Add mixer ctrls
to independently configure TX and RX sample
rates to allow BT RX and TX backends.
Change-Id: I2370eccb10da666ecf267f2756b2efd66ecbf8f6
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
Jiangen Jiao [Fri, 8 Sep 2017 08:58:49 +0000 (16:58 +0800)]
ARM: dts: msm: Use peripheral nodes from QRD630 on QRD636
Include QRD630 device tree file to leverage peripherals nodes and
delete smb1351 node as it is not present on QRD630 board.
Change-Id: I91b6356bf7267d56af73eee1a1bea3fa5ae944f4
Signed-off-by: Jiangen Jiao <jiangenj@codeaurora.org>
Signed-off-by: Zhenhua Huang <zhenhuah@codeaurora.org>
Sreelakshmi Gownipalli [Thu, 11 Jan 2018 18:45:23 +0000 (10:45 -0800)]
diag: Initialize memory device memory pools
Initialize memory device memory pools for diag bridge
only during diag bridge initialization.
Change-Id: I6454ced55e020ade9e3bb99a266548f77f79e193
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Tirupathi Reddy [Fri, 27 Apr 2018 11:37:45 +0000 (17:07 +0530)]
ARM: dts: msm: Add speed-bin 4 support for sdm660
Add APC CPR configuration for sdm660 speed-bin 4
parts.
Change-Id: Iaeb5611218fbad22083f030a374db31c5774153b
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Tirupathi Reddy [Fri, 11 May 2018 09:35:13 +0000 (15:05 +0530)]
regulator: cprh-kbss: Add speed-bin 4 support for sdm660
Update fuse combo count supported for sdm660 to 40.
Change-Id: I9ee2c15792c3f006db5969be42bce19a4ebc180c
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Yong Ding [Tue, 8 May 2018 08:41:14 +0000 (16:41 +0800)]
ARM: dts: msm: add hab device node into the msm8996 ivi LA vplatform
HAB(Hypervisor ABstraction driver) is used to support
message tx/rx or buffer sharing between multiple OS in the
virtualization environment.
With such hab device node in the ivi LA vplatform's device
tree, hab driver will get its configurations dynamically.
So it will not use the default configurations any more.
Change-Id: Ie036799428bccac3685229c249b4943335807b68
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Zhiqiang Tu [Sat, 12 May 2018 07:21:31 +0000 (15:21 +0800)]
rh850: Add support to get irq type from device tree
Irq type may vary among targets, add support to get
it from device tree.
Change-Id: I60cb49a4c5fee3dda4ec5abc02966b0b961590da
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Vivek Kumar [Fri, 11 May 2018 06:47:59 +0000 (12:17 +0530)]
Revert "defconfig: msm: Enable 802.11AD WiFi platform driver"
This reverts commit
976d5ca5ddeff6f4b2b364edb916d39fa6448365.
Change-Id: I4b6bb0e3af39bcdf0238ca542ab3acfc584a5fd3
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
Maulik Shah [Fri, 11 May 2018 04:51:22 +0000 (10:21 +0530)]
lpm-levels: Remove kfree for memory allocated with devm_kzalloc
Do not use kfree for memory allocated with devm_kzalloc during
failures as device memory will get freed in device release.
Change-Id: I6c4d3f8ed55ab02e3e70a1fe65452a8817c8b64e
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Yimin Peng [Fri, 11 May 2018 02:08:19 +0000 (10:08 +0800)]
spmi: pmic-arb: support updating interrupt type flags
Have the qpnpint_irq_set_type function clear unwanted high/low
trigger bits when updating the interrupt flags.
Change-Id: Ie55d6178ea94350ecf8c79714cb863ea63d76ea6
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
Linux Build Service Account [Thu, 10 May 2018 18:33:48 +0000 (11:33 -0700)]
Merge "soc: qcom: scm_qcpe: Add support for GHS"
Linux Build Service Account [Thu, 10 May 2018 18:33:45 +0000 (11:33 -0700)]
Merge "soc: qcom: hab: hold the message when the read buffer is smaller"
Timothy Sham [Fri, 27 Apr 2018 16:38:15 +0000 (12:38 -0400)]
ARM: dts: msm: support msm-pcm-dtmf on msm8996 adsp/cdp
Add msm-pcm-dtmf DAI for sound cards on msm8996
automotive ADP/CDP platforms.
Change-Id: I5015536ec7293892bb1da4547b2ea90b20d93123
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
Linux Build Service Account [Thu, 10 May 2018 08:25:18 +0000 (01:25 -0700)]
Merge "Merge android-4.4.131 (
d5d6526) into msm-4.4"
Linux Build Service Account [Wed, 9 May 2018 20:54:15 +0000 (13:54 -0700)]
Merge "diag: Add new WLAN_RSN event id"
Sachin Bhayare [Thu, 12 Apr 2018 13:27:52 +0000 (18:57 +0530)]
msm: mdss: Increase fbmem buf ref count before use in mdp3
The reference count for fbmem buf is not increased before use,
which means it can be get freed unintentionally when the reference
count is decreased to "0". In this case, there is possibility of
use after free. Ensure that fbmem buf refcount is incremented
before use mdp3 driver.
Change-Id: I38787c27a26ae550c6fb28697a7583490ad19df8
Signed-off-by: Sachin Bhayare <sachin.bhayare@codeaurora.org>
Linux Build Service Account [Wed, 9 May 2018 12:09:47 +0000 (05:09 -0700)]
Merge "drm: msm: improve early splash mechanism"
Yong Ding [Mon, 23 Apr 2018 11:04:39 +0000 (19:04 +0800)]
soc: qcom: hab: hold the message when the read buffer is smaller
If the receive buffer in habmm_socket_recv() is smaller
than the message, it should be kept in the queue rather
than dropped.
Change-Id: Iabc1f73e5b443cc7ebdefc3961d5bec9049a265f
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Manoj Prabhu B [Fri, 4 May 2018 09:05:11 +0000 (14:35 +0530)]
diag: Add new WLAN_RSN event id
The patch adds new WLAN_RSN_INFO event as latest ID.
Change-Id: Ic76506632ea0aa61c79c52824556b6aaeb0b04e6
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Timothy Sham [Thu, 3 May 2018 15:45:54 +0000 (11:45 -0400)]
ASoC: msm: qdsp6v2: increase max Rx DTMF duration
Increase the maximum value of the DTMF Rx Generate
mixer command and change the read to int16 to allow
for clients to be able to set '-1', infinite tone.
Change-Id: I44eed4712bb05a70b4464d9db38c348c131a3f61
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
Linux Build Service Account [Tue, 8 May 2018 20:46:01 +0000 (13:46 -0700)]
Merge "ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr"
Linux Build Service Account [Tue, 8 May 2018 20:45:59 +0000 (13:45 -0700)]
Merge "power: smb-lib: Enable TypeC crude sensor PBS WA based on PMIC type"
Linux Build Service Account [Tue, 8 May 2018 20:45:58 +0000 (13:45 -0700)]
Merge "power: smb-lib: Add support for SW based OV detection"