Commit Graph

3671 Commits

Author SHA1 Message Date
qctecmdr
33e47130d4 Merge "dsp: q6afe: reset clk_state and clk_status when adsp ssr happens" 2020-12-09 09:48:00 -08:00
Soumya Managoli
98afffc24d ASoC: Add support to send voice UI port id to afe
As per the current design in afe, if the
afe_get_cal_topology for AFE_TOPOLOGY_CAL
or send_afe_cal_type for AFE_COMMON_TX_CAL
fails, then the voice UI calblock is fetched/sent.
This is resulting in sending voice UI calblock
on a non voice UI port during concurrent usecase scenario.

Fix is to check if the calblock for get/set is for
a voice UI port or not. Added support to send this
port id info from routing driver to afe when usecase
is enabled via mixer_control.

Change-Id: I356aae61e1b9d11324e7b9f9a57953767a64b71e
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2020-12-08 17:05:12 +05:30
Han Lu
4eb1a6ea14 ASoC: msm: add kcontrol to support ASRC config
Added kcontrol to write clock drift to ASRC module in ADSP. There
are two options:
1. read drift from an active AFE port, and write to target ASRC module.
   The read-and-write process will loop automatically with configurable
   delay. (50 ms by default)
2. write drift value to target ASRC module for one time operation.

Change-Id: I2df7ed646d53612aca96074c0ca3d44a404cebf4
Signed-off-by: Han Lu <hanlu@codeaurora.org>
2020-12-07 16:25:00 +08:00
Hongtao Peng
fa5ffd2abe ASoC: msm: Fix compile issue for "Check cleanly with sparse"
* Remove comparison of unsigned expression;
* Add static keyword for local variable;

Change-Id: I57d6cf8d94baf6108041f8476cb1cf38741bb3a7
Signed-off-by: Hongtao Peng <hongtaop@codeaurora.org>
2020-12-07 15:04:01 +08:00
Meng Wang
b273c82691 soc: swr-mstr: return when requesting hw vote fails
SSR notification may not come to swr master control
in time and cause swrm_runtime_resume tries to access
SWR registers. Update the logic to return when requesting
hw vote fails.

Change-Id: Ia85e9ce540ff88d16e8e73c48bab26fb277b86bb
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-12-06 21:35:32 -08:00
Vangala, Amarnath
499ec05405 asoc: codecs: add child devices after completing initialization
In bolero-cdc and tx, va, wsa and rx macros, move schedule_work call to
add the child devices to the point later to where the parent
initialization gets completed.

Change-Id: Iaa07329a25020dde21d9249c3848bb7fcf7d816a
Signed-off-by: Vangala, Amarnath <avangala@codeaurora.org>
2020-12-03 17:13:08 +05:30
Meng Wang
3d63e1feb0 asoc: bolero: update incorrect bolero register
Update incorrect bolero register for default value.

Change-Id: I8eba8618a2f7592c94d98dcf4ad09be239e85e11
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-12-03 16:15:16 +08:00
qctecmdr
c285d08046 Merge "asoc: fix compile issue due to soundwire" 2020-11-29 23:55:13 -08:00
qctecmdr
976215bfd2 Merge "asoc: swr-haptics: add non-HBoost regulator support" 2020-11-29 23:55:13 -08:00
qctecmdr
9a00990f8a Merge "asoc: bolero: Fix AMIC TX pop issue on Bolero 2.0" 2020-11-29 23:55:13 -08:00
qctecmdr
8f873b516f Merge "soc: swr-mstr: update logic to dump soundwire register" 2020-11-29 23:55:13 -08:00
qctecmdr
3f80a3cb17 Merge "asoc: wsa881x: Fix crash while capturing swr_slv codec dump" 2020-11-29 23:55:13 -08:00
Gangadhar S
a88e39453c asoc: q6adm: Channel map configuration for multi-channel
- Channel swap with current channel map
- changes to adm channel map matching to asm channel map.

Change-Id: I1bcd15b091895f689314b7aae4644268f99e797a
Signed-off-by: Gangadhar S <gangadha@codeaurora.org>
2020-11-26 21:45:50 -08:00
qctecmdr
30f23bd6ea Merge "ASoC: msm: Add second proxy tx device FE and AFE Rx BE" 2020-11-25 22:10:13 -08:00
qctecmdr
5d09fd2f10 Merge "asoc: msm-pcm-routing: Add missing intercon for MultiMedia23" 2020-11-25 18:57:02 -08:00
qctecmdr
92a978066d Merge "ASoC: sdx: Add initial machine driver" 2020-11-25 18:57:02 -08:00
qctecmdr
9f35768b19 Merge "asoc: bolero: Add core_vote before gfmux access" 2020-11-25 18:57:02 -08:00
qctecmdr
d01dff99d6 Merge "dsp: afe: Add new token to handle nowait cmds" 2020-11-25 18:57:02 -08:00
qctecmdr
9fd3acfe83 Merge "ASoC: bolero: remove LPI status check during device switch" 2020-11-25 18:57:01 -08:00
qctecmdr
287c245659 Merge "ASoC: wsa883x: disable speaker brown out protection" 2020-11-25 18:57:01 -08:00
qctecmdr
65c5953d9a Merge "soc: swr-mstr: Avoid underflow due to CPS spkr prot enabled" 2020-11-25 18:57:01 -08:00
qctecmdr
8527c974cb Merge "soc: swr-mstr: Update soundwire state to SSR during UP" 2020-11-25 18:57:01 -08:00
qctecmdr
f3bf502f35 Merge "dsp: unmap cma memory before hyp unassign during adm close" 2020-11-25 18:57:01 -08:00
xsang
20ad21c0b3 asoc: compress: support gapless playback in GKI mode
Next track gapless mode requires stream state of running. Set
stream state to running after partial buffer, EOS and zero buffer.

Change-Id: I61e55989305cd495a9a03306ccecdd62b4f7504f
Signed-off-by: xsang <xsang@codeaurora.org>
2020-11-26 10:26:13 +08:00
Tahir Dawson
453c34d2bd ASoC: msm: Add second proxy tx device FE and AFE Rx BE
* Add AFE playback backend with port 0x2002
* Add proxy capture frontend to read data from port 0x2002
* Modify AFE platform and DSP drivers to support dual proxy usecase

Change-Id: I35e33e5e922fb3092cffcc065fb514268c16cc17
Signed-off-by: Alexy Joseph <alexyj@codeaurora.org>
2020-11-25 08:50:14 +08:00
Amitkumar H(Temp)
2196f8b020 ASoC: sdx: Add initial machine driver
Add SDX machine driver and dai links.

Change-Id: Ia74403e3318439278476460a75310bd084cefac9
Signed-off-by: Amitkumar H(Temp) <amih@codeaurora.org>
Signed-off-by: Vivek Malapaka <malapaka@codeaurora.org>
2020-11-23 15:46:55 +05:30
Shashi Kant Maurya
634e5ba4c0 asoc: wsa881x: Fix crash while capturing swr_slv codec dump
Swr-slv address is overwritten during wsa881x_swr_probe,
hence soundwire getting incorrect slave address. While
accessing swr master from swr slave due to incorrect
address device crashed.
To avoid the issue align the debugfs similar to wsa883x codec.

Change-Id: Ic8aaa0728a43936cd4c6e1ed590e01ba8f0fbf5b
Signed-off-by: Shashi Kant Maurya <smaury@codeaurora.org>
2020-11-23 13:18:08 +05:30
Meng Wang
dc21b76271 asoc: lahaina: remove auxpcm be dai when auxpcm is disabled
Remove AUXPCM be dailinks when auxpcm is disabled to reduce
audio error log during bootup.

Change-Id: Idbf9a1d934714514a5c6bdf2254a2130a93e49f8
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-11-22 22:18:23 -08:00
Fenglin Wu
2f2e85ea28 asoc: swr-haptics: add non-HBoost regulator support
Haptics module is supplied by HBoost regulator by default, it requests
voltage to HBoost regulator through hardware channel. Haptics module
can also be configured to use other regulator device, in this case, it
requires software to request the voltage from the regulator before
enabling the play. Add support for this.

Change-Id: I4a8305ff2732a92bc8be90bd3ed197fa643a101e
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2020-11-23 09:06:06 +08:00
qctecmdr
27e52b9f18 Merge "asoc: codec: add range check to avoid overflow" 2020-11-20 02:14:34 -08:00
qctecmdr
9cd98ddfc7 Merge "ASoC: codecs: Add count check for swr haptics device up/down" 2020-11-20 02:14:34 -08:00
qctecmdr
b27eed5dc9 Merge "dsp: q6core: retry till adsp is up to send custom topologies" 2020-11-20 02:14:34 -08:00
qctecmdr
ddd29e8bca Merge "dsp: use default bit-width when start VoLTE call in power mode" 2020-11-20 02:14:34 -08:00
qctecmdr
8148965cc4 Merge "dsp: add change to fix use-after-free issue" 2020-11-20 02:14:34 -08:00
qctecmdr
9bb5ce8e27 Merge "ASoC: msm: add proxy port and pcm backend in machine driver" 2020-11-20 02:14:34 -08:00
qctecmdr
30f572a80d Merge "ASOC: fix audio machine driver compile issue" 2020-11-20 02:14:34 -08:00
qctecmdr
d4c2f7ad66 Merge "asoc: reduce AUXPCM widget connection when it's disabled" 2020-11-20 02:14:33 -08:00
qctecmdr
2fea3356dc Merge "ASoC: Fix typo in SENARY_MI2S_RX clk info" 2020-11-20 02:14:33 -08:00
qctecmdr
b6c1574215 Merge "ASoC: wsa883x: Handle PA_ERR interrupt on WSA speaker" 2020-11-20 02:14:33 -08:00
Akhil Karuturi
62eca6d27b dsp: unmap cma memory before hyp unassign during adm close
unmap memory before hyp unassign during adm close
for handset/speaker FNN usecase.

Change-Id: I1d4d335c5179e42af4dcf7cf8e82e48669b32830
Signed-off-by: Akhil Karuturi <akarutur@codeaurora.org>
2020-11-19 21:35:04 -08:00
Deru Wang
f7990a7248 asoc: fix compile issue due to soundwire
Change-Id: Ia4996026b95ee5b3fe693c279147205a7f0894b3
Signed-off-by: Deru Wang <deruwang@codeaurora.org>
2020-11-19 06:05:04 -08:00
Deru Wang
89bf53a666 asoc: fix the punctuation error of sa6155
fix the compilation failure due to punctuation error for sa6155

Change-Id: If6209008ccbdc17ba34e4a598eca869747eed3d5
Signed-off-by: Deru Wang <deruwang@codeaurora.org>
2020-11-19 06:04:53 -08:00
Meng Wang
ac3440b044 asoc: bolero: Fix AMIC TX pop issue on Bolero 2.0
For bolero 2.0, amic can connect on any SWR input.
Update logic to check amic usecase.

Change-Id: Ia6b808a1cad681906732408d271e953dde6eff6f
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-11-19 15:59:38 +08:00
Vignesh Kulothungan
eefcf012a3 ASoC: wsa883x: disable speaker brown out protection
Disable brown out protection (bop) attenuation levels 1,2 and 3 
which causes fast and coarse transitions in gain during voltage drop.
This creates "pop" noise during the drop. Since battery current
limiting (bcl) feature is enabled with CPS, bop is redundant and
can be disabled.

Change-Id: I51617333203ba14784e2338d91a96082c55e1331
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
2020-11-18 19:46:07 -08:00
Sudheer Papothi
3d94de3747 ASoC: wsa883x: Handle PA_ERR interrupt on WSA speaker
PA_ERR can happen during speaker path setup. Log the
error status in the interrupt handler and clear the error
status for next audio playback to resume properly on
the speaker.

Change-Id: I5800d9505a3036127097745aaa880b73b3e87f30
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2020-11-17 16:51:26 -08:00
Laxminath Kasam
643c33dcd6 soc: swr-mstr: Update soundwire state to SSR during UP
During SSR up event handler, if soundwire state is
already up or auto suspend jiffies is not completed,
ensure put in suspend/SSR state.

Change-Id: I853f42d125eb5a60e3f1f065a60516877e3a463c
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-11-17 02:30:16 -08:00
Tahir Dawson
34bba45ccf asoc: msm-pcm-routing: Add missing intercon for MultiMedia23
Add missing intercon entry needed for MultiMedia23 routing

Change-Id: I0f57adafb007c8ca7b62bd30b712f46e130765b6
Signed-off-by: Tahir Dawson <dawson@codeaurora.org>
2020-11-16 17:39:12 -08:00
Viraja Kommaraju
9cb508c863 audio-kernel: include sa6155 config
Include sa6155 config to compile Talos machine driver

Change-Id: I35213a8ff533f217869f37355ef35074df65ba1c
Signed-off-by: Viraja Kommaraju <virajak@codeaurora.org>
2020-11-16 20:07:36 +05:30
Hongtao Peng
eae52c27a7 ASOC: fix audio machine driver compile issue
LV Platform use the same LVGVM cause Kbuild mismatch issue

Change-Id: Iad092ebcbd991e52daedb87406920055528e3a1c
Signed-off-by: Hongtao Peng <hongtaop@codeaurora.org>
2020-11-15 18:32:38 -08:00
Meng Wang
2bf206021d dsp: q6afe: reset clk_state and clk_status when adsp ssr happens
Reset this_afe.clk_state and this_afe.clk_status when adsp
ssr happens to release the mutex_lock held by audio driver.

Change-Id: Ib5b679badb86cfd5cd1549fcfe8cd1ce3886cf82
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-11-13 10:26:48 +08:00