Commit Graph

1254 Commits

Author SHA1 Message Date
qctecmdr
8707284023 Merge "ASoC: wcd-mbhc: Fix playback pause during lineout insertion" 2020-04-29 22:27:54 -07:00
qctecmdr
184a32dbe4 Merge "ASoC: wcd937x: Fix headset record pop during SSR" 2020-04-29 22:27:54 -07:00
qctecmdr
1cd62679d5 Merge "ASoC: wsa883x: Enable WSA883x codec driver compilation." 2020-04-29 22:27:54 -07:00
qctecmdr
42292dc0cd Merge "asoc: codecs: Update va_macro fix for SVA for bolero 2.1" 2020-04-29 22:27:54 -07:00
qctecmdr
8310f644b9 Merge "asoc: codecs: fix incorrect micbias value set at rouleur" 2020-04-29 22:27:54 -07:00
Sudheer Papothi
80ef65d015 Revert "ASoC: wsa883x: Add support for VBAT monitor"
This reverts commit eecf60dcb5.

Change-Id: Id5cd06a70aab59e0bbd83985526078572d126457
2020-04-29 11:53:16 +05:30
Vatsal Bucha
f118f0b5b3 bolero: tx-macro: Fix audio distortion during amic record
Distortion is heard during CTS audio record. Do not
add delay while toggle hpf frequency and zero gate
to resolve distortion.

Change-Id: I234cfcce43a6fb5d9c372f2655abdb2f8b5c4853
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-28 22:54:33 -07:00
Aditya Bavanari
05ae12f1e0 asoc: codecs: Add BCS channel select mixer control
Add mixer control to support BCS SWR channel selection
in bolero.

Change-Id: Id26b20d674026d1798239c0e4e7e4c2d18ba89db
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-04-27 21:37:58 -07:00
Kunlei Zhang
3acbdc5f2c asoc: update tx frame config for soundwire port
Set correct tx frame config for soundwire port
using  wcd9375.

Change-Id: Icbefda65713338908e4d94935296ff30ac4e5f9c
Signed-off-by: Kunlei Zhang <kunleiz@codeaurora.org>
2020-04-27 21:18:23 -07:00
Fenglin Wu
47fa139a5a ASoC: swr-haptics: Cleanup on the error printings
Some prints in the driver have NULL pointer reference, correct them and
clean up on the other possible NULL pointer reference cases.

Change-Id: Iba8682014e21dd716caaaebc1231cb4fe39bdfe1
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2020-04-28 11:07:57 +08:00
Laxminath Kasam
cb88df80a7 asoc: wsa-macro: Update VI sense setting based on pcm rate
Retrieve sample rate for VI sense and update codec settings
based on it.

Change-Id: If4341bac77ecae290c44c4412a39b9e5cbf46ac0
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-04-27 13:21:11 -07:00
Kunlei Zhang
d0e5b03a72 asoc: wcd937x: enable wcd937x codec driver compilation.
Enable wcd937x codec driver compilation support.

Change-Id: I001f7ca278549a4a77c5b02e1c6a86d1dbf51ff7
Signed-off-by: Kunlei Zhang <kunleiz@codeaurora.org>
2020-04-27 08:47:44 -07:00
qctecmdr
e63542d6b7 Merge "asoc: codecs: Set EAR compander if mixer ctl set" 2020-04-26 23:42:50 -07:00
qctecmdr
b221915dc1 Merge "ASoC: wcd938x: Enable digital clk for tx0 if micbias enabled" 2020-04-26 23:42:49 -07:00
qctecmdr
7078690c22 Merge "asoc: codecs: Update sequence for HPH path in rouleur" 2020-04-26 23:42:49 -07:00
qctecmdr
8206d768b1 Merge "asoc: wcd937x: Update retry logic for SWR logical addr" 2020-04-26 23:42:49 -07:00
qctecmdr
57705d7be4 Merge "asoc: wsa881x-analog: remove warnings result in CPU log" 2020-04-26 23:42:49 -07:00
qctecmdr
dbc98f568b Merge "ASOC: wcd938x: Handle button press before release interrupt" 2020-04-26 23:42:49 -07:00
qctecmdr
ec24d856d7 Merge "ASoC: wcd-mbhc: Disable moisture detect threshold if duty cycle disabled" 2020-04-26 23:42:49 -07:00
qctecmdr
7378260dd1 Merge "ASoC: codecs: wsa883x: fix swr probe error handling" 2020-04-26 23:42:49 -07:00
qctecmdr
0fa13e4ada Merge "asoc: haptics: update port config to match devicetree" 2020-04-26 23:42:49 -07:00
qctecmdr
2811ce0144 Merge "asoc: bolero: add channel map for AIF6_PB" 2020-04-26 23:42:49 -07:00
Xiaojun Sang
27b6c75029 asoc: codecs: fix incorrect micbias value set at rouleur
Micbias value set does not take effect on rouleur.
Shift micbias value to correct bits.

Change-Id: Ice083e3bc30f6e8e3fe7132c633a4043329ccfa5
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2020-04-25 20:01:22 -07:00
Aditya Bavanari
6389dd3809 asoc: rouleur: Enable rouleur codec driver compilation
Add changes to enable compilation for rouleur
codec driver.

Change-Id: I87eefe0c3d9bbe6445391902110fb210c4b0cd5b
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-04-22 23:12:57 -07:00
Vignesh Kulothungan
fca013355e ASoC: codecs: check component pointer before use
Add NULL check for swr dmic component pointer before
using it.

CRs-Fixed: 2666974
Change-Id: I25c14c17f820ce3be7e1c7d892a2c0e29ac2b9fc
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
2020-04-21 11:38:34 -07:00
Vatsal Bucha
b00df5a5c7 ASoC: wcd938x: Do not enable hold_off while enabling watchdog
Hold_off bit for enabling watchdog will enable mute until
there is a block reset and watchdog bits aren't toggled.
Disable hold_off bit so that wcd is recovered from mute
instantly once watchdog occurred.

Change-Id: Ia87593ead05dde4e31a0afefd6ffaca89bb95448
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-21 00:17:11 -07:00
Sudheer Papothi
5e450b198c ASoC: swr-haptics: Update the configuration and gain settings
Update the configuration and gain settings as per hardware
sequence recommendation for soundwire haptics usecase.

Change-Id: I09b86026f664fec3105af4a8180168fda457d4fd
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2020-04-21 11:18:54 +05:30
Sudheer Papothi
8e815fed8b ASoC: wsa883x: Check for dereference before access
Check for valid pointer before access in wsa883x driver
to avoid dereference.

Change-Id: I1c7c158063d178b489ea1e71be745ed3ca32fb16
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2020-04-21 09:45:52 +05:30
Meng Wang
5ec99c4a5b asoc: wcd938x: adjust swr sequence for wcd mic recording
SND_SOC_DAPM_MIXER_E widget is powered up before SND_SOC_DAPM_ADC_E
which causes mute on wcd mic recording. Adjust wcd938x_tx_connect_port
and swr_slvdev_datapath_control sequence to fix it.

Change-Id: I3dbfb239dcfbd65102d0d98be40326be71cf8479
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-04-20 14:30:04 -07:00
Aditya Bavanari
b4364f47ec asoc: codecs: Update sequence for HPH path in rouleur
Update HPHL and HPHR sequence to avoid clicks and pops
by setting the LDIV and RDIV values in HD2
coefficients and increasing ramp time.

Change-Id: Ib47d14255a098511393b4b75392854c8b34dc0d3
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-04-20 11:32:47 -07:00
Laxminath Kasam
101e71693d asoc: wcd937x: Update retry logic for SWR logical addr
Update retry logic for SWR logical address during SSR.

Change-Id: Ifa5cdec751a271c09a8b6340009ec0e862ffb326
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-04-20 11:32:20 -07:00
Ramlal Karra
52be60c41f ASoC: wsa883x: Enable WSA883x codec driver compilation.
Enable WSA883x codec driver compilation support.

Change-Id: I263e4eb0e2446c345b250df9e484f380164e77e2
Signed-off-by: Ramlal Karra <rkarra@codeaurora.org>
2020-04-20 10:18:30 -07:00
Aditya Bavanari
236ff485d2 codecs: Enable clock voting logs to debug AHB/NOC issues
Enable clock voting logs to debug stability issues.

Change-Id: Ie1f995ab004778a81ea42baad15ea36858407e9a
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-04-20 10:17:02 -07:00
Vatsal Bucha
fb63ca16cc ASoC: wcd938x: Enable digital clk for tx0 if micbias enabled
Mute is observed in amic record sometimes in concurrency with
sva. This is because if record is over tx0 then digital clk
is not enabled. Enable clk after enabling micbias to resolve mute.

Change-Id: Iba3aa4fade0ac5889218eaee2c5d2c4bd4431d50
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-19 08:25:30 -07:00
Laxminath Kasam
2e025248a2 asoc: codecs: Set EAR compander if mixer ctl set
Enable compander based on mixer ctl set for ear path.

Change-Id: Ie6287469f1baa9dba239d369bd5a29ed8e44522f
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-04-19 08:11:52 -07:00
Vignesh Kulothungan
575148c5a7 ASoC: codecs: wsa883x: fix swr probe error handling
Remove wsa soundwire device from master device list only during
critical error and not for probe defer.

Change-Id: I5c4f71a4735de4bb459094043d41a6b5c560a6fd
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
2020-04-17 15:31:53 -07:00
Vatsal Bucha
6b4f250e7b ASoC: wcd937x: Fix headset record pop during SSR
Pop is heard with special headset with silence record
during SSR. Resolve pop by allowing sufficient time for
wcd937x_reset post SSR and again initialize registers
post SSR.

Change-Id: I80e70a98a72b247dca878673a30651647b676659
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-16 23:48:16 -07:00
Laxminath Kasam
e0eb71e186 asoc: codecs: Update va_macro fix for SVA for bolero 2.1
For bolero 2.1 with SWR_TX in va macro, update SVA fixes.

Change-Id: I250df0fe476bc2c0439ab491a17dea2e7ac18707
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-04-16 23:44:58 -07:00
Vatsal Bucha
c2e5189852 ASoC: wcd-mbhc: Fix playback pause during lineout insertion
Playback pauses during aux cable insertion as removal of
cable is reported followed by insertion. Report removal
of current cable only when headset connected to other end
of extension cable and not lineout.

Change-Id: I08933f4a88493136a518ee72646aa10b1f06eb70
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-16 09:51:53 -07:00
Laxminath Kasam
33bd3daaa6 asoc: wsa881x-analog: remove warnings result in CPU log
Avoid warnings causing RT throttling during SSR.

Change-Id: I814da52c9777f42faa3f2b5dc793fc177a85c635
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-04-16 03:12:38 -07:00
Vatsal Bucha
b073ec7258 ASOC: wcd938x: Handle button press before release interrupt
If button press and release interrupts occur at same time
processing button release first would treat the button event
as fake, as it is not preceeded with press event. Hence
process button press before button release in irq driver.

Change-Id: I36d5ad8a3571f4bd32d309a060a6988f29ff27ad
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-16 03:12:12 -07:00
Vatsal Bucha
7544634ca6 ASoC: wcd-mbhc: Disable moisture detect threshold if duty cycle disabled
Moisture detection is not disabled properly if threshold
remains set as 24k even if duty cycle is disabled.
This is leading into headset not getting detected
sometimes. Disable threshold as well if duty cycle disabled.

Change-Id: Ic90c65d8bbaa965cf147f95edf5add8980889e1f
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-16 03:11:42 -07:00
Linux Build Service Account
ad679b60a1 Merge "asoc: bolero: check if va is enabled when register/deregister wakeup irq" into audio-drivers.lnx.5.0 2020-04-16 02:11:08 -07:00
Linux Build Service Account
a74e363d47 Merge "asoc: Add support for rouleur codec in machine driver" into audio-drivers.lnx.5.0 2020-04-16 02:11:00 -07:00
Meng Wang
5e7cf016e2 asoc: bolero: check if va is enabled when register/deregister wakeup irq
When LPI SVA is enabled, start recording and stop LPI SVA, wakeup irq
is not deregistered as tx_swr_clk_cnt is not 0. Add new check for
va_swr_clk_cnt to resolve the issue.

Change-Id: I441394f26b42f554169400194d021309ef70af9e
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-04-16 01:21:21 -07:00
Aditya Bavanari
ee6367c560 asoc: Add support for rouleur codec in machine driver
Add rouleur codec support in bengal machine driver
to create codec entry and invoke mbhc hs detect
functions for respective codecs. Correct the logic
for headset detection pull up current and
volatile registers for digital part of rouleur codec.

Change-Id: I22545dc796c215c1501e883796546c97d8ca8698
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-04-16 01:17:00 -07:00
Vatsal Bucha
93f005b878 ASoC: wcd938x: Enable surge protection at bootup
Enable surge protection at bootup for traverso.

Change-Id: I443c576e6fdfc640b8e67c2d3f9622e8c3366d45
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-16 01:15:21 -07:00
Linux Build Service Account
29eea04338 Merge "ASoC: swr-haptics: Update playback sequence" into audio-drivers.lnx.5.0 2020-04-16 01:08:46 -07:00
Linux Build Service Account
a2531a80df Merge "asoc: bolero: Update mask of wsa macro" into audio-drivers.lnx.5.0 2020-04-16 01:08:39 -07:00
Linux Build Service Account
65af65b19d Merge "asoc: bolero: Update fs_clk gen for va macro" into audio-drivers.lnx.5.0 2020-04-16 01:07:52 -07:00