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

[alsa-devel] [PATCH] ALSA: pcm: Enable MMAP status and control for ARMv7 and ARMv8
by twischer＠de.adit-jv.com 10 Jul '19

10 Jul '19

From: Timo Wischer <twischer(a)de.adit-jv.com> Since ARMv7 hardware cache coherence is supported. "The SCU maintains coherency between the individual data caches in the Cortex-A5 MPCore processor using a variation of the MOESI protocol" [1]. Therefore this patch enables the MMAP access to the status and control structures. This avoids HWSYYNC ioctl calls and therefore lowers the CPU usage. [1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0434c/ BABJECBF.html Signed-off-by: Timo Wischer <twischer(a)de.adit-jv.com> --- sound/core/pcm_native.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 1d84529..b8019ef 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3225,7 +3225,8 @@ static __poll_t snd_pcm_poll(struct file *file, poll_table *wait) * Only on coherent architectures, we can mmap the status and the control records * for effcient data transfer. On others, we have to use HWSYNC ioctl... */ -#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA) +#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA) || \ + (defined(CONFIG_ARM) && defined(CONFIG_CPU_V7)) || defined(CONFIG_ARM64) /* * mmap status record */ -- 2.7.4

3 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] ASoC: Intel: Skylake: Recover BXT FW on DSP boot timeout error
by Pawel Harlozinski 08 Jul '19

08 Jul '19

When DSP boots with timeout error, reinitialize, transfer and boot firmware to recover audio. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek(a)intel.com> --- sound/soc/intel/skylake/bxt-sst.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 440bca7afbf1..a2844bdca1b8 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -455,13 +455,18 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id) /* If core 1 was turned on for booting core 0, turn it off */ skl_dsp_core_power_down(ctx, SKL_DSP_CORE_MASK(1)); if (ret == 0) { - dev_err(ctx->dev, "%s: DSP boot timeout\n", __func__); - dev_err(ctx->dev, "Error code=0x%x: FW status=0x%x\n", + dev_warn(ctx->dev, + "DSP boot timeout: Error code=0x%x: FW status=0x%x\n", sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE), sst_dsp_shim_read(ctx, BXT_ADSP_FW_STATUS)); - dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); - ret = -EIO; - goto err; + + ret = bxt_sst_init_fw(skl->dev, skl); + dev_warn(ctx->dev, "Reload fw status: %d\n", ret); + if (ret < 0) { + dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); + ret = -EIO; + goto err; + } } } -- 2.17.1

3 2

[alsa-devel] [v3] ASoC: max98357a: avoid speaker pop when playback startup
by mac.chiang＠intel.com 04 Jul '19

04 Jul '19

From: Mac Chiang <mac.chiang(a)intel.com> Loud speaker pop happens during playback even when in slience playback. Specify Max98357a amp delay times to make sure clocks are always earlier than sdmode on. Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> --- Changelog: v3: - rebase to branch for-next v2: - added device_property_read_u32() func --- --- .../devicetree/bindings/sound/max98357a.txt | 4 ++ sound/soc/codecs/max98357a.c | 55 ++++++++++++++++++---- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/max98357a.txt b/Documentation/devicetree/bindings/sound/max98357a.txt index 28645a2..4bce14c 100644 --- a/Documentation/devicetree/bindings/sound/max98357a.txt +++ b/Documentation/devicetree/bindings/sound/max98357a.txt @@ -9,6 +9,10 @@ Optional properties: - sdmode-gpios : GPIO specifier for the chip's SD_MODE pin. If this option is not specified then driver does not manage the pin state (e.g. chip is always on). +- sdmode-delay : specify delay time for SD_MODE pin. + If this option is specified, which means it's required i2s clocks + ready before SD_MODE is unmuted in order to avoid the speaker pop noise. + It's observed that 5ms is sufficient. Example: diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index 6f724c9..6f0e28f 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -19,24 +19,42 @@ #include <sound/soc-dai.h> #include <sound/soc-dapm.h> +struct max98357a_priv { + struct delayed_work enable_sdmode_work; + struct gpio_desc *sdmode; + unsigned int sdmode_delay; +}; + +static void max98357a_enable_sdmode_work(struct work_struct *work) +{ + struct max98357a_priv *max98357a = + container_of(work, struct max98357a_priv, + enable_sdmode_work.work); + + gpiod_set_value(max98357a->sdmode, 1); +} + static int max98357a_daiops_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct gpio_desc *sdmode = snd_soc_dai_get_drvdata(dai); + struct max98357a_priv *max98357a = snd_soc_dai_get_drvdata(dai); - if (!sdmode) + if (!max98357a->sdmode) return 0; switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - gpiod_set_value(sdmode, 1); + queue_delayed_work(system_power_efficient_wq, + &max98357a->enable_sdmode_work, + msecs_to_jiffies(max98357a->sdmode_delay)); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - gpiod_set_value(sdmode, 0); + cancel_delayed_work_sync(&max98357a->enable_sdmode_work); + gpiod_set_value(max98357a->sdmode, 0); break; } @@ -90,14 +108,33 @@ static struct snd_soc_dai_driver max98357a_dai_driver = { static int max98357a_platform_probe(struct platform_device *pdev) { - struct gpio_desc *sdmode; + struct max98357a_priv *max98357a; + int ret; - sdmode = devm_gpiod_get_optional(&pdev->dev, + max98357a = devm_kzalloc(&pdev->dev, sizeof(*max98357a), GFP_KERNEL); + + if (!max98357a) + return -ENOMEM; + + max98357a->sdmode = devm_gpiod_get_optional(&pdev->dev, "sdmode", GPIOD_OUT_LOW); - if (IS_ERR(sdmode)) - return PTR_ERR(sdmode); - dev_set_drvdata(&pdev->dev, sdmode); + if (IS_ERR(max98357a->sdmode)) + return PTR_ERR(max98357a->sdmode); + + ret = device_property_read_u32(&pdev->dev, "sdmode-delay", + &max98357a->sdmode_delay); + + if (ret) { + max98357a->sdmode_delay = 0; + dev_dbg(&pdev->dev, + "no optional property 'sdmode-delay' found, default: no delay\n"); + } + + dev_set_drvdata(&pdev->dev, max98357a); + + INIT_DELAYED_WORK(&max98357a->enable_sdmode_work, + max98357a_enable_sdmode_work); return devm_snd_soc_register_component(&pdev->dev, &max98357a_component_driver, -- 2.7.4

2 1

[alsa-devel] [PATCH] sound/soc/codecs/tas5720.c: add ACPI support
by Nikolaus Voss 04 Jul '19

04 Jul '19

Add support for ACPI enumeration for tas5720 and tas5722. Use device_match API to unify access to driver data for DT and ACPI. Aggregate variant stuff into its own struct and directly reference it in variant data for i2c/of/acpi_device_id. Signed-off-by: Nikolaus Voss <nikolaus.voss(a)loewensteinmedical.de> --- sound/soc/codecs/tas5720.c | 215 +++++++++++++++++-------------------- 1 file changed, 99 insertions(+), 116 deletions(-) diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c index 37fab8f22800..ea973764c745 100644 --- a/sound/soc/codecs/tas5720.c +++ b/sound/soc/codecs/tas5720.c @@ -7,6 +7,7 @@ * Author: Andreas Dannenberg <dannenberg(a)ti.com> */ +#include <linux/acpi.h> #include <linux/module.h> #include <linux/errno.h> #include <linux/device.h> @@ -28,9 +29,10 @@ /* Define how often to check (and clear) the fault status register (in ms) */ #define TAS5720_FAULT_CHECK_INTERVAL 200 -enum tas572x_type { - TAS5720, - TAS5722, +struct tas5720_variant { + const int device_id; + const struct regmap_config reg_config; + const struct snd_soc_component_driver comp_drv; }; static const char * const tas5720_supply_names[] = { @@ -44,7 +46,7 @@ struct tas5720_data { struct snd_soc_component *component; struct regmap *regmap; struct i2c_client *tas5720_client; - enum tas572x_type devtype; + const struct tas5720_variant *variant; struct regulator_bulk_data supplies[TAS5720_NUM_SUPPLIES]; struct delayed_work fault_check_work; unsigned int last_fault; @@ -179,17 +181,13 @@ static int tas5720_set_dai_tdm_slot(struct snd_soc_dai *dai, goto error_snd_soc_component_update_bits; /* Configure TDM slot width. This is only applicable to TAS5722. */ - switch (tas5720->devtype) { - case TAS5722: + if (tas5720->variant->device_id == TAS5722_DEVICE_ID) { ret = snd_soc_component_update_bits(component, TAS5722_DIGITAL_CTRL2_REG, TAS5722_TDM_SLOT_16B, slot_width == 16 ? TAS5722_TDM_SLOT_16B : 0); if (ret < 0) goto error_snd_soc_component_update_bits; - break; - default: - break; } return 0; @@ -277,7 +275,7 @@ static void tas5720_fault_check_work(struct work_struct *work) static int tas5720_codec_probe(struct snd_soc_component *component) { struct tas5720_data *tas5720 = snd_soc_component_get_drvdata(component); - unsigned int device_id, expected_device_id; + unsigned int device_id; int ret; tas5720->component = component; @@ -301,21 +299,9 @@ static int tas5720_codec_probe(struct snd_soc_component *component) goto probe_fail; } - switch (tas5720->devtype) { - case TAS5720: - expected_device_id = TAS5720_DEVICE_ID; - break; - case TAS5722: - expected_device_id = TAS5722_DEVICE_ID; - break; - default: - dev_err(component->dev, "unexpected private driver data\n"); - return -EINVAL; - } - - if (device_id != expected_device_id) + if (device_id != tas5720->variant->device_id) dev_warn(component->dev, "wrong device ID. expected: %u read: %u\n", - expected_device_id, device_id); + tas5720->variant->device_id, device_id); /* Set device to mute */ ret = snd_soc_component_update_bits(component, TAS5720_DIGITAL_CTRL2_REG, @@ -462,24 +448,6 @@ static bool tas5720_is_volatile_reg(struct device *dev, unsigned int reg) } } -static const struct regmap_config tas5720_regmap_config = { - .reg_bits = 8, - .val_bits = 8, - - .max_register = TAS5720_MAX_REG, - .cache_type = REGCACHE_RBTREE, - .volatile_reg = tas5720_is_volatile_reg, -}; - -static const struct regmap_config tas5722_regmap_config = { - .reg_bits = 8, - .val_bits = 8, - - .max_register = TAS5722_MAX_REG, - .cache_type = REGCACHE_RBTREE, - .volatile_reg = tas5720_is_volatile_reg, -}; - /* * DAC analog gain. There are four discrete values to select from, ranging * from 19.2 dB to 26.3dB. @@ -558,40 +526,6 @@ static const struct snd_soc_dapm_route tas5720_audio_map[] = { { "OUT", NULL, "DAC" }, }; -static const struct snd_soc_component_driver soc_component_dev_tas5720 = { - .probe = tas5720_codec_probe, - .remove = tas5720_codec_remove, - .suspend = tas5720_suspend, - .resume = tas5720_resume, - .controls = tas5720_snd_controls, - .num_controls = ARRAY_SIZE(tas5720_snd_controls), - .dapm_widgets = tas5720_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(tas5720_dapm_widgets), - .dapm_routes = tas5720_audio_map, - .num_dapm_routes = ARRAY_SIZE(tas5720_audio_map), - .idle_bias_on = 1, - .use_pmdown_time = 1, - .endianness = 1, - .non_legacy_dai_naming = 1, -}; - -static const struct snd_soc_component_driver soc_component_dev_tas5722 = { - .probe = tas5720_codec_probe, - .remove = tas5720_codec_remove, - .suspend = tas5720_suspend, - .resume = tas5720_resume, - .controls = tas5722_snd_controls, - .num_controls = ARRAY_SIZE(tas5722_snd_controls), - .dapm_widgets = tas5720_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(tas5720_dapm_widgets), - .dapm_routes = tas5720_audio_map, - .num_dapm_routes = ARRAY_SIZE(tas5720_audio_map), - .idle_bias_on = 1, - .use_pmdown_time = 1, - .endianness = 1, - .non_legacy_dai_naming = 1, -}; - /* PCM rates supported by the TAS5720 driver */ #define TAS5720_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) @@ -637,29 +571,25 @@ static int tas5720_probe(struct i2c_client *client, { struct device *dev = &client->dev; struct tas5720_data *data; - const struct regmap_config *regmap_config; + const struct tas5720_variant *type; int ret; int i; + type = device_get_match_data(&client->dev); + if (!type && id) + type = (const struct tas5720_variant *)id->driver_data; + + if (!type) + return -EINVAL; + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; data->tas5720_client = client; - data->devtype = id->driver_data; + data->variant = type; - switch (id->driver_data) { - case TAS5720: - regmap_config = &tas5720_regmap_config; - break; - case TAS5722: - regmap_config = &tas5722_regmap_config; - break; - default: - dev_err(dev, "unexpected private driver data\n"); - return -EINVAL; - } - data->regmap = devm_regmap_init_i2c(client, regmap_config); + data->regmap = devm_regmap_init_i2c(client, &type->reg_config); if (IS_ERR(data->regmap)) { ret = PTR_ERR(data->regmap); dev_err(dev, "failed to allocate register map: %d\n", ret); @@ -678,51 +608,104 @@ static int tas5720_probe(struct i2c_client *client, dev_set_drvdata(dev, data); - switch (id->driver_data) { - case TAS5720: - ret = devm_snd_soc_register_component(&client->dev, - &soc_component_dev_tas5720, - tas5720_dai, - ARRAY_SIZE(tas5720_dai)); - break; - case TAS5722: - ret = devm_snd_soc_register_component(&client->dev, - &soc_component_dev_tas5722, - tas5720_dai, - ARRAY_SIZE(tas5720_dai)); - break; - default: - dev_err(dev, "unexpected private driver data\n"); - return -EINVAL; - } - if (ret < 0) { - dev_err(dev, "failed to register component: %d\n", ret); - return ret; - } + ret = devm_snd_soc_register_component(&client->dev, + &type->comp_drv, + tas5720_dai, + ARRAY_SIZE(tas5720_dai)); - return 0; + if (ret < 0) + dev_err(dev, "failed to register component: %d\n", ret); + + return ret; } +static const struct tas5720_variant variant[] = { + { + .device_id = TAS5720_DEVICE_ID, + .reg_config = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = TAS5720_MAX_REG, + .cache_type = REGCACHE_RBTREE, + .volatile_reg = tas5720_is_volatile_reg, + }, + .comp_drv = { + .probe = tas5720_codec_probe, + .remove = tas5720_codec_remove, + .suspend = tas5720_suspend, + .resume = tas5720_resume, + .controls = tas5720_snd_controls, + .num_controls = ARRAY_SIZE(tas5720_snd_controls), + .dapm_widgets = tas5720_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tas5720_dapm_widgets), + .dapm_routes = tas5720_audio_map, + .num_dapm_routes = ARRAY_SIZE(tas5720_audio_map), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1 + }, + }, + { + .device_id = TAS5722_DEVICE_ID, + .reg_config = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = TAS5722_MAX_REG, + .cache_type = REGCACHE_RBTREE, + .volatile_reg = tas5720_is_volatile_reg, + }, + .comp_drv = { + .probe = tas5720_codec_probe, + .remove = tas5720_codec_remove, + .suspend = tas5720_suspend, + .resume = tas5720_resume, + .controls = tas5722_snd_controls, + .num_controls = ARRAY_SIZE(tas5722_snd_controls), + .dapm_widgets = tas5720_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tas5720_dapm_widgets), + .dapm_routes = tas5720_audio_map, + .num_dapm_routes = ARRAY_SIZE(tas5720_audio_map), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, + }, + }, +}; + static const struct i2c_device_id tas5720_id[] = { - { "tas5720", TAS5720 }, - { "tas5722", TAS5722 }, + { "tas5720", (kernel_ulong_t)&variant[0] }, + { "tas5722", (kernel_ulong_t)&variant[1] }, { } }; MODULE_DEVICE_TABLE(i2c, tas5720_id); #if IS_ENABLED(CONFIG_OF) static const struct of_device_id tas5720_of_match[] = { - { .compatible = "ti,tas5720", }, - { .compatible = "ti,tas5722", }, + { .compatible = "ti,tas5720", .data = &variant[0], }, + { .compatible = "ti,tas5722", .data = &variant[1], }, { }, }; MODULE_DEVICE_TABLE(of, tas5720_of_match); #endif +#if IS_ENABLED(CONFIG_ACPI) +static const struct acpi_device_id tas5720_acpi_match[] = { + { "10TI5720", (kernel_ulong_t)&variant[0] }, + { "10TI5722", (kernel_ulong_t)&variant[1] }, + { } +}; +MODULE_DEVICE_TABLE(acpi, tas5720_acpi_match); +#endif + static struct i2c_driver tas5720_i2c_driver = { .driver = { .name = "tas5720", .of_match_table = of_match_ptr(tas5720_of_match), + .acpi_match_table = ACPI_PTR(tas5720_acpi_match), }, .probe = tas5720_probe, .id_table = tas5720_id, -- 2.17.1

4 13

[alsa-devel] [PATCH 1/2] ASoC: codecs: ad193x: Group register initialization at probe
by Codrin Ciubotariu 03 Jul '19

03 Jul '19

Create a structure with the register initialization values at probe and use it to initialize all the registers at once. Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> --- The order of the initialization is changed, but it doesn't seem to matter. There is one checkpatch warning, let me know if you want to remove it: WARNING: line over 80 characters #32: FILE: sound/soc/codecs/ad193x.c:425: + { 0, 0x99 }, /* PLL_CLK_CTRL0: pll input: mclki/xi 12.288Mhz */ sound/soc/codecs/ad193x.c | 52 +++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 3ebc0524f4b2..f944228f014e 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -413,6 +413,38 @@ static struct snd_soc_dai_driver ad193x_no_adc_dai = { .ops = &ad193x_dai_ops, }; +struct ad193x_reg_default { + unsigned int reg; + unsigned int val; +}; + +/* codec register values to set after reset */ +static void ad193x_reg_default_init(struct ad193x_priv *ad193x) +{ + const struct ad193x_reg_default reg_init[] = { + { 0, 0x99 }, /* PLL_CLK_CTRL0: pll input: mclki/xi 12.288Mhz */ + { 1, 0x04 }, /* PLL_CLK_CTRL1: no on-chip Vref */ + { 2, 0x40 }, /* DAC_CTRL0: TDM mode */ + { 4, 0x1A }, /* DAC_CTRL2: 48kHz de-emphasis, unmute dac */ + { 5, 0x00 }, /* DAC_CHNL_MUTE: unmute DAC channels */ + }; + const struct ad193x_reg_default reg_adc_init[] = { + { 14, 0x03 }, /* ADC_CTRL0: high-pass filter enable */ + { 15, 0x43 }, /* ADC_CTRL1: sata delay=1, adc aux mode */ + }; + int i; + + for (i = 0; i < ARRAY_SIZE(reg_init); i++) + regmap_write(ad193x->regmap, reg_init[i].reg, reg_init[i].val); + + if (ad193x_has_adc(ad193x)) { + for (i = 0; i < ARRAY_SIZE(reg_adc_init); i++) { + regmap_write(ad193x->regmap, reg_adc_init[i].reg, + reg_adc_init[i].val); + } + } +} + static int ad193x_component_probe(struct snd_soc_component *component) { struct ad193x_priv *ad193x = snd_soc_component_get_drvdata(component); @@ -420,25 +452,7 @@ static int ad193x_component_probe(struct snd_soc_component *component) int num, ret; /* default setting for ad193x */ - - /* unmute dac channels */ - regmap_write(ad193x->regmap, AD193X_DAC_CHNL_MUTE, 0x0); - /* de-emphasis: 48kHz, powedown dac */ - regmap_write(ad193x->regmap, AD193X_DAC_CTRL2, 0x1A); - /* dac in tdm mode */ - regmap_write(ad193x->regmap, AD193X_DAC_CTRL0, 0x40); - - /* adc only */ - if (ad193x_has_adc(ad193x)) { - /* high-pass filter enable */ - regmap_write(ad193x->regmap, AD193X_ADC_CTRL0, 0x3); - /* sata delay=1, adc aux mode */ - regmap_write(ad193x->regmap, AD193X_ADC_CTRL1, 0x43); - } - - /* pll input: mclki/xi */ - regmap_write(ad193x->regmap, AD193X_PLL_CLK_CTRL0, 0x99); /* mclk=24.576Mhz: 0x9D; mclk=12.288Mhz: 0x99 */ - regmap_write(ad193x->regmap, AD193X_PLL_CLK_CTRL1, 0x04); + ad193x_reg_default_init(ad193x); /* adc only */ if (ad193x_has_adc(ad193x)) { -- 2.20.1

4 5

[alsa-devel] [PATCH 00/46] ASoC: consider CPU-Platform possibility
by Kuninori Morimoto 03 Jul '19

03 Jul '19

Hi Mark My posted patch (= "ASoC: xxx: don't select unnecessary Platform") removed Platform component settings from Card driver if it selects CPU as Platform. ALSA SoC will ignore duplicate component. I thought these Card driver don't need Platform, but it was wrong. Some CPU component is using generic DMAEngine component. In such case, CPU and Platform have same name but different component, and some Card needs both. My posted above patch breaks (not all but) few Cards. We can revert one-by-one if we get report, but better to revert all from stable kernel point of view. These patches revert all patches. I'm so sorry to bother you and users. I hope these can fixup issue. Kuninori Morimoto (46): ASoC: vc4: vc4_htmi: consider CPU-Platform possibility ASoC: atmel: atmel-classd: consider CPU-Platform possibility ASoC: atmel: atmel-pdmic: consider CPU-Platform possibility ASoC: atmel: atmel_wm8904: consider CPU-Platform possibility unnecessary Platform" ASoC: amtel: mikroe-proto: consider CPU-Platform possibility ASoC: atmel: sam9g20_wm8731: consider CPU-Platform possibility ASoC: atmel: sam9x5_wm8731: consider CPU-Platform possibility ASoC: atmel: tse850-pcm5142: consider CPU-Platform possibility ASoC: fsl: eukrea-tlv320: consider CPU-Platform possibility ASoC: fsl: fsl-asoc-card: consider CPU-Platform possibility ASoC: fsl: imx-es8328: consider CPU-Platform possibility ASoC: fsl: imx-sgtl5000: consider CPU-Platform possibility ASoC: fsl: imx-spdif: consider CPU-Platform possibility ASoC: fsl: imx-audmix: consider CPU-Platform possibility ASoC: kirkwood: armada-370-db: consider CPU-Platform possibility ASoC: mxs: mxs-sgtl5000: consider CPU-Platform possibility ASoC: qcom: apq8016_sbc: consider CPU-Platform possibility ASoC: qcom: storm: consider CPU-Platform possibility ASoC: rockchip: rk3288_hdmi_analog: consider CPU-Platform possibility ASoC: rockchip: rockchip_max98090: consider CPU-Platform possibility ASoC: rockchip: rockchip_rt5645: consider CPU-Platform possibility ASoC: samsung: arndale_rt5631: consider CPU-Platform possibility ASoC: samsung: smdk_wm8994: consider CPU-Platform possibility ASoC: samsung: snow: consider CPU-Platform possibility ASoC: samsung: tm2_wm5110: consider CPU-Platform possibility ASoC: sirf: sirf-audio: consider CPU-Platform possibility ASoC: sunxi: sun4i-codec: consider CPU-Platform possibility ASoC: tegra: tegra_alc5632: consider CPU-Platform possibility ASoC: tegra: tegra_max98090: consider CPU-Platform possibility ASoC: tegra: tegra_rt5640: consider CPU-Platform possibility ASoC: tegra: tegra_rt5677: consider CPU-Platform possibility ASoC: tegra: tegra_sgtl5000: consider CPU-Platform possibility ASoC: tegra: tegra_wm8753: consider CPU-Platform possibility ASoC: tegra: tegra_wm8903: consider CPU-Platform possibility ASoC: tegra: tegra_wm9712: consider CPU-Platform possibility ASoC: tegra: trimslice: consider CPU-Platform possibility ASoC: ti: davinci-evm: consider CPU-Platform possibility ASoC: ti: omap-abe-twl6040: consider CPU-Platform possibility ASoC: ti: omap-hdmi: consider CPU-Platform possibility ASoC: ti: omap-twl4030: consider CPU-Platform possibility ASoC: ti: rx51: consider CPU-Platform possibility ASoC: ux500: mop500: consider CPU-Platform possibility ASoC: simple-card-utils: consider CPU-Platform possibility ASoC: qcom: consider CPU-Platform possibility ASoC: rockchip: rk3399_gru_sound: consider CPU-Platform possibility ASoC: soc-utils: respawn dummy Platform drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++++ sound/soc/atmel/atmel-classd.c | 5 ++++- sound/soc/atmel/atmel-pdmic.c | 5 ++++- sound/soc/atmel/atmel_wm8904.c | 4 +++- sound/soc/atmel/mikroe-proto.c | 7 +++++-- sound/soc/atmel/sam9g20_wm8731.c | 5 ++++- sound/soc/atmel/sam9x5_wm8731.c | 5 ++++- sound/soc/atmel/tse850-pcm5142.c | 4 +++- sound/soc/fsl/eukrea-tlv320.c | 5 ++++- sound/soc/fsl/fsl-asoc-card.c | 6 +++++- sound/soc/fsl/imx-audmix.c | 14 ++++++++++---- sound/soc/fsl/imx-es8328.c | 5 ++++- sound/soc/fsl/imx-sgtl5000.c | 5 ++++- sound/soc/fsl/imx-spdif.c | 5 ++++- sound/soc/generic/simple-card-utils.c | 15 +++------------ sound/soc/kirkwood/armada-370-db.c | 12 +++++++++--- sound/soc/mxs/mxs-sgtl5000.c | 8 ++++++-- sound/soc/qcom/apq8016_sbc.c | 10 +++++++--- sound/soc/qcom/common.c | 4 +--- sound/soc/qcom/storm.c | 4 +++- sound/soc/rockchip/rk3288_hdmi_analog.c | 5 ++++- sound/soc/rockchip/rk3399_gru_sound.c | 19 +++++++++++++------ sound/soc/rockchip/rockchip_max98090.c | 5 ++++- sound/soc/rockchip/rockchip_rt5645.c | 5 ++++- sound/soc/samsung/arndale_rt5631.c | 6 +++++- sound/soc/samsung/smdk_wm8994.c | 9 +++++++-- sound/soc/samsung/snow.c | 10 +++++++--- sound/soc/samsung/tm2_wm5110.c | 12 +++++++++--- sound/soc/sirf/sirf-audio.c | 5 ++++- sound/soc/soc-utils.c | 25 +++++++++++++++++++++++++ sound/soc/sunxi/sun4i-codec.c | 5 ++++- sound/soc/tegra/tegra_alc5632.c | 7 ++++++- sound/soc/tegra/tegra_max98090.c | 5 ++++- sound/soc/tegra/tegra_rt5640.c | 5 ++++- sound/soc/tegra/tegra_rt5677.c | 6 +++++- sound/soc/tegra/tegra_sgtl5000.c | 7 ++++++- sound/soc/tegra/tegra_wm8753.c | 5 ++++- sound/soc/tegra/tegra_wm8903.c | 5 ++++- sound/soc/tegra/tegra_wm9712.c | 5 ++++- sound/soc/tegra/trimslice.c | 6 +++++- sound/soc/ti/davinci-evm.c | 5 ++++- sound/soc/ti/omap-abe-twl6040.c | 22 ++++++++++++++-------- sound/soc/ti/omap-hdmi.c | 5 ++++- sound/soc/ti/omap-twl4030.c | 12 ++++++++++-- sound/soc/ti/rx51.c | 5 ++++- sound/soc/ux500/mop500.c | 8 ++++++-- 46 files changed, 261 insertions(+), 85 deletions(-) -- 2.7.4

3 95

[alsa-devel] [PATCH v2 00/23] ASoC: use devm_xxx
by Kuninori Morimoto 03 Jul '19

03 Jul '19

Hi Mark These are v2 patch of converting for devm_xxx(). v2 is caring about related empty functions. Kuninori Morimoto (23): ASoC: atmel: atmel-pcm-dma.c: use devm_snd_dmaengine_pcm_register() ASoC: sunxi: sun4i-i2s.c: use devm_snd_dmaengine_pcm_register() ASoC: tegra: tegra_pcm.c: use devm_snd_dmaengine_pcm_register() ASoC: ux500: ux500_pcm.c: use devm_snd_dmaengine_pcm_register() ASoC: au1x: i2sc.c: use devm_snd_soc_register_component() ASoC: au1x: ac97c.c: use devm_snd_soc_register_component() ASoC: au1x: psc-ac97.c: use devm_snd_soc_register_component() ASoC: au1x: psc-i2s.c: use devm_snd_soc_register_component() ASoC: cirrus: ep93xx-i2s.c: use devm_snd_soc_register_component() ASoC: cirrus: ep93xx-ac97.c: use devm_snd_soc_register_component() ASoC: rt5682: use devm_snd_soc_register_component() ASoC: ak4118: use devm_snd_soc_register_component() ASoC: cros_ec_codec: use devm_snd_soc_register_component() ASoC: fsl: imx-ssi.c: use devm_snd_soc_register_component() ASoC: fsl: mpc5200_psc_i2s.c: use devm_snd_soc_register_component() ASoC: fsl: mpc5200_psc_ac97.c: use devm_snd_soc_register_component() ASoC: pxa: pxa2xx-ac97.c: use devm_snd_soc_register_component() ASoC: tegra: tegra20_i2s.c: use devm_snd_soc_register_component() ASoC: tegra: tegra20_spdif.c: use devm_snd_soc_register_component() ASoC: tegra: tegra20_ac97.c: use devm_snd_soc_register_component() ASoC: tegra: tegra30_i2s.c: use devm_snd_soc_register_component() ASoC: ti: davinci-i2s.c: use devm_snd_soc_register_component() ASoC: ux500: ux500_msp_dai.c: use devm_snd_soc_register_component() sound/soc/atmel/atmel-pcm-dma.c | 9 ++------- sound/soc/atmel/atmel-pcm-pdc.c | 5 ----- sound/soc/atmel/atmel-pcm.h | 8 -------- sound/soc/atmel/atmel_ssc_dai.c | 11 ----------- sound/soc/au1x/ac97c.c | 4 +--- sound/soc/au1x/i2sc.c | 4 +--- sound/soc/au1x/psc-ac97.c | 6 ++---- sound/soc/au1x/psc-i2s.c | 6 ++---- sound/soc/cirrus/ep93xx-ac97.c | 10 +++------- sound/soc/cirrus/ep93xx-i2s.c | 7 ++----- sound/soc/codecs/ak4118.c | 11 ++--------- sound/soc/codecs/cros_ec_codec.c | 2 +- sound/soc/codecs/rt5682.c | 13 +++---------- sound/soc/fsl/imx-ssi.c | 8 ++------ sound/soc/fsl/mpc5200_psc_ac97.c | 3 +-- sound/soc/fsl/mpc5200_psc_i2s.c | 3 +-- sound/soc/pxa/pxa2xx-ac97.c | 3 +-- sound/soc/sunxi/sun4i-i2s.c | 4 +--- sound/soc/tegra/tegra20_ac97.c | 11 +++-------- sound/soc/tegra/tegra20_i2s.c | 11 +++-------- sound/soc/tegra/tegra20_spdif.c | 12 ++++-------- sound/soc/tegra/tegra30_i2s.c | 11 +++-------- sound/soc/tegra/tegra_pcm.c | 11 +++-------- sound/soc/tegra/tegra_pcm.h | 1 - sound/soc/ti/davinci-i2s.c | 8 ++------ sound/soc/ux500/ux500_msp_dai.c | 12 ++---------- sound/soc/ux500/ux500_pcm.c | 9 +-------- sound/soc/ux500/ux500_pcm.h | 1 - 28 files changed, 46 insertions(+), 158 deletions(-) -- 2.7.4

3 34

[alsa-devel] [PATCH v6] ASoC: max98090: remove 24-bit format support if RJ is 0
by Yu-Hsuan Hsu 02 Jul '19

02 Jul '19

The supported formats are S16_LE and S24_LE now. However, S24_LE is not supported when TDM is 0 and it is not in the right justified mode. We should remove 24-bit format in that situation to avoid triggering error. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> --- Changed the order of the conditional. Remove the snd_pcm_hw_constraint_msbits function. Use removing 24 bits format instead of fixing at 16 bits format. sound/soc/codecs/max98090.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 7619ea31ab50..9fbb4c31bcf1 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -1909,6 +1909,24 @@ static int max98090_configure_dmic(struct max98090_priv *max98090, return 0; } +static int max98090_dai_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component); + unsigned int fmt = max98090->dai_fmt; + + /* + * When TDM = 0, remove 24-bit format support if it is not in right + * justified mode. + */ + if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) != SND_SOC_DAIFMT_RIGHT_J && + !max98090->tdm_slots) + substream->runtime->hw.formats &= ~SNDRV_PCM_FMTBIT_S24_LE; + + return 0; +} + static int max98090_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -2316,6 +2334,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect); #define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) static const struct snd_soc_dai_ops max98090_dai_ops = { + .startup = max98090_dai_startup, .set_sysclk = max98090_dai_set_sysclk, .set_fmt = max98090_dai_set_fmt, .set_tdm_slot = max98090_set_tdm_slot, -- 2.22.0.410.gd8fdbe21b5-goog

2 1

[alsa-devel] [PATCH -next] ASoC: madera: Remove duplicated include from cs47l35.c
by YueHaibing 02 Jul '19

02 Jul '19

Remove duplicated include. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/cs47l35.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c index 511d0d6fa962..e3585c1dab3d 100644 --- a/sound/soc/codecs/cs47l35.c +++ b/sound/soc/codecs/cs47l35.c @@ -19,7 +19,6 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/tlv.h> -#include <sound/tlv.h> #include <linux/irqchip/irq-madera.h> #include <linux/mfd/madera/core.h>

3 2