Commit Graph

130 Commits

Author SHA1 Message Date
Linux Build Service Account
5ef0c002fa Merge "ASoC: codecs: add mixer ctls to control boost level" 2017-11-10 17:24:13 -08:00
Linux Build Service Account
8ad81f0d8a Merge "ASoC: add support for speaker protection 3.0" 2017-11-10 17:24:12 -08:00
Xiaojun Sang
24daae8895 ASoC: codecs: add mixer ctls to control boost level
Add new mixer ctls to control max boost state level
for speaker protection V3.

Change-Id: If967de46955f6dc8692986503daea68ce105f642
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2017-11-07 01:36:52 -08:00
Xiaojun Sang
12120ab1ad ASoC: add support for speaker protection 3.0
Add a new AFE API to send limiter threshold to ADSP.

Change-Id: Ibcd795d7c0edb4f081636c621e51e5a1eaa036b1
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2017-11-07 01:36:20 -08:00
Xiaojun Sang
b5321975e7 uapi: extend struct of spk prot for ADSP SPv3
To support speaker protection v3, add sp version and
limiter threshold in spk_prot_cfg struct.

Change-Id: Ia4c89934e00bfa8c0e0c6823f48d56baf6759f14
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2017-11-07 01:35:50 -08:00
Rohit kumar
ebce3d99a4 dsp: q6audio: add support for quinary interfaces
Add support for quinary pcm and tdm interfaces in q6audio.

CRs-Fixed: 2133890
Change-Id: I59ca2965f5d38d30bea5a00f34898af5c948ac16
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
2017-11-07 01:19:28 -08:00
Rohit kumar
b242df4632 asoc: dai-q6: update quinary mi2s dai id to 4
Update quinary mi2s dai id to 4 and secondary mi2s playback
sd1 dai id to 5. Also update index of mi2s_config_controls
for primary, secondary, tertiary and quaternary mi2s.

CRs-Fixed: 2133890
Change-Id: I00997b79a148cf50b2a3f9acf6e44fe603e5c944
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
2017-11-07 01:18:26 -08:00
Rohit kumar
20df545466 asoc: sdm660: update cpu dai id for quinary mi2s interface
Update quinary mi2s cpu dai id to 4 for sdm670. This is
required for sending correct afe port id for quin mi2s
and keep all MI2S interfaces in sequence.

CRs-Fixed: 2133890
Change-Id: I0ab35f2d97858f355da577076a5a1e3f438a1bab
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
2017-11-07 01:17:38 -08:00
Laxminath Kasam
8b1366a648 Audio: DLKM support for all audio modules
Switch to DLKM for all audio kernel modules.

Change-Id: I6a96023a21f655f873531af9ace81f2b01eb0f58
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-11-02 13:42:09 +05:30
Linux Build Service Account
97c9da7a1e Merge "ASoC: codecs: sdm660_cdc: Fix mute if compander is disabled" 2017-10-30 11:35:08 -07:00
Linux Build Service Account
30fe05e7ba Merge "audio-lnx: asoc: sdm660: fix rmmod issue with gpio_free" 2017-10-25 22:31:50 -07:00
Linux Build Service Account
1cb9edcc98 Merge "audio-lnx: asoc: sdm660: fix rmmod issue with audio notifier" 2017-10-25 22:31:50 -07:00
Linux Build Service Account
953c2b88b1 Merge "dsp: add support for aptX dual mono" 2017-10-25 09:56:58 -07:00
Linux Build Service Account
3d0e2dec05 Merge "ASoC: sdm845: update TDM configurations for TX and RX" 2017-10-25 09:56:57 -07:00
Linux Build Service Account
73780981b5 Merge "ASoC: codecs: sdm660_cdc: Fix pop noise issue at DMIC" 2017-10-25 09:56:56 -07:00
Linux Build Service Account
d36dc15e53 Merge "asoc: sdm660: update cpu_dai_name for quin_tdm" 2017-10-25 09:56:55 -07:00
Linux Build Service Account
5b52f14215 Merge "audio-lnx: soc: pinctrl-lpi: fix rmmod issues" 2017-10-25 09:56:54 -07:00
Linux Build Service Account
75de9ef794 Merge "audio-lnx: asoc: codecs: Fix rmmod issues with wcd9335" 2017-10-25 09:56:53 -07:00
Linux Build Service Account
0933274fcb Merge "audio-lnx: Add support to build sdm670 machine driver as module" 2017-10-25 09:56:53 -07:00
Vatsal Bucha
523325316e ASoC: codecs: sdm660_cdc: Fix mute if compander is disabled
Compander disable sequence does not get called
after headphone playback on FM. This results
in mute at one channel. Compander clock
should be disabled at the end to resolve the mute.

CRs-Fixed: 2102126
Change-Id: Ia47fb1c393db255b52a965173a769896768f245e
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2017-10-25 18:20:34 +05:30
Meng Wang
c4ef3b5eca audio-lnx: asoc: sdm660: fix rmmod issue with gpio_free
Check if GPIO is valid before free to avoid crash.

Change-Id: Ie052e5ff1776ad57ae9c1d0f00873ba29e11f78f
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-10-19 18:22:56 -07:00
Meng Wang
431f0b1a3a audio-lnx: asoc: sdm660: fix rmmod issue
Remove msm_free_auxdev_mem to avoid kernel panic.

Change-Id: I0a60cc33acf942c33273d86d9ef24dff6bd3a1b6
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-10-19 18:22:53 -07:00
Meng Wang
c444ff7b6a audio-lnx: asoc: sdm660: fix rmmod issue with audio notifier
Deregister sound card with audio notifier when removing driver to
avoid crash.

Change-Id: I4f22fefce519e8dab25901337fdf2e62044090ed
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-10-20 09:21:56 +08:00
Xiaoyu Ye
04d1931018 ASoC: sdm845: update TDM configurations for TX and RX
Update TDM configurations for primary, secondary, and
tertiary TDM interfaces.

Change-Id: I1729ad4d8563063802dfae9128e290d58ad43497
Signed-off-by: Xiaoyu Ye <benyxy@codeaurora.org>
2017-10-18 11:24:58 -07:00
Linux Build Service Account
2e3e81889d Merge "ASoC: msm: qdsp6v2: Add S24_3LE support to DP driver" 2017-10-18 04:49:41 -07:00
Linux Build Service Account
9809437498 Merge "dsp: fix reset logic during ADSP SSR for lsm" 2017-10-18 04:49:40 -07:00
Linux Build Service Account
22f45372f5 Merge "dsp: add support to set topology specific info in voice usecases" 2017-10-18 04:49:39 -07:00
Linux Build Service Account
5928db0dea Merge "rtac: add size check when reading cal data kvaddr buffer" 2017-10-18 04:49:39 -07:00
Meng Wang
921b95f9a2 audio-lnx: soc: pinctrl-lpi: fix rmmod issues
Deregister lpi with audio notifier when removing driver to
avoid crash when rmmod and insmod again.

Change-Id: Ibcaf272e6405ef8403b3ac66af5572050fa1092e
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-10-17 19:27:57 -07:00
Meng Wang
3b19449547 audio-lnx: asoc: codecs: Fix rmmod issues with wcd9335
Remove any child devices associated with this
codec driver so that rmmod and insmod again will
run without issues.

Clear MBHC setting during tasha_remove.

Change-Id: Icad9b2ad21601525c68c5d151cd664aa6060e911
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-10-18 10:27:25 +08:00
Meng Wang
f74efd8eb1 audio-lnx: Add support to build sdm670 machine driver as module
When CONFIG_SND_SOC_EXT_CODEC/CONFIG_SND_SOC_INT_CODEC is set to m not y,
"ifdef CONFIG_SND_SOC_EXT_CODEC/CONFIG_SND_SOC_INT_CODEC"
would be false which would cause init functions as dummy functions.
Change to "if IS_ENABLED" and When CONFIG_SND_SOC_EXT_CODEC/
CONFIG_SND_SOC_INT_CODEC is set to y/m, both would set the
condition to true.
Change Makefile to compile machine driver for internal/external
codec as one module.

Change-Id: Ib72f95a24e8a4e657a1e9efc655f92a397b44d32
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-10-18 10:19:08 +08:00
Xiaoyu Ye
5e7ef9c922 ASoC: add support to configure clock frequency for all TDM interfaces
Enable all five TDM interfaces to configure clock frequency during
the runtime.

Change-Id: I066ea2034509dee2350205ee887dd3eeb6f5389b
Signed-off-by: Xiaoyu Ye <benyxy@codeaurora.org>
2017-10-17 16:47:34 -07:00
Rohit kumar
091ff79031 asoc: sdm660: update cpu_dai_name for quin_tdm
Update cpu_dai_name of quin_tdm from tdm group id to
port id for sdm670 internal and external codec machine
driver to fix soundcard registration issue.

Change-Id: I2f7ed4ea983c1d457c4d2940c33f5bb7440ddee6
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
2017-10-17 12:22:38 +05:30
Xiaoyu Ye
fb90eb6176 dsp: fix reset logic during ADSP SSR for lsm
During ADSP SSR, unless all APR clients are de-registered, Glink
channel will not be closed, which will cause Glink channel to remain
in stale/unusable state after ADSP SSR. Fix this by adding APR reset
logic in LSM driver.

Change-Id: Idec26836cfa4ecbacc557996339facd84ac19668
Signed-off-by: Xiaoyu Ye <benyxy@codeaurora.org>
2017-10-15 18:04:50 -07:00
Linux Build Service Account
9c484bd176 Merge "dsp: remove wakelock.h includes" 2017-10-15 09:58:00 -07:00
Aditya Bavanari
88513a31e5 dsp: add support to set topology specific info in voice usecases
Add support to set number of channels and channel mapping to DSP
as per the info received from ACDB files along with topology
for a device in voice usecases instead of reading from
backend configuration. When topology specific channel info is
not supported, send the default no of channels and
channel mapping as per backend to support backward compatibility.

CRs-Fixed: 2110934
Change-Id: Iad512474fc25c906d97513f6648cd8ba6244eda1
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2017-10-14 11:51:35 +05:30
Ben Romberger
8e4368d3dd ASoC: msm: qdsp6v2: Add S24_3LE support to DP driver
Add support for HDMI and DP for S24_3LE bit format.
This allows playback of 24bit audio on the external
device.

Change-Id: Ia6e1148b2e5d13cc0ff6f2372d61c83c3e704255
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
2017-10-13 13:22:31 -07:00
Preetam Singh Ranawat
899b78bd18 dsp: add support for aptX dual mono
Send sync mode parameter to DSP for supporting aptX dual mono.

Change-Id: I1c43b0dec6661a77644e28df45ca6c1a182745de
Signed-off-by: Aniket Kumar Lata <alata@codeaurora.org>
2017-10-11 13:43:44 -07:00
Vatsal Bucha
2e3e0f2180 ASoC: codecs: sdm660_cdc: Fix pop noise issue at DMIC
Pop noise occurs during switch from handset to speaker mode
during voice call. This is because sufficient delay
is not provided for tx to unmute. A delayed workqueue
that will do unmute at the end solves the issue.

CRs-Fixed: 2101423
Change-Id: I1ae7068b23158bb8428d5b96e9f65fb05a67ff7e
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2017-10-11 19:58:38 +05:30
Linux Build Service Account
21d942b0f4 Merge "soc: define dummy function for swrm_wcd_notify" 2017-10-10 11:39:20 -07:00
Linux Build Service Account
58f31c8a93 Merge "dsp: add quinary interface support in q6afe" 2017-10-10 11:39:20 -07:00
Linux Build Service Account
c876a3cd4b Merge "ASoC: Modify name for Tertiary MI2S RX and TX" 2017-10-10 11:39:19 -07:00
Rohit Kumar
7fccd584b6 soc: pinctrl-lpi: update sizeof lpi offset to 32bit
Update sizeof lpi register offset to 32 bit to
accommodate all register offset for sdm670.

Change-Id: I9a3fdb56f9faf6c0aff627cbedaa54db606d2434
Signed-off-by: Rohit Kumar <rohitkr@codeaurora.org>
2017-10-10 19:34:27 +05:30
Linux Build Service Account
6825c6717e Merge "asoc: codecs: Add support to compile internal codec as module" 2017-10-06 03:35:17 -07:00
Linux Build Service Account
5ffdd5b2ec Merge "asoc: wcd934x: update micbias noise filter resistance" 2017-10-06 03:35:16 -07:00
Linux Build Service Account
50091ca0c6 Merge "ASoC: wcd-mbhc: update electrical removal detection logic" 2017-10-06 03:35:15 -07:00
Linux Build Service Account
1228153fca Merge "asoc: sdm660: configure mi2s gpios from machine driver" 2017-10-06 03:35:14 -07:00
Rohit Kumar
c08b14f78c dsp: add quinary interface support in q6afe
Add support for quinary interfaces in q6afe. Also,
fix routing for quinary tdm rx port.

Change-Id: I5db68da1cc8bc17bc5e7b743282abf83fb100bbc
Signed-off-by: Rohit Kumar <rohitkr@codeaurora.org>
2017-10-06 10:52:17 +05:30
Stephen Boyd
dbe57dc5a7 dsp: remove wakelock.h includes
These includes aren't used and the file will go away in the
future, so just drop it.

Change-Id: I9bfcd39fd775e16765c46ea99da087292fe2e461
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2017-10-05 15:23:27 -07:00
Xiaoyu Ye
0cf63fe351 soc: define dummy function for swrm_wcd_notify
Add dummy function for swrm_wcd_notify to avoid
compilation errors when configuration options
'CONFIG_SOUNDWIRE' and 'CONFIG_SOUNDWIRE_WCD_CTRL'
are not selected for a target.

Change-Id: Ie12d2df8777934494f0f8607d846e2d1ec49f2a6
Signed-off-by: Xiaoyu Ye <benyxy@codeaurora.org>
2017-10-05 12:49:54 -07:00