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

[alsa-devel] [PATCH - hwmixvolume 2/9] hwmixvolume: switch to GTK+ 3.0
by Emmanuel Gil Peyrot 08 Aug '18

08 Aug '18

Signed-off-by: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> diff --git a/hwmixvolume/hwmixvolume b/hwmixvolume/hwmixvolume index 28ce776..039ca17 100755 --- a/hwmixvolume/hwmixvolume +++ b/hwmixvolume/hwmixvolume @@ -62,7 +62,7 @@ class Stream: values = value.get_tuple(TYPE_INTEGER, info.count) self.label = Gtk.Label(self.get_label(info)) self.label.set_single_line_mode(True) - self.parent.scales_vbox.pack_start(self.label, expand=False) + self.parent.scales_vbox.add(self.label) for i in range(info.count): adj = Gtk.Adjustment(value=values[i], lower=info.min, upper=info.max, @@ -71,7 +71,7 @@ class Stream: adj.connect('value-changed', self.update_ctl_from_scale, i) scale = Gtk.HScale(adj) scale.set_draw_value(False) - self.parent.scales_vbox.pack_start(scale, expand=False) + self.parent.scales_vbox.add(scale) self.scales.append(scale) self.adjustments.append(adj) self.parent.scales_vbox.show_all() @@ -174,45 +174,48 @@ class MixerWindow(Gtk.Window): self.connect('destroy', lambda w: Gtk.main_quit()) self.set_title("Hardware Mixer Volumes") - vbox = Gtk.VBox() + vbox = Gtk.Grid() + vbox.set_orientation(Gtk.Orientation.VERTICAL) self.add(vbox) - hbox = Gtk.HBox() - vbox.pack_start(hbox, expand=False) + hbox = Gtk.Grid() + vbox.add(hbox) - label = Gtk.Label("_Sound Card: ") - label.set_use_underline(True) - hbox.pack_start(label, expand=False) + label = Gtk.Label.new_with_mnemonic("_Sound Card: ") + hbox.add(label) - combo = Gtk.combo_box_new_text() + combo = Gtk.ComboBoxText() + combo.set_hexpand(True) for i in self.card_numbers: str = "%d: %s" % (i, alsacard.card_get_name(i)) combo.append_text(str) if len(self.card_numbers) > 0: combo.set_active(0) combo.connect('changed', lambda c: self.change_card(self.card_numbers[combo.get_active()])) - hbox.pack_start(combo) + hbox.add(combo) label.set_mnemonic_widget(combo) - self.lock_check = Gtk.CheckButton(label="_Lock Channels") + self.lock_check = Gtk.CheckButton.new_with_mnemonic(label="_Lock Channels") self.lock_check.set_active(True) - vbox.pack_start(self.lock_check, expand=False) + vbox.add(self.lock_check) scrollwin = Gtk.ScrolledWindow() - scrollwin.set_policy(hscrollbar_policy=Gtk.POLICY_NEVER, vscrollbar_policy=Gtk.POLICY_AUTOMATIC) - scrollwin.set_shadow_type(Gtk.SHADOW_NONE) - vbox.pack_start(scrollwin) + scrollwin.set_policy(hscrollbar_policy=Gtk.PolicyType.NEVER, vscrollbar_policy=Gtk.PolicyType.AUTOMATIC) + scrollwin.set_shadow_type(Gtk.ShadowType.NONE) + scrollwin.set_vexpand(True) + vbox.add(scrollwin) - self.scales_vbox = Gtk.VBox() + self.scales_vbox = Gtk.Grid() + self.scales_vbox.set_orientation(Gtk.Orientation.VERTICAL) scrollwin.add_with_viewport(self.scales_vbox) label = Gtk.Label() label.set_single_line_mode(True) - line_height = label.size_request()[1] + line_height = label.size_request().height label.destroy() scale = Gtk.HScale() scale.set_draw_value(False) - line_height += scale.size_request()[1] + line_height += scale.size_request().height scale.destroy() # always have space for at least four sliders scrollwin.set_size_request(width=-1, height=line_height*4+4) @@ -252,7 +255,7 @@ class MixerWindow(Gtk.Window): self.streams.append(stream) for fd,condition in self.hcontrol.poll_fds: - self.hctl_sources.append(GLib.io_add_watch(fd, condition, self.hctl_io_callback)) + self.hctl_sources.append(GLib.io_add_watch(fd, 0, GLib.IOCondition(condition), self.hctl_io_callback)) self.update_msg_label() @@ -271,7 +274,8 @@ class MixerWindow(Gtk.Window): msg = "This card does not have stream controls." if not has_msg: self.msg_label = Gtk.Label(msg) - self.scales_vbox.pack_start(self.msg_label) + self.msg_label.set_vexpand(True) + self.scales_vbox.add(self.msg_label) self.scales_vbox.show_all() elif self.msg_label.get_text() != msg: self.msg_label.set_text(msg) @@ -284,8 +288,8 @@ class MixerWindow(Gtk.Window): except: # TODO: alsa error msg dlg = Gtk.MessageDialog(self, - Gtk.DIALOG_MODAL | Gtk.DIALOG_DESTROY_WITH_PARENT, - Gtk.MESSAGE_ERROR, Gtk.BUTTONS_OK, + Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT, + Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, "Cannot open sound card control device.") dlg.run() dlg.destroy() -- 2.18.0

1 0

[alsa-devel] [PATCH v2] ASoC: rt5677: Fix initialization of rt5677_of_match.data
by Matthias Kaehlcke 08 Aug '18

08 Aug '18

The driver expects to find the device id in rt5677_of_match.data, however it is currently assigned to rt5677_of_match.type. Fix this. The problem was found with the help of clang: sound/soc/codecs/rt5677.c:5010:36: warning: expression which evaluates to zero treated as a null pointer constant of type 'const void *' [-Wnon-literal-null-conversion] { .compatible = "realtek,rt5677", RT5677 }, ^~~~~~ Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources") Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> -- Changes in v2: - assign device id to data instead of 'type' - updated subject and commit message - added: 'Fixes' tag --- sound/soc/codecs/rt5677.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 8a0181a2db08..47feef30dadb 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -5007,7 +5007,7 @@ static const struct regmap_config rt5677_regmap = { }; static const struct of_device_id rt5677_of_match[] = { - { .compatible = "realtek,rt5677", RT5677 }, + { .compatible = "realtek,rt5677", .data = (const void *)RT5677 }, { } }; MODULE_DEVICE_TABLE(of, rt5677_of_match); -- 2.18.0.597.ga71716f1ad-goog

4 4

[alsa-devel] [PATCH] ASoC: wm_adsp: Correct DSP pointer for preloader control
by Charles Keepax 08 Aug '18

08 Aug '18

From: Ajit Pandey <ajit.pandey(a)cirrus.com> The offset of the DSP core needs to be taken into account for the DSP preloader control get and put. Currently the dsp->preloaded variable will only ever be read/updated on the first DSP, whilst this doesn't affect the operation of the control the readback will be incorrect. Signed-off-by: Ajit Pandey <ajit.pandey(a)cirrus.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 3bc1bb5504a1..ae131376cea1 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -2665,7 +2665,10 @@ int wm_adsp2_preloader_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); - struct wm_adsp *dsp = snd_soc_component_get_drvdata(component); + struct wm_adsp *dsps = snd_soc_component_get_drvdata(component); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + struct wm_adsp *dsp = &dsps[mc->shift - 1]; ucontrol->value.integer.value[0] = dsp->preloaded; @@ -2677,10 +2680,11 @@ int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); - struct wm_adsp *dsp = snd_soc_component_get_drvdata(component); + struct wm_adsp *dsps = snd_soc_component_get_drvdata(component); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; + struct wm_adsp *dsp = &dsps[mc->shift - 1]; char preload[32]; snprintf(preload, ARRAY_SIZE(preload), "DSP%u Preload", mc->shift); -- 2.11.0

2 1

[alsa-devel] [PATCH] ASoC: max98373: Added software reset register to readable registers
by Ryan Lee 08 Aug '18

08 Aug '18

Signed-off-by: Ryan Lee <ryans.lee(a)maximintegrated.com> --- Changes : Added 'MAX98373_R2000_SW_RESET' register to 'max98373_readable_register' Software reset didn't work properly after suspend/resume. sound/soc/codecs/max98373.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index a925861..92b7125 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -488,6 +488,7 @@ static const DECLARE_TLV_DB_RANGE(max98373_bde_gain_tlv, static bool max98373_readable_register(struct device *dev, unsigned int reg) { switch (reg) { + case MAX98373_R2000_SW_RESET: case MAX98373_R2001_INT_RAW1 ... MAX98373_R200C_INT_EN3: case MAX98373_R2010_IRQ_CTRL: case MAX98373_R2014_THERM_WARN_THRESH -- 2.7.4

2 1

Re: [alsa-devel] A bug about cache inconsistency report
by Hans Hu(SH-RD) 08 Aug '18

08 Aug '18

> > > 1. noise relate test: > > > When I annotate the return after set_pages_array_wc, then > > > set_memory_wc works, noise disappear static void > > > __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, > > > bool > > > on) { ... > > > set_pages_array_wb(sgbuf->page_table, sgbuf->pages); //return; } > > > #endif > > > > > set_memory_uc() performs __pa() for the given address, and in this case, it's vmapped address. Something bogus in your test, I'm afraid. > > > > [Hans:] I know __pa() handle the vmapped address is wrong, that why I don't know how to fix the problem, I try this because I see kernel older than 3.7.6. [bogus? pretending to be real or genuine?] no no no, but the noise problem machine(8086:1c20) in another city, I will make sure it again. > > >I meant about the reliability of the test result. Or whether we're heading to a wrong fish. > >In anyway, which kernel version are you testing? And exactly what is your problem? Which machine, which hardware setup (codec, etc) and which output, and how is the sound backend (PulseAudio or direct ALSA write)? > > [Hans:] OS: Ubuntu 17.10 + 4.13.0-21-generic (or any one after 3.7.6). > HW: mother board is Dell 042P49, HDA controller is 8086:1c20, codec is cx20641. > Output and sound backend: Except the command below, anything other is default setting. > > Problem(what I have done and found): When system setup, I add "modprobe snd-had-intel.snoop=0" in grub, after setup, execute command "aplay -D plughw:0,0 44.1k_16b_2c.wav", then I hear music with noise. The reason cause this is the buffer address should been mark as WC type and the __mark_pages_wc was patched for this, but if define CONFIG_SND_DMA_SGBUF, the actual marked address is the address before vmapped(0xffff88*...*), however the address used in snd_pcm_lib_write_transfer() is the address after vmapped(0xffffc9*...*), so the mark didn't work and cache inconsistency occur(noise). >Well, basically the vmapped address isn't used *at all* on the HD-audio controller hardware. The SG buffer addresses are passed on BDL of the chip, but the vmapped address is used only in PCM core for some data manipulation. And this is purely software stuff, hence it shouldn't matter there whether it's in snoop mode or not. The snoop mode difference appears mainly when accessed via mmap from user-space directly to kernel-space. >That said, I guess your suspect heading to a wrong direction. [Hans:] So, am I misunderstand? Or snoop has two different meanings? As I know, In the hardware layer HDAC’s stream have two data transport path : non-snoop & snoop; In the software layer ALSA-Driver have two data transport path : mmap & not mmap(test shows, it is dependent on wav's format or mmap_flag in aplay.c). When hardware at non-snoop mode, without hardware module's help, software must mark the mem to WC type: when mmap used, the mark action happened at pcm_mmap_prepare(), the not-mmap mode's mark action happened at __mark_pages_wc(). And when at not-mmap mode, the vmapped address directly used in snd_pcm_lib_write_transfer() -> copy_from_user(). Yes, of course, this path combinations(non-snoop + not-mmap) unlikely be used in most music players. > > > And moreover, all Intel chipsets do work with snooping well, AFAIK. > > [Hans:] yes, all Intel chipsets do work with snooping well here too. And the problem case here is "non-snoop"+"aplay -D plughw:*.*"+"44.1k 16bit"+"8086:1c20", I will see if I can find more machine do the test. > >Ah, so you explicitly test with non-snoop mode for this chipset? > >For what purpose...? > > [Hans:] Yes, I've been testing a HDA controller recently(predecessor is VIA), it has the same problem. I want to figure out if it is hardware's problem or not. > > [Hans:] I did the same test on another platform(8086:A170), it do work with non-snoop well. In addition, I did such a change, oneliner, the purpose is to mark nothing, and it still do work with non-snoop well, this supposed to be right? > > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > #ifdef CONFIG_X86 > static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer > *dmab, bool on) { int pages; > +return; >This is essentially other way round; it skips the non-cache setup. > > > 2. change *_SG relate test: > > > Just followed your proposal > > > -snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, > > > +snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, > > > > >OK, you need one more oneliner: > > > > >diff --git a/sound/pci/hda/hda_controller.c > > >b/sound/pci/hda/hda_controller.c index a12e594d4e3b..2eaed4956e7f > > >100644 > > >--- a/sound/pci/hda/hda_controller.c > > >+++ b/sound/pci/hda/hda_controller.c > > >@@ -707,7 +707,7 @@ static const struct snd_pcm_ops azx_pcm_ops = { > > >.pointer = azx_pcm_pointer, > > >.get_time_info = azx_get_time_info, >.mmap = azx_pcm_mmap, > > >-.page = snd_pcm_sgbuf_ops_page, > > >+// .page = snd_pcm_sgbuf_ops_page, > > > }; > > > > > static void azx_pcm_free(struct snd_pcm *pcm) > > [Hans :] I did this, and the Oops report as the same. > > >My bad, there are other SG-buffer codes in sound/hda/*, too. > > >So scratch these two oneliners. The only thing you'd need is the big-hammer change (again oneliner :) > > >--- a/sound/core/Kconfig > >+++ b/sound/core/Kconfig > >@@ -181,7 +181,7 @@ config SND_VMASTER > >bool > > > > config SND_DMA_SGBUF > >-def_bool y > >+def_bool n > > depends on X86 > > > source "sound/core/seq/Kconfig" > > [Hans :] If this, All the platform are all right. >Then the next step would be to fake sg-buffer from this straight >buffer. Revert the above, and modify sgbuf.c to the following: >- Allocate a large continuous buffer >- Assign each page in this large buffer >If this still works, it's not about vmap, but it just means that the >physically ordered pages do matter -- implicitly showing that the >snooping behavior isn't properly turned on / off on the controller. To fake SG-buffer, I did this test: restore all the codes to the original, then added some codes in snd_malloc_sgbuf_pages() like below, the result is badly niose. ---a/sound/core/sgbuf.c +++b/sound/core/sgbuf.c void *snd_malloc_sgbuf_pages(struct device *device, size_t size, struct snd_dma_buffer *dmab, size_t *res_size) { struct snd_sg_buf *sgbuf; unsigned int i, pages, chunk, maxpages; struct snd_dma_buffer tmpb; struct snd_sg_page *table; struct page **pgtable; +size *= 2; /* expand the buffer two times */ dmab->area = NULL; dmab->addr = 0; ... ... if (chunk < maxpages) maxpages = chunk; } +for(i = 0; i < sgbuf->pages / 2; i ++) /* restore size to the original it wanted */ +sgbuf->page_table[i] = sgbuf->page_table[i * 2]; /* take a page every other page, just for test, ignore page release */ +size /= 2; +sgbuf->pages /= 2; sgbuf->size = size; dmab->area = vmap(sgbuf->page_table, sgbuf->pages, VM_MAP, PAGE_KERNEL); Thanks, Hans 保密声明：本邮件含有保密或专有信息，仅供指定收件人使用。严禁对本邮件或其内容做任何未经授权的查阅、使用、复制或转发。 CONFIDENTIAL NOTE: This email contains confidential or legally privileged information and is for the sole use of its intended recipient. Any unauthorized review, use, copying or forwarding of this email or the content of this email is strictly prohibited.

2 7

[alsa-devel] [PATCH 00/14] conf/ucm: bytcr-rt5651: Various improvements + long-name profiles addition
by Hans de Goede 08 Aug '18

08 Aug '18

Hi All, Here is a set of patches to the bytcr-rt5651 UCM profiles. This series also adds a bunch of long-name profiles so that users automatically only see the inputs / outputs which their device actually has. The long-names are based on the long-names set by the kernel after the rt5651 patch series which is currently queued in -next: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/log/?h=fo… With these UCM profile patches and the kernel changes in place all inputs and outputs as well as jack-detect will work 100% OOTB on supported bytcr-rt5651 devices, without the user needing to do any manual config or mixer settings. Regards, Hans

3 22

[alsa-devel] Spectre x360 fixing the top speakers (again)
by Alex G. 08 Aug '18

08 Aug '18

It's only been since 4.18-rc2 that the speaker issue on the x360 [1] was resolved. I didn't even know I had four speakers until seeing that bug report. My HP Spectre x360 (13-ae0xx) has the same issue as the original x360 with Bang speakers. The subsystem PCI ID is different [103c:83b9]. Of the two fixes developed in [1], only the mute led fix works when the PCI id is added to patch-realtek. If I try to add the full ALC295_FIXUP_HP_X360 fix, there's no audio coming out at all. One thing I tried was to boot W10 virtual machine and redirect the audio PCI device to the VM: 0:1f.3 Audio device: Intel Corporation Sunrise Point-LP HD Audio (rev 21) It all worked in the VM, but as soon as I shut it down and tried to play audio from linux, the top speakers still didn't work. The difference being that PAVUcontrol could see a "4.0 output" configuration. The same issue: audio sent to the bottom speakers was heard, but audio sent to the top speakers was not. Since I'm likely going to have to change _everything_ anyway, here's what I'm trying to achieve: 1) Make the top speakers great again. Whether they produce the same sound as the bottom speakers, or have their own audio channel, I don't care that much. 2) Be able to use the speakers when something is plugged in the headphone jack. Right now it's stupid. I try to plug in a microphone (with the proper TRRS jack), and the speakers die. I haven't seen this before. I was playing with HDA-Analyzer and was able to get speaker sounds with a dummy plugged in the jack, so I know it's possible. I don't remember how I did it, and it only worked once. 3) (optional) see if there's a way to use the jack as a line in or stereo mic in. I'm not sure where to start. Alex [1] https://bugzilla.kernel.org/show_bug.cgi?id=189331

3 3

[alsa-devel] [PATCH] ASoC: Intel: hdac_hdmi: Add sampling frequencies constraint
by Yong Zhi 07 Aug '18

07 Aug '18

Playback of 44.1Khz contents with HDMI plugged returns "Invalid pipe config". This patch adds rate constraint to allow user space SRC to do the converting. Signed-off-by: Yong Zhi <yong.zhi(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 7b8533abf637..b222a2e91463 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -288,6 +288,38 @@ static unsigned int sad_sample_bits_lpcm(const u8 *sad) return (sad[2] & 7); } +/** + * sad_sample_rates_lpcm - Find supported sampling frequencies + * + * @sad: pointer to CEA_SADs entry byte 2 which details sampling frequencies + * supported according to CEA-861 EDID V3. In little endian byte order. + * + * bit 7: Reserved (0) + * bit 6: 192kHz + * bit 5: 176kHz + * bit 4: 96kHz + * bit 3: 88kHz + * bit 2: 48kHz + * bit 1: 44kHz + * bit 0: 32kHz + * + * Return: bitmask of supported sampling frequencies. + */ +static u8 sad_sample_rates_lpcm(const u8 *sad) +{ + return (sad[1] & 0x7F); +} + +static const unsigned int cea_sampling_freqs[7] = { + SNDRV_PCM_RATE_32000, /* 0: 32000Hz */ + SNDRV_PCM_RATE_44100, /* 1: 44100Hz */ + SNDRV_PCM_RATE_48000, /* 2: 48000Hz */ + SNDRV_PCM_RATE_88200, /* 3: 88200Hz */ + SNDRV_PCM_RATE_96000, /* 4: 96000Hz */ + SNDRV_PCM_RATE_176400, /* 5: 176400Hz */ + SNDRV_PCM_RATE_192000, /* 6: 192000Hz */ +}; + static int hdac_hdmi_eld_limit_formats(struct snd_pcm_runtime *runtime, void *eld) { @@ -301,6 +333,8 @@ static int hdac_hdmi_eld_limit_formats(struct snd_pcm_runtime *runtime, for (i = drm_eld_sad_count(eld_buf); i > 0; i--, sad += 3) { if (sad_format(sad) == 1) { /* AUDIO_CODING_TYPE_LPCM */ + unsigned int rates = 0; + u8 sad_rates, j; /* * the controller support 20 and 24 bits in 32 bit @@ -308,6 +342,16 @@ static int hdac_hdmi_eld_limit_formats(struct snd_pcm_runtime *runtime, */ if (sad_sample_bits_lpcm(sad) & 0x6) formats |= SNDRV_PCM_FMTBIT_S32; + + sad_rates = sad_sample_rates_lpcm(sad); + /* Filter out 44.1, 88.2 and 176.4Khz */ + for (j = 0; j < 7; j += 2) + if (sad_rates & BIT(j)) + rates |= cea_sampling_freqs[j]; + + snd_pcm_hw_constraint_mask64(runtime, + SNDRV_PCM_HW_PARAM_RATE, + rates); } } -- 2.7.4

4 6

[alsa-devel] [PATCH] ASoC: rsnd: Document R-Car M3-N support
by Yoshihiro Kaneko 07 Aug '18

07 Aug '18

From: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Document support for the sound modules in the Renesas M3-N (r8a77965) SoC. No driver update is needed. Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Yoshihiro Kaneko <ykaneko0929(a)gmail.com> --- This patch is based on the devel branch of Simon Horman's renesas tree. Documentation/devicetree/bindings/sound/renesas,rsnd.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index b86d790..9e764270 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -352,6 +352,7 @@ Required properties: - "renesas,rcar_sound-r8a7794" (R-Car E2) - "renesas,rcar_sound-r8a7795" (R-Car H3) - "renesas,rcar_sound-r8a7796" (R-Car M3-W) + - "renesas,rcar_sound-r8a77965" (R-Car M3-N) - reg : Should contain the register physical address. required register is SRU/ADG/SSI if generation1 -- 1.9.1

4 3

[alsa-devel] [PATCH] ASoC: rt5677: Remove bogus device id from rt5677_of_match
by Matthias Kaehlcke 07 Aug '18

07 Aug '18

The initializer of rt5677_of_match contains a bogus device id (enum type) for the 'type' field (char []). Remove it. Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- sound/soc/codecs/rt5677.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 8a0181a2db08..7dab53b35cbf 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -5007,7 +5007,7 @@ static const struct regmap_config rt5677_regmap = { }; static const struct of_device_id rt5677_of_match[] = { - { .compatible = "realtek,rt5677", RT5677 }, + { .compatible = "realtek,rt5677", }, { } }; MODULE_DEVICE_TABLE(of, rt5677_of_match); -- 2.18.0.597.ga71716f1ad-goog

2 2