- Alsa-devel - mailman.alsa-project.org

i have some technical issues with the Arturia minifuse 1 sound card. i would like help with converting the minifuse 2 UCM config to work with minifuse 1
by GitHub issues - edited 01 Oct '22

01 Oct '22

alsa-project/alsa-ucm-conf issue #220 was edited from Ali32bit: greetings. so i have a sound card with multiple outputs and some loop back channels. it is USB complaint but those extra bells and whistles cause ALSA to think its a surround sound device when its actually just stereo. and this actually impacts the sound when i play games on it cause sounds from behind are basically muted. and thats the case with some music too but less obvious here is what alsa_info generated for me too : http://alsa-project.org/db/?f=b6db7723ffa65f32b93297109bf1f8e4d853cf4e there should already be a minifuse 2 setup so if possible please adapt it to minifuse 1 or help me convert and install it myself. the hardware is mostly the same but it has 1 input instead of 2 and no extra midi ports in the back. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/220 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

issues with the Arturia minifuse 1 sound card. i would like help with converting the minifuse 2 UCM config to work with minifuse 1
by GitHub issues - opened 30 Sep '22

30 Sep '22

alsa-project/alsa-ucm-conf issue #220 was opened from Ali32bit: greetings. so i have a sound card with multiple outputs and some loop back channels. it is USB complaint but those extra bells and whistles cause ALSA to think its a surround sound device when its actually just stereo. and this actually impacts the sound when i play games on it cause sounds from behind are basically muted. and thats the case with some music too but less obvious here is what alsa_info generated for me too : http://alsa-project.org/db/?f=b6db7723ffa65f32b93297109bf1f8e4d853cf4e there should already be a minifuse 2 setup so if possible please adapt it to minifuse 1 or help me convert and install it myself. the hardware is mostly the same but it has 1 input instead of 2 and no extra midi ports in the back. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/220 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[GIT PULL] ASoC fixes for v6.0-rc7
by Mark Brown 30 Sep '22

30 Sep '22

The following changes since commit 0a0342ede303fc420f3a388e1ae82da3ae8ff6bd: ASoC: tas2770: Reinit regcache on reset (2022-09-19 18:48:43 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.0-rc7 for you to fetch changes up to e18f6bcf8e864ea0e9690691d0d749c662b6a2c7: ASoC: wcd-mbhc-v2: Revert "ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()" (2022-09-29 15:20:12 +0100) ---------------------------------------------------------------- ASoC: Last fixes for v6.0 In the even that there's another pull request here's some more driver specific fixes. ---------------------------------------------------------------- Krzysztof Kozlowski (3): ASoC: wcd9335: fix order of Slimbus unprepare/disable ASoC: wcd934x: fix order of Slimbus unprepare/disable ASoC: wcd-mbhc-v2: Revert "ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()" Pierre-Louis Bossart (1): ASoC: es8316: fix register sync error in suspend/resume tests Shengjiu Wang (1): ASoC: fsl_audmux: Fix amixer write errors sound/soc/codecs/es8316.c | 2 ++ sound/soc/codecs/wcd-mbhc-v2.c | 10 ++++++---- sound/soc/codecs/wcd9335.c | 2 +- sound/soc/codecs/wcd934x.c | 2 +- sound/soc/fsl/fsl_audmix.c | 16 ++++------------ 5 files changed, 14 insertions(+), 18 deletions(-)

2 1

[PATCH] ASoC: qcom: fix unmet direct dependencies for SND_SOC_QDSP6
by Srinivas Kandagatla 30 Sep '22

30 Sep '22

SND_SOC_QDSP6 already has COMPILE_TEST so remove that from SND_SOC_SC8280XP and also add QCOM_APR dependencies to SND_SOC_SC8280XP like other Qualcomm machine drivers. This should also fix below warning: on x86_64, when QCOM_APR is not set and COMPILE_TEST=y: WARNING: unmet direct dependencies detected for SND_SOC_QDSP6 Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_QCOM [=y] && QCOM_APR [=n] && COMMON_CLK [=y] Selected by [y]: - SND_SOC_SC8280XP [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_QCOM [=y] && (QCOM_APR [=n] || COMPILE_TEST [=y]) && SOUNDWIRE [=y] && COMMON_CLK [=y] Fixes: 295aeea6646a ("ASoC: qcom: add machine driver for sc8280xp") Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 1b0252ec4665..d0e59e07b1fc 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -175,8 +175,7 @@ config SND_SOC_SM8250 config SND_SOC_SC8280XP tristate "SoC Machine driver for SC8280XP boards" - depends on QCOM_APR || COMPILE_TEST - depends on SOUNDWIRE + depends on QCOM_APR && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON -- 2.25.1

2 1

[PATCH] ASoC: mediatek: mt8192-mt6359: Set the driver name for the card
by Nícolas F. R. A. Prado 30 Sep '22

30 Sep '22

The ASoC core automatically populates the driver name field in the card from the card name if left unset. However, since the driver name can be at most 16 characters long, wrapping will happen if the card name is longer, which is the case for the mt8192-mt6359 driver. Explicitly set the driver name for the card in order to avoid said wrapping and have a readable driver name exposed to userspace. Signed-off-by: Nícolas F. R. A. Prado <nfraprado(a)collabora.com> --- Issue noticed while upstreaming the UCM file for this driver [1]. [1] https://github.com/alsa-project/alsa-ucm-conf/pull/217 sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index ff40ccd36f7e..b93c3237ef2d 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -24,6 +24,8 @@ #include "mt8192-afe-clk.h" #include "mt8192-afe-gpio.h" +#define DRIVER_NAME "mt8192_mt6359" + #define RT1015_CODEC_DAI "rt1015-aif" #define RT1015_DEV0_NAME "rt1015.1-0028" #define RT1015_DEV1_NAME "rt1015.1-0029" @@ -1070,6 +1072,7 @@ static struct snd_soc_codec_conf rt1015_amp_conf[] = { static struct snd_soc_card mt8192_mt6359_rt1015_rt5682_card = { .name = RT1015_RT5682_CARD_NAME, + .driver_name = DRIVER_NAME, .owner = THIS_MODULE, .dai_link = mt8192_mt6359_dai_links, .num_links = ARRAY_SIZE(mt8192_mt6359_dai_links), @@ -1105,6 +1108,7 @@ static const struct snd_kcontrol_new mt8192_mt6359_rt1015p_rt5682x_controls[] = }; static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682x_card = { + .driver_name = DRIVER_NAME, .owner = THIS_MODULE, .dai_link = mt8192_mt6359_dai_links, .num_links = ARRAY_SIZE(mt8192_mt6359_dai_links), @@ -1266,7 +1270,7 @@ static const struct dev_pm_ops mt8192_mt6359_pm_ops = { static struct platform_driver mt8192_mt6359_driver = { .driver = { - .name = "mt8192_mt6359", + .name = DRIVER_NAME, #ifdef CONFIG_OF .of_match_table = mt8192_mt6359_dt_match, #endif -- 2.37.3

3 2

[PATCH] ALSA: usb-audio: Fix potential memory leaks
by Takashi Iwai 30 Sep '22

30 Sep '22

When the driver hits -ENOMEM at allocating a URB or a buffer, it aborts and goes to the error path that releases the all previously allocated resources. However, when -ENOMEM hits at the middle of the sync EP URB allocation loop, the partially allocated URBs might be left without released, because ep->nurbs is still zero at that point. Fix it by setting ep->nurbs at first, so that the error handler loops over the full URB list. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/endpoint.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 36f753a28341..48a3843a08f1 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1268,6 +1268,7 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep) if (!ep->syncbuf) return -ENOMEM; + ep->nurbs = SYNC_URBS; for (i = 0; i < SYNC_URBS; i++) { struct snd_urb_ctx *u = &ep->urb[i]; u->index = i; @@ -1287,8 +1288,6 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep) u->urb->complete = snd_complete_urb; } - ep->nurbs = SYNC_URBS; - return 0; out_of_memory: -- 2.35.3

1 0

[PATCH] ALSA: usb-audio: Fix NULL dererence at error path
by Takashi Iwai 30 Sep '22

30 Sep '22

At an error path to release URB buffers and contexts, the driver might hit a NULL dererence for u->urb pointer, when u->buffer_size has been already set but the actual URB allocation failed. Fix it by adding the NULL check of urb. Also, make sure that buffer_size is cleared after the error path or the close. Cc: <stable(a)vger.kernel.org> Reported-by: Sabri N. Ferreiro <snferreiro1(a)gmail.com> Link: https://lore.kernel.org/r/CAKG+3NRjTey+fFfUEGwuxL-pi_=T4cUskYG9OzpzHytF+tzY… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/endpoint.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index b2d0b42b581f..36f753a28341 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -95,12 +95,13 @@ static inline unsigned get_usb_high_speed_rate(unsigned int rate) */ static void release_urb_ctx(struct snd_urb_ctx *u) { - if (u->buffer_size) + if (u->urb && u->buffer_size) usb_free_coherent(u->ep->chip->dev, u->buffer_size, u->urb->transfer_buffer, u->urb->transfer_dma); usb_free_urb(u->urb); u->urb = NULL; + u->buffer_size = 0; } static const char *usb_error_string(int err) -- 2.35.3

1 0

Re: general protection fault in release_urbs
by Takashi Iwai 30 Sep '22

30 Sep '22

On Fri, 30 Sep 2022 04:23:23 +0200, Sabri N. Ferreiro wrote: > > Hi, > > When I used fuzz testing to test Linux kernel 6.0.0-rc6, the kernel > triggered the following error: > HEAD commit: 521a547ced6477c54b4b0cc206000406c221b4d6 > git tree: upstream Could you retest with 6.0-rc7 or later? A commit reverting the change might influence on the behavior significantly. thanks, Takashi > kernel config: https://pastebin.com/raw/hekxU61F > console log: https://pastebin.com/KVwW9VQs > > It seems that the fuzzer failed to extract any C reproducer, but I > would so appreciate it if you have any idea how to solve this bug. > > general protection fault, probably for non-canonical address > 0xdffffc000000000d: 0000 [#1] PREEMPT SMP KASAN > KASAN: null-ptr-deref in range [0x0000000000000068-0x000000000000006f] > CPU: 1 PID: 29906 Comm: syz-executor.4 Not tainted 6.0.0-rc6+ #3 > Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS > 1.13.0-1ubuntu1.1 04/01/2014 > RIP: 0010:release_urb_ctx sound/usb/endpoint.c:97 [inline] > RIP: 0010:release_urbs sound/usb/endpoint.c:1046 [inline] > RIP: 0010:release_urbs+0x254/0x5a0 sound/usb/endpoint.c:1031 > Code: 44 89 fe 48 c1 e0 08 4c 8b 74 03 58 e8 75 b4 53 fa 45 85 ff 0f > 84 29 ff ff ff e8 07 b3 53 fa 49 8d 7e 68 48 89 f8 48 c1 e8 03 <42> 80 > 3c 20 00 0f 85 32 03 00 00 49 8d 7e 60 49 8b 4e 68 48 89 f8 > RSP: 0018:ffffc9001698f8d0 EFLAGS: 00010212 > RAX: 000000000000000d RBX: ffff88805fc44000 RCX: 0000000000040000 > RDX: ffffc900169d1000 RSI: ffff888018c21d40 RDI: 0000000000000068 > RBP: 0000000000000000 R08: ffffffff87273539 R09: 0000000000000000 > R10: 0000000000000005 R11: ffffed100bf88805 R12: dffffc0000000000 > R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000120 > FS: 00007febd6e4e700(0000) GS:ffff88807ec00000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 000055555663ddc8 CR3: 0000000065e07000 CR4: 0000000000350ee0 > Call Trace: > <TASK> > snd_usb_endpoint_set_params+0x1aab/0x2550 > snd_mask_min include/sound/pcm_params.h:49 [inline] > params_format include/sound/pcm_params.h:315 [inline] > snd_usb_hw_params+0x934/0x1180 sound/usb/pcm.c:503 > snd_pcm_hw_params+0xbad/0x1da0 sound/core/pcm_native.c:767 > snd_pcm_kernel_ioctl+0x164/0x310 sound/core/pcm_native.c:3437 > snd_pcm_oss_change_params_locked+0x1834/0x3860 sound/core/oss/pcm_oss.c:976 > snd_pcm_oss_change_params+0x76/0xd0 sound/core/oss/pcm_oss.c:1116 > snd_pcm_oss_make_ready+0xb7/0x170 sound/core/oss/pcm_oss.c:1175 > snd_pcm_oss_get_ptr sound/core/oss/pcm_oss.c:2208 [inline] > snd_pcm_oss_ioctl+0x3cd/0x3270 sound/core/oss/pcm_oss.c:2729 > vfs_ioctl fs/ioctl.c:51 [inline] > __do_sys_ioctl fs/ioctl.c:870 [inline] > __se_sys_ioctl fs/ioctl.c:856 [inline] > __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:856 > do_syscall_x64 arch/x86/entry/common.c:50 [inline] > do_syscall_64+0x35/0x80 arch/x86/entry/common.c:80 > entry_SYSCALL_64_after_hwframe+0x63/0xcd > RIP: 0033:0x7febd66a80fd > Code: 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 > 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d > 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 > RSP: 002b:00007febd6e4dbf8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 > RAX: ffffffffffffffda RBX: 00007febd679c340 RCX: 00007febd66a80fd > RDX: 00000000200000c0 RSI: 00000000800c5011 RDI: 0000000000000003 > RBP: 00007febd6e4dc50 R08: 0000000000000000 R09: 0000000000000000 > R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000005f > R13: 00007ffc28c4cf7f R14: 00007ffc28c4d120 R15: 00007febd6e4dd80 > </TASK> > Modules linked in: > ---[ end trace 0000000000000000 ]--- > RIP: 0010:release_urb_ctx sound/usb/endpoint.c:97 [inline] > RIP: 0010:release_urbs sound/usb/endpoint.c:1046 [inline] > RIP: 0010:release_urbs+0x254/0x5a0 sound/usb/endpoint.c:1031 > Code: 44 89 fe 48 c1 e0 08 4c 8b 74 03 58 e8 75 b4 53 fa 45 85 ff 0f > 84 29 ff ff ff e8 07 b3 53 fa 49 8d 7e 68 48 89 f8 48 c1 e8 03 <42> 80 > 3c 20 00 0f 85 32 03 00 00 49 8d 7e 60 49 8b 4e 68 48 89 f8 > RSP: 0018:ffffc9001698f8d0 EFLAGS: 00010212 > RAX: 000000000000000d RBX: ffff88805fc44000 RCX: 0000000000040000 > RDX: ffffc900169d1000 RSI: ffff888018c21d40 RDI: 0000000000000068 > RBP: 0000000000000000 R08: ffffffff87273539 R09: 0000000000000000 > R10: 0000000000000005 R11: ffffed100bf88805 R12: dffffc0000000000 > R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000120 > FS: 00007febd6e4e700(0000) GS:ffff88807ec00000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000001b31424000 CR3: 0000000065e07000 CR4: 0000000000350ee0 > ---------------- > Code disassembly (best guess): > 0: 44 89 fe mov %r15d,%esi > 3: 48 c1 e0 08 shl $0x8,%rax > 7: 4c 8b 74 03 58 mov 0x58(%rbx,%rax,1),%r14 > c: e8 75 b4 53 fa callq 0xfa53b486 > 11: 45 85 ff test %r15d,%r15d > 14: 0f 84 29 ff ff ff je 0xffffff43 > 1a: e8 07 b3 53 fa callq 0xfa53b326 > 1f: 49 8d 7e 68 lea 0x68(%r14),%rdi > 23: 48 89 f8 mov %rdi,%rax > 26: 48 c1 e8 03 shr $0x3,%rax > * 2a: 42 80 3c 20 00 cmpb $0x0,(%rax,%r12,1) <-- trapping instruction > 2f: 0f 85 32 03 00 00 jne 0x367 > 35: 49 8d 7e 60 lea 0x60(%r14),%rdi > 39: 49 8b 4e 68 mov 0x68(%r14),%rcx > 3d: 48 89 f8 mov %rdi,%rax >

1 2

[PATCH 1/2] slimbus: stream: handle unsupported bitrates for presence rate
by Krzysztof Kozlowski 30 Sep '22

30 Sep '22

Handle errors of getting presence rate for unsupported stream bitrate, instead of sending -EINVAL in change content message. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- drivers/slimbus/stream.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/slimbus/stream.c b/drivers/slimbus/stream.c index f8eade1e0132..28fbecb3907d 100644 --- a/drivers/slimbus/stream.c +++ b/drivers/slimbus/stream.c @@ -204,7 +204,7 @@ int slim_stream_prepare(struct slim_stream_runtime *rt, { struct slim_controller *ctrl = rt->dev->ctrl; struct slim_port *port; - int num_ports, i, port_id; + int num_ports, i, port_id, prrate; pr_err("%s:%d AAAA\n", __func__, __LINE__); if (rt->ports) { @@ -222,6 +222,13 @@ int slim_stream_prepare(struct slim_stream_runtime *rt, rt->bps = cfg->bps; rt->direction = cfg->direction; + prrate = slim_get_prate_code(cfg->rate); + if (prrate < 0) { + dev_err(&rt->dev->dev, "Cannot get presence rate for rate %d Hz\n", + cfg->rate); + return -EINVAL; + } + if (cfg->rate % ctrl->a_framer->superfreq) { /* * data rate not exactly multiple of super frame, @@ -242,7 +249,7 @@ int slim_stream_prepare(struct slim_stream_runtime *rt, port = &rt->ports[i]; port->state = SLIM_PORT_DISCONNECTED; port->id = port_id; - port->ch.prrate = slim_get_prate_code(cfg->rate); + port->ch.prrate = prrate; port->ch.id = cfg->chs[i]; port->ch.data_fmt = SLIM_CH_DATA_FMT_NOT_DEFINED; port->ch.aux_fmt = SLIM_CH_AUX_FMT_NOT_APPLICABLE; -- 2.34.1

1 2

[PATCH] ASoC: nau8825: Add TDM support
by David Lin 30 Sep '22

30 Sep '22

Support TDM format for NAU88L25. Signed-off-by: David Lin <CTLIN0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 97 ++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 14 ++++++ 2 files changed, 111 insertions(+) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index b3cdbe884c05..6a2c2e373efd 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1425,10 +1425,107 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) return 0; } +/** + * nau8825_set_tdm_slot - configure DAI TDM. + * @dai: DAI + * @tx_mask: bitmask representing active TX slots. + * @rx_mask: bitmask representing active RX slots. + * @slots: Number of slots in use. + * @slot_width: Width in bits for each slot. + * + * Configures a DAI for TDM operation. Support TDM 4/8 slots. + * The limitation is DAC and ADC need shift 4 slots at 8 slots mode. + */ +static int nau8825_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, + unsigned int rx_mask, int slots, int slot_width) +{ + struct snd_soc_component *component = dai->component; + struct nau8825 *nau8825 = snd_soc_component_get_drvdata(component); + unsigned int ctrl_val = 0, ctrl_offset = 0, value = 0, dac_s, adc_s; + + if (slots != 4 && slots != 8) { + dev_err(nau8825->dev, "Only support 4 or 8 slots!\n"); + return -EINVAL; + } + + /* The driver is limited to 1-channel for ADC, and 2-channel for DAC on TDM mode */ + if (hweight_long((unsigned long) tx_mask) != 1 || + hweight_long((unsigned long) rx_mask) != 2) { + dev_err(nau8825->dev, + "The limitation is 1-channel for ADC, and 2-channel for DAC on TDM mode.\n"); + return -EINVAL; + } + + if (((tx_mask & 0xf) && (tx_mask & 0xf0)) || + ((rx_mask & 0xf) && (rx_mask & 0xf0)) || + ((tx_mask & 0xf) && (rx_mask & 0xf0)) || + ((rx_mask & 0xf) && (tx_mask & 0xf0))) { + dev_err(nau8825->dev, + "Slot assignment of DAC and ADC need to set same interval.\n"); + return -EINVAL; + } + + /* The offset of fixed 4 slots for 8 slots support */ + if (rx_mask & 0xf0) { + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_PCM_TS_EN_MASK, NAU8825_I2S_PCM_TS_EN); + regmap_read(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1, &value); + ctrl_val |= NAU8825_TDM_OFFSET_EN; + ctrl_offset = 4 * slot_width; + if (!(value & NAU8825_I2S_PCMB_MASK)) + ctrl_offset += 1; + dac_s = (rx_mask & 0xf0) >> 4; + adc_s = fls((tx_mask & 0xf0) >> 4); + } else { + dac_s = rx_mask & 0xf; + adc_s = fls(tx_mask & 0xf); + } + + ctrl_val |= NAU8825_TDM_MODE; + + switch (dac_s) { + case 0x3: + ctrl_val |= 1 << NAU8825_TDM_DACR_RX_SFT; + break; + case 0x5: + ctrl_val |= 2 << NAU8825_TDM_DACR_RX_SFT; + break; + case 0x6: + ctrl_val |= 1 << NAU8825_TDM_DACL_RX_SFT; + ctrl_val |= 2 << NAU8825_TDM_DACR_RX_SFT; + break; + case 0x9: + ctrl_val |= 3 << NAU8825_TDM_DACR_RX_SFT; + break; + case 0xa: + ctrl_val |= 1 << NAU8825_TDM_DACL_RX_SFT; + ctrl_val |= 3 << NAU8825_TDM_DACR_RX_SFT; + break; + case 0xc: + ctrl_val |= 2 << NAU8825_TDM_DACL_RX_SFT; + ctrl_val |= 3 << NAU8825_TDM_DACR_RX_SFT; + break; + default: + return -EINVAL; + } + + ctrl_val |= adc_s - 1; + + regmap_update_bits(nau8825->regmap, NAU8825_REG_TDM_CTRL, + NAU8825_TDM_MODE | NAU8825_TDM_OFFSET_EN | + NAU8825_TDM_DACL_RX_MASK | NAU8825_TDM_DACR_RX_MASK | + NAU8825_TDM_TX_MASK, ctrl_val); + regmap_update_bits(nau8825->regmap, NAU8825_REG_LEFT_TIME_SLOT, + NAU8825_TSLOT_L0_MASK, ctrl_offset); + + return 0; +} + static const struct snd_soc_dai_ops nau8825_dai_ops = { .startup = nau8825_dai_startup, .hw_params = nau8825_hw_params, .set_fmt = nau8825_set_dai_fmt, + .set_tdm_slot = nau8825_set_tdm_slot, }; #define NAU8825_RATES SNDRV_PCM_RATE_8000_192000 diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 6d112b6145df..d84191a7beb2 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -225,6 +225,15 @@ #define NAU8825_JKDET_PULL_EN (1 << 9) /* 0 - enable pull, 1 - disable */ #define NAU8825_JKDET_OUTPUT_EN (1 << 8) /* 0 - enable input, 1 - enable output */ +/* TDM_CTRL (0x1b) */ +#define NAU8825_TDM_MODE (0x1 << 15) +#define NAU8825_TDM_OFFSET_EN (0x1 << 14) +#define NAU8825_TDM_DACL_RX_SFT 6 +#define NAU8825_TDM_DACL_RX_MASK (0x3 << NAU8825_TDM_DACL_RX_SFT) +#define NAU8825_TDM_DACR_RX_SFT 4 +#define NAU8825_TDM_DACR_RX_MASK (0x3 << NAU8825_TDM_DACR_RX_SFT) +#define NAU8825_TDM_TX_MASK 0x3 + /* I2S_PCM_CTRL1 (0x1c) */ #define NAU8825_I2S_BP_SFT 7 #define NAU8825_I2S_BP_MASK (1 << NAU8825_I2S_BP_SFT) @@ -249,6 +258,9 @@ #define NAU8825_I2S_TRISTATE (1 << 15) /* 0 - normal mode, 1 - Hi-Z output */ #define NAU8825_I2S_LRC_DIV_SFT 12 #define NAU8825_I2S_LRC_DIV_MASK (0x3 << NAU8825_I2S_LRC_DIV_SFT) +#define NAU8825_I2S_PCM_TS_EN_SFT 10 +#define NAU8825_I2S_PCM_TS_EN_MASK (1 << NAU8825_I2S_PCM_TS_EN_SFT) +#define NAU8825_I2S_PCM_TS_EN (1 << NAU8825_I2S_PCM_TS_EN_SFT) #define NAU8825_I2S_MS_SFT 3 #define NAU8825_I2S_MS_MASK (1 << NAU8825_I2S_MS_SFT) #define NAU8825_I2S_MS_MASTER (1 << NAU8825_I2S_MS_SFT) @@ -259,6 +271,8 @@ #define NAU8825_FS_ERR_CMP_SEL_SFT 14 #define NAU8825_FS_ERR_CMP_SEL_MASK (0x3 << NAU8825_FS_ERR_CMP_SEL_SFT) #define NAU8825_DIS_FS_SHORT_DET (1 << 13) +#define NAU8825_TSLOT_L0_MASK 0x3ff +#define NAU8825_TSLOT_R0_MASK 0x3ff /* BIQ_CTRL (0x20) */ #define NAU8825_BIQ_WRT_SFT 4 -- 2.25.1

2 1