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

[PATCH] dt-bindings: sound: wlf,wm8903: Convert txt bindings to yaml
by David Heidelberg 28 Oct '21

28 Oct '21

Convert the Wolfson WM8903 Ultra-Low Power Stereo CODEC Device Tree binding documentation to json-schema. Signed-off-by: David Heidelberg <david(a)ixit.cz> --- .../devicetree/bindings/sound/wlf,wm8903.yaml | 116 ++++++++++++++++++ .../devicetree/bindings/sound/wm8903.txt | 82 ------------- 2 files changed, 116 insertions(+), 82 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8903.yaml delete mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt diff --git a/Documentation/devicetree/bindings/sound/wlf,wm8903.yaml b/Documentation/devicetree/bindings/sound/wlf,wm8903.yaml new file mode 100644 index 000000000000..afdcf9002b60 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/wlf,wm8903.yaml @@ -0,0 +1,116 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/sound/wlf,wm8903.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: WM8903 audio codec + +description: | + This device supports I2C only. + Pins on the device (for linking into audio routes): + * IN1L + * IN1R + * IN2L + * IN2R + * IN3L + * IN3R + * DMICDAT + * HPOUTL + * HPOUTR + * LINEOUTL + * LINEOUTR + * LOP + * LON + * ROP + * RON + * MICBIAS + +maintainers: + - Mark Brown <broonie(a)opensource.wolfsonmicro.com> + +properties: + compatible: + const: wlf,wm8903 + + reg: + maxItems: 1 + + gpio-controller: true + '#gpio-cells': + const: 2 + + interrupts: + maxItems: 1 + + micdet-cfg: + $ref: /schemas/types.yaml#/definitions/uint32 + default: 0 + description: Default register value for R6 (Mic Bias). + + micdet-delay: + $ref: /schemas/types.yaml#/definitions/uint32 + default: 100 + description: The debounce delay for microphone detection in mS. + + gpio-cfg: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: | + minItems: 5 + maxItems: 5 + A list of GPIO configuration register values. + If absent, no configuration of these registers is performed. + If any entry has the value 0xffffffff, that GPIO's + configuration will not be modified. + + AVDD-supply: + description: Analog power supply regulator on the AVDD pin. + + CPVDD-supply: + description: Charge pump supply regulator on the CPVDD pin. + + DBVDD-supply: + description: Digital buffer supply regulator for the DBVDD pin. + + DCVDD-supply: + description: Digital core supply regulator for the DCVDD pin. + + +required: + - compatible + - reg + - gpio-controller + - '#gpio-cells' + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + wm8903: codec@1a { + compatible = "wlf,wm8903"; + reg = <0x1a>; + interrupts = <347>; + + AVDD-supply = <&fooreg_a>; + CPVDD-supply = <&fooreg_b>; + DBVDD-supply = <&fooreg_c>; + DCVDD-supply = <&fooreg_d>; + + gpio-controller; + #gpio-cells = <2>; + + micdet-cfg = <0>; + micdet-delay = <100>; + gpio-cfg = < + 0x0600 /* DMIC_LR, output */ + 0x0680 /* DMIC_DAT, input */ + 0x0000 /* GPIO, output, low */ + 0x0200 /* Interrupt, output */ + 0x01a0 /* BCLK, input, active high */ + >; + }; + }; diff --git a/Documentation/devicetree/bindings/sound/wm8903.txt b/Documentation/devicetree/bindings/sound/wm8903.txt deleted file mode 100644 index 6371c2434afe..000000000000 --- a/Documentation/devicetree/bindings/sound/wm8903.txt +++ /dev/null @@ -1,82 +0,0 @@ -WM8903 audio CODEC - -This device supports I2C only. - -Required properties: - - - compatible : "wlf,wm8903" - - - reg : the I2C address of the device. - - - gpio-controller : Indicates this device is a GPIO controller. - - - #gpio-cells : Should be two. The first cell is the pin number and the - second cell is used to specify optional parameters (currently unused). - -Optional properties: - - - interrupts : The interrupt line the codec is connected to. - - - micdet-cfg : Default register value for R6 (Mic Bias). If absent, the - default is 0. - - - micdet-delay : The debounce delay for microphone detection in mS. If - absent, the default is 100. - - - gpio-cfg : A list of GPIO configuration register values. The list must - be 5 entries long. If absent, no configuration of these registers is - performed. If any entry has the value 0xffffffff, that GPIO's - configuration will not be modified. - - - AVDD-supply : Analog power supply regulator on the AVDD pin. - - - CPVDD-supply : Charge pump supply regulator on the CPVDD pin. - - - DBVDD-supply : Digital buffer supply regulator for the DBVDD pin. - - - DCVDD-supply : Digital core supply regulator for the DCVDD pin. - -Pins on the device (for linking into audio routes): - - * IN1L - * IN1R - * IN2L - * IN2R - * IN3L - * IN3R - * DMICDAT - * HPOUTL - * HPOUTR - * LINEOUTL - * LINEOUTR - * LOP - * LON - * ROP - * RON - * MICBIAS - -Example: - -wm8903: codec@1a { - compatible = "wlf,wm8903"; - reg = <0x1a>; - interrupts = < 347 >; - - AVDD-supply = <&fooreg_a>; - CPVDD-supply = <&fooreg_b>; - DBVDD-supply = <&fooreg_c>; - DCVDC-supply = <&fooreg_d>; - - gpio-controller; - #gpio-cells = <2>; - - micdet-cfg = <0>; - micdet-delay = <100>; - gpio-cfg = < - 0x0600 /* DMIC_LR, output */ - 0x0680 /* DMIC_DAT, input */ - 0x0000 /* GPIO, output, low */ - 0x0200 /* Interrupt, output */ - 0x01a0 /* BCLK, input, active high */ - >; -}; -- 2.33.0

1 0

[PATCH 1/2] alsaloop: Renamed field capt_pitch to ctl_pitch
by Pavel Hofman 28 Oct '21

28 Oct '21

Renaming capt_pitch to ctl_pitch to respect the naming style of snd_ctl_elem_value_t fields in loopback_handle. Also making the variable name suitable for planned support of playback pitch. Signed-off-by: Pavel Hofman <pavel.hofman(a)ivitera.com> --- alsaloop/alsaloop.h | 2 +- alsaloop/pcmjob.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/alsaloop/alsaloop.h b/alsaloop/alsaloop.h index 7a98ef3..a5539ef 100644 --- a/alsaloop/alsaloop.h +++ b/alsaloop/alsaloop.h @@ -122,7 +122,7 @@ struct loopback_handle { unsigned int ctl_pollfd_count; snd_ctl_elem_value_t *ctl_notify; snd_ctl_elem_value_t *ctl_rate_shift; - snd_ctl_elem_value_t *capt_pitch; + snd_ctl_elem_value_t *ctl_pitch; snd_ctl_elem_value_t *ctl_active; snd_ctl_elem_value_t *ctl_format; snd_ctl_elem_value_t *ctl_rate; diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c index 13fa595..7b47c40 100644 --- a/alsaloop/pcmjob.c +++ b/alsaloop/pcmjob.c @@ -1063,9 +1063,9 @@ static int set_rate_shift(struct loopback_handle *lhandle, double pitch) if (lhandle->ctl_rate_shift) { snd_ctl_elem_value_set_integer(lhandle->ctl_rate_shift, 0, pitch * 100000); err = snd_ctl_elem_write(lhandle->ctl, lhandle->ctl_rate_shift); - } else if (lhandle->capt_pitch) { - snd_ctl_elem_value_set_integer(lhandle->capt_pitch, 0, (1 / pitch) * 1000000); - err = snd_ctl_elem_write(lhandle->ctl, lhandle->capt_pitch); + } else if (lhandle->ctl_pitch) { + snd_ctl_elem_value_set_integer(lhandle->ctl_pitch, 0, (1 / pitch) * 1000000); + err = snd_ctl_elem_write(lhandle->ctl, lhandle->ctl_pitch); } else { return 0; } @@ -1252,7 +1252,7 @@ static int openctl(struct loopback_handle *lhandle, int device, int subdevice) openctl_elem(lhandle, device, subdevice, "PCM Rate Shift 100000", &lhandle->ctl_rate_shift); openctl_elem(lhandle, device, subdevice, "Capture Pitch 1000000", - &lhandle->capt_pitch); + &lhandle->ctl_pitch); set_rate_shift(lhandle, 1); openctl_elem(lhandle, device, subdevice, "PCM Slave Active", &lhandle->ctl_active); @@ -1338,9 +1338,9 @@ static int closeit(struct loopback_handle *lhandle) if (lhandle->ctl_rate_shift) snd_ctl_elem_value_free(lhandle->ctl_rate_shift); lhandle->ctl_rate_shift = NULL; - if (lhandle->capt_pitch) - snd_ctl_elem_value_free(lhandle->capt_pitch); - lhandle->capt_pitch = NULL; + if (lhandle->ctl_pitch) + snd_ctl_elem_value_free(lhandle->ctl_pitch); + lhandle->ctl_pitch = NULL; if (lhandle->ctl) err = snd_ctl_close(lhandle->ctl); lhandle->ctl = NULL; @@ -1386,7 +1386,7 @@ int pcmjob_init(struct loopback *loop) snprintf(id, sizeof(id), "%s/%s", loop->play->id, loop->capt->id); id[sizeof(id)-1] = '\0'; loop->id = strdup(id); - if (loop->sync == SYNC_TYPE_AUTO && (loop->capt->ctl_rate_shift || loop->capt->capt_pitch)) + if (loop->sync == SYNC_TYPE_AUTO && (loop->capt->ctl_rate_shift || loop->capt->ctl_pitch)) loop->sync = SYNC_TYPE_CAPTRATESHIFT; if (loop->sync == SYNC_TYPE_AUTO && loop->play->ctl_rate_shift) loop->sync = SYNC_TYPE_PLAYRATESHIFT; -- 2.25.1

2 2

[PATCH alsa-utils] alsactl: Add --quiet option to suppress alsa-lib error messages
by Takashi Iwai 28 Oct '21

28 Oct '21

alsactl prints error messages from alsa-lib as is, and it's rather annoying to see the error messages like alsactl[xxx]: alsa-lib parser.c:242:(error_node) UCM is not supported for this HDA model (HDA Intel PCH...) alsactl[xxx]: alsa-lib main.c:1405:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -6 that are recorded in the syslog at each boot. This patch adds --quiet (or -q) option to suppress those error messages from alsa-lib, and applies to the systemd services as default. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- alsactl/alsa-restore.service.in | 4 ++-- alsactl/alsa-state.service.in | 4 ++-- alsactl/alsactl.1 | 4 ++++ alsactl/alsactl.c | 5 +++++ alsactl/alsactl.h | 2 ++ alsactl/utils.c | 2 ++ 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 80fd5fd48203..06bc21c355de 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -11,5 +11,5 @@ ConditionPathExistsGlob=/dev/snd/control* [Service] Type=oneshot RemainAfterExit=true -ExecStart=-@sbindir@/alsactl restore -ExecStop=-@sbindir@/alsactl store +ExecStart=-@sbindir@/alsactl -q restore +ExecStop=-@sbindir@/alsactl -q store diff --git a/alsactl/alsa-state.service.in b/alsactl/alsa-state.service.in index 5a8fe5eeed7e..6b6e704ad8e5 100644 --- a/alsactl/alsa-state.service.in +++ b/alsactl/alsa-state.service.in @@ -9,5 +9,5 @@ ConditionPathExists=@daemonswitch@ [Service] Type=simple -ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon -ExecStop=-@sbindir@/alsactl -s kill save_and_quit +ExecStart=-@sbindir@/alsactl -q -s -n 19 -c rdaemon +ExecStop=-@sbindir@/alsactl -q -s kill save_and_quit diff --git a/alsactl/alsactl.1 b/alsactl/alsactl.1 index 8296663a7c2d..0a0b4597a137 100644 --- a/alsactl/alsactl.1 +++ b/alsactl/alsactl.1 @@ -94,6 +94,10 @@ Use debug mode: a bit more verbose. \fI\-v, \-\-version\fP Print alsactl version number. +.TP +\fI\-q, \-\-quiet\fP +Suppress error messages from alsa-lib. + .TP \fI\-f, \-\-file\fP Select the configuration file to use. The default is /var/lib/alsa/asound.state. diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c index 05738fb6b35f..e3bef2c69558 100644 --- a/alsactl/alsactl.c +++ b/alsactl/alsactl.c @@ -52,6 +52,7 @@ int use_syslog = 0; char *command; char *statefile = NULL; char *lockfile = SYS_LOCKFILE; +int verbose_error = 1; #define TITLE 0x0100 #define HEADER 0x0200 @@ -74,6 +75,7 @@ static struct arg args[] = { { 'h', "help", "this help" }, { 'd', "debug", "debug mode" }, { 'v', "version", "print version of this program" }, +{ 'q', "quiet", "suppress errors from alsa-lib" }, { HEADER, NULL, "Available state options:" }, { FILEARG | 'f', "file", "configuration file (default " SYS_ASOUNDRC ")" }, { FILEARG | 'a', "config-dir", "boot / hotplug configuration directory (default " SYS_ASOUND_DIR ")" }, @@ -370,6 +372,9 @@ int main(int argc, char *argv[]) printf("alsactl version " SND_UTIL_VERSION_STR "\n"); res = EXIT_SUCCESS; goto out; + case 'q': + verbose_error = 0; + break; case '?': // error msg already printed help(); res = EXIT_FAILURE; diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h index bbdf6c88baeb..f9c25931c924 100644 --- a/alsactl/alsactl.h +++ b/alsactl/alsactl.h @@ -83,3 +83,5 @@ static inline int hextodigit(int c) } #define ARRAY_SIZE(a) (sizeof (a) / sizeof (a)[0]) + +extern int verbose_error; diff --git a/alsactl/utils.c b/alsactl/utils.c index a50797259f21..dfb06e1a4a15 100644 --- a/alsactl/utils.c +++ b/alsactl/utils.c @@ -182,6 +182,8 @@ void error_handler(const char *file, int line, const char *function, int err, co char buf[2048]; va_list arg; + if (!verbose_error) + return; va_start(arg, fmt); vsnprintf(buf, sizeof(buf), fmt, arg); va_end(arg); -- 2.31.1

2 3

[PATCH 0/3] Make genaral and simple for new sof machine driver
by David Lin 28 Oct '21

28 Oct '21

The series of features will make general and simple for new sof machine driver. David Lin (3): ASoC: nau8825: add set_jack coponment support ASoC: nau8825: add disable jack detection support ASoC: nau8825: add clock management for power saving sound/soc/codecs/nau8825.c | 49 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-)

4 8

[PATCH] ALSA: hda/realtek: Add a quirk for HP OMEN 15 mute LED
by Takashi Iwai 28 Oct '21

28 Oct '21

HP OMEN 15 laptop requires the quirk to fiddle with COEF 0x0b bit 2 for toggling the mute LED. It's already implemented for other HP laptops, and we just need to add a proper fixup entry. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=214735 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e82d756ab850..6322fac9e694 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8634,6 +8634,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { ALC285_FIXUP_HP_GPIO_AMP_INIT), SND_PCI_QUIRK(0x103c, 0x8783, "HP ZBook Fury 15 G7 Mobile Workstation", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x87e7, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED), -- 2.31.1

1 0

[PATCH v4 0/3] Update SoundWire RX and TX cgcr register control
by Srinivasa Rao Mandadapu 28 Oct '21

28 Oct '21

This patch series is to add v1.6.0 compatable name for qcom soundwire driver and to update soundwire RX and TX cgcr register control. Changes Since V3: -- Add v1.6.0 compatable name and soundwire data structure. -- Change macro define name properly. -- Update bindings for new property. -- Change commit message description. -- Change signedoff by sequence. Changes since v2: -- Update error check after ioremap. Changes since v1: -- Add const name to mask value. Srinivasa Rao Mandadapu (3): ASoC: qcom: soundwire: Disable soundwire rxtx cgcr hardware control dt-bindings: soundwire: qcom: Add bindings for RX and TX cgcr register control soundwire: qcom: Add compatible name for v1.6.0 .../devicetree/bindings/soundwire/qcom,sdw.txt | 9 +++++++++ drivers/soundwire/qcom.c | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+) -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

3 7

[PATCH] ASoC: amd: acp: fix Kconfig dependencies
by Arnd Bergmann 27 Oct '21

27 Oct '21

From: Arnd Bergmann <arnd(a)arndb.de> The CONFIG_SND_SOC_AMD_MACH_COMMON has some dependencies that are not checked by the symbols that select it: WARNING: unmet direct dependencies detected for SND_SOC_AMD_MACH_COMMON Depends on [n]: SOUND [=y] && !UML && SND [=m] && SND_SOC [=m] && X86 && PCI [=y] && I2C [=n] Selected by [m]: - SND_SOC_AMD_LEGACY_MACH [=m] && SOUND [=y] && !UML && SND [=m] && SND_SOC [=m] - SND_SOC_AMD_SOF_MACH [=m] && SOUND [=y] && !UML && SND [=m] && SND_SOC [=m] WARNING: unmet direct dependencies detected for SND_SOC_AMD_MACH_COMMON Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && X86 && PCI [=n] && I2C [=m] Selected by [m]: - SND_SOC_AMD_LEGACY_MACH [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] Make this more consistent by adding the same checks everywhere. Fixes: 9d8a7be88b33 ("ASoC: amd: acp: Add legacy sound card support for Chrome audio") Fixes: 9f84940f5004 ("ASoC: amd: acp: Add SOF audio support on Chrome board") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/amd/acp/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index 98ec18791d35..737135357ee2 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -28,24 +28,26 @@ config SND_AMD_ASOC_RENOIR config SND_SOC_AMD_MACH_COMMON tristate + depends on X86 && PCI && I2C select CLK_FIXED_FCH select SND_SOC_RT5682_I2C select SND_SOC_DMIC select SND_SOC_RT1019 select SND_SOC_MAX98357A select SND_SOC_RT5682S - depends on X86 && PCI && I2C help This option enables common Machine driver module for ACP. config SND_SOC_AMD_LEGACY_MACH tristate "AMD Legacy Machine Driver Support" + depends on X86 && PCI && I2C select SND_SOC_AMD_MACH_COMMON help This option enables legacy sound card support for ACP audio. config SND_SOC_AMD_SOF_MACH tristate "AMD SOF Machine Driver Support" + depends on X86 && PCI && I2C select SND_SOC_AMD_MACH_COMMON help This option enables SOF sound card support for ACP audio. -- 2.29.2

2 1

[PATCH v2 1/1] ASoC: meson: t9015: Add missing AVDD-supply property
by Alexander Stein 27 Oct '21

27 Oct '21

Fixes the schema check warning "audio-controller@32000: 'AVDD-supply' do not match any of the regexes: 'pinctrl-[0-9]+'" Fixes: 5c36abcd2621 ("ASoC: meson: add t9015 internal codec binding documentation") Reviewed-by: Jerome Brunet <jbrunet(a)baylibre.com> Signed-off-by: Alexander Stein <alexander.stein(a)mailbox.org> --- Thanks all for their review. Here is v2 with the following changes: v2: * Separated from other meson DT patches (2/4 - 4/4) * Adjusted recipients * Added missing property in example * Adjusted commit message subject * Added Reviewed-by: Jerome Brunet tag Documentation/devicetree/bindings/sound/amlogic,t9015.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml index c7613ea728d4..db7b04da0b39 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml @@ -34,6 +34,10 @@ properties: resets: maxItems: 1 + AVDD-supply: + description: + Analogue power supply. + required: - "#sound-dai-cells" - compatible @@ -41,6 +45,7 @@ required: - clocks - clock-names - resets + - AVDD-supply additionalProperties: false @@ -56,4 +61,5 @@ examples: clocks = <&clkc CLKID_AUDIO_CODEC>; clock-names = "pclk"; resets = <&reset RESET_AUDIO_CODEC>; + AVDD-supply = <&vddao_1v8>; }; -- 2.33.1

2 1

[PATCH] ASoC: Intel: soc-acpi: add entry for ESSX8336 on JSL
by Bard Liao 27 Oct '21

27 Oct '21

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> We have configurations for this codec on APL, GLK and TGL, somehow the information that some designs rely on JasperLake was not shared. BugLink: https://github.com/thesofproject/linux/issues/3210 Fixes: 790049fb6623 ('ASoC: Intel: soc-acpi: apl/glk/tgl: add entry for devices based on ES8336 codec') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c index 20fd9dcc74af..e7d22e397299 100644 --- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c @@ -105,6 +105,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { .quirk_data = &mx98360a_spk, .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg", }, + { + .id = "ESSX8336", + .drv_name = "sof-essx8336", + .sof_fw_filename = "sof-jsl.ri", + .sof_tplg_filename = "sof-jsl-es8336.tplg", + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_jsl_machines); -- 2.17.1

2 1

[RESEND,v6 1/2] ASoC: dt-bindings: max98520: add initial bindings
by George Song 27 Oct '21

27 Oct '21

add initial bindings for max98520 audio amplifier Signed-off-by: George Song <george.song(a)maximintegrated.com> Reviewed-by: Rob Herring <robh(a)kernel.org> --- .../bindings/sound/maxim,max98520.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98520.yaml diff --git a/Documentation/devicetree/bindings/sound/maxim,max98520.yaml b/Documentation/devicetree/bindings/sound/maxim,max98520.yaml new file mode 100644 index 000000000000..b6509cb2c8e0 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/maxim,max98520.yaml @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/maxim,max98520.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim Integrated MAX98520 Speaker Amplifier Driver + +maintainers: + - George Song <george.song(a)maximintegrated.com> + +properties: + compatible: + const: maxim,max98520 + + reg: + maxItems: 1 + description: I2C address of the device. + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + max98520: amplifier@38 { + compatible = "maxim,max98520"; + reg = <0x38>; + }; + }; + -- 2.25.1

2 2