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

[alsa-devel] ASoC: regulator notifier registration should be managed
by Guennadi Liakhovetski 08 Feb '19

08 Feb '19

From: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Regulator notifiers, that were registered during codec driver probing, must be unregistered during driver release, or device managed versions have to be used. This patch fixes codec drivers, that weren't explicitly unregistering notifiers and simplifies those, that did that manually. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> --- sound/soc/codecs/max9860.c | 3 ++- sound/soc/codecs/pcm512x.c | 5 +++-- sound/soc/codecs/tlv320aic31xx.c | 16 +++------------- sound/soc/codecs/tlv320aic3x.c | 25 ++++--------------------- sound/soc/codecs/wm8770.c | 18 +++--------------- sound/soc/codecs/wm8962.c | 9 +++------ sound/soc/codecs/wm8995.c | 29 +++++++---------------------- sound/soc/codecs/wm8996.c | 9 +++------ 8 files changed, 28 insertions(+), 86 deletions(-) diff --git a/sound/soc/codecs/max9860.c b/sound/soc/codecs/max9860.c index de3d44e9199b..8be636fe6552 100644 --- a/sound/soc/codecs/max9860.c +++ b/sound/soc/codecs/max9860.c @@ -615,7 +615,8 @@ static int max9860_probe(struct i2c_client *i2c) max9860->dvddio_nb.notifier_call = max9860_dvddio_event; - ret = regulator_register_notifier(max9860->dvddio, &max9860->dvddio_nb); + ret = devm_regulator_register_notifier(max9860->dvddio, + &max9860->dvddio_nb); if (ret) dev_err(dev, "Failed to register DVDDIO notifier: %d\n", ret); diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 4cc24a5d5c31..18f414be849f 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -1520,8 +1520,9 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) pcm512x->supply_nb[2].notifier_call = pcm512x_regulator_event_2; for (i = 0; i < ARRAY_SIZE(pcm512x->supplies); i++) { - ret = regulator_register_notifier(pcm512x->supplies[i].consumer, - &pcm512x->supply_nb[i]); + ret = devm_regulator_register_notifier( + pcm512x->supplies[i].consumer, + &pcm512x->supply_nb[i]); if (ret != 0) { dev_err(dev, "Failed to register regulator notifier: %d\n", diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 608ad49ad978..7a4a607cca3c 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1274,8 +1274,9 @@ static int aic31xx_codec_probe(struct snd_soc_component *component) aic31xx->disable_nb[i].nb.notifier_call = aic31xx_regulator_event; aic31xx->disable_nb[i].aic31xx = aic31xx; - ret = regulator_register_notifier(aic31xx->supplies[i].consumer, - &aic31xx->disable_nb[i].nb); + ret = devm_regulator_register_notifier( + aic31xx->supplies[i].consumer, + &aic31xx->disable_nb[i].nb); if (ret) { dev_err(component->dev, "Failed to request regulator notifier: %d\n", @@ -1298,19 +1299,8 @@ static int aic31xx_codec_probe(struct snd_soc_component *component) return 0; } -static void aic31xx_codec_remove(struct snd_soc_component *component) -{ - struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component); - int i; - - for (i = 0; i < ARRAY_SIZE(aic31xx->supplies); i++) - regulator_unregister_notifier(aic31xx->supplies[i].consumer, - &aic31xx->disable_nb[i].nb); -} - static const struct snd_soc_component_driver soc_codec_driver_aic31xx = { .probe = aic31xx_codec_probe, - .remove = aic31xx_codec_remove, .set_bias_level = aic31xx_set_bias_level, .controls = common31xx_snd_controls, .num_controls = ARRAY_SIZE(common31xx_snd_controls), diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 6a271e6e6b8f..6dcc3ace9d70 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1605,13 +1605,14 @@ static int aic3x_probe(struct snd_soc_component *component) for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) { aic3x->disable_nb[i].nb.notifier_call = aic3x_regulator_event; aic3x->disable_nb[i].aic3x = aic3x; - ret = regulator_register_notifier(aic3x->supplies[i].consumer, - &aic3x->disable_nb[i].nb); + ret = devm_regulator_register_notifier( + aic3x->supplies[i].consumer, + &aic3x->disable_nb[i].nb); if (ret) { dev_err(component->dev, "Failed to request regulator notifier: %d\n", ret); - goto err_notif; + return ret; } } @@ -1669,29 +1670,11 @@ static int aic3x_probe(struct snd_soc_component *component) aic3x_add_widgets(component); return 0; - -err_notif: - while (i--) - regulator_unregister_notifier(aic3x->supplies[i].consumer, - &aic3x->disable_nb[i].nb); - return ret; -} - -static void aic3x_remove(struct snd_soc_component *component) -{ - struct aic3x_priv *aic3x = snd_soc_component_get_drvdata(component); - int i; - - list_del(&aic3x->list); - for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) - regulator_unregister_notifier(aic3x->supplies[i].consumer, - &aic3x->disable_nb[i].nb); } static const struct snd_soc_component_driver soc_component_dev_aic3x = { .set_bias_level = aic3x_set_bias_level, .probe = aic3x_probe, - .remove = aic3x_remove, .controls = aic3x_snd_controls, .num_controls = ARRAY_SIZE(aic3x_snd_controls), .dapm_widgets = aic3x_dapm_widgets, diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 806245c70f8b..37467c512597 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c @@ -666,8 +666,9 @@ static int wm8770_spi_probe(struct spi_device *spi) /* This should really be moved into the regulator core */ for (i = 0; i < ARRAY_SIZE(wm8770->supplies); i++) { - ret = regulator_register_notifier(wm8770->supplies[i].consumer, - &wm8770->disable_nb[i]); + ret = devm_regulator_register_notifier( + wm8770->supplies[i].consumer, + &wm8770->disable_nb[i]); if (ret) { dev_err(&spi->dev, "Failed to register regulator notifier: %d\n", @@ -687,25 +688,12 @@ static int wm8770_spi_probe(struct spi_device *spi) return ret; } -static int wm8770_spi_remove(struct spi_device *spi) -{ - struct wm8770_priv *wm8770 = spi_get_drvdata(spi); - int i; - - for (i = 0; i < ARRAY_SIZE(wm8770->supplies); ++i) - regulator_unregister_notifier(wm8770->supplies[i].consumer, - &wm8770->disable_nb[i]); - - return 0; -} - static struct spi_driver wm8770_spi_driver = { .driver = { .name = "wm8770", .of_match_table = wm8770_of_match, }, .probe = wm8770_spi_probe, - .remove = wm8770_spi_remove }; module_spi_driver(wm8770_spi_driver); diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index efd8910b1ff7..467ed78dd2df 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3424,8 +3424,9 @@ static int wm8962_probe(struct snd_soc_component *component) /* This should really be moved into the regulator core */ for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) { - ret = regulator_register_notifier(wm8962->supplies[i].consumer, - &wm8962->disable_nb[i]); + ret = devm_regulator_register_notifier( + wm8962->supplies[i].consumer, + &wm8962->disable_nb[i]); if (ret != 0) { dev_err(component->dev, "Failed to register regulator notifier: %d\n", @@ -3467,15 +3468,11 @@ static int wm8962_probe(struct snd_soc_component *component) static void wm8962_remove(struct snd_soc_component *component) { struct wm8962_priv *wm8962 = snd_soc_component_get_drvdata(component); - int i; cancel_delayed_work_sync(&wm8962->mic_work); wm8962_free_gpio(component); wm8962_free_beep(component); - for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) - regulator_unregister_notifier(wm8962->supplies[i].consumer, - &wm8962->disable_nb[i]); } static const struct snd_soc_component_driver soc_component_dev_wm8962 = { diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 68c99fe37097..fe2156a1220a 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -1995,20 +1995,6 @@ static int wm8995_set_bias_level(struct snd_soc_component *component, return 0; } -static void wm8995_remove(struct snd_soc_component *component) -{ - struct wm8995_priv *wm8995; - int i; - - wm8995 = snd_soc_component_get_drvdata(component); - - for (i = 0; i < ARRAY_SIZE(wm8995->supplies); ++i) - regulator_unregister_notifier(wm8995->supplies[i].consumer, - &wm8995->disable_nb[i]); - - regulator_bulk_free(ARRAY_SIZE(wm8995->supplies), wm8995->supplies); -} - static int wm8995_probe(struct snd_soc_component *component) { struct wm8995_priv *wm8995; @@ -2021,8 +2007,9 @@ static int wm8995_probe(struct snd_soc_component *component) for (i = 0; i < ARRAY_SIZE(wm8995->supplies); i++) wm8995->supplies[i].supply = wm8995_supply_names[i]; - ret = regulator_bulk_get(component->dev, ARRAY_SIZE(wm8995->supplies), - wm8995->supplies); + ret = devm_regulator_bulk_get(component->dev, + ARRAY_SIZE(wm8995->supplies), + wm8995->supplies); if (ret) { dev_err(component->dev, "Failed to request supplies: %d\n", ret); return ret; @@ -2039,8 +2026,9 @@ static int wm8995_probe(struct snd_soc_component *component) /* This should really be moved into the regulator core */ for (i = 0; i < ARRAY_SIZE(wm8995->supplies); i++) { - ret = regulator_register_notifier(wm8995->supplies[i].consumer, - &wm8995->disable_nb[i]); + ret = devm_regulator_register_notifier( + wm8995->supplies[i].consumer, + &wm8995->disable_nb[i]); if (ret) { dev_err(component->dev, "Failed to register regulator notifier: %d\n", @@ -2052,7 +2040,7 @@ static int wm8995_probe(struct snd_soc_component *component) wm8995->supplies); if (ret) { dev_err(component->dev, "Failed to enable supplies: %d\n", ret); - goto err_reg_get; + retturn ret; } ret = snd_soc_component_read32(component, WM8995_SOFTWARE_RESET); @@ -2099,8 +2087,6 @@ static int wm8995_probe(struct snd_soc_component *component) err_reg_enable: regulator_bulk_disable(ARRAY_SIZE(wm8995->supplies), wm8995->supplies); -err_reg_get: - regulator_bulk_free(ARRAY_SIZE(wm8995->supplies), wm8995->supplies); return ret; } @@ -2188,7 +2174,6 @@ static struct snd_soc_dai_driver wm8995_dai[] = { static const struct snd_soc_component_driver soc_component_dev_wm8995 = { .probe = wm8995_probe, - .remove = wm8995_remove, .set_bias_level = wm8995_set_bias_level, .controls = wm8995_snd_controls, .num_controls = ARRAY_SIZE(wm8995_snd_controls), diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 91711f8958c5..ab04ea18c312 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2801,8 +2801,9 @@ static int wm8996_i2c_probe(struct i2c_client *i2c, /* This should really be moved into the regulator core */ for (i = 0; i < ARRAY_SIZE(wm8996->supplies); i++) { - ret = regulator_register_notifier(wm8996->supplies[i].consumer, - &wm8996->disable_nb[i]); + ret = devm_regulator_register_notifier( + wm8996->supplies[i].consumer, + &wm8996->disable_nb[i]); if (ret != 0) { dev_err(&i2c->dev, "Failed to register regulator notifier: %d\n", @@ -3071,16 +3072,12 @@ static int wm8996_i2c_probe(struct i2c_client *i2c, static int wm8996_i2c_remove(struct i2c_client *client) { struct wm8996_priv *wm8996 = i2c_get_clientdata(client); - int i; wm8996_free_gpio(wm8996); if (wm8996->pdata.ldo_ena > 0) { gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); gpio_free(wm8996->pdata.ldo_ena); } - for (i = 0; i < ARRAY_SIZE(wm8996->supplies); i++) - regulator_unregister_notifier(wm8996->supplies[i].consumer, - &wm8996->disable_nb[i]); return 0; } -- 2.17.1

2 4

[alsa-devel] Applied "ASoC: msm8916-wcd-analog: add missing license information" to the asoc tree
by Mark Brown 08 Feb '19

08 Feb '19

The patch ASoC: msm8916-wcd-analog: add missing license information has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3f22e31da833e576fcfecce1f4e7ed958477d1ec Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan(a)kernel.org> Date: Fri, 8 Feb 2019 16:16:55 +0100 Subject: [PATCH] ASoC: msm8916-wcd-analog: add missing license information Add the missing license and copyright information which never made it into the analog driver when the original driver was split in two as part of the review process. Link: https://lkml.kernel.org/r/1465582725-30183-3-git-send-email-srinivas.kandag… Fixes: 585e881e5b9e ("ASoC: codecs: Add msm8916-wcd analog codec") Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Johan Hovold <johan(a)kernel.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/msm8916-wcd-analog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index b7cf7cce95fe..368b6c09474b 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2016, The Linux Foundation. All rights reserved. + #include <linux/module.h> #include <linux/err.h> #include <linux/kernel.h> -- 2.20.1

1 0

[alsa-devel] Applied "ASoC: msm8916-wcd-digital: convert license header to SPDX" to the asoc tree
by Mark Brown 08 Feb '19

08 Feb '19

The patch ASoC: msm8916-wcd-digital: convert license header to SPDX has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3ebc584ce7d1cc73151682c77ad2bea9318ddf98 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan(a)kernel.org> Date: Fri, 8 Feb 2019 16:16:56 +0100 Subject: [PATCH] ASoC: msm8916-wcd-digital: convert license header to SPDX Convert the GPLv2-only license header to SPDX. Signed-off-by: Johan Hovold <johan(a)kernel.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/msm8916-wcd-digital.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index 423bfebabed4..a63961861e55 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c @@ -1,14 +1,5 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2016, The Linux Foundation. All rights reserved. #include <linux/module.h> #include <linux/err.h> -- 2.20.1

1 0

[alsa-devel] Applied "gpiolib: acpi: Introduce ACPI_GPIO_QUIRK_ONLY_GPIOIO" to the asoc tree
by Mark Brown 08 Feb '19

08 Feb '19

The patch gpiolib: acpi: Introduce ACPI_GPIO_QUIRK_ONLY_GPIOIO has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 4d1f7a6eabd45639d9de22a8a004f3c208d13c1a Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Date: Wed, 6 Feb 2019 22:49:46 +0200 Subject: [PATCH] gpiolib: acpi: Introduce ACPI_GPIO_QUIRK_ONLY_GPIOIO New quirk enforces search for GPIO based on its type, i.e. iterate over GpioIo resources only. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Acked-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Tested-by: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/gpio/gpiolib-acpi.c | 15 ++++-- include/linux/acpi.h | 7 +++ sound/soc/intel/boards/bytcr_rt5651.c | 74 ++++----------------------- 3 files changed, 27 insertions(+), 69 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 259cf6ab969b..4d291b75cb9f 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -530,17 +530,24 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data) if (ares->type != ACPI_RESOURCE_TYPE_GPIO) return 1; - if (lookup->n++ == lookup->index && !lookup->desc) { + if (!lookup->desc) { const struct acpi_resource_gpio *agpio = &ares->data.gpio; - int pin_index = lookup->pin_index; + bool gpioint = agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT; + int pin_index; + if (lookup->info.quirks & ACPI_GPIO_QUIRK_ONLY_GPIOIO && gpioint) + lookup->index++; + + if (lookup->n++ != lookup->index) + return 1; + + pin_index = lookup->pin_index; if (pin_index >= agpio->pin_table_length) return 1; lookup->desc = acpi_get_gpiod(agpio->resource_source.string_ptr, agpio->pin_table[pin_index]); - lookup->info.gpioint = - agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT; + lookup->info.gpioint = gpioint; /* * Polarity and triggering are only specified for GpioInt diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 87715f20b69a..03b4c4f225d0 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1014,6 +1014,13 @@ struct acpi_gpio_mapping { /* Ignore IoRestriction field */ #define ACPI_GPIO_QUIRK_NO_IO_RESTRICTION BIT(0) +/* + * When ACPI GPIO mapping table is in use the index parameter inside it + * refers to the GPIO resource in _CRS method. That index has no + * distinction of actual type of the resource. When consumer wants to + * get GpioIo type explicitly, this quirk may be used. + */ +#define ACPI_GPIO_QUIRK_ONLY_GPIOIO BIT(1) unsigned int quirks; }; diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index c3b7732929cc..b0a4d297176e 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -844,74 +844,18 @@ static const struct x86_cpu_id cherrytrail_cpu_ids[] = { {} }; -static const struct acpi_gpio_params first_gpio = { 0, 0, false }; -static const struct acpi_gpio_params second_gpio = { 1, 0, false }; +static const struct acpi_gpio_params ext_amp_enable_gpios = { 0, 0, false }; -static const struct acpi_gpio_mapping byt_rt5651_amp_en_first[] = { - { "ext-amp-enable-gpios", &first_gpio, 1 }, - { }, -}; - -static const struct acpi_gpio_mapping byt_rt5651_amp_en_second[] = { - { "ext-amp-enable-gpios", &second_gpio, 1 }, +static const struct acpi_gpio_mapping cht_rt5651_gpios[] = { + /* + * Some boards have I2cSerialBusV2, GpioIo, GpioInt as ACPI resources, + * other boards may have I2cSerialBusV2, GpioInt, GpioIo instead. + * We want the GpioIo one for the ext-amp-enable-gpio. + */ + { "ext-amp-enable-gpios", &ext_amp_enable_gpios, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO }, { }, }; -/* - * Some boards have I2cSerialBusV2, GpioIo, GpioInt as ACPI resources, other - * boards may have I2cSerialBusV2, GpioInt, GpioIo instead. We want the - * GpioIo one for the ext-amp-enable-gpio and both count for the index in - * acpi_gpio_params index. So we have 2 different mappings and the code - * below figures out which one to use. - */ -struct byt_rt5651_acpi_resource_data { - int gpio_count; - int gpio_int_idx; -}; - -static int snd_byt_rt5651_acpi_resource(struct acpi_resource *ares, void *arg) -{ - struct byt_rt5651_acpi_resource_data *data = arg; - - if (ares->type != ACPI_RESOURCE_TYPE_GPIO) - return 0; - - if (ares->data.gpio.connection_type == ACPI_RESOURCE_GPIO_TYPE_INT) - data->gpio_int_idx = data->gpio_count; - - data->gpio_count++; - return 0; -} - -static void snd_byt_rt5651_mc_pick_amp_en_gpio_mapping(struct device *codec) -{ - struct byt_rt5651_acpi_resource_data data = { 0, -1 }; - LIST_HEAD(resources); - int ret; - - ret = acpi_dev_get_resources(ACPI_COMPANION(codec), &resources, - snd_byt_rt5651_acpi_resource, &data); - if (ret < 0) { - dev_warn(codec, "Failed to get ACPI resources, not adding external amplifier GPIO mapping\n"); - return; - } - - /* All info we need is gathered during the walk */ - acpi_dev_free_resource_list(&resources); - - switch (data.gpio_int_idx) { - case 0: - byt_rt5651_gpios = byt_rt5651_amp_en_second; - break; - case 1: - byt_rt5651_gpios = byt_rt5651_amp_en_first; - break; - default: - dev_warn(codec, "Unknown GpioInt index %d, not adding external amplifier GPIO mapping\n", - data.gpio_int_idx); - } -} - struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ u64 aif_value; /* 1: AIF1, 2: AIF2 */ u64 mclock_value; /* usually 25MHz (0x17d7940), ignored */ @@ -1038,7 +982,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) /* Cherry Trail devices use an external amplifier enable gpio */ if (x86_match_cpu(cherrytrail_cpu_ids) && !byt_rt5651_gpios) - snd_byt_rt5651_mc_pick_amp_en_gpio_mapping(codec_dev); + byt_rt5651_gpios = cht_rt5651_gpios; if (byt_rt5651_gpios) { devm_acpi_dev_add_driver_gpios(codec_dev, byt_rt5651_gpios); -- 2.20.1

1 0

[alsa-devel] [PATCH v3] gpiolib: acpi: Introduce ACPI_GPIO_QUIRK_ONLY_GPIOIO
by Andy Shevchenko 08 Feb '19

08 Feb '19

New quirk enforces search for GPIO based on its type, i.e. iterate over GpioIo resources only. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Acked-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Tested-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/gpio/gpiolib-acpi.c | 15 ++++-- include/linux/acpi.h | 7 +++ sound/soc/intel/boards/bytcr_rt5651.c | 74 ++++----------------------- 3 files changed, 27 insertions(+), 69 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 15077c0797b9..2513593f9800 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -533,17 +533,24 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data) if (ares->type != ACPI_RESOURCE_TYPE_GPIO) return 1; - if (lookup->n++ == lookup->index && !lookup->desc) { + if (!lookup->desc) { const struct acpi_resource_gpio *agpio = &ares->data.gpio; - int pin_index = lookup->pin_index; + bool gpioint = agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT; + int pin_index; + if (lookup->info.quirks & ACPI_GPIO_QUIRK_ONLY_GPIOIO && gpioint) + lookup->index++; + + if (lookup->n++ != lookup->index) + return 1; + + pin_index = lookup->pin_index; if (pin_index >= agpio->pin_table_length) return 1; lookup->desc = acpi_get_gpiod(agpio->resource_source.string_ptr, agpio->pin_table[pin_index]); - lookup->info.gpioint = - agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT; + lookup->info.gpioint = gpioint; /* * Polarity and triggering are only specified for GpioInt diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 13f5cb2c4763..7a3dffe8f971 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1014,6 +1014,13 @@ struct acpi_gpio_mapping { /* Ignore IoRestriction field */ #define ACPI_GPIO_QUIRK_NO_IO_RESTRICTION BIT(0) +/* + * When ACPI GPIO mapping table is in use the index parameter inside it + * refers to the GPIO resource in _CRS method. That index has no + * distinction of actual type of the resource. When consumer wants to + * get GpioIo type explicitly, this quirk may be used. + */ +#define ACPI_GPIO_QUIRK_ONLY_GPIOIO BIT(1) unsigned int quirks; }; diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index c3b7732929cc..b0a4d297176e 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -844,74 +844,18 @@ static const struct x86_cpu_id cherrytrail_cpu_ids[] = { {} }; -static const struct acpi_gpio_params first_gpio = { 0, 0, false }; -static const struct acpi_gpio_params second_gpio = { 1, 0, false }; +static const struct acpi_gpio_params ext_amp_enable_gpios = { 0, 0, false }; -static const struct acpi_gpio_mapping byt_rt5651_amp_en_first[] = { - { "ext-amp-enable-gpios", &first_gpio, 1 }, - { }, -}; - -static const struct acpi_gpio_mapping byt_rt5651_amp_en_second[] = { - { "ext-amp-enable-gpios", &second_gpio, 1 }, +static const struct acpi_gpio_mapping cht_rt5651_gpios[] = { + /* + * Some boards have I2cSerialBusV2, GpioIo, GpioInt as ACPI resources, + * other boards may have I2cSerialBusV2, GpioInt, GpioIo instead. + * We want the GpioIo one for the ext-amp-enable-gpio. + */ + { "ext-amp-enable-gpios", &ext_amp_enable_gpios, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO }, { }, }; -/* - * Some boards have I2cSerialBusV2, GpioIo, GpioInt as ACPI resources, other - * boards may have I2cSerialBusV2, GpioInt, GpioIo instead. We want the - * GpioIo one for the ext-amp-enable-gpio and both count for the index in - * acpi_gpio_params index. So we have 2 different mappings and the code - * below figures out which one to use. - */ -struct byt_rt5651_acpi_resource_data { - int gpio_count; - int gpio_int_idx; -}; - -static int snd_byt_rt5651_acpi_resource(struct acpi_resource *ares, void *arg) -{ - struct byt_rt5651_acpi_resource_data *data = arg; - - if (ares->type != ACPI_RESOURCE_TYPE_GPIO) - return 0; - - if (ares->data.gpio.connection_type == ACPI_RESOURCE_GPIO_TYPE_INT) - data->gpio_int_idx = data->gpio_count; - - data->gpio_count++; - return 0; -} - -static void snd_byt_rt5651_mc_pick_amp_en_gpio_mapping(struct device *codec) -{ - struct byt_rt5651_acpi_resource_data data = { 0, -1 }; - LIST_HEAD(resources); - int ret; - - ret = acpi_dev_get_resources(ACPI_COMPANION(codec), &resources, - snd_byt_rt5651_acpi_resource, &data); - if (ret < 0) { - dev_warn(codec, "Failed to get ACPI resources, not adding external amplifier GPIO mapping\n"); - return; - } - - /* All info we need is gathered during the walk */ - acpi_dev_free_resource_list(&resources); - - switch (data.gpio_int_idx) { - case 0: - byt_rt5651_gpios = byt_rt5651_amp_en_second; - break; - case 1: - byt_rt5651_gpios = byt_rt5651_amp_en_first; - break; - default: - dev_warn(codec, "Unknown GpioInt index %d, not adding external amplifier GPIO mapping\n", - data.gpio_int_idx); - } -} - struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ u64 aif_value; /* 1: AIF1, 2: AIF2 */ u64 mclock_value; /* usually 25MHz (0x17d7940), ignored */ @@ -1038,7 +982,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) /* Cherry Trail devices use an external amplifier enable gpio */ if (x86_match_cpu(cherrytrail_cpu_ids) && !byt_rt5651_gpios) - snd_byt_rt5651_mc_pick_amp_en_gpio_mapping(codec_dev); + byt_rt5651_gpios = cht_rt5651_gpios; if (byt_rt5651_gpios) { devm_acpi_dev_add_driver_gpios(codec_dev, byt_rt5651_gpios); -- 2.20.1

3 3

[alsa-devel] [PATCH 0/3] ASoC: msm8916-wcd: license and documentation fixes
by Johan Hovold 08 Feb '19

08 Feb '19

This series adds the missing license information to the msm8916-wcd-analog driver and converts it's digital counterpart to SPDX. Included is also a fix of the binding example for the analog driver. Johan Johan Hovold (3): ASoC: msm8916-wcd-analog: add missing license information ASoC: msm8916-wcd-digital: convert license header to SPDX dt-bindings: sound: msm8916-wcd-analog: fix example regulator names .../bindings/sound/qcom,msm8916-wcd-analog.txt | 7 ++++--- sound/soc/codecs/msm8916-wcd-analog.c | 5 +++++ sound/soc/codecs/msm8916-wcd-digital.c | 13 +++---------- 3 files changed, 12 insertions(+), 13 deletions(-) -- 2.20.1

2 7

[alsa-devel] [PATCH v6 0/3] ALSA: pcm: anonymous dup implementation
by Jaroslav Kysela 08 Feb '19

08 Feb '19

This patchset contains the anonymous dup implementation with permissions checking for the ALSA's PCM interface in kernel to enable the restricted DMA sound buffer sharing for the restricted tasks. The code was tested through qemu and it seems to be pretty stable. The initial tinyalsa implementation can be found here: https://github.com/perexg/tinyalsa/commits/anondup The filtering might be refined. It depends on the real requirements. Perhaps, we may create more ioctl groups. Any comments are more than welcome. v2 of the patches: - change clone parameter to subdevice number for the pcm attach - change SNDRV_PCM_PERM_MAX to SNDRV_PCM_PERM_MASK - the tinyalsa implementation was a little updated (restructured) v3 of the patches: - group integer declarations in snd_pcm_anonymous_dup() - replaced substream->pcm with pcm in snd_pcm_anonymous_dup() - added SNDRV_PCM_PERM_RW check for read/write/readv/writev syscalls v4 of the patches: - more simple restriction control (only two modes - full/buffer) - the tinyalsa implementation follows this change v5 of the patches: - merge pcm_..._mmap_allowed fcns to the snd_pcm_mmap_... fcns v6: - add proper open_mutex protection for snd_pcm_open_file() Cc: Phil Burk <philburk(a)google.com> Cc: Zach Riggle <riggle(a)google.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Leo Yan <leo.yan(a)linaro.org> Cc: Baolin Wang <baolin.wang(a)linaro.org> Jaroslav Kysela (3): ALSA: pcm: implement the anonymous dup (inode file descriptor) ALSA: pcm: merge pcm_..._mmap_allowed fcns to the snd_pcm_mmap_... fcns ALSA: pcm: implement the mmap buffer mode for the anonymous dup include/sound/pcm.h | 10 +-- include/uapi/sound/asound.h | 6 +- sound/core/oss/pcm_oss.c | 2 +- sound/core/pcm.c | 13 ++-- sound/core/pcm_compat.c | 1 + sound/core/pcm_native.c | 154 +++++++++++++++++++++++++++++++++----------- 6 files changed, 133 insertions(+), 53 deletions(-) -- 2.13.6

3 5

[alsa-devel] [PATCH v2 0/2] ASoC: msm8916-wcd: license and documentation fixes
by Johan Hovold 08 Feb '19

08 Feb '19

This series adds the missing license information to the msm8916-wcd-analog driver and converts it's digital counterpart to SPDX. Johan v2 - drop the now applied binding doc update - switch to c++ comments also for the copyright headers for consistency with the ASoC style Johan Hovold (2): ASoC: msm8916-wcd-analog: add missing license information ASoC: msm8916-wcd-digital: convert license header to SPDX sound/soc/codecs/msm8916-wcd-analog.c | 3 +++ sound/soc/codecs/msm8916-wcd-digital.c | 13 ++----------- 2 files changed, 5 insertions(+), 11 deletions(-) -- 2.20.1

1 2

[alsa-devel] [GIT PULL] ASoC updates for v5.1
by Mark Brown 08 Feb '19

08 Feb '19

The following changes since commit f17b5f06cb92ef2250513a1e154c47b78df07d40: Linux 5.0-rc4 (2019-01-27 15:18:05 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.1 for you to fetch changes up to a50e32694fbcdbf55875095258b9398e2eabd71f: ASoC: codecs: jz4725b: Use C++ style comments in header (2019-02-07 14:38:49 +0000) ---------------------------------------------------------------- ASoC: Updates for v5.1 Lots and lots of new drivers so far, a highlight being the MediaTek BTCVSD which is a driver for a Bluetooth radio chip - the first such driver we've had upstream. Hopefully we will soon also see a baseband with an upstream driver! - Support for only powering up channels that are actively being used. - Quite a few improvements to simplify the generic card drivers, especially the merge of the SCU cards into the main generic drivers. - Lots of fixes for probing on Intel systems, trying to rationalize things to look more standard from a framework point of view. - New drivers for Asahi Kasei Microdevices AK4497, Cirrus Logic CS4341, Google ChromeOS embedded controllers, Ingenic JZ4725B, MediaTek BTCVSD, MT8183 and MT6358, NXP MICFIL, Rockchip RK3328, Spreadtrum DMA controllers, Qualcomm WCD9335, Xilinx S/PDIF and PCM formatters. ---------------------------------------------------------------- Adam Thomson (2): ASoC: da7219: MCLK should be enabled before DAI clocks ASoC: da7219: Add recalc_rate function to return DAI clock rate Agrawal, Akshu (1): ASoC: ADAU7002: Add optional delay before start of capture Alexander Shiyan (2): ASoC: cs4341: Add driver for CS4341 DAC ASoC: cs4341: Add DT bindings documentation for CS4341 DAC Alison Wang (1): ASoC: sgtl5000: Allow SCLK pad drive strength to be changed Amadeusz Sławiński (3): ASoC: topology: Reduce number of dereferences when accessing dobj ASoC: topology: Remove widgets from dobj list ASoC: topology: Fix memory leak from soc_tplg_denum_create_texts Anders Roxell (1): ASoC: cs4341: fix waring unused-function Axel Lin (1): ASoC: msm8916-wcd-digital: Select REGMAP_MMIO to fix build error Baolin Wang (2): dt-bindings: ASoC: Add Spreadtrum DMA platform documentation ASoC: sprd: Add Spreadtrum audio DMA platfrom driver Bard liao (7): ASoC: rt5645: remove unused mux define ASoC: rt5670: remove unused mux/mixer define ASoC: rt5645: store eq kcontrol byte in __be ASoC: rl6437a: use __be32 for a __be32 buf ASoC: rt5682: add default pdata for i2s mode ASoC: topology: fix memory leak in soc_tplg_dapm_widget_create ASoC: topology: unload physical dai link in remove Charles Keepax (6): ASoC: core: Allow soc_find_component lookups to match parent of_node ASoC: arizona: Add channel numbers to AIFs ASoC: dapm: Only power up active channels from a DAI ASoC: dapm: Check for NULL widget in dapm_update_dai_unlocked ASoC: compress: Clarify the intent of current compressed ops handling ASoC: compress: Add helper functions for component trigger/set_params Cheng-Yi Chiang (4): ASoC: qcom: Kconfig: select max98927 for sdm845 ASoC: sdm845: Set DAI format for dmic codec ASoC: Documentation: Add google, cros-ec-codec ASoC: cros_ec_codec: Add codec driver for Cros EC Clément Péron (1): ASoC: ak4118: fix missing header Colin Ian King (3): ASoC: Intel: make const arrays static, reduces object code size ASoC: mediatek: btcvsd: fix spelling mistake "offest" -> "offset" ASoC: codecs: jz4725b: fix spelling mistake "Deemphatize" -> "Deemphasize" Cosmin Samoila (2): ASoC: micfil: Add bindings for MICFIL DAI ASoC: Add MICFIL SoC Digital Audio Interface driver. Curtis Malainey (1): ASoC: soc-core: clear platform pointers on error Dan Carpenter (1): ASoC: wcd9335: remove some unnecessary NULL checks Daniel Baluta (2): ASoC: ak4458: Add support for AK4497 ASoC: dt-bindings: Document support for ak4497 Daniel Mack (1): ASoC: eliminate left-over from Raumfeld machine driver removal Danny Milosavljevic (8): ASoC: sun4i-codec: Add MIC2 Pre-Amplifier, Mic2 input ASoC: sun4i-codec: Add Mic Playback Volume ASoC: sun4i-codec: Add sun7i_codec_controls, sun7i_codec_codec ASoC: sun4i-codec: Add Mic1 Boost Volume, Mic2 Boost Volume ASoC: sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls ASoC: sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch ASoC: sun4i-codec: Add FM Playback Volume, FM Left, FM Right, FM Playback Switch ASoC: sun4i-codec: Add Line Playback Volume, Line Boost Volume, Line Right, Line Left, Line Playback Switch Dimitris Papavasiliou (2): ASoC: pcm512x: Implement the set_bclk_ratio interface ASoC: pcm512x: Fix clocking calculations when not using the PLL Fabio Estevam (1): ASoC: MAINTAINERS: fsl: Change Fabio's email address Guennadi Liakhovetski (1): ASoC: topology: fix oops/use-after-free case with dai driver Gustavo A. R. Silva (1): ASoC: xlnx: fix error handling in xlnx_formatter_pcm_probe Hans de Goede (17): ASoC: es8316: Add jack-detect support ASoC: es8316: Add DAC mono mix switch mixer control ASoC: Intel: bytcht_es8316: Sort includes alphabetically ASoC: Intel: bytcht_es8316: Minor refactoring ASoC: Intel: bytcht_es8316: Add support for SSP0 (BYTCR) ASoC: Intel: bytcht_es8316: Add jack-detect support ASoC: Intel: bytcht_es8316: Add external speaker mux support ASoC: Intel: bytcht_es8316: Add input-map support ASoC: Intel: bytcht_es8316: Set card long_name based on quirks ASoC: Intel: Add ACPI match table entry for ES8316 codec on BYTCR platform ASoC: Intel: common: Add quirk for PoV P1006W tablet ASoC: rt5651: Add ACPI ID 10EC5640 ASoC: rt5651: Add support for jack detect using an external GPIO ASoC: Intel: bytcr_rt5651: Revert "Fix DMIC map headsetmic mapping" ASoC: Intel: bytcr_rt5651: Add quirks module parameter ASoC: Intel: bytcr_rt5651: Add support for jack-detect using an external GPIO ASoC: Intel: bytcr_rt5651: Add quirk for PoV TAB-P1006W-232 (v1.0) tablet KaiChieh Chuang (2): ASoC: mediatek: add documents for btcvsd driver ASoC: mediatek: add btcvsd driver Katsuhiro Suzuki (2): ASoC: rockchip: support ACODEC for rk3328 ASoC: rockchip: add workaround for silence of rk3288 ACODEC Kuninori Morimoto (31): ASoC: simple-card-utils: check "reg" property on asoc_simple_card_get_dai_id() ASoC: audio-graph-card: add asoc_graph_card_get_conversion() ASoC: audio-graph-scu-card: remove audio-graph-scu-card on Doc ASoC: audio-graph-scu-card: remove audio-graph-scu-card ASoC: simple-scu-card: remove simple-scu-card on Doc ASoC: simple-scu-card: remove simple-scu-card ASoC: audio-graph-card: add 1 CPU : 1 Codec support again ASoC: audio-graph-card: add link_info ASoC: audio-graph-card: cleanup DAI link loop method - step1 ASoC: audio-graph-card: cleanup DAI link loop method - step2 ASoC: audio-graph-card: reduce naming prefix ASoC: simple-card: add asoc_simple_card_get_conversion() ASoC: simple-card: add 1 CPU : 1 Codec support again ASoC: simple-card: add link_info ASoC: simple-card: cleanup DAI link loop method - step1 ASoC: simple-card: cleanup DAI link loop method - step2 ASoC: simple-card: reduce naming prefix ASoC: rsnd: update BSDSR/BSDISR handling ASoC: soc.h: add explanation of legacy/modern style of dai_link ASoC: soc-core: add .num_platform for dai_link ASoC: soc-core: add new snd_soc_flush_all_delayed_work() ASoC: soc-core: merge card resources cleanup method ASoC: soc-core: reduce if/else nest on soc_probe_link_dais ASoC: soc-core: add soc_cleanup_component() ASoC: soc-core: use for_each_link_codecs() for dai_link codecs ASoC: simple-card: rename to asoc_simple_card_canonicalize_platform() ASoC: Fixup build error for mt6358 ASoC: soc-core: use for_each_link_codecs() for dai_link codecs V2 ASoC: rsnd: fixup MIX kctrl registration ASoC: rsnd: synchronize connection check for simple-card/audio-graph ASoC: rsnd: fixup TDM Split mode check for CTU Marco Felsch (1): ASoC: ssm2602: switch to SPDX identifier Mark Brown (7): Merge branch 'asoc-4.21' into HEAD Merge branch 'asoc-4.22' into asoc-5.0 Merge tag 'asoc-fix-v5.0-rc2' into asoc-5.1 ASoC: core: Fix multi-CODEC setups ASoC: wcd9335: Fix missing slimbus dependency Merge tag 'v5.0-rc4' into asoc-5.1 Merge branch 'asoc-5.0' into asoc-5.1 for dapm table Maruthi Srinivas Bayyavarapu (7): dt-bindings: ASoC: xlnx, audio-formatter: Document audio formatter bindings ASoC: xlnx: add pcm formatter platform driver ASoC: xlnx: enable audio formatter driver build dt-bindings: ASoC: xlnx, spdif: Document spdif bindings ASoC: xlnx: add SPDIF audio driver ASoC: xlnx: enable SPDIF driver build ASoC: xlnx: parse AES audio parameters Michał Mirosław (3): ASoC: wm8904: make the driver visible in Kconfig ASoC: wm8904: save model id directly in of_device_id.data ASoC: wm8904: enable MCLK in STANDBY Paul Cercueil (7): ASoC: codecs: Add jz4725b-codec driver dt-bindings: sound: Document jz4740-codec bindings dt-bindings: sound: Document jz4725b-codec bindings ASoC: codecs: jz4740: Use SPDX license notifier ASoC: codecs: jz4740: Add support for devicetree ASoC: codecs: Kconfig: Show knob, and depend on MIPS || COMPILE_TEST ASoC: codecs: jz4725b: Use C++ style comments in header Peter Ujfalusi (3): ASoC: ti: davinci-mcasp: No need for IS_MODULE/BUILTIN check for pcm driver ASoC: davinci-mcasp: Document GPIO support ASoC: ti: davinci-mcasp: Add support for GPIO mode of the pins Philipp Zabel (1): ASoC: ssm2602: Fix ADC powerup sequencing Pierre-Louis Bossart (45): ASoC: Intel: Skylake: remove useless cast ASoC: Intel: Skylake: simplify boolean tests ASoC: Intel: Haswell: remove unneeded semicolon ASoC: Intel: Haswell: assign booleans to true/false ASoC: Intel: Baytrail: remove unneeded variable ASoC: Intel: Baytrail: simplify boolean test ASoC: Intel: Atom: simplify boolean tests ASoC: Intel: boards: use snd_mask_set_format in all machine drivers ASoC: dmic: declare trigger function as static ASoC: max98090: remove unused constant variables ASoC: es8316: remove unused constant variables ASoC: codecs: fix kernel doc descriptions ASoC: max98383: fix boolean assignments to true/false ASoC: cs4271: fix boolean assignments ASoC: rt274: fix boolean tests ASoc: rt286: fix boolean tests ASoC: rt5640: fix boolean assignments ASoC: max98927: fix boolean assignments ASoC: rt5651: fix boolean assignments ASoC: nau8824: fix boolean assignment ASoC: tscs42xx.c: fix boolean test ASoC: mt6351: remove unneeded variable ASoC: da7219: fix endianness issues ASoC: da7219: use logical AND ASoC: rt298: fix boolean tests ASoC: soc-acpi: add static inline fallbacks when CONFIG_ACPI=n ASoC: add helper to change platform name for all dailinks ASoC: Intel: haswell: platform name fixup support ASoC: Intel: broadwell: platform name fixup support ASoC: Intel: bdw-rt5677: platform name fixup support ASoC: Intel: bytcr_rt5640: platform name fixup support ASoC: Intel: bytcr_rt5651: platform name fixup support ASoC: Intel: bytcht_da7213: platform name fixup support ASoC: Intel: bytcht_es8316: platform name fixup support ASoC: Intel: cht_bsw_max98090_ti: platform name fixup support ASoC: Intel: cht_bsw_nau8824: platform name fixup support ASoC: Intel: cht_bsw_rt5645: platform name fixup support ASoC: Intel: cht_bsw_rt5672: platform name fixup support ASoC: Intel: bxt_da7219_max98357a: platform name fixup support ASoC: Intel: bxt_rt298: platform name fixup support ASoC: Intel: glk_rt5682_max98357a: platform name fixup support ASoC: Intel: cht_bsw_rt5672: remove useless test ASoC: dapm: fix use-after-free issue with dailink sname ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables ASoC: dapm: harden use of lookup tables Ranjani Sridharan (2): ASoC: topology: add SND_SOC_DOBJ_GRAPH type for dapm routes ASoC: topology: modify dapm route loading routine and add dapm route unloading Russell King (1): ASoC: hdmi-codec: fix oops on re-probe Shengjiu Wang (1): ASoC: fsl_sai: Remove expensive print in irq handler Shuming Fan (1): ASoC: rt5682: Correct the setting while select ASRC clk for AD/DA filter Shunli Wang (4): ASoC: mediatek: mt8183: add platform driver ASoC: mediatek: mt8183: add audio afe document ASoC: mediatek: mt6358: add codec driver ASoC: mediatek: mt6358: add codec document Srinivas Kandagatla (9): ASoC: msm8916-wcd-digital: remove few unused variables ASoC: dt-bindings: update wcd9335 bindings. ASoC: wcd9335: add support to wcd9335 codec ASoC: wcd9335: add CLASS-H Controller support ASoC: wcd9335: add basic controls ASoC: wcd9335: add playback dapm widgets ASoC: wcd9335: add capture dapm widgets ASoC: wcd9335: add audio routings ASoC: apq8096: add slim support Stefan Agner (6): ASoC: imx-sgtl5000: put of nodes if finding codec fails ASoC: imx-sgtl5000: lower log level for potential probe deferral cases ASoC: imx-sgtl5000: don't print EPROBE_DEFER as error ASoC: fsl_spdif: don't print EPROBE_DEFER as error ASoC: imx-spdif: don't print EPROBE_DEFER as error ASoC: soc-core: remove error due to probe deferral Stephan Gerhold (3): ASoC: Intel: sst: Simplify is_byt_cr() ASoC: Intel: sst: Fallback to BYT-CR if IRQ 5 is missing ASoC: Intel: bytcr_rt5640: Add quirks for ASUS MeMO Pad 7 (ME176C) Wei Yongjun (1): ASoC: Intel: bytcht_es8316: use correct drvdata in snd_byt_cht_es8316_mc_remove() Yizhuo (2): ASoC: rt274: Variable "buf" in function rt274_jack_detect() could be uninitialized ASoC: rt5651: Variable "ret" in function rt5651_i2c_probe() could be uninitialized YueHaibing (1): ASoC: rockchip: fix platform_no_drv_owner.cocci warnings Zhiwei Jiang (1): ASoC: dapm: Add warnings for widget overwrite when adding route b-ak (1): ASoC: tlv320aic32x4: SND_SOC_DAPM_MICBIAS is deprecated kbuild test robot (1): ASoC: wcd9335: fix semicolon.cocci warnings wen yang (1): ASoC: fsl-asoc-card: fix object reference leaks in fsl_asoc_card_probe Documentation/devicetree/bindings/sound/ak4458.txt | 2 +- .../bindings/sound/audio-graph-scu-card.txt | 123 - Documentation/devicetree/bindings/sound/cs4341.txt | 22 + .../bindings/sound/davinci-mcasp-audio.txt | 17 + .../devicetree/bindings/sound/fsl,micfil.txt | 32 + .../bindings/sound/google,cros-ec-codec.txt | 26 + .../bindings/sound/ingenic,jz4725b-codec.txt | 20 + .../bindings/sound/ingenic,jz4740-codec.txt | 20 + Documentation/devicetree/bindings/sound/mt6358.txt | 18 + .../devicetree/bindings/sound/mt8183-afe-pcm.txt | 36 + .../devicetree/bindings/sound/mtk-btcvsd-snd.txt | 24 + .../devicetree/bindings/sound/qcom,wcd9335.txt | 10 +- .../bindings/sound/rockchip,rk3328-codec.txt | 23 + .../devicetree/bindings/sound/sgtl5000.txt | 9 + .../devicetree/bindings/sound/simple-scu-card.txt | 94 - .../devicetree/bindings/sound/sprd-pcm.txt | 23 + .../bindings/sound/xlnx,audio-formatter.txt | 29 + .../devicetree/bindings/sound/xlnx,spdif.txt | 28 + MAINTAINERS | 12 +- include/sound/simple_card_utils.h | 4 +- include/sound/soc-acpi.h | 28 +- include/sound/soc-dapm.h | 27 +- include/sound/soc-topology.h | 8 +- include/sound/soc.h | 70 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 62 +- sound/soc/codecs/Makefile | 12 + sound/soc/codecs/adau7002.c | 45 + sound/soc/codecs/ak4118.c | 1 + sound/soc/codecs/ak4458.c | 79 +- sound/soc/codecs/cros_ec_codec.c | 441 ++ sound/soc/codecs/cs4271.c | 4 +- sound/soc/codecs/cs4341.c | 346 ++ sound/soc/codecs/cs47l24.c | 52 +- sound/soc/codecs/da7219-aad.c | 2 +- sound/soc/codecs/da7219.c | 85 +- sound/soc/codecs/da7219.h | 1 + sound/soc/codecs/dmic.c | 4 +- sound/soc/codecs/es8316.c | 200 +- sound/soc/codecs/es8316.h | 7 + sound/soc/codecs/hdmi-codec.c | 4 +- sound/soc/codecs/jz4725b.c | 598 +++ sound/soc/codecs/jz4740.c | 26 +- sound/soc/codecs/max98090.c | 15 - sound/soc/codecs/max98373.c | 6 +- sound/soc/codecs/max98927.c | 8 +- sound/soc/codecs/msm8916-wcd-digital.c | 10 - sound/soc/codecs/mt6351.c | 4 +- sound/soc/codecs/mt6358.c | 2336 +++++++++ sound/soc/codecs/mt6358.h | 2314 +++++++++ sound/soc/codecs/nau8824.c | 2 +- sound/soc/codecs/nau8825.c | 1 + sound/soc/codecs/pcm512x.c | 32 +- sound/soc/codecs/rk3328_codec.c | 519 ++ sound/soc/codecs/rk3328_codec.h | 210 + sound/soc/codecs/rl6347a.c | 4 +- sound/soc/codecs/rt274.c | 19 +- sound/soc/codecs/rt286.c | 8 +- sound/soc/codecs/rt298.c | 12 +- sound/soc/codecs/rt5514.c | 1 + sound/soc/codecs/rt5640.c | 6 +- sound/soc/codecs/rt5645.c | 66 +- sound/soc/codecs/rt5651.c | 67 +- sound/soc/codecs/rt5651.h | 1 + sound/soc/codecs/rt5670.c | 54 - sound/soc/codecs/rt5677.c | 8 +- sound/soc/codecs/rt5682.c | 10 + sound/soc/codecs/sgtl5000.c | 19 +- sound/soc/codecs/ssm2602.c | 71 +- sound/soc/codecs/tlv320aic32x4.c | 30 +- sound/soc/codecs/tlv320aic32x4.h | 1 + sound/soc/codecs/tscs42xx.c | 2 +- sound/soc/codecs/wcd-clsh-v2.c | 576 +++ sound/soc/codecs/wcd-clsh-v2.h | 49 + sound/soc/codecs/wcd9335.c | 5244 ++++++++++++++++++++ sound/soc/codecs/wcd9335.h | 640 +++ sound/soc/codecs/wm5102.c | 64 +- sound/soc/codecs/wm5110.c | 80 +- sound/soc/codecs/wm8904.c | 21 +- sound/soc/codecs/wm8997.c | 60 +- sound/soc/codecs/wm8998.c | 60 +- sound/soc/fsl/Kconfig | 9 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl-asoc-card.c | 1 + sound/soc/fsl/fsl_micfil.c | 826 +++ sound/soc/fsl/fsl_micfil.h | 283 ++ sound/soc/fsl/fsl_sai.c | 8 +- sound/soc/fsl/fsl_spdif.c | 2 +- sound/soc/fsl/imx-sgtl5000.c | 11 +- sound/soc/fsl/imx-spdif.c | 4 +- sound/soc/generic/Kconfig | 17 - sound/soc/generic/Makefile | 4 - sound/soc/generic/audio-graph-card.c | 481 +- sound/soc/generic/audio-graph-scu-card.c | 501 -- sound/soc/generic/simple-card-utils.c | 25 +- sound/soc/generic/simple-card.c | 472 +- sound/soc/generic/simple-scu-card.c | 474 -- sound/soc/intel/atom/sst-atom-controls.c | 2 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 45 +- sound/soc/intel/atom/sst/sst_drv_interface.c | 2 +- sound/soc/intel/atom/sst/sst_loader.c | 2 +- sound/soc/intel/baytrail/sst-baytrail-ipc.c | 3 +- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 2 +- sound/soc/intel/boards/bdw-rt5677.c | 14 + sound/soc/intel/boards/broadwell.c | 16 + sound/soc/intel/boards/bxt_da7219_max98357a.c | 13 + sound/soc/intel/boards/bxt_rt298.c | 13 + sound/soc/intel/boards/bytcht_da7213.c | 8 + sound/soc/intel/boards/bytcht_es8316.c | 336 +- sound/soc/intel/boards/bytcr_rt5640.c | 23 +- sound/soc/intel/boards/bytcr_rt5651.c | 114 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 + sound/soc/intel/boards/cht_bsw_nau8824.c | 12 + sound/soc/intel/boards/cht_bsw_rt5645.c | 9 + sound/soc/intel/boards/cht_bsw_rt5672.c | 30 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 23 +- sound/soc/intel/boards/haswell.c | 15 + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 +- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 44 +- sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +- sound/soc/intel/haswell/sst-haswell-pcm.c | 4 +- sound/soc/intel/skylake/skl-messages.c | 2 +- sound/soc/intel/skylake/skl-pcm.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 2 +- sound/soc/mediatek/Kconfig | 19 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/common/Makefile | 2 + sound/soc/mediatek/common/mtk-btcvsd.c | 1364 +++++ sound/soc/mediatek/mt8183/Makefile | 13 + sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 611 +++ sound/soc/mediatek/mt8183/mt8183-afe-clk.h | 38 + sound/soc/mediatek/mt8183/mt8183-afe-common.h | 108 + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 1237 +++++ sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 501 ++ sound/soc/mediatek/mt8183/mt8183-dai-hostless.c | 118 + sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 1040 ++++ sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 318 ++ sound/soc/mediatek/mt8183/mt8183-dai-tdm.c | 639 +++ sound/soc/mediatek/mt8183/mt8183-interconnection.h | 33 + sound/soc/mediatek/mt8183/mt8183-reg.h | 1666 +++++++ sound/soc/pxa/Makefile | 1 - sound/soc/qcom/Kconfig | 1 + sound/soc/qcom/apq8096.c | 71 +- sound/soc/qcom/sdm845.c | 2 + sound/soc/sh/rcar/core.c | 48 +- sound/soc/sh/rcar/src.c | 125 +- sound/soc/soc-compress.c | 177 +- sound/soc/soc-core.c | 267 +- sound/soc/soc-dapm.c | 244 +- sound/soc/soc-pcm.c | 4 + sound/soc/soc-topology.c | 171 +- sound/soc/sprd/Kconfig | 6 + sound/soc/sprd/Makefile | 4 + sound/soc/sprd/sprd-pcm-dma.c | 562 +++ sound/soc/sprd/sprd-pcm-dma.h | 15 + sound/soc/sunxi/sun4i-codec.c | 149 +- sound/soc/ti/davinci-mcasp.c | 175 +- sound/soc/xilinx/Kconfig | 14 + sound/soc/xilinx/Makefile | 4 + sound/soc/xilinx/xlnx_formatter_pcm.c | 708 +++ sound/soc/xilinx/xlnx_spdif.c | 339 ++ 163 files changed, 27411 insertions(+), 2566 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt create mode 100644 Documentation/devicetree/bindings/sound/cs4341.txt create mode 100644 Documentation/devicetree/bindings/sound/fsl,micfil.txt create mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt create mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt create mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt create mode 100644 Documentation/devicetree/bindings/sound/mt6358.txt create mode 100644 Documentation/devicetree/bindings/sound/mt8183-afe-pcm.txt create mode 100644 Documentation/devicetree/bindings/sound/mtk-btcvsd-snd.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt delete mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt create mode 100644 Documentation/devicetree/bindings/sound/sprd-pcm.txt create mode 100644 Documentation/devicetree/bindings/sound/xlnx,audio-formatter.txt create mode 100644 Documentation/devicetree/bindings/sound/xlnx,spdif.txt create mode 100644 sound/soc/codecs/cros_ec_codec.c create mode 100644 sound/soc/codecs/cs4341.c create mode 100644 sound/soc/codecs/jz4725b.c create mode 100644 sound/soc/codecs/mt6358.c create mode 100644 sound/soc/codecs/mt6358.h create mode 100644 sound/soc/codecs/rk3328_codec.c create mode 100644 sound/soc/codecs/rk3328_codec.h create mode 100644 sound/soc/codecs/wcd-clsh-v2.c create mode 100644 sound/soc/codecs/wcd-clsh-v2.h create mode 100644 sound/soc/codecs/wcd9335.c create mode 100644 sound/soc/codecs/wcd9335.h create mode 100644 sound/soc/fsl/fsl_micfil.c create mode 100644 sound/soc/fsl/fsl_micfil.h delete mode 100644 sound/soc/generic/audio-graph-scu-card.c delete mode 100644 sound/soc/generic/simple-scu-card.c create mode 100644 sound/soc/mediatek/common/mtk-btcvsd.c create mode 100644 sound/soc/mediatek/mt8183/Makefile create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-clk.c create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-clk.h create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-common.h create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-pcm.c create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-adda.c create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-hostless.c create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-i2s.c create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-pcm.c create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-tdm.c create mode 100644 sound/soc/mediatek/mt8183/mt8183-interconnection.h create mode 100644 sound/soc/mediatek/mt8183/mt8183-reg.h create mode 100644 sound/soc/sprd/Kconfig create mode 100644 sound/soc/sprd/Makefile create mode 100644 sound/soc/sprd/sprd-pcm-dma.c create mode 100644 sound/soc/sprd/sprd-pcm-dma.h create mode 100644 sound/soc/xilinx/xlnx_formatter_pcm.c create mode 100644 sound/soc/xilinx/xlnx_spdif.c

2 3

[alsa-devel] [GIT PULL] ASoC fixes for v5.0
by Mark Brown 08 Feb '19

08 Feb '19

The following changes since commit 4cb79ef9c6c4413427cd70afbb1f3bc01e9b7abf: ASoC: amd: Fix potential NULL pointer dereference (2019-01-15 19:06:23 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.0-rc5 for you to fetch changes up to 860b454c2c0cbda6892954f5cdbbb48931b3c8db: ASoC: samsung: Prevent clk_get_rate() calls in atomic context (2019-02-07 14:34:53 +0000) ---------------------------------------------------------------- ASoC: Fixes for v5.0 A selection of driver specific fixes here, along with a few core fixes: - A fixup for some MFD devices that were broken by the previous fixes for deferred probe. - A fix for potential out of bounds array accesses when ordering DAPM power/up down sequences. - Avoid use after free issue when unloading and reloading drivers using topologies. ---------------------------------------------------------------- Charles Keepax (1): ASoC: core: Allow soc_find_component lookups to match parent of_node Fabio Estevam (1): ASoC: MAINTAINERS: fsl: Change Fabio's email address Guennadi Liakhovetski (1): ASoC: topology: fix oops/use-after-free case with dai driver Jiada Wang (1): ASoC: rsnd: ssiu: correct shift bit for ssiu9 Kuninori Morimoto (2): ASoC: rsnd: fixup MIX kctrl registration ASoC: rsnd: fixup rsnd_ssi_master_clk_start() user count check Pierre-Louis Bossart (1): ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables Russell King (1): ASoC: hdmi-codec: fix oops on re-probe Shuming Fan (1): ASoC: rt5682: Correct the setting while select ASRC clk for AD/DA filter Sylwester Nawrocki (1): ASoC: samsung: Prevent clk_get_rate() calls in atomic context MAINTAINERS | 4 ++-- sound/soc/codecs/hdmi-codec.c | 4 ++-- sound/soc/codecs/rt5682.c | 2 ++ sound/soc/samsung/i2s.c | 10 +++++----- sound/soc/sh/rcar/core.c | 8 ++++---- sound/soc/sh/rcar/ssi.c | 2 +- sound/soc/sh/rcar/ssiu.c | 2 +- sound/soc/soc-core.c | 9 +++++++-- sound/soc/soc-dapm.c | 24 ++++++++++++++++++++++++ sound/soc/soc-topology.c | 5 +++++ 10 files changed, 53 insertions(+), 17 deletions(-)

2 1