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

HDA codec problem
by Randy Dunlap 21 Aug '21

21 Aug '21

Hi, I am having problems getting audio working on my computer: 00:1f.3 Audio device: Intel Corporation Device f1c8 I did an internet search that said that I would need 5.13 or later to have support for this device. openSUSE 15.3 kernel 5.3.18-59.19-default says: snd_hda_codec_realtek hdaudioC0D0: autoconfig for ALC233: line_outs=1 (0x1b/0x0/0x0/0x0/0x0) type:line snd_hda_codec_realtek hdaudioC0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) snd_hda_codec_realtek hdaudioC0D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) snd_hda_codec_realtek hdaudioC0D0: mono: mono_out=0x0 snd_hda_codec_realtek hdaudioC0D0: inputs: snd_hda_codec_realtek hdaudioC0D0: Mic=0x1a snd_hda_codec_realtek hdaudioC0D0: Mic=0x19 but produces no sound output. Kernel 5.13.10 or 5.14-rc6 say: calling azx_driver_init+0x0/0x20 @ 1 snd_hda_intel 0000:00:1f.3: enabling device (0000 -> 0002) snd_hda_intel 0000:00:1f.3: bound 0000:00:02.0 (ops i915_audio_component_bind_ops) snd_hda_intel 0000:00:1f.3: azx_get_response timeout, switching to polling mode: last cmd=0x200f0000 snd_hda_intel 0000:00:1f.3: No response from codec, disabling MSI: last cmd=0x200f0000 snd_hda_intel 0000:00:1f.3: Codec #2 probe error; disabling it... snd_hda_intel 0000:00:1f.3: azx_get_response timeout, switching to single_cmd mode: last cmd=0x000f0001 hdaudio hdaudioC0D0: no AFG or MFG node found snd_hda_intel 0000:00:1f.3: no codecs initialized and of course no sound output. Anyone have suggestions or has a fix for this already been posted? or maybe I am just doing something wrong? thanks. -- ~Randy

2 5

[RESEND 1/3] ASoC: ics43432: add CMM-4030D-261 support
by Angelo Dureghello 21 Aug '21

21 Aug '21

Despite minimal datasheet differences, the driver seems perfectly compatible with CMM-4030D-261. Tested CMM-4030D-261 to work with this changes: / { cmm4030d: cmm4030d { #sound-dai-cells = <0>; compatible = "cui,cmm-4030d-261"; }; sound_mic { compatible = "simple-audio-card"; simple-audio-card,name = "i2s mem mic"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound_master>; simple-audio-card,frame-master = <&sound_master>; sound_master: simple-audio-card,cpu { sound-dai = <&ssi2>; system-clock-frequency = <2822400>; }; simple-audio-card,codec { sound-dai = <&cmm4030d>; }; }; }; Audio has been captured and tested successfully by: arecord -D "hw:1,0" -f S24_LE > test.wav aplay test.wav Signed-off-by: Angelo Dureghello <angelo.dureghello(a)timesys.com> --- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/ics43432.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index db16071205ba..cd1976aae328 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -847,7 +847,7 @@ config SND_SOC_HDAC_HDA select SND_HDA config SND_SOC_ICS43432 - tristate + tristate "ICS43423 and compatible i2s microphones" config SND_SOC_INNO_RK3036 tristate "Inno codec driver for RK3036 SoC" diff --git a/sound/soc/codecs/ics43432.c b/sound/soc/codecs/ics43432.c index 47e749f03940..de4c8460ab3d 100644 --- a/sound/soc/codecs/ics43432.c +++ b/sound/soc/codecs/ics43432.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * I2S MEMS microphone driver for InvenSense ICS-43432 + * I2S MEMS microphone driver for InvenSense ICS-43432 and similar + * MEMS-based microphones. * * - Non configurable. * - I2S interface, 64 BCLs per frame, 32 bits per channel, 24 bit data @@ -53,6 +54,7 @@ static int ics43432_probe(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id ics43432_ids[] = { { .compatible = "invensense,ics43432", }, + { .compatible = "cui,cmm-4030d-261", }, { } }; MODULE_DEVICE_TABLE(of, ics43432_ids); -- 2.32.0

1 2

(.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here
by GitHub issues - edited 20 Aug '21

20 Aug '21

alsa-project/alsa-lib issue #171 was edited from shoober420: Trying to compile alsa-lib from the latest two commits as of Aug 20th (https://github.com/alsa-project/alsa-lib/commit/868ecd509deb05938107faf6657…) (https://github.com/alsa-project/alsa-lib/commit/95eb312fade1908a2c944e9de46…), I get these errors during build. Im using Gentoo Linux with GCC 11.2 version. [buildalsalib.log](https://github.com/alsa-project/alsa-lib/files/7023522/bu… ``` (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: parser.o (symbol from plugin): in function `uc_mgr_config_load_file': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_cond.o (symbol from plugin): in function `uc_mgr_evaluate_condition': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_subs.o (symbol from plugin): in function `uc_mgr_get_substituted_value': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_include.o (symbol from plugin): in function `uc_mgr_config_tree_merge': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_regex.o (symbol from plugin): in function `uc_mgr_define_regex': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_exec.o (symbol from plugin): in function `uc_mgr_exec': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: main.o (symbol from plugin): in function `snd_use_case_identifier': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here collect2: error: ld returned 1 exit status make[2]: *** [Makefile:495: libasound.la] Error 1 make[2]: Leaving directory '/var/tmp/portage/media-libs/alsa-lib-9999/work/alsa-lib-9999-abi_x86_32.x86/src' make[1]: *** [Makefile:555: all-recursive] Error 1 make[1]: Leaving directory '/var/tmp/portage/media-libs/alsa-lib-9999/work/alsa-lib-9999-abi_x86_32.x86/src' make: *** [Makefile:407: all-recursive] Error 1 ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/171 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

(.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here
by GitHub issues - opened 20 Aug '21

20 Aug '21

alsa-project/alsa-lib issue #171 was opened from shoober420: Trying to compile alsa-lib from the latest two commits as of Aug 20th (https://github.com/alsa-project/alsa-lib/commit/868ecd509deb05938107faf6657…) (https://github.com/alsa-project/alsa-lib/commit/95eb312fade1908a2c944e9de46…), I get this error during build. Im using Gentoo Linux with GCC 11.2 version. [buildalsalib.log](https://github.com/alsa-project/alsa-lib/files/7023522/bu… ``` (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: parser.o (symbol from plugin): in function `uc_mgr_config_load_file': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_cond.o (symbol from plugin): in function `uc_mgr_evaluate_condition': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_subs.o (symbol from plugin): in function `uc_mgr_get_substituted_value': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_include.o (symbol from plugin): in function `uc_mgr_config_tree_merge': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_regex.o (symbol from plugin): in function `uc_mgr_define_regex': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: ucm_exec.o (symbol from plugin): in function `uc_mgr_exec': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: main.o (symbol from plugin): in function `snd_use_case_identifier': (.text+0x0): multiple definition of `__packed'; .libs/conf.o (symbol from plugin):(.text+0x0): first defined here collect2: error: ld returned 1 exit status make[2]: *** [Makefile:495: libasound.la] Error 1 make[2]: Leaving directory '/var/tmp/portage/media-libs/alsa-lib-9999/work/alsa-lib-9999-abi_x86_32.x86/src' make[1]: *** [Makefile:555: all-recursive] Error 1 make[1]: Leaving directory '/var/tmp/portage/media-libs/alsa-lib-9999/work/alsa-lib-9999-abi_x86_32.x86/src' make: *** [Makefile:407: all-recursive] Error 1 ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/171 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 0/5] ASoC: Intel/rt5640: Add support for HP Elite Pad 1000G2 jack-detect
by Hans de Goede 20 Aug '21

20 Aug '21

The HP Elitepad 1000 G2 tablet has 2 headset jacks: 1. on the dock which uses the output of the codecs built-in HP-amp + the standard IN2 input which is always used with the headset-jack. 2. on the tablet itself, this uses the line-out of the codec + an external HP-amp, which gets enabled by the ALC5642 codec's GPIO1 pin; and IN1 for the headset-mic. The codec's GPIO1 is also its only IRQ output pin, so this means that the codec's IRQ cannot be used on this tablet. Instead the jack-detect is connected directly to GPIOs on the main SoC. The dock has a helper chip which also detects if a headset-mic is present or not, so there are 2 GPIOs for the jack-detect status of the dock. The tablet jack uses a single GPIO which indicates if a jack is present or not. Differentiating between between headphones vs a headset on the tablet jack is done by using the usual mic-bias over-current-detection mechanism. Regards, Hans Hans de Goede (5): ASoC: rt5640: Move rt5640_disable_jack_detect() up in the rt5640.c file ASoC: rt5640: Delay requesting IRQ until the machine-drv calls set_jack ASoC: rt5640: Add optional hp_det_gpio parameter to rt5640_detect_headset() ASoC: rt5640: Add rt5640_set_ovcd_params() helper ASoC: Intel: bytcr_rt5640: Add support for HP Elite Pad 1000G2 jack-detect sound/soc/codecs/rt5640.c | 133 ++++++++++++----------- sound/soc/codecs/rt5640.h | 6 ++ sound/soc/intel/boards/bytcr_rt5640.c | 146 +++++++++++++++++++++++++- 3 files changed, 225 insertions(+), 60 deletions(-) -- 2.31.1

3 10

[PATCH] ASoC: rsnd: adg: clearly handle clock error / NULL case
by Kuninori Morimoto 20 Aug '21

20 Aug '21

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This driver is assuming that all adg->clk[i] is not NULL. Because of this prerequisites, for_each_rsnd_clk() is possible to work for all clk without checking NULL. In other words, all adg->clk[i] should not NULL. Some SoC might doesn't have clk_a/b/c/i. devm_clk_get() returns error in such case. This driver calls rsnd_adg_null_clk_get() and use null_clk instead of NULL in such cases. But devm_clk_get() might returns NULL even though such clocks exist, but it doesn't mean error (user deliberately chose to disable the feature). NULL clk itself is not error from clk point of view, but is error from this driver point of view because it is not assuming such case. But current code is using IS_ERR() which doesn't care NULL. This driver uses IS_ERR_OR_NULL() instead of IS_ERR() for clk check. And it uses ERR_CAST() to clarify null_clk error. One concern here is that it unconditionally uses null_clk if clk_a/b/c/i was error. It is correct if it doesn't exist, but is not correct if it returns error even though it exist. It needs to check "clock-names" from DT before calling devm_clk_get() to handling such case. But let's assume it is overkill so far. Link: https://lore.kernel.org/r/YMCmhfQUimHCSH/n@mwanda Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/adg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 0ebee1ed06a9..5f1e72edfee0 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -391,9 +391,9 @@ static struct clk *rsnd_adg_create_null_clk(struct rsnd_priv *priv, struct clk *clk; clk = clk_register_fixed_rate(dev, name, parent, 0, 0); - if (IS_ERR(clk)) { + if (IS_ERR_OR_NULL(clk)) { dev_err(dev, "create null clk error\n"); - return NULL; + return ERR_CAST(clk); } return clk; @@ -430,9 +430,9 @@ static int rsnd_adg_get_clkin(struct rsnd_priv *priv) for (i = 0; i < CLKMAX; i++) { clk = devm_clk_get(dev, clk_name[i]); - if (IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) clk = rsnd_adg_null_clk_get(priv); - if (IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) goto err; adg->clk[i] = clk; @@ -582,7 +582,7 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) if (!count) { clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT], parent_clk_name, 0, req_rate[0]); - if (IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) goto err; adg->clkout[CLKOUT] = clk; @@ -596,7 +596,7 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv) clk = clk_register_fixed_rate(dev, clkout_name[i], parent_clk_name, 0, req_rate[0]); - if (IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) goto err; adg->clkout[i] = clk; -- 2.25.1

2 1

[PATCH] ASoC: rsnd: core: make some arrays static const, makes object smaller
by Kuninori Morimoto 20 Aug '21

20 Aug '21

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Don't populate arrays on the stack but instead them static const. Makes the object code smaller by 48 bytes. Before: text data bss dec hex filename 20938 916 104 21958 55c6 ./sound/soc/sh/rcar/core.o After: text data bss dec hex filename 20890 916 104 21910 5596 ./sound/soc/sh/rcar/core.o gcc version 11.1.0) Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 5e382b5c9d45..978bd0406729 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -426,19 +426,19 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod) { - enum rsnd_mod_type playback_mods[] = { + static const enum rsnd_mod_type playback_mods[] = { RSND_MOD_SRC, RSND_MOD_CMD, RSND_MOD_SSIU, }; - enum rsnd_mod_type capture_mods[] = { + static const enum rsnd_mod_type capture_mods[] = { RSND_MOD_CMD, RSND_MOD_SRC, RSND_MOD_SSIU, }; struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); struct rsnd_mod *tmod = NULL; - enum rsnd_mod_type *mods = + const enum rsnd_mod_type *mods = rsnd_io_is_play(io) ? playback_mods : capture_mods; int i; -- 2.25.1

2 1

[PATCH v2 0/6] ASoC: Intel/rt5640: Add support for HP Elite Pad 1000G2 jack-detect
by Hans de Goede 20 Aug '21

20 Aug '21

Changes in v2: - Rebase on asoc/for-next - New patch: "ASoC: Intel: bytct_rt5640: Add a separate "Headset Mic 2" DAPM pin for the mic on the 2nd jack" - Addressed Pierre-Louis' comments about calling acpi_dev_add_driver_gpios() twice Original cover-letter: The HP Elitepad 1000 G2 tablet has 2 headset jacks: 1. on the dock which uses the output of the codecs built-in HP-amp + the standard IN2 input which is always used with the headset-jack. 2. on the tablet itself, this uses the line-out of the codec + an external HP-amp, which gets enabled by the ALC5642 codec's GPIO1 pin; and IN1 for the headset-mic. The codec's GPIO1 is also its only IRQ output pin, so this means that the codec's IRQ cannot be used on this tablet. Instead the jack-detect is connected directly to GPIOs on the main SoC. The dock has a helper chip which also detects if a headset-mic is present or not, so there are 2 GPIOs for the jack-detect status of the dock. The tablet jack uses a single GPIO which indicates if a jack is present or not. Differentiating between between headphones vs a headset on the tablet jack is done by using the usual mic-bias over-current-detection mechanism. Regards, Hans Hans de Goede (6): ASoC: rt5640: Move rt5640_disable_jack_detect() up in the rt5640.c file ASoC: rt5640: Delay requesting IRQ until the machine-drv calls set_jack ASoC: rt5640: Add optional hp_det_gpio parameter to rt5640_detect_headset() ASoC: rt5640: Add rt5640_set_ovcd_params() helper ASoC: Intel: bytct_rt5640: Add a separate "Headset Mic 2" DAPM pin for the mic on the 2nd jack ASoC: Intel: bytcr_rt5640: Add support for HP Elite Pad 1000G2 jack-detect sound/soc/codecs/rt5640.c | 136 ++++++++++++---------- sound/soc/codecs/rt5640.h | 6 + sound/soc/intel/boards/bytcr_rt5640.c | 158 +++++++++++++++++++++++++- 3 files changed, 234 insertions(+), 66 deletions(-) -- 2.31.1

4 9

[PATCH] ALSA: hda/realtek: Workaround for conflicting SSID on ASUS ROG Strix G17
by Takashi Iwai 20 Aug '21

20 Aug '21

ASUS ROG Strix G17 has the very same PCI and codec SSID (1043:103f) as ASUS TX300, and unfortunately, the existing quirk for TX300 is broken on ASUS ROG. Actually the device works without the quirk, so we'll need to clear the quirk before applying for this device. Since ASUS ROG has a different codec (ALC294 - while TX300 has ALC282), this patch adds a workaround for the device, just clearing the codec->fixup_id by checking the codec vendor_id. It's a bit ugly to add such a workaround there, but it seems to be the simplest way. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=214101 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7ad689f991e7..3d525b79b848 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9521,6 +9521,16 @@ static int patch_alc269(struct hda_codec *codec) snd_hda_pick_fixup(codec, alc269_fixup_models, alc269_fixup_tbl, alc269_fixups); + /* FIXME: both TX300 and ROG Strix G17 have the same SSID, and + * the quirk breaks the latter (bko#214101). + * Clear the wrong entry. + */ + if (codec->fixup_id == ALC282_FIXUP_ASUS_TX300 && + codec->core.vendor_id == 0x10ec0294) { + codec_dbg(codec, "Clear wrong fixup for ASUS ROG Strix G17\n"); + codec->fixup_id = HDA_FIXUP_ID_NOT_SET; + } + snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups, true); snd_hda_pick_pin_fixup(codec, alc269_fallback_pin_fixup_tbl, alc269_fixups, false); snd_hda_pick_fixup(codec, NULL, alc269_fixup_vendor_tbl, -- 2.26.2

1 0

[PATCH v3 0/2] alsa-lib patches for rawmidi framing
by David Henningsson 20 Aug '21

20 Aug '21

v3: Adjusted according to comments from tiwai David Henningsson (2): Add rawmidi framing API Add test for rawmidi framing API include/rawmidi.h | 38 +++++++++++++++++ include/sound/uapi/asound.h | 30 +++++++++++++- src/rawmidi/rawmidi.c | 83 +++++++++++++++++++++++++++++++++++++ src/rawmidi/rawmidi_hw.c | 2 + src/rawmidi/rawmidi_local.h | 2 + test/rawmidi.c | 65 ++++++++++++++++++++++++++--- 6 files changed, 212 insertions(+), 8 deletions(-) -- 2.25.1

2 3