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

[alsa-devel] [PATCH v2 0/4] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 10 Jul '19

10 Jul '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. Changes from v1 to v2: - hdmi-codec.c: cleanup the sequence of hdmi_codec_jack_report and hdmi_codec_set_jack_detect. - dw-hdmi.c: change argument of hdmi_codec_plugged_cb so it takes a generic device which has hdmi_codec_priv in its drvdata. - dw-hdmi.c: add a helper function handle_plugged_change to check audio platform device and codec platform device before calling callback. - dw-hdmi-c: avoid setting callback function if audio platform device or codec platform device is missing. - rockchip_max98090: fix the checking of return code when setting sysclk on cpu_dai and codec_dai. cpu_dai error should be reported. For HDMI codec_dai, there is no need to set sysclk. Cheng-Yi Chiang (4): ASoC: hdmi-codec: Add an op to set callback function for plug event drm: bridge: dw-hdmi: Report connector status using callback ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip_max98090: Add HDMI jack support .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 3 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 ++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 55 ++++++++- include/sound/hdmi-codec.h | 16 +++ sound/soc/codecs/hdmi-codec.c | 45 +++++++ sound/soc/rockchip/rockchip_max98090.c | 116 ++++++++++++++---- 6 files changed, 221 insertions(+), 24 deletions(-) -- 2.22.0.410.gd8fdbe21b5-goog

1 4

[alsa-devel] [PATCH 0/7] Add HDMI audio support on RK3288 veyron board
by Cheng-Yi Chiang 10 Jul '19

10 Jul '19

This patch series is to support HDMI audio on RK3288 veyron board. To support jack reporting, there are two old patches: video: add HDMI state notifier support <https://lore.kernel.org/linux-media/20161213150813.37966-2-hverkuil@xs4all.…> ASoC: hdmi-codec: use HDMI state notifier to add jack support <https://patchwork.kernel.org/patch/9430355/> They are modified to pass checkpatch checking based on latest ASoC tree https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next branch. With these two patches at hand, hdmi-notifier support is then added to dw-hdmi driver so the plug/unplug event can be passed to codec driver. The rest patches are about machine driver rockchip_max98090. A HDMI DAI link is added for HDMI playback so there will be two devices on this sound card. One for max98090 and one for HDMI. The HDMI node is passed from DTS so machine driver can set the correct hdmi-notifier on codec driver. Cheng-Yi Chiang (5): drm/bridge/synopsys: dw-hdmi: Add HDMI notifier support ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip: rockchip-max98090: Add node for HDMI ASoC: rockchip_max98090: Add HDMI jack support ARM: dts: rockchip: Specify HDMI node to sound card node Hans Verkuil (1): video: add HDMI state notifier support Philipp Zabel (1): ASoC: hdmi-codec: use HDMI state notifier to add jack support .../bindings/sound/rockchip-max98090.txt | 2 + MAINTAINERS | 6 + .../boot/dts/rk3288-veyron-analog-audio.dtsi | 1 + drivers/gpu/drm/bridge/synopsys/Kconfig | 1 + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 28 +++- drivers/video/Kconfig | 3 + drivers/video/Makefile | 1 + drivers/video/hdmi-notifier.c | 145 ++++++++++++++++++ include/linux/hdmi-notifier.h | 112 ++++++++++++++ include/sound/hdmi-codec.h | 7 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdmi-codec.c | 104 ++++++++++++- sound/soc/rockchip/rockchip_max98090.c | 123 ++++++++++++--- 13 files changed, 508 insertions(+), 26 deletions(-) create mode 100644 drivers/video/hdmi-notifier.c create mode 100644 include/linux/hdmi-notifier.h -- 2.22.0.rc1.257.g3120a18244-goog

5 29

[alsa-devel] [PATCH] sound: soc: codecs: wcd9335: add irqflag IRQF_ONESHOT flag
by Hariprasad Kelam 10 Jul '19

10 Jul '19

Add IRQF_ONESHOT to ensure "Interrupt is not reenabled after the hardirq handler finished". fixes below issue reported by coccicheck sound/soc/codecs/wcd9335.c:4068:8-33: ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/soc/codecs/wcd9335.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 85737fe..7ab9bf6f 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -4056,6 +4056,9 @@ static struct wcd9335_irq wcd9335_irqs[] = { static int wcd9335_setup_irqs(struct wcd9335_codec *wcd) { int irq, ret, i; + unsigned long irqflags; + + irqflags = IRQF_TRIGGER_RISING | IRQF_ONESHOT; for (i = 0; i < ARRAY_SIZE(wcd9335_irqs); i++) { irq = regmap_irq_get_virq(wcd->irq_data, wcd9335_irqs[i].irq); @@ -4067,7 +4070,7 @@ static int wcd9335_setup_irqs(struct wcd9335_codec *wcd) ret = devm_request_threaded_irq(wcd->dev, irq, NULL, wcd9335_irqs[i].handler, - IRQF_TRIGGER_RISING, + irqflags, wcd9335_irqs[i].name, wcd); if (ret) { dev_err(wcd->dev, "Failed to request %s\n", -- 2.7.4

2 2

[alsa-devel] Reminder: 4 open syzbot bugs in sound subsystem
by Eric Biggers 09 Jul '19

09 Jul '19

[This email was generated by a script. Let me know if you have any suggestions to make it better, or if you want it re-generated with the latest status.] Of the currently open syzbot reports against the upstream kernel, I've manually marked 4 of them as possibly being bugs in the sound subsystem. I've listed these reports below, sorted by an algorithm that tries to list first the reports most likely to be still valid, important, and actionable. If you believe a bug is no longer valid, please close the syzbot report by sending a '#syz fix', '#syz dup', or '#syz invalid' command in reply to the original thread, as explained at https://goo.gl/tpsmEJ#status If you believe I misattributed a bug to the sound subsystem, please let me know, and if possible forward the report to the correct people or mailing list. Here are the bugs: -------------------------------------------------------------------------------- Title: INFO: rcu detected stall in snd_seq_write Last occurred: 72 days ago Reported: 316 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=33501520944e11adedf1c454eec4cb818bee16… Original thread: https://lkml.kernel.org/lkml/000000000000e5050205746dcbb0@google.com/T/#u This bug has a syzkaller reproducer only. The original thread for this bug received 1 reply, 315 days ago. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+97aae04ce27e39cbfca9(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/000000000000e5050205746dcbb0@google.com -------------------------------------------------------------------------------- Title: WARNING: suspicious RCU usage in line6_pcm_acquire Last occurred: 44 days ago Reported: 75 days ago Branches: Mainline (with usb-fuzzer patches) Dashboard link: https://syzkaller.appspot.com/bug?id=a0ea128a37bfe56208042c02d080873dcbdf69… Original thread: https://lkml.kernel.org/lkml/0000000000007cb1ee0587591549@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one has replied to the original thread for this bug yet. This looks like a bug in a sound USB driver. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+06b7a5a8c4acc0445995(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000007cb1ee0587591549@google.com -------------------------------------------------------------------------------- Title: KASAN: use-after-free Read in wake_up_if_idle Last occurred: 117 days ago Reported: 253 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=b1e300cd7b124fc83dd4199d4d1df26310111b… Original thread: https://lkml.kernel.org/lkml/00000000000066ab7105795f245e@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one replied to the original thread for this bug. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+2c1253bc508adef78a7f(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/00000000000066ab7105795f245e@google.com -------------------------------------------------------------------------------- Title: INFO: task hung in snd_seq_write Last occurred: 110 days ago Reported: 315 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=9366cef8455b032553567ce096a5b31d8307b7… Original thread: https://lkml.kernel.org/lkml/0000000000001f74de0574710d3e@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one replied to the original thread for this bug. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+4c595632b98bb8ffcc66(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000001f74de0574710d3e@google.com

1 0

[alsa-devel] [PATCH] sound: soc: codecs: wcd9335: fix Unneeded variable: "ret"
by Hariprasad Kelam 09 Jul '19

09 Jul '19

this fixes below issues reported by coccicheck sound/soc/codecs/wcd9335.c:3611:5-8: Unneeded variable: "ret". Return "0" on line 3625 sound/soc/codecs/wcd9335.c:3941:5-8: Unneeded variable: "ret". Return "0" on line 3971 sound/soc/codecs/wcd9335.c:3745:5-8: Unneeded variable: "ret". Return "0" on line 3784 sound/soc/codecs/wcd9335.c:3896:5-8: Unneeded variable: "ret". Return "0" on line 3934 sound/soc/codecs/wcd9335.c:3026:5-8: Unneeded variable: "ret". Return "0" on line 3038 We cannot change return of these functions as they are callback functions. Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/soc/codecs/wcd9335.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 1bbbe42..e13af36 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -3018,7 +3018,6 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = snd_soc_component_get_drvdata(comp); struct wcd_slim_codec_dai_data *dai = &wcd->dai[w->shift]; - int ret = 0; switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -3030,7 +3029,7 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, break; } - return ret; + return 0; } static int wcd9335_codec_enable_mix_path(struct snd_soc_dapm_widget *w, @@ -3603,7 +3602,6 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, { struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -3617,7 +3615,7 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static void wcd9335_codec_hph_post_pa_config(struct wcd9335_codec *wcd, @@ -3737,7 +3735,6 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); int hph_mode = wcd->hph_mode; - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -3776,7 +3773,7 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w, @@ -3888,7 +3885,6 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); int hph_mode = wcd->hph_mode; - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -3926,14 +3922,13 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kc, int event) { struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); - int ret = 0; switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -3963,7 +3958,7 @@ static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static irqreturn_t wcd9335_slimbus_irq(int irq, void *data) -- 2.7.4

1 0

[alsa-devel] [PATCH] MLK-22197 sound: asoc: add micfil dc remover amixer control
by Irina Patru 09 Jul '19

09 Jul '19

Add control for DC Remover Control register: 11b - DC Remover is bypassed 00b - DC Remover is cut-off at 21Hz 01b - DC Remover is cut-off at 83Hz 10b - DC Remover is cut-off at 152Hz This control modifies DC mode for all channels. For more information see DC Remover Block Diagram in micfil reference manual. Signed-off-by: Irina Patru <ioana-irina.patru(a)nxp.com> --- sound/soc/fsl/fsl_micfil.c | 59 ++++++++++++++++++++++++++++++++++++++ sound/soc/fsl/fsl_micfil.h | 10 +++++++ 2 files changed, 69 insertions(+) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index 7bb8d4cb5f71..2eaf9fda4865 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -45,6 +45,7 @@ struct fsl_micfil { bool slave_mode; int channel_gain[8]; int clk_src_id; + int dc_remover; int vad_sound_gain; int vad_noise_gain; int vad_input_gain; @@ -140,6 +141,17 @@ static const char * const micfil_clk_src_texts[] = { "Auto", "AudioPLL1", "AudioPLL2", "ExtClk3", }; +/* DC Remover Control + * Filter Bypassed 1 1 + * Cut-off @21Hz 0 0 + * Cut-off @83Hz 0 1 + * Cut-off @152HZ 1 0 + */ +static const char * const micfil_dc_remover_texts[] = { + "Cut-off @21Hz", "Cut-off @83Hz", + "Cut-off @152Hz", "Bypass", +}; + static const struct soc_enum fsl_micfil_quality_enum = SOC_ENUM_SINGLE(REG_MICFIL_CTRL2, MICFIL_CTRL2_QSEL_SHIFT, @@ -168,6 +180,10 @@ static const struct soc_enum fsl_micfil_hwvad_rate_enum = static const struct soc_enum fsl_micfil_clk_src_enum = SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(micfil_clk_src_texts), micfil_clk_src_texts); +static const struct soc_enum fsl_micfil_dc_remover_enum = + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(micfil_dc_remover_texts), + micfil_dc_remover_texts); + static int micfil_put_clk_src(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) @@ -194,6 +210,45 @@ static int micfil_get_clk_src(struct snd_kcontrol *kcontrol, return 0; } +static int micfil_put_dc_remover_state(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; + struct fsl_micfil *micfil = snd_soc_component_get_drvdata(comp); + unsigned int *item = ucontrol->value.enumerated.item; + int val = snd_soc_enum_item_to_val(e, item[0]); + int i = 0, ret = 0; + u32 reg_val = 0; + + if (val < 0 || val > 3) + return -1; + micfil->dc_remover = val; + + /* Calculate total value for all channels */ + for (i = 0; i < 8; i++) + reg_val |= MICFIL_DC_MODE(val, i); + + /* Update DC Remover mode for all channels */ + ret = snd_soc_component_update_bits(comp, + REG_MICFIL_DC_CTRL, + MICFIL_DC_CTRL_MASK, + reg_val); + return ret; +} + +static int micfil_get_dc_remover_state(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol); + struct fsl_micfil *micfil = snd_soc_component_get_drvdata(comp); + + ucontrol->value.enumerated.item[0] = micfil->dc_remover; + + return 0; +} + + static int hwvad_put_init_mode(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -676,6 +731,10 @@ static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = { SOC_ENUM_EXT("Clock Source", fsl_micfil_clk_src_enum, micfil_get_clk_src, micfil_put_clk_src), + SOC_ENUM_EXT("MICFIL DC Remover Control", + fsl_micfil_dc_remover_enum, + micfil_get_dc_remover_state, + micfil_put_dc_remover_state), { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "HWVAD Input Gain", diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h index 792187b717f0..e47dba9b90b8 100644 --- a/sound/soc/fsl/fsl_micfil.h +++ b/sound/soc/fsl/fsl_micfil.h @@ -278,6 +278,16 @@ #define MICFIL_HWVAD_HPF_102HZ 3 #define MICFIL_HWVAD_FRAMET_DEFAULT 10 +/* MICFIL DC Remover Control Register -- REG_MICFIL_DC_CTRL */ +#define MICFIL_DC_CTRL_SHIFT 0 +#define MICFIL_DC_CTRL_MASK 0xFFFF +#define MICFIL_DC_CTRL_WIDTH 2 +#define MICFIL_DC_CHX_SHIFT(v) (2 * (v)) +#define MICFIL_DC_CHX_MASK(v) ((BIT(MICFIL_DC_CTRL_WIDTH) - 1) \ + << MICFIL_DC_CHX_SHIFT(v)) +#define MICFIL_DC_MODE(v1, v2) (((v1) << MICFIL_DC_CHX_SHIFT(v2)) \ + & MICFIL_DC_CHX_MASK(v2)) + /* MICFIL Output Control Register */ #define MICFIL_OUTGAIN_CHX_SHIFT(v) (4 * (v)) -- 2.21.0

4 3

[alsa-devel] [PATCH 1/4] ALSA: compress: Fix regression on compressed capture streams
by Charles Keepax 09 Jul '19

09 Jul '19

A previous fix to the stop handling on compressed capture streams causes some knock on issues. The previous fix updated snd_compr_drain_notify to set the state back to PREPARED for capture streams. This causes some issues however as the handling for snd_compr_poll differs between the two states and some user-space applications were relying on the poll failing after the stream had been stopped. To correct this regression whilst still fixing the original problem the patch was addressing, update the capture handling to skip the PREPARED state rather than skipping the SETUP state as it has done until now. Fixes: 4f2ab5e1d13d ("ALSA: compress: Fix stop handling on compressed capture streams") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- include/sound/compress_driver.h | 5 +---- sound/core/compress_offload.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index c5188ff724d12..bc88d6f964da9 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -173,10 +173,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - if (stream->direction == SND_COMPRESS_PLAYBACK) - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - else - stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + stream->runtime->state = SNDRV_PCM_STATE_SETUP; wake_up(&stream->runtime->sleep); } diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index a1a6fd75cfe50..f031495311ee4 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -587,10 +587,7 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) stream->metadata_set = false; stream->next_track = false; - if (stream->direction == SND_COMPRESS_PLAYBACK) - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - else - stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + stream->runtime->state = SNDRV_PCM_STATE_SETUP; } else { return -EPERM; } @@ -706,8 +703,17 @@ static int snd_compr_start(struct snd_compr_stream *stream) { int retval; - if (stream->runtime->state != SNDRV_PCM_STATE_PREPARED) + switch (stream->runtime->state) { + case SNDRV_PCM_STATE_SETUP: + if (stream->direction != SND_COMPRESS_CAPTURE) + return -EPERM; + break; + case SNDRV_PCM_STATE_PREPARED: + break; + default: return -EPERM; + } + retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_START); if (!retval) stream->runtime->state = SNDRV_PCM_STATE_RUNNING; -- 2.11.0

2 5

[alsa-devel] [PATCH 0/4] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 09 Jul '19

09 Jul '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. Cheng-Yi Chiang (4): ASoC: hdmi-codec: Add an op to set callback function for plug event drm: bridge: dw-hdmi: Report connector status using callback ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip_max98090: Add HDMI jack support .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 3 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 ++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 32 ++++- include/sound/hdmi-codec.h | 16 +++ sound/soc/codecs/hdmi-codec.c | 52 ++++++++ sound/soc/rockchip/rockchip_max98090.c | 112 ++++++++++++++---- 6 files changed, 201 insertions(+), 24 deletions(-) -- 2.22.0.410.gd8fdbe21b5-goog

6 19

Re: [alsa-devel] [PATCH V2 2/2] ASoC: fsl_esai: recover the channel swap after xrun
by S.j. Wang 09 Jul '19

09 Jul '19

> > > > + > > > > + /* restore registers by regcache_sync */ > > > > + fsl_esai_register_restore(esai_priv); > > > > + > > > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, > > > > + ESAI_xCR_xPR_MASK, 0); > > > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, > > > > + ESAI_xCR_xPR_MASK, 0); > > > > > > And just for curious, can (or shall) we stuff this personal reset to > > > the reset() function? I found this one is a part of the reset > > > routine being mentioned in the RM -- it was done after ESAI reset is > done via ECR register. > > > > > > > There is a problem to do this, TPR/RPR need to be clear after > > configure the control register. (TCCR, TCR). So it seems not only one > > place (reset function) need to be changed. > > Do you know (or remember) why we suddenly involve this TPR/PRP? > The driver has no problem so far, even if we don't have them. > > The "personal reset" sounds like a feature that we would use to reset TX or > RX individually, while this hw_reset() does a full reset for both TX and RX. > So I wonder whether they're necessary. The hw_reset flow is suggested by design team, so involve TRP/RPP is from them, I don't know the detail. Best regards Wang shengjiu

1 0

Re: [alsa-devel] [PATCH V2 2/2] ASoC: fsl_esai: recover the channel swap after xrun
by S.j. Wang 09 Jul '19

09 Jul '19

> > > + > > + /* restore registers by regcache_sync */ > > + fsl_esai_register_restore(esai_priv); > > + > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, > > + ESAI_xCR_xPR_MASK, 0); > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, > > + ESAI_xCR_xPR_MASK, 0); > > And just for curious, can (or shall) we stuff this personal reset to the reset() > function? I found this one is a part of the reset routine being mentioned in > the RM -- it was done after ESAI reset is done via ECR register. > There is a problem to do this, TPR/RPR need to be clear after configure the control register. (TCCR, TCR). So it seems not only one place (reset function) need to be changed. Best regards Wang shengjiu

2 1