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

[alsa-devel] Applied "ASoC: tlv320aic32x4: Break out clock setting into separate function" to the asoc tree
by Mark Brown 20 Mar '19

20 Mar '19

The patch ASoC: tlv320aic32x4: Break out clock setting into separate function 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 bf31cbfbe25001036e1e096b1c260bf871766ea5 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond <nh6z(a)nh6z.net> Date: Mon, 18 Mar 2019 20:37:44 -0700 Subject: [PATCH] ASoC: tlv320aic32x4: Break out clock setting into separate function Break the clock setting logic out from the main hw_params. It's rather large and unweildy and makes for a large function. This also better enables some of the following changes to the clock tree access in the driver. Signed-off-by: Annaliese McDermond <nh6z(a)nh6z.net> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/tlv320aic32x4.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 96f1526cb258..1aa8f5aa4225 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -696,17 +696,13 @@ static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) return 0; } -static int aic32x4_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) +static int aic32x4_setup_clocks(struct snd_soc_component *component, + unsigned int sample_rate, + unsigned int parent_rate) { - struct snd_soc_component *component = dai->component; - struct aic32x4_priv *aic32x4 = snd_soc_component_get_drvdata(component); - u8 iface1_reg = 0; - u8 dacsetup_reg = 0; int i; - i = aic32x4_get_divs(aic32x4->sysclk, params_rate(params)); + i = aic32x4_get_divs(parent_rate, sample_rate); if (i < 0) { printk(KERN_ERR "aic32x4: sampling rate not supported\n"); return i; @@ -763,6 +759,20 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream, snd_soc_component_update_bits(component, AIC32X4_BCLKN, AIC32X4_BCLK_MASK, aic32x4_divs[i].blck_N); + return 0; +} + +static int aic32x4_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct aic32x4_priv *aic32x4 = snd_soc_component_get_drvdata(component); + u8 iface1_reg = 0; + u8 dacsetup_reg = 0; + + aic32x4_setup_clocks(component, params_rate(params), aic32x4->sysclk); + switch (params_width(params)) { case 16: iface1_reg |= (AIC32X4_WORD_LEN_16BITS << -- 2.20.1

1 0

[alsa-devel] [PATCH] ASoC: samsung: i2s: Don't use register read to determine slave/master mode
by Sylwester Nawrocki 20 Mar '19

20 Mar '19

We can simplify the code by caching the CPU DAI master/slave information rather than reading previously set register bit. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/samsung/i2s.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index ab471d550d17..9722940da6a4 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -88,12 +88,6 @@ struct samsung_i2s_priv { struct platform_device *pdev; struct platform_device *pdev_sec; - /* Memory mapped SFR region */ - void __iomem *addr; - - /* Spinlock protecting access to the device's registers */ - spinlock_t lock; - /* Lock for cross interface checks */ spinlock_t pcm_lock; @@ -122,6 +116,15 @@ struct samsung_i2s_priv { /* The clock provider's data */ struct clk *clk_table[3]; struct clk_onecell_data clk_data; + + /* Spinlock protecting member fields below */ + spinlock_t lock; + + /* Memory mapped SFR region */ + void __iomem *addr; + + /* A flag indicating the I2S slave mode operation */ + bool slave_mode; }; /* Returns true if this is the 'overlay' stereo DAI */ @@ -130,15 +133,6 @@ static inline bool is_secondary(struct i2s_dai *i2s) return i2s->drv->id == SAMSUNG_I2S_ID_SECONDARY; } -/* If operating in SoC-Slave mode */ -static inline bool is_slave(struct i2s_dai *i2s) -{ - struct samsung_i2s_priv *priv = i2s->priv; - - u32 mod = readl(priv->addr + I2SMOD); - return (mod & (1 << priv->variant_regs->mss_off)) ? true : false; -} - /* If this interface of the controller is transmitting data */ static inline bool tx_active(struct i2s_dai *i2s) { @@ -715,6 +709,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) mod &= ~(sdf_mask | lrp_rlow | mod_slave); mod |= tmp; writel(mod, priv->addr + I2SMOD); + priv->slave_mode = (mod & mod_slave); spin_unlock_irqrestore(&priv->lock, flags); pm_runtime_put(dai->dev); @@ -917,7 +912,7 @@ static int config_setup(struct i2s_dai *i2s) set_rfs(i2s, rfs); /* Don't bother with PSR in Slave mode */ - if (is_slave(i2s)) + if (priv->slave_mode) return 0; if (!(priv->quirks & QUIRK_NO_MUXPSR)) { -- 2.17.1

2 1

[alsa-devel] [PATCH] ASoC: wm_adsp: Correct some minor issues
by Charles Keepax 20 Mar '19

20 Mar '19

The wm_adsp_ops structures should be static and correct two printf specifiers. Fixes: 170b1e123f38 ("ASoC: wm_adsp: Add support for new Halo core DSPs") Fixes: 4e08d50d1fb6 ("ASoC: wm_adsp: Factor out DSP specific operations") Reported-by: kbuild test robot <lkp(a)intel.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 644aaf1d27403..5e615fbddf9a7 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -306,9 +306,9 @@ #define HALO_MPU_VIO_ERR_SRC_MASK 0x00007fff #define HALO_MPU_VIO_ERR_SRC_SHIFT 0 -struct wm_adsp_ops wm_adsp1_ops; -struct wm_adsp_ops wm_adsp2_ops[]; -struct wm_adsp_ops wm_halo_ops; +static struct wm_adsp_ops wm_adsp1_ops; +static struct wm_adsp_ops wm_adsp2_ops[]; +static struct wm_adsp_ops wm_halo_ops; struct wm_adsp_buf { struct list_head list; @@ -2142,7 +2142,7 @@ static void wmfw_parse_id_header(struct wm_adsp *dsp, dsp->fw_id = be32_to_cpu(fw->id); dsp->fw_id_version = be32_to_cpu(fw->ver); - adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n", + adsp_info(dsp, "Firmware: %x v%d.%d.%d, %d algorithms\n", dsp->fw_id, (dsp->fw_id_version & 0xff0000) >> 16, (dsp->fw_id_version & 0xff00) >> 8, dsp->fw_id_version & 0xff, nalgs); @@ -2155,7 +2155,7 @@ static void wmfw_v3_parse_id_header(struct wm_adsp *dsp, dsp->fw_id_version = be32_to_cpu(fw->ver); dsp->fw_vendor_id = be32_to_cpu(fw->vendor_id); - adsp_info(dsp, "Firmware: %x vendor: 0x%x v%d.%d.%d, %zu algorithms\n", + adsp_info(dsp, "Firmware: %x vendor: 0x%x v%d.%d.%d, %d algorithms\n", dsp->fw_id, dsp->fw_vendor_id, (dsp->fw_id_version & 0xff0000) >> 16, (dsp->fw_id_version & 0xff00) >> 8, dsp->fw_id_version & 0xff, @@ -4407,13 +4407,13 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data) } EXPORT_SYMBOL_GPL(wm_halo_wdt_expire); -struct wm_adsp_ops wm_adsp1_ops = { +static struct wm_adsp_ops wm_adsp1_ops = { .validate_version = wm_adsp_validate_version, .parse_sizes = wm_adsp1_parse_sizes, .region_to_reg = wm_adsp_region_to_reg, }; -struct wm_adsp_ops wm_adsp2_ops[] = { +static struct wm_adsp_ops wm_adsp2_ops[] = { { .sys_config_size = sizeof(struct wm_adsp_system_config_xm_hdr), .parse_sizes = wm_adsp2_parse_sizes, @@ -4474,7 +4474,7 @@ struct wm_adsp_ops wm_adsp2_ops[] = { }, }; -struct wm_adsp_ops wm_halo_ops = { +static struct wm_adsp_ops wm_halo_ops = { .sys_config_size = sizeof(struct wm_halo_system_config_xm_hdr), .parse_sizes = wm_adsp2_parse_sizes, .validate_version = wm_halo_validate_version, -- 2.11.0

2 1

[alsa-devel] [PATCH 0/3] ASoC: stm32: dfsdm: fixes
by Olivier Moysan 20 Mar '19

20 Mar '19

This patch-set provides the following fixes for STM32 DFSDM: - manage multiple prepare - fix debugfs warnings on entry creation - add mmap support Olivier Moysan (3): ASoC: stm32: dfsdm: manage multiple prepare ASoC: stm32: dfsdm: fix debugfs warnings on entry creation ASoC: stm32: dfsdm: add mmap support sound/soc/stm/stm32_adfsdm.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) -- 2.7.4

2 6

[alsa-devel] [RFC PATCH asoc] ASoC: wm_adsp: wm_halo_ops can be static
by kbuild test robot 20 Mar '19

20 Mar '19

Fixes: 170b1e123f38 ("ASoC: wm_adsp: Add support for new Halo core DSPs") Signed-off-by: kbuild test robot <lkp(a)intel.com> --- wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 644aaf1..33b39c6 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -308,7 +308,7 @@ struct wm_adsp_ops wm_adsp1_ops; struct wm_adsp_ops wm_adsp2_ops[]; -struct wm_adsp_ops wm_halo_ops; +static struct wm_adsp_ops wm_halo_ops; struct wm_adsp_buf { struct list_head list;

3 2

[alsa-devel] [PATCH 1/2] ASoC: lochnagar: Add device tree binding document
by Charles Keepax 20 Mar '19

20 Mar '19

Lochnagar is an evaluation and development board for Cirrus Logic Smart CODEC and Amp devices. It allows the connection of most Cirrus Logic devices on mini-cards, as well as allowing connection of various application processor systems to provide a full evaluation platform. This driver supports the board controller chip on the Lochnagar board. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- .../devicetree/bindings/sound/cirrus,lochnagar.txt | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt diff --git a/Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt b/Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt new file mode 100644 index 0000000000000..fba5fb53a2f90 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt @@ -0,0 +1,39 @@ +Cirrus Logic Lochnagar Audio Development Board + +Lochnagar is an evaluation and development board for Cirrus Logic +Smart CODEC and Amp devices. It allows the connection of most Cirrus +Logic devices on mini-cards, as well as allowing connection of +various application processor systems to provide a full evaluation +platform. Audio system topology, clocking and power can all be +controlled through the Lochnagar, allowing the device under test +to be used in a variety of possible use cases. + +This binding document describes the binding for the audio portion +of the driver. + +This binding must be part of the Lochnagar MFD binding: + [4] ../mfd/cirrus,lochnagar.txt + +Required properties: + + - compatible : One of the following strings: + "cirrus,lochnagar2-soundcard" + + - #sound-dai-cells : Must be set to 1. + + - clocks : Contains an entry for each entry in clock-names. + - clock-names : Must include the following clocks: + "ln-sound-mclk" Master clock source for the sound card, should + normally be set to LOCHNAGAR_SOUNDCARD_MCLK provided by the + Lochnagar clock driver. + +Example: + +lochnagar-sc { + compatible = "cirrus,lochnagar2-soundcard"; + + #sound-dai-cells = <1>; + + clocks = <&lochnagar_clk LOCHNAGAR_SOUNDCARD_MCLK>; + clock-names = "ln-soundcard-mclk"; +}; -- 2.11.0

2 3

[alsa-devel] [PATCH 00/13] ASoC: tlv320aic32x4: Rework Clock Setting
by Annaliese McDermond 20 Mar '19

20 Mar '19

The current tlv320aic32x4 code sets the various clock parameters by looking in a static table in the kernel. This works well enough, but it has a few disadvantages. 1) If the master clock doesn't match one of the precalculated values the driver cannot work. This could be because the designer decided to use a different crystal, or because the clock comes from a PLL that can't quite achieve the proper frequency exactly. 2) The driver only supports certain pre-calculated sample rates. The actual hardware can support many more. These changes enable those rates. Additionally, certain sample rates at certain clock rates were previously unavailable as combinations. This patch dynamically calculates the various PLL and divider values to find something that works. Additionally, to enable much of this, the clock tree is modeled as a part of the Common Clock Framework. This allows for easier debugigng as you can use the standard tools such as /sys/kernel/debug/clk/clk_summary. It also simplifies enabling the entirety of the clock tree needed, and makes sure unused clocks become disabled. These patches have been tested and are working on a Raspberry Pi with the simplecard driver. Annaliese McDermond (13): ASoC: tlv320aic32x4: Break out clock setting into separate function ASoC: tlv320aic32x4: Model PLL in CCF ASoC: tlv320aic32x4: Model CODEC_CLKIN in CCF ASoC: tlv320aic32x4: Model DAC/ADC dividers in CCF ASoC: tlv320aic32x4: Model BDIV divider in CCF ASoC: tlv320aic32x4: Control clock gating with CCF ASoC: tlv320aic32x4: Move aosr and dosr setting to separate functions ASoC: tlv320aic32x4: Dynamically Determine Clocking ASoC: tlv320aic32x4: Fix clock activation on bias level change ASoC: tlv320aic32x4: Remove sysclk references ASoC: tlv320aic32x4: Remove mclk references ASoC: tlv320aic32x4: Propery Set Processing Blocks ASoC: tlv320aic32x4: Allow 192000 Sample Rate sound/soc/codecs/Makefile | 2 +- sound/soc/codecs/tlv320aic32x4-clk.c | 483 +++++++++++++++++++++++++++ sound/soc/codecs/tlv320aic32x4.c | 374 ++++++++++----------- sound/soc/codecs/tlv320aic32x4.h | 11 + 4 files changed, 670 insertions(+), 200 deletions(-) create mode 100644 sound/soc/codecs/tlv320aic32x4-clk.c -- Annaliese McDermond nh6z(a)nh6z.net

2 22

[alsa-devel] [PATCH] slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register
by Kangjie Lu 20 Mar '19

20 Mar '19

In case platform_device_alloc fails, the fix returns an error code to avoid the NULL pointer dereference. Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> --- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 71f094c9ec68..f3585777324c 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1342,6 +1342,10 @@ static int of_qcom_slim_ngd_register(struct device *parent, return -ENOMEM; ngd->pdev = platform_device_alloc(QCOM_SLIM_NGD_DRV_NAME, id); + if (!ngd->pdev) { + kfree(ngd); + return -ENOMEM; + } ngd->id = id; ngd->pdev->dev.parent = parent; ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME; -- 2.17.1

2 1

[alsa-devel] [PATCH] slimbus: ngd: Fix to avoid potential NULL pointer dereference
by Aditya Pakki 20 Mar '19

20 Mar '19

In of_qcom_slim_ngd_register, of_match_node may fail and return a NULL pointer. This patch avoids such a scenario leading to NULL pointer dereference. Fixes: 458a445deb9c ("slimbus: ngd: Fix build error on x86") Signed-off-by: Aditya Pakki <pakki001(a)umn.edu> --- drivers/slimbus/qcom-ngd-ctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 71f094c9ec68..9cc7256028c9 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1332,6 +1332,8 @@ static int of_qcom_slim_ngd_register(struct device *parent, u32 id; match = of_match_node(qcom_slim_ngd_dt_match, parent->of_node); + if (!match) + return -ENXIO; data = match->data; for_each_available_child_of_node(parent->of_node, node) { if (of_property_read_u32(node, "reg", &id)) -- 2.17.1

2 1

[alsa-devel] [PATCH v2 00/12] ASoC: tlv320aic32x4: Rework Clock Setting
by Annaliese McDermond 20 Mar '19

20 Mar '19

The current tlv320aic32x4 code sets the various clock parameters by looking in a static table in the kernel. This works well enough, but it has a few disadvantages. 1) If the master clock doesn't match one of the precalculated values the driver cannot work. This could be because the designer decided to use a different crystal, or because the clock comes from a PLL that can't quite achieve the proper frequency exactly. 2) The driver only supports certain pre-calculated sample rates. The actual hardware can support many more. These changes enable those rates. Additionally, certain sample rates at certain clock rates were previously unavailable as combinations. This patch dynamically calculates the various PLL and divider values to find something that works. Additionally, to enable much of this, the clock tree is modeled as a part of the Common Clock Framework. This allows for easier debugigng as you can use the standard tools such as /sys/kernel/debug/clk/clk_summary. It also simplifies enabling the entirety of the clock tree needed, and makes sure unused clocks become disabled. These patches have been tested and are working on a Raspberry Pi with the simplecard driver. Changes in v2: - Update 0002 patch to change Kconfig to add dependency on CCF - Update 0002 patch to correct the SPDX identifier - Update 0002 patch to use EXPORT_SYMBOL_GPL() instead of EXPORT_SYMBOL() - Update patches 0002, 0004 and 0005 to use prepare/unprepare instead of enable/disable since the i2c operations are not atomic - Update 0004 patch to fix indentation in commit message - Drop patch 0009 because it is a duplicate of the already committed patch in 667e9334 - Update 0019 patch to keep aic32x4_set_dai_sysclk but to have it use clk_set_rate to set the master clock rate Annaliese McDermond (12): ASoC: tlv320aic32x4: Break out clock setting into separate function ASoC: tlv320aic32x4: Model PLL in CCF ASoC: tlv320aic32x4: Model CODEC_CLKIN in CCF ASoC: tlv320aic32x4: Model DAC/ADC dividers in CCF ASoC: tlv320aic32x4: Model BDIV divider in CCF ASoC: tlv320aic32x4: Control clock gating with CCF ASoC: tlv320aic32x4: Move aosr and dosr setting to separate functions ASoC: tlv320aic32x4: Dynamically Determine Clocking ASoC: tlv320aic32x4: Restructure set_dai_sysclk ASoC: tlv320aic32x4: Remove mclk references ASoC: tlv320aic32x4: Propery Set Processing Blocks ASoC: tlv320aic32x4: Allow 192000 Sample Rate sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/Makefile | 2 +- sound/soc/codecs/tlv320aic32x4-clk.c | 483 +++++++++++++++++++++++++++ sound/soc/codecs/tlv320aic32x4.c | 365 ++++++++++---------- sound/soc/codecs/tlv320aic32x4.h | 11 + 5 files changed, 674 insertions(+), 188 deletions(-) create mode 100644 sound/soc/codecs/tlv320aic32x4-clk.c -- 2.19.1

1 12