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

[alsa-devel] [PATCH] ASoC: cs42xx8: Add reset gpio handling
by S.j. Wang 08 May '19

08 May '19

Handle the reset GPIO and reset the device in pm_runtime_resume Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/codecs/cs42xx8.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index ebb9e0cf8364..fc28e6d26c6d 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/module.h> #include <linux/of_device.h> +#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <sound/pcm_params.h> @@ -45,6 +46,7 @@ struct cs42xx8_priv { bool slave_mode; unsigned long sysclk; u32 tx_channels; + int gpio_reset; }; /* -127.5dB to 0dB with step of 0.5dB */ @@ -467,6 +469,17 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap) return -EINVAL; } + cs42xx8->gpio_reset = of_get_named_gpio(dev->of_node, "gpio-reset", 0); + if (gpio_is_valid(cs42xx8->gpio_reset)) { + ret = devm_gpio_request_one(dev, cs42xx8->gpio_reset, + GPIOF_OUT_INIT_LOW, "cs42xx8 reset"); + if (ret) { + dev_err(dev, "unable to get reset gpio\n"); + return ret; + } + gpio_set_value_cansleep(cs42xx8->gpio_reset, 1); + } + cs42xx8->clk = devm_clk_get(dev, "mclk"); if (IS_ERR(cs42xx8->clk)) { dev_err(dev, "failed to get the clock: %ld\n", @@ -547,6 +560,11 @@ static int cs42xx8_runtime_resume(struct device *dev) return ret; } + if (gpio_is_valid(cs42xx8->gpio_reset)) { + gpio_set_value_cansleep(cs42xx8->gpio_reset, 0); + gpio_set_value_cansleep(cs42xx8->gpio_reset, 1); + } + ret = regulator_bulk_enable(ARRAY_SIZE(cs42xx8->supplies), cs42xx8->supplies); if (ret) { @@ -559,6 +577,7 @@ static int cs42xx8_runtime_resume(struct device *dev) regcache_cache_only(cs42xx8->regmap, false); + regcache_mark_dirty(cs42xx8->regmap); ret = regcache_sync(cs42xx8->regmap); if (ret) { dev_err(dev, "failed to sync regmap: %d\n", ret); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: SOF: Propagate sof_get_ctrl_copy_params() error properly
by Takashi Iwai 08 May '19

08 May '19

This fixes a compile warning below by properly handling the error code from sof_get_ctrl_copy_params(): include/linux/kernel.h:843:43: warning: 'sparams.pl_size' may be used uninitialized in this function [-Wmaybe-uninitialized] sound/soc/sof/ipc.c:639:34: note: 'sparams.pl_size' was declared here The function returns an error before setting sparams.pl_size, so it'd assign an uninitialized value at a later point. Fixes: 53e0c72d98ba ("ASoC: SOF: Add support for IPC IO between DSP and Host") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/sof/ipc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c index ba1bb17a8d1e..f0b9d3c53f6f 100644 --- a/sound/soc/sof/ipc.c +++ b/sound/soc/sof/ipc.c @@ -567,7 +567,7 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, size_t offset = 0; size_t msg_bytes; size_t pl_size; - int err = 0; + int err; int i; /* allocate max ipc size because we have at least one */ @@ -576,9 +576,13 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, return -ENOMEM; if (send) - sof_get_ctrl_copy_params(cdata->type, cdata, partdata, sparams); + err = sof_get_ctrl_copy_params(cdata->type, cdata, partdata, + sparams); else - sof_get_ctrl_copy_params(cdata->type, partdata, cdata, sparams); + err = sof_get_ctrl_copy_params(cdata->type, partdata, cdata, + sparams); + if (err < 0) + return err; msg_bytes = sparams->msg_bytes; pl_size = sparams->pl_size; -- 2.16.4

3 3

[alsa-devel] [PATCH] ASoC: rt5677: Add component driver name
by Curtis Malainey 08 May '19

08 May '19

Add name to component driver so it is possible to lookup the component when needed. Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- sound/soc/codecs/rt5677.c | 7 ++++--- sound/soc/codecs/rt5677.h | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 6fc70e441458..44071c7a4670 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -4650,7 +4650,7 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset) } static const struct gpio_chip rt5677_template_chip = { - .label = "rt5677", + .label = RT5677_DRV_NAME, .owner = THIS_MODULE, .direction_output = rt5677_gpio_direction_out, .set = rt5677_gpio_set, @@ -4958,6 +4958,7 @@ static struct snd_soc_dai_driver rt5677_dai[] = { }; static const struct snd_soc_component_driver soc_component_dev_rt5677 = { + .name = RT5677_DRV_NAME, .probe = rt5677_probe, .remove = rt5677_remove, .suspend = rt5677_suspend, @@ -5079,7 +5080,7 @@ static struct regmap_irq rt5677_irqs[] = { }; static struct regmap_irq_chip rt5677_irq_chip = { - .name = "rt5677", + .name = RT5677_DRV_NAME, .irqs = rt5677_irqs, .num_irqs = ARRAY_SIZE(rt5677_irqs), @@ -5267,7 +5268,7 @@ static int rt5677_i2c_remove(struct i2c_client *i2c) static struct i2c_driver rt5677_i2c_driver = { .driver = { - .name = "rt5677", + .name = RT5677_DRV_NAME, .of_match_table = rt5677_of_match, .acpi_match_table = ACPI_PTR(rt5677_acpi_match), }, diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h index 183d92b03045..11a2ffceec3b 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -1674,6 +1674,8 @@ #define RT5677_FIRMWARE1 "rt5677_dsp_fw1.bin" #define RT5677_FIRMWARE2 "rt5677_dsp_fw2.bin" +#define RT5677_DRV_NAME "rt5677" + /* System Clock Source */ enum { RT5677_SCLK_S_MCLK, -- 2.21.0.1020.gf2820cf01a-goog

2 2

[alsa-devel] [PATCH V5] ASoC: fsl_esai: Fix missing break in switch statement
by S.j. Wang 08 May '19

08 May '19

case ESAI_HCKT_EXTAL and case ESAI_HCKR_EXTAL should be independent of each other, so replace fall-through with break. Fixes: 43d24e76b698 ("ASoC: fsl_esai: Add ESAI CPU DAI driver") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Acked-by: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: <stable(a)vger.kernel.org> --- Changes in v5 - remove new line after Fixes Changes in v4 - Add acked-by Changes in v3 - Update subject line and cc stable Changes in v2 - Fix "Fixes" tag sound/soc/fsl/fsl_esai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 3623aa9a6f2e..15202a637197 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -251,7 +251,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, break; case ESAI_HCKT_EXTAL: ecr |= ESAI_ECR_ETI; - /* fall through */ + break; case ESAI_HCKR_EXTAL: ecr |= ESAI_ECR_ERI; break; -- 1.9.1

3 2

[alsa-devel] [PATCH v4 0/3] Fix jack detection for Chromebook Pixel
by Fletcher Woodruff 08 May '19

08 May '19

Headphone/mic jack detection doesn't work on the Chromebook Pixel 2015. This patch changes the irq implementation to support polarity flipping and fixes the configuration code so that correct GPIO pins are read from ACPI. With this series, plugging and unplugging the headphone jack switches between headphones and speakers automatically, and headset microphones are also detected. v4: - Fix incorrect void* cast in rt5677_irq() v3: - Update commit message for patch 1/3 to clarify why we implement our own irq_chip. v2: - Split IRQ change into two patches: adding and fixing potential race - Change config reading code to try both DT and ACPI style names Ben Zhang (1): ASoC: rt5677: allow multiple interrupt sources Fletcher Woodruff (2): ASoC: rt5677: handle concurrent interrupts ASoC: rt5677: fall back to DT prop names on error sound/soc/codecs/rt5677.c | 346 ++++++++++++++++++++++++++------------ sound/soc/codecs/rt5677.h | 14 +- 2 files changed, 256 insertions(+), 104 deletions(-) -- 2.21.0.1020.gf2820cf01a-goog

3 6

[alsa-devel] cs4265 : alsactl store and "C data buffer" fails
by Matt Flax 08 May '19

08 May '19

Hi, When alsactl store is run with a cs4265 chip, the following error occurs (from https://github.com/Audio-Injector/Ultra/issues/25) : $ sudo alsactl store alsactl: get_control:256: Cannot read control '2,0,0,C Data Buffer,0': Input/output error Upon commenting out the C data buffer control it works : https://github.com/torvalds/linux/blob/master/sound/soc/codecs/cs4265.c#L163 Can you suggest a suitable method for fixing this bug ? thanks Matt

2 2

[alsa-devel] [PATCH] Headset fixup for System76 Gazelle (gaze14)
by Jeremy Soller 08 May '19

08 May '19

On the System76 Gazelle (gaze14), there is a headset microphone input attached to 0x1a that does not have a jack detect. In order to get it working, the pin configuration needs to be set correctly, and the ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC fixup needs to be applied. This is identical to the patch already applied for the System76 Darter Pro (darp5). Signed-off-by: Jeremy Soller <jeremy(a)system76.com> --- diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f5b510f119ed..4ea3affad617 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6931,6 +6931,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1558, 0x1325, "System76 Darter Pro (darp5)", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x8550, "System76 Gazelle (gaze14)", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS), SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE), SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),

2 2

[alsa-devel] Question: Selecting one codec from multiple codecs using rk3288_hdmi_analog driver
by Cheng-yi Chiang 08 May '19

08 May '19

Hi all, I am wondering whether it is possible to selectively play to one codec out of multiple codecs. There is a multiple codec usage in driver rk3288_hdmi_analog: https://github.com/torvalds/linux/blob/master/sound/soc/rockchip/rk3288_hdm… https://patchwork.kernel.org/patch/9554267/ I am not sure whether the driver supports playing to analog output or HDMI selectively one at a time ? I don't have a Firefly-RK3288 board to test that driver, but I have RK3288 veyron board. I followed the similar way like that driver does to support max98090 and HDMI on RK3288 veyron board. However, when I play to the device, it goes to both max98090 and HDMI codec. >From rk3288_hdmi_analog implementation, I failed to find out how to turn off HDMI codec when HDMI path is unwanted. The DAPM pin switch "HDMI" does not help since that even if DAPM path I2S Playback -> TX -> HDMI is turned off, the startup ops of HDMI codec is still called from soc_pcm_open path. Could someone please explain whether this is supported in the framework ? There seems to be two ways to achieve this One is to use TDM and select different channel for two codecs. The second is to add mixer controls and turn codec on/off to disable codec completely. But those requires changes on codec driver and the capability of TDM or mixer control on each codec. Maybe there should be a way to bypass startup ops of one of multiple codecs if it is unwanted ? Any help or suggestion is appreciated. Thanks!

1 0

[alsa-devel] [PATCH v1 0/2] ASoC: Intel: Add Cometlake PCI IDs
by Evan Green 07 May '19

07 May '19

This small series adds PCI IDs for Cometlake platforms, for a dazzling audio experience. Evan Green (2): ASoC: SOF: Add Comet Lake PCI ID ASoC: Intel: Skylake: Add Cometlake PCI IDs sound/soc/intel/Kconfig | 9 +++++++++ sound/soc/intel/skylake/skl-messages.c | 8 ++++++++ sound/soc/intel/skylake/skl.c | 5 +++++ sound/soc/sof/intel/Kconfig | 16 ++++++++++++++++ sound/soc/sof/sof-pci-dev.c | 4 ++++ 5 files changed, 42 insertions(+) -- 2.20.1

3 9

[alsa-devel] [PATCH] ALSA: hda/intel: add CometLake PCI IDs
by Pierre-Louis Bossart 07 May '19

07 May '19

Add PCI IDs for LP and H skews. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/pci/hda/hda_intel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 789308f54785..0741eae23f10 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2378,6 +2378,12 @@ static const struct pci_device_id azx_ids[] = { /* Cannonlake */ { PCI_DEVICE(0x8086, 0x9dc8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* CometLake-LP */ + { PCI_DEVICE(0x8086, 0x02C8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* CometLake-H */ + { PCI_DEVICE(0x8086, 0x06C8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Icelake */ { PCI_DEVICE(0x8086, 0x34c8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, -- 2.17.1

2 1