Commit Graph

584 次程式碼提交

作者 SHA1 備註 提交日期
Linux Build Service Account
353ea8a466 Merge "ASoC: msm: qdsp6v2: Add dynamic chmix config support" 2018-06-20 21:13:49 -07:00
Linux Build Service Account
d1db0560b8 Merge "soc: pinctrl-lpi: Add support to read lpi offset from device tree" 2018-06-20 08:52:49 -07:00
Linux Build Service Account
dd85796fb6 Merge "asoc: msm-pcm-routing: add Listen app type config v2 mixer control" 2018-06-19 22:04:20 -07:00
Linux Build Service Account
cfebfced54 Merge "dsp: q6adm: add ADM_LSM_AUDPROC_PERSISTENT cal type" 2018-06-19 22:04:16 -07:00
Linux Build Service Account
e97c27f096 Merge "msm-lsm-client: decouple input and output hardware parameters" 2018-06-19 22:04:14 -07:00
Linux Build Service Account
ca3d8c53fb Merge "asoc: msm: fix display port rx1 route" 2018-06-19 20:24:12 -07:00
Bhalchandra Gajare
eed46bd521 ASoC: msm: qdsp6v2: Add dynamic chmix config support
Add support to dynamically configure channel mixing weightage
coefficients for both ASM and LSM sessions.
Currently the code is executed only for LSM session and can be
extended to ASM as well.

Change-Id: I727ea6fa2d3a99bbf6811005c5733535f680891b
Signed-off-by: Chaithanya Krishna Bacharaju <chaithan@codeaurora.org>
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-19 18:45:52 -07:00
Linux Build Service Account
e4e8a88459 Merge "uapi: lsm_params: add support for lsm version 3.0" 2018-06-19 16:59:30 -07:00
Linux Build Service Account
25a990e3c4 Merge "asoc: codecs: stub for WCD CPE core" 2018-06-19 15:52:38 -07:00
Bhalchandra Gajare
3693b6559c asoc: msm-pcm-routing: add Listen app type config v2 mixer control
It is required to know the number of output channels for any
particular app_type so that channel mixing can be performed
if the channels do not match as that of the listen stream.
Add new Listen app type config V2 mixer control that reads the
num_out_channels field along with the others.

Change-Id: I49a74004e12dfa5a4c1ebaac4ac065acc6ff5bc3
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-19 15:52:24 -07:00
Bhalchandra Gajare
bbb641427b dsp: q6adm: add ADM_LSM_AUDPROC_PERSISTENT cal type
ADM supports certain modules that can have very large calibration sizes,
in such cases the calibration is expected to be persistent in memory.
Add new cal type for this purpose.

Change-Id: Ieb2e941036595b7dff4b8bfb341f2ec152cf648a
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-19 15:50:19 -07:00
Bhalchandra Gajare
54b7fb7bce uapi: msm_audio_calibration: add new cal type for ADM_LSM
New cal type ADM_LSM_AUDPROC_PERSISTENT is added to enable
the larger calibration sizes for ADM that need to be kept
persistent in memory.

Change-Id: Ie23f52d6aad45dc1133a4a6fa692c1331b93d3e8
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-19 15:49:23 -07:00
Bhalchandra Gajare
6ee5b50fd4 msm-lsm-client: decouple input and output hardware parameters
With multichannel voice activation support in LSM, it could be possible
that the input media format/hw_params to LSM would be different than
the output media format/hw_params. This change decouples the input
and output hw_params for LSM. The output hw_params are obtained through
ALSA pcm_hw_params operation, whereas the input hw_params are obtained
though the LSM_SET_INPUT_HW_PARAMS ioctl to LSM.

At the same time, the below parameter IDs are added to send the channel
information to LSM service:
	- LSM_PARAM_ID_MEDIA_FMT_V2
	- LSM_PARAM_ID_LAB_OUTPUT_CHANNEL_CONFIG

Change-Id: Ie53a087b0ec54e83c4eba93a0828f9bdd6cc147d
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-19 15:10:18 -07:00
Linux Build Service Account
d69c855747 Merge "ASoC: Add support for audio drivers compilation on kernel-4.14" 2018-06-19 12:12:33 -07:00
Karthikeyan Mani
fbea92ff45 asoc: msm: fix display port rx1 route
Fix proper name for rx1 dp port widget for
proper registration of the dp route.

Change-Id: I31894c0b1f66ed8848f533728f3ca07ec9fefd34
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
2018-06-19 12:09:59 -07:00
Mangesh Kunchamwar
bb2d759893 asoc: codecs: stub for WCD CPE core
Add stub functions for WCD CPE core APIs

Change-Id: Iddfdc8de9962d7a8d96cf7010c0b7ab18826ce37
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-19 17:02:33 +05:30
Aditya Bavanari
d7ec18ce76 soc: pinctrl-lpi: Add support to read lpi offset from device tree
In order to support variable lpi offsets from different chipsets
read the lpi offset values of gpio groups from device tree. Any
target which uses LPI has to define this gpio offset table
in device tree.

Change-Id: I3bd54017e4571deb9a189cfd6903698887a6413a
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2018-06-19 16:27:22 +05:30
Ramprasad Katkam
75a24ba3cd asoc: config: Update qsc405 config for new soundwire driver
Update vipertooth auto conf files to include new
soundwire master

Change-Id: I1854e392cc376aec0eb36147231a8e38127b4102
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2018-06-19 00:37:05 -07:00
Ramprasad Katkam
e80ab29892 asoc: swr: Add config flag for New soundiwre driver compilation
Add new kconfig to control compilation of new soundwire driver

Change-Id: I6eb8b30de9f6dc2ffa152b6dfffbc2b02d0a990c
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2018-06-19 00:36:27 -07:00
Linux Build Service Account
b40af4675e Merge "dsp: fix return code check in adm driver" into audio-drivers.lnx.3.0 2018-06-18 20:58:18 -07:00
Linux Build Service Account
686869fffc Merge "ASoC: wcd-mbhc: Fix detection of special headset" into audio-drivers.lnx.3.0 2018-06-18 20:08:00 -07:00
Bhalchandra Gajare
1f6b04af93 uapi: lsm_params: add support for lsm version 3.0
Listen v3.0 adds new algorithm and multichannel support. The
input and output of LSM could have different media format,
especially number of channels. Add required support to obtain
input hardware params from userspace. Existing pcm_hw_params
operations will be used to obtain the lsm output hw params.

Change-Id: I3feca50b4b13ece59ceb39787199e2cec17b3cae
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-18 18:36:16 -07:00
Linux Build Service Account
20ecda1ebf Merge "dsp: Fix rtac memory unmap issue in ASM driver" into audio-drivers.lnx.3.0 2018-06-18 16:42:56 -07:00
Linux Build Service Account
f3d6f39387 Merge "asoc: msm: routing: Add support for LSM routings for codec dma interfaces" into audio-drivers.lnx.3.0 2018-06-18 16:42:54 -07:00
Sudheer Papothi
8d34b2e801 ASoC: Add support for audio drivers compilation on kernel-4.14
Add support for audio drivers compilation on kernel-4.14.

Change-Id: Id7689cef4ae7cdb6711fed386d2a6b0d427b3fc3
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2018-06-19 03:43:54 +05:30
Linux Build Service Account
74104df871 Merge "Asoc: swr: New soundwire master driver" into audio-drivers.lnx.3.0 2018-06-18 13:38:47 -07:00
Aditya Bavanari
d66cc71409 dsp: Fix rtac memory unmap issue in ASM driver
During unmap of rtac block in ASM, mem_map_handle
address is set to zero instead of the value. Set the
map handle value to zero to avoid issue in freeing the
ion memory.

CRs-Fixed: 2254339
Change-Id: I6584be029d4c8dde235e722149c758df0db9916e
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2018-06-18 12:57:32 +05:30
Ramprasad Katkam
9f040f339f Asoc: swr: New soundwire master driver
New soundwire master driver to support multi master
for Talos/vipertooth.

Change-Id: I2616b940339e8f3d8d120e6705247d7bd1656bac
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2018-06-18 12:07:47 +05:30
Vidyakumar Athota
e427c419f5 dsp: fix return code check in adm driver
Return error only if apr_send_pkt() function
return code is less than 0.

Change-Id: I98903c6c275f360d32c3af523352071d92d1ef85
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2018-06-16 00:02:46 -07:00
Linux Build Service Account
8fbad90eb9 Merge "asoc: msm-lsm-client: add __user attribute for IOCTL" into audio-drivers.lnx.3.0 2018-06-14 23:47:15 -07:00
Linux Build Service Account
01b512d58e Merge "asoc: Add Makefile.am for audio modules compilation" into audio-drivers.lnx.3.0 2018-06-14 23:47:14 -07:00
Linux Build Service Account
620343727b Merge "asoc: qcs405: Add machine driver changes for new swr master" into audio-drivers.lnx.3.0 2018-06-14 22:44:45 -07:00
Sudheer Papothi
ede0f05017 ASoC: wcd-mbhc: Fix detection of special headset
Comparison of headset threshold during special headset detection is
not proper. This results in to improper detection of special headset
and recording usecase failure on special headset. Fix the special
headset detection issue by adding proper check condition while selection
of headset threshold from device tree.

Change-Id: I4c338ded1bcb9fa643e1584eb23c6260fe52acee
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2018-06-15 04:06:31 +05:30
Sachin Mohan Gadag
0ebe6b8637 asoc: Add Makefile.am for audio modules compilation
Add Makefile to compile audio modules for LE build
compilation.

Change-Id: I60710bd786d60dd29d1133acffdf098f0de5a6a2
Signed-off-by: Sachin Mohan Gadag <sgadag@codeaurora.org>
2018-06-14 14:53:48 +05:30
Ramprasad Katkam
e38aed40db Asoc: swr: Bus Driver changes to support new master driver
soundwire bus driver changes to support new soundwire
master driver for Talos/vipertooth.

Change-Id: I70e52a72edd80abc72ccb99b29b1a642debec257
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2018-06-14 00:39:50 +05:30
Mangesh Kunchamwar
637d612f1b asoc: msm: routing: Add support for LSM routings for codec dma interfaces
This change is to add support routing for codec dma
interface backends and LSM front ends.

Change-Id: Ia0d6a5a5969ca1a18ceed2b55b634146ecc3f956
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-13 20:33:51 +05:30
Ramprasad Katkam
a1f21ebf06 asoc: qcs405: Add machine driver changes for new swr master
Send additional port types information from machine driver
to wsa required for new soundwire driver.

Change-Id: Ia3188cfe6e33dd5b219a12900cb0d04ca03fd02c
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2018-06-13 02:38:34 -07:00
Xiaoyu Ye
97f76efc86 asoc: msm-lsm-client: add __user attribute for IOCTL
Add __user attribute for msm_lsm_ioctl's input parameter
"*arg" to explicitly identify it as user space pointer.

Change-Id: I33e8a23cdef9eee9a55b77bb017716ccf2ba5f81
Signed-off-by: Xiaoyu Ye <benyxy@codeaurora.org>
2018-06-12 15:50:01 -07:00
Mangesh Kunchamwar
0bf1f57c59 asoc: config: configuration update for QCS405 machine driver
Add configuration updates for enabling QCS405 machine driver

Change-Id: I5a426730388aeafcdd6fb2e7c6d4cc7a0af78e1c
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-12 19:20:17 +05:30
Mangesh Kunchamwar
d4a064213f asoc: qcs405: Add support for VAD in QCS405 machine driver
Update QCS405 machine driver to create HW dependent node for AFE
to hold VAD core calibration.

Change-Id: Ied9c11af87df0fb2b419f1e4a9c1e5cc67d84c00
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-12 19:19:49 +05:30
Mangesh Kunchamwar
0c794ae9f4 asoc: Add support for VAD in DAI driver
Update DAI driver to include VAD configuration related mixer
controls for the supported DAIs.

Change-Id: I7c1ff9a30c3afcf9bb66e40283e6909631df9aa6
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-12 19:19:37 +05:30
Mangesh Kunchamwar
4e1e71885e dsp: afe: Add support for VAD in AFE native driver
Update to AFE native driver to send VAD calibration
to DSP. Add support for per service API version query
in q6core driver.

Change-Id: I6234879054e7b5622a40912da16072fd8dbd83fe
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-12 19:18:35 +05:30
Mangesh Kunchamwar
cd74176d75 asoc: qcs405: Add machine driver support for qcs405
Add DAI(Digital Audio Interface) links, internal codec macros &
external codec configuration to support audio functionality on
qcs405

Change-Id: Ibe88f6e670d300bf18a7d07c3575991bcc686389
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-12 19:18:07 +05:30
Mangesh Kunchamwar
d191c5fe13 asoc: Add support for codec dma interface
New codec dma interfaces have been introduced to connect LPASS and
Codec macros. This change is to add codec dma interface dai driver
and corresponding dais.

Change-Id: I307950ff3cbfe80c966bd9de21803655bb46e05c
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-11 14:09:54 +05:30
Mangesh Kunchamwar
a21bef610b asoc: msm: routing: Add support for codec dma interfaces in routing driver
New codec dma interfaces have been introduced to connect LPASS and
Codec macros. This change is to add support routing for codec dma
interface backends and their corresponding front ends.

Change-Id: I8145921559457c50408d35c90b13d018e1c32c8a
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-11 14:09:28 +05:30
Mangesh Kunchamwar
8c706aba34 dsp: afe: Add support for codec dma interface
New codec dma interfaces have been introduced to connect LPASS and
Codec macros. This change is to add codec dma interface related
updates to Q6 AFE native driver.

Change-Id: Ia3d1e5e80c694c8c4a7f904151adfcb504964b08
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-10 22:46:57 -07:00
Karthikeyan Mani
e964a75f32 asoc: codecs: cancel all delayed work during SSR/PDR
Cancel any pending delayed work in device down call
to ensure no work is scheduled during or after a
SSR/PDR sequence.

Change-Id: I4cc89cb1a9d8be732c978044d4eea3cf6644ec30
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
2018-06-09 11:26:06 -07:00
Linux Build Service Account
4ea1aaec01 Merge "ASoC: codecs: fix inconsistency of boost state register value" into audio-drivers.lnx.3.0 2018-06-08 21:04:03 -07:00
Linux Build Service Account
21a3728025 Merge "dsp: Add platform driver support for q6core" into audio-drivers.lnx.3.0 2018-06-08 18:42:55 -07:00
Xiaojun Sang
e0c3f3f39d ASoC: codecs: fix inconsistency of boost state register value
Use hardware default value for boost state in regmap.
Use correct mask for initial value of boost state.

Change-Id: Ia8b707ba0128662d47059d25325693bc8eaff723
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2018-06-08 15:04:09 -07:00