Commit graph

600 commits

Author SHA1 Message Date
Linux Build Service Account
5bb5ccdee1 Merge "asoc: fix for reading dt file for codec dma node" 2018-06-25 19:47:40 -07:00
Mangesh Kunchamwar
b8526cc457 asoc: fix for reading dt file for codec dma node
Read 32bit instead of 16bit from dt files for
codec dma dai id.

CRs-Fixed: 2248380
Change-Id: I7d49e0530df7261a9a5d2bb8a742ebe3095cc9d0
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-25 15:31:45 +05:30
Linux Build Service Account
6734209811 Merge "dsp: adm: Update module id for sound focus and source tracking" 2018-06-23 00:33:35 -07:00
Linux Build Service Account
349d2f1d25 Merge "dsp: adm: Update get params packet size" 2018-06-23 00:33:34 -07:00
Linux Build Service Account
d560c4b9ba Merge "asoc: bolero: Add codec entry for bolero for rtac support" 2018-06-22 14:43:04 -07:00
Vignesh Kulothungan
6f75e7b369 dsp: adm: Update module id for sound focus and source tracking
Update module id used in get/set for sound focus and source tracking.

CRs-Fixed: 2262638
Change-Id: Ieb35c12b8f6ec8a5db6f699f70bf85ef29b29178
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
2018-06-21 18:18:48 -07:00
Vignesh Kulothungan
aadecdf6c3 dsp: adm: Update get params packet size
Update apr header packet size in get pp params.
Add header field for the apr packet.
Update the check condition to differentiate between
in-band and out-band case in adm callback.

CRs-Fixed: 2262638
Change-Id: I57ef88e0638c09b203503f4c1cff2f810ef51c6e
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
2018-06-21 18:02:47 -07:00
Linux Build Service Account
e58c940b93 Merge "asoc: qcs405: fix compilation issue" 2018-06-21 13:37:40 -07:00
Linux Build Service Account
236a9e3943 Merge "asoc: wcd9335: register speaker wsa controls only if WSA attached" 2018-06-21 12:44:59 -07:00
Laxminath Kasam
21c8b22849 asoc: bolero: Add codec entry for bolero for rtac support
Add codec entry for bolero codec under proc codecs list.
Update the names of wsa-macro gain offset and mode for
wsa8810 variant to avoid conflict with wcd9335.

Change-Id: Icaa2ef7c2f7253060cd7cccd44130b0b12dc0713
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-06-21 18:52:24 +05:30
Laxminath Kasam
f2687c989a asoc: wcd9335: register speaker wsa controls only if WSA attached
In vipertooth, both wsa-macro and wcd9335 are present.
wcd9335 doesn't have wsa attached, and wsa-macro supports wsa
attached which defines spkr wsa controls. wcd9335 driver needs to
avoid register same controls if wsa is not attached to it.

Change-Id: Ia3db8982b5214ade95e6d8f27a44a68e20b772a0
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-06-21 18:36:52 +05:30
Mangesh Kunchamwar
9c6c107239 asoc: qcs405: fix compilation issue
fix compilation issue due to missing forward declartion.

Change-Id: I64feb9e1baf25ad725f4333931726feceee2979a
Signed-off-by: Mangesh Kunchamwar <mangeshk@codeaurora.org>
2018-06-21 17:18:22 +05:30
Linux Build Service Account
212d26c853 Merge "lsm_client: add support to perform channel mixing" 2018-06-21 02:19:30 -07:00
Linux Build Service Account
5cf0f89294 Merge "asoc: msm-pcm-routing: add msm_pcm_routing_get_pp_ch_cnt" 2018-06-20 21:13:50 -07:00
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
74cc9e08b5 lsm_client: add support to perform channel mixing
With pre-processing applied, it is possible that the processed
number of channels could be different than the number of channels
that voice wakeup can run with. In such cases, the channel mixer
should be setup to downmix the channel. For voice wakeup to detect
keywords properly, preprocessed channels cannot be mixed hence
the channel mixer is always setup with unity co-efficients or 0
to either select or drop the channel. In this case the channel mixer
acts more like an channel selector.

Change-Id: I79b578b56ad5484e27f433404a5371540618a2ae
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-19 18:46:23 -07:00
Bhalchandra Gajare
3b1c926e42 asoc: msm-pcm-routing: add msm_pcm_routing_get_pp_ch_cnt
Based on the type of pre/post processing, it is possible that
the processed channel count could be different from the input
channel count. As an example, the FFECNS processing block
could accept 3 channel input and has the ability to output
upto 9 channels of processed data. In cases like these, the
stream side needs to know the processed channel count to set
up its own configuration. Change adds functionality in
routing driver to read the processed channel count.

Change-Id: I06c365f8c53270712709631bc23649d37434f405
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2018-06-19 18:46:04 -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