September 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [linux-sunxi][PATCH 3/3] ASOC: sunxi: Add support for the spdif block
by codekipper＠gmail.com 29 Sep '15

29 Sep '15

From: Marcus Cooper <codekipper(a)gmail.com> The sun4i, sun6i and sun7i SoC families have an SPDIF block which is capable of playback and capture. This patch enables the playback of this block for the sun4i and sun7i families. Signed-off-by: Marcus Cooper <codekipper(a)gmail.com> --- sound/soc/sunxi/Kconfig | 10 + sound/soc/sunxi/Makefile | 4 + sound/soc/sunxi/sunxi-machine-spdif.c | 110 +++++ sound/soc/sunxi/sunxi-spdif.c | 801 ++++++++++++++++++++++++++++++++++ 4 files changed, 925 insertions(+) create mode 100644 sound/soc/sunxi/sunxi-machine-spdif.c create mode 100644 sound/soc/sunxi/sunxi-spdif.c diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig index 84c72ec..053db02 100644 --- a/sound/soc/sunxi/Kconfig +++ b/sound/soc/sunxi/Kconfig @@ -8,4 +8,14 @@ config SND_SUN4I_CODEC Select Y or M to add support for the Codec embedded in the Allwinner A10 and affiliated SoCs. +config SND_SOC_SUNXI_DAI_SPDIF + tristate + select SND_SOC_GENERIC_DMAENGINE_PCM + select REGMAP_MMIO + +config SND_SOC_SUNXI_MACHINE_SPDIF + tristate "APB on-chip sun4i/sun5i/sun7i SPDIF" + select SND_SOC_SUNXI_DAI_SPDIF + help + Say Y if you want to add support for SoC S/PDIF audio as simple audio card. endmenu diff --git a/sound/soc/sunxi/Makefile b/sound/soc/sunxi/Makefile index ea8a08c..7849a75 100644 --- a/sound/soc/sunxi/Makefile +++ b/sound/soc/sunxi/Makefile @@ -1,2 +1,6 @@ obj-$(CONFIG_SND_SUN4I_CODEC) += sun4i-codec.o +snd-soc-sunxi-dai-spdif-objs := sunxi-spdif.o +obj-$(CONFIG_SND_SOC_SUNXI_DAI_SPDIF) += snd-soc-sunxi-dai-spdif.o +snd-soc-sunxi-machine-spdif-objs := sunxi-machine-spdif.o +obj-$(CONFIG_SND_SOC_SUNXI_MACHINE_SPDIF) += snd-soc-sunxi-machine-spdif.o diff --git a/sound/soc/sunxi/sunxi-machine-spdif.c b/sound/soc/sunxi/sunxi-machine-spdif.c new file mode 100644 index 0000000..f8f6bd8 --- /dev/null +++ b/sound/soc/sunxi/sunxi-machine-spdif.c @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2015 Andrea Venturi <be17068(a)iperbole.bo.it> + * From code by (C) 2013 Freescale Semiconductor, Inc. + * (sound/soc/fsl/imx-spdif.c) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. + */ + +#include <linux/module.h> +#include <linux/of_platform.h> +#include <sound/soc.h> + +struct sunxi_machine_spdif_data { + struct snd_soc_dai_link dai; + struct snd_soc_card card; +}; + +static int sunxi_machine_spdif_audio_probe(struct platform_device *pdev) +{ + struct device_node *spdif_np, *np = pdev->dev.of_node; + struct sunxi_machine_spdif_data *data; + int ret = 0; + + dev_dbg(&pdev->dev, "%s: Looking for spdif-controller\n", __func__); + spdif_np = of_parse_phandle(np, "spdif-controller", 0); + if (!spdif_np) { + dev_err(&pdev->dev, "failed to find spdif-controller\n"); + ret = -EINVAL; + goto end; + } + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) { + ret = -ENOMEM; + goto end; + } + + data->dai.name = "S/PDIF PCM"; + data->dai.stream_name = "S/PDIF PCM"; + data->dai.codec_dai_name = "snd-soc-dummy-dai"; + data->dai.codec_name = "snd-soc-dummy"; + data->dai.cpu_of_node = spdif_np; + data->dai.platform_of_node = spdif_np; + data->dai.playback_only = true; + data->dai.capture_only = true; + + if (of_property_read_bool(np, "spdif-out")) + data->dai.capture_only = false; + + if (of_property_read_bool(np, "spdif-in")) + data->dai.playback_only = false; + + if (data->dai.playback_only && data->dai.capture_only) { + dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n"); + goto end; + } + + data->card.dev = &pdev->dev; + data->card.dai_link = &data->dai; + data->card.num_links = 1; + data->card.owner = THIS_MODULE; + + ret = snd_soc_of_parse_card_name(&data->card, "model"); + if (ret) + goto end; + + ret = devm_snd_soc_register_card(&pdev->dev, &data->card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret); + goto end; + } + + platform_set_drvdata(pdev, data); + +end: + of_node_put(spdif_np); + + return ret; +} + +#ifdef CONFIG_OF +static const struct of_device_id sunxi_machine_spdif_dt_ids[] = { + { .compatible = "allwinner,sunxi-audio-spdif", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, sunxi_machine_spdif_dt_ids); +#endif + +static struct platform_driver sunxi_machine_spdif_driver = { + .driver = { + .name = "sunxi-machine-spdif", + .of_match_table = sunxi_machine_spdif_dt_ids, + }, + .probe = sunxi_machine_spdif_audio_probe, +}; + +module_platform_driver(sunxi_machine_spdif_driver); + +MODULE_AUTHOR("Marcus Cooper <codekipper(a)gmail.com>"); +MODULE_AUTHOR("Andrea Venturi, <be17068(a)iperbole.bo.it>"); +MODULE_DESCRIPTION("Allwinner sunxi S/PDIF machine driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/sunxi/sunxi-spdif.c b/sound/soc/sunxi/sunxi-spdif.c new file mode 100644 index 0000000..cae9261 --- /dev/null +++ b/sound/soc/sunxi/sunxi-spdif.c @@ -0,0 +1,801 @@ +/* + * ALSA SoC SPDIF Audio Layer + * + * Copyright 2015 Andrea Venturi <be17068(a)iperbole.bo.it> + * Copyright 2015 Marcus Cooper <codekipper(a)gmail.com> + * + * Based on the Allwinner SDK driver, released under the GPL. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. + */ + +/* + * this is SPDIF sunxi simple audio card DAI driver that uses the codec + * "dummy driver" as per sound/soc/fsl/imx-spdif.c + */ +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/regmap.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/ioport.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/dmaengine_pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#define SUNXI_SPDIF_CTL (0x00) + #define SUNXI_SPDIF_CTL_MCLKDIV(v) ((v) << 4) /* v even */ + #define SUNXI_SPDIF_CTL_MCLKOUTEN BIT(2) + #define SUNXI_SPDIF_CTL_GEN BIT(1) + #define SUNXI_SPDIF_CTL_RESET BIT(0) + +#define SUNXI_SPDIF_TXCFG (0x04) + #define SUNXI_SPDIF_TXCFG_SINGLEMOD BIT(31) + #define SUNXI_SPDIF_TXCFG_ASS BIT(17) + #define SUNXI_SPDIF_TXCFG_NONAUDIO BIT(16) + #define SUNXI_SPDIF_TXCFG_TXRATIO(v) ((v) << 4) + #define SUNXI_SPDIF_TXCFG_TXRATIO_MASK GENMASK(8, 4) + #define SUNXI_SPDIF_TXCFG_FMTRVD GENMASK(3, 2) + #define SUNXI_SPDIF_TXCFG_FMT16BIT (0 << 2) + #define SUNXI_SPDIF_TXCFG_FMT20BIT (1 << 2) + #define SUNXI_SPDIF_TXCFG_FMT24BIT (2 << 2) + #define SUNXI_SPDIF_TXCFG_CHSTMODE BIT(1) + #define SUNXI_SPDIF_TXCFG_TXEN BIT(0) + +#define SUNXI_SPDIF_RXCFG (0x08) + #define SUNXI_SPDIF_RXCFG_LOCKFLAG BIT(4) + #define SUNXI_SPDIF_RXCFG_CHSTSRC BIT(3) + #define SUNXI_SPDIF_RXCFG_CHSTCP BIT(1) + #define SUNXI_SPDIF_RXCFG_RXEN BIT(0) + +#define SUNXI_SPDIF_TXFIFO (0x0C) + +#define SUNXI_SPDIF_RXFIFO (0x10) + +#define SUNXI_SPDIF_FCTL (0x14) + #define SUNXI_SPDIF_FCTL_FIFOSRC BIT(31) + #define SUNXI_SPDIF_FCTL_FTX BIT(17) + #define SUNXI_SPDIF_FCTL_FRX BIT(16) + #define SUNXI_SPDIF_FCTL_TXTL(v) ((v) << 8) + #define SUNXI_SPDIF_FCTL_TXTL_MASK GENMASK(12, 8) + #define SUNXI_SPDIF_FCTL_RXTL(v) ((v) << 3) + #define SUNXI_SPDIF_FCTL_RXTL_MASK GENMASK(7, 3) + #define SUNXI_SPDIF_FCTL_TXIM BIT(2) + #define SUNXI_SPDIF_FCTL_RXOM(v) ((v) << 0) + #define SUNXI_SPDIF_FCTL_RXOM_MASK GENMASK(1, 0) + +#define SUNXI_SPDIF_FSTA (0x18) + #define SUNXI_SPDIF_FSTA_TXE BIT(14) + #define SUNXI_SPDIF_FSTA_TXECNTSHT (8) + #define SUNXI_SPDIF_FSTA_RXA BIT(6) + #define SUNXI_SPDIF_FSTA_RXACNTSHT (0) + +#define SUNXI_SPDIF_INT (0x1C) + #define SUNXI_SPDIF_INT_RXLOCKEN BIT(18) + #define SUNXI_SPDIF_INT_RXUNLOCKEN BIT(17) + #define SUNXI_SPDIF_INT_RXPARERREN BIT(16) + #define SUNXI_SPDIF_INT_TXDRQEN BIT(7) + #define SUNXI_SPDIF_INT_TXUIEN BIT(6) + #define SUNXI_SPDIF_INT_TXOIEN BIT(5) + #define SUNXI_SPDIF_INT_TXEIEN BIT(4) + #define SUNXI_SPDIF_INT_RXDRQEN BIT(2) + #define SUNXI_SPDIF_INT_RXOIEN BIT(1) + #define SUNXI_SPDIF_INT_RXAIEN BIT(0) + +#define SUNXI_SPDIF_ISTA (0x20) + #define SUNXI_SPDIF_ISTA_RXLOCKSTA BIT(18) + #define SUNXI_SPDIF_ISTA_RXUNLOCKSTA BIT(17) + #define SUNXI_SPDIF_ISTA_RXPARERRSTA BIT(16) + #define SUNXI_SPDIF_ISTA_TXUSTA BIT(6) + #define SUNXI_SPDIF_ISTA_TXOSTA BIT(5) + #define SUNXI_SPDIF_ISTA_TXESTA BIT(4) + #define SUNXI_SPDIF_ISTA_RXOSTA BIT(1) + #define SUNXI_SPDIF_ISTA_RXASTA BIT(0) + +#define SUNXI_SPDIF_TXCNT (0x24) + +#define SUNXI_SPDIF_RXCNT (0x28) + +#define SUNXI_SPDIF_TXCHSTA0 (0x2C) + #define SUNXI_SPDIF_TXCHSTA0_CLK(v) ((v) << 28) + #define SUNXI_SPDIF_TXCHSTA0_SAMFREQ(v) ((v) << 24) + #define SUNXI_SPDIF_TXCHSTA0_SAMFREQ_MASK GENMASK(27, 24) + #define SUNXI_SPDIF_TXCHSTA0_CHNUM(v) ((v) << 20) + #define SUNXI_SPDIF_TXCHSTA0_CHNUM_MASK GENMASK(23, 20) + #define SUNXI_SPDIF_TXCHSTA0_SRCNUM(v) ((v) << 16) + #define SUNXI_SPDIF_TXCHSTA0_CATACOD(v) ((v) << 8) + #define SUNXI_SPDIF_TXCHSTA0_MODE(v) ((v) << 6) + #define SUNXI_SPDIF_TXCHSTA0_EMPHASIS(v) ((v) << 3) + #define SUNXI_SPDIF_TXCHSTA0_CP BIT(2) + #define SUNXI_SPDIF_TXCHSTA0_AUDIO BIT(1) + #define SUNXI_SPDIF_TXCHSTA0_PRO BIT(0) + +#define SUNXI_SPDIF_TXCHSTA1 (0x30) + #define SUNXI_SPDIF_TXCHSTA1_CGMSA(v) ((v) << 8) + #define SUNXI_SPDIF_TXCHSTA1_ORISAMFREQ(v) ((v) << 4) + #define SUNXI_SPDIF_TXCHSTA1_ORISAMFREQ_MASK GENMASK(7, 4) + #define SUNXI_SPDIF_TXCHSTA1_SAMWORDLEN(v) ((v) << 1) + #define SUNXI_SPDIF_TXCHSTA1_MAXWORDLEN BIT(0) + +#define SUNXI_SPDIF_RXCHSTA0 (0x34) + #define SUNXI_SPDIF_RXCHSTA0_CLK(v) ((v) << 28) + #define SUNXI_SPDIF_RXCHSTA0_SAMFREQ(v) ((v) << 24) + #define SUNXI_SPDIF_RXCHSTA0_CHNUM(v) ((v) << 20) + #define SUNXI_SPDIF_RXCHSTA0_SRCNUM(v) ((v) << 16) + #define SUNXI_SPDIF_RXCHSTA0_CATACOD(v) ((v) << 8) + #define SUNXI_SPDIF_RXCHSTA0_MODE(v) ((v) << 6) + #define SUNXI_SPDIF_RXCHSTA0_EMPHASIS(v) ((v) << 3) + #define SUNXI_SPDIF_RXCHSTA0_CP BIT(2) + #define SUNXI_SPDIF_RXCHSTA0_AUDIO BIT(1) + #define SUNXI_SPDIF_RXCHSTA0_PRO BIT(0) + +#define SUNXI_SPDIF_RXCHSTA1 (0x38) + #define SUNXI_SPDIF_RXCHSTA1_CGMSA(v) ((v) << 8) + #define SUNXI_SPDIF_RXCHSTA1_ORISAMFREQ(v) ((v) << 4) + #define SUNXI_SPDIF_RXCHSTA1_SAMWORDLEN(v) ((v) << 1) + #define SUNXI_SPDIF_RXCHSTA1_MAXWORDLEN BIT(0) + +/* Defines for Sampling Frequency */ +enum sunxi_spdif_sampling_freq { + SUNXI_SPDIF_SAMFREQ_44_1KHZ = 0x0, + SUNXI_SPDIF_SAMFREQ_NOT_INDICATED = 0x1, + SUNXI_SPDIF_SAMFREQ_48KHZ = 0x2, + SUNXI_SPDIF_SAMFREQ_32KHZ = 0x3, + SUNXI_SPDIF_SAMFREQ_22_05KHZ = 0x4, + SUNXI_SPDIF_SAMFREQ_24KHZ = 0x6, + SUNXI_SPDIF_SAMFREQ_88_2KHZ = 0x8, + SUNXI_SPDIF_SAMFREQ_768KHZ = 0x9, + SUNXI_SPDIF_SAMFREQ_96KHZ = 0xa, + SUNXI_SPDIF_SAMFREQ_176_4KHZ = 0xc, + SUNXI_SPDIF_SAMFREQ_192KHZ = 0xe, +}; + +/* + * Original sampling frequency can be represented by inverting the value of the + * sampling frequency. + */ +#define ORIGINAL(v) ((~v) & 0xf) + +struct sunxi_spdif_dev { + struct platform_device *pdev; + struct clk *clk; + struct clk *apb_clk; + struct clk *audio_clk; + struct snd_soc_dai_driver cpu_dai_drv; + bool running; + struct regmap *regmap; + struct snd_dmaengine_dai_dma_data dma_params_tx; + struct snd_dmaengine_dai_dma_data dma_params_rx; + bool playback_supported; + bool capture_supported; +}; + +static void sunxi_spdif_configure(struct sunxi_spdif_dev *host) +{ + u32 reg_val; + + /* soft reset SPDIF */ + regmap_write(host->regmap, SUNXI_SPDIF_CTL, SUNXI_SPDIF_CTL_RESET); + + /* MCLK OUTPUT enable */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_CTL, + SUNXI_SPDIF_CTL_MCLKOUTEN, SUNXI_SPDIF_CTL_MCLKOUTEN); + + /* flush TX FIFO */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_FCTL, SUNXI_SPDIF_FCTL_FTX, + SUNXI_SPDIF_FCTL_FTX); + + /* clear interrupt status */ + regmap_read(host->regmap, SUNXI_SPDIF_ISTA, &reg_val); + regmap_write(host->regmap, SUNXI_SPDIF_ISTA, reg_val); + + /* clear TX counter */ + regmap_write(host->regmap, SUNXI_SPDIF_TXCNT, 0); + +} + +void sunxi_snd_txctrl(struct snd_pcm_substream *substream, + struct sunxi_spdif_dev *host, int on) +{ + u32 tmp; + + regmap_read(host->regmap, SUNXI_SPDIF_TXCNT, &tmp); + if (substream->runtime->channels == 1) + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCFG, + SUNXI_SPDIF_TXCFG_SINGLEMOD, + SUNXI_SPDIF_TXCFG_SINGLEMOD); + + if (on) { + /* SPDIF TX ENABLE */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCFG, + SUNXI_SPDIF_TXCFG_TXEN, + SUNXI_SPDIF_TXCFG_TXEN); + + /* DRQ ENABLE */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_INT, + SUNXI_SPDIF_INT_TXDRQEN, + SUNXI_SPDIF_INT_TXDRQEN); + + /* Global enable */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_CTL, + SUNXI_SPDIF_CTL_GEN, + SUNXI_SPDIF_CTL_GEN); + } else { + /* SPDIF TX DISABLE */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCFG, + SUNXI_SPDIF_TXCFG_TXEN, 0); + + /* DRQ DISABLE */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_INT, + SUNXI_SPDIF_INT_TXDRQEN, 0); + + /* Global disable */ + regmap_update_bits(host->regmap, SUNXI_SPDIF_CTL, + SUNXI_SPDIF_CTL_GEN, 0); + } +} + +static int sunxi_spdif_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *cpu_dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct sunxi_spdif_dev *host = snd_soc_dai_get_drvdata(rtd->cpu_dai); + int ret; + + if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) + return -EINVAL; + + /* Reset module and interrupts only for first initialization */ + if (!cpu_dai->active) { + ret = clk_prepare_enable(host->clk); + if (ret) + return ret; + } + + host->running = true; + sunxi_spdif_configure(host); + + return 0; +} + +static void sunxi_spdif_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct sunxi_spdif_dev *host = snd_soc_dai_get_drvdata(rtd->cpu_dai); + + if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) + return; + + clk_disable_unprepare(host->clk); + host->running = false; +} + +static int sunxi_spdif_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) +{ + u32 reg_val; + struct sunxi_spdif_dev *host = snd_soc_dai_get_drvdata(cpu_dai); + + reg_val = 0; + reg_val &= ~SUNXI_SPDIF_TXCFG_SINGLEMOD; + reg_val |= SUNXI_SPDIF_TXCFG_ASS; + reg_val |= fmt; /* set non audio and bit depth */ + reg_val |= SUNXI_SPDIF_TXCFG_CHSTMODE; + regmap_write(host->regmap, SUNXI_SPDIF_TXCFG, reg_val); + reg_val = 0; + reg_val &= ~SUNXI_SPDIF_FCTL_FIFOSRC; + reg_val |= SUNXI_SPDIF_FCTL_TXTL_MASK; + reg_val |= SUNXI_SPDIF_FCTL_RXTL_MASK; + reg_val |= SUNXI_SPDIF_FCTL_TXIM; + reg_val |= SUNXI_SPDIF_FCTL_RXOM_MASK; + regmap_write(host->regmap, SUNXI_SPDIF_FCTL, reg_val); + reg_val = 0; + reg_val |= (SUNXI_SPDIF_TXCHSTA0_CHNUM(2)); + regmap_write(host->regmap, SUNXI_SPDIF_TXCHSTA0, reg_val); + + reg_val = 0; + reg_val |= (SUNXI_SPDIF_TXCHSTA1_SAMWORDLEN(1)); + if ((fmt & SUNXI_SPDIF_TXCFG_FMT24BIT) == SUNXI_SPDIF_TXCFG_FMT24BIT) + reg_val |= SUNXI_SPDIF_TXCHSTA1_MAXWORDLEN; + regmap_write(host->regmap, SUNXI_SPDIF_TXCHSTA1, reg_val); + return 0; +} + +static int sunxi_spdif_set_sysclk(struct snd_soc_dai *cpu_dai, unsigned int freq) +{ + struct sunxi_spdif_dev *host = snd_soc_dai_get_drvdata(cpu_dai); + struct platform_device *pdev = host->pdev; + + if (clk_set_rate(host->audio_clk, freq)) + dev_err(&pdev->dev, + "Setting pll2 clock rate for %d Hz failed!\n", freq); + if (clk_set_rate(host->clk, freq)) + dev_err(&pdev->dev, + "Setting SPDIF clock rate for %d Hz failed!\n", freq); + return 0; +} + +static int sunxi_spdif_set_clkdiv(struct snd_soc_dai *cpu_dai, + unsigned int rate, int div) +{ + struct sunxi_spdif_dev *host = snd_soc_dai_get_drvdata(cpu_dai); + int sample_freq, original_sample_freq; + + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCHSTA0, + SUNXI_SPDIF_TXCHSTA0_SAMFREQ_MASK, 0); + + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCHSTA1, + SUNXI_SPDIF_TXCHSTA1_ORISAMFREQ_MASK, 0); + + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCFG, + SUNXI_SPDIF_TXCFG_TXRATIO_MASK, + SUNXI_SPDIF_TXCFG_TXRATIO(div - 1)); + + if (rate == 24576000) { + switch (div) { + /* 24KHZ */ + case 8: + sample_freq = SUNXI_SPDIF_SAMFREQ_24KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_24KHZ); + break; + + /* 32KHZ */ + case 6: + sample_freq = SUNXI_SPDIF_SAMFREQ_32KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_32KHZ); + break; + + /* 48KHZ */ + case 4: + sample_freq = SUNXI_SPDIF_SAMFREQ_48KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_48KHZ); + break; + + /* 96KHZ */ + case 2: + sample_freq = SUNXI_SPDIF_SAMFREQ_96KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_96KHZ); + break; + + /* 192KHZ */ + case 1: + sample_freq = SUNXI_SPDIF_SAMFREQ_192KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_192KHZ); + break; + + default: + sample_freq = SUNXI_SPDIF_SAMFREQ_NOT_INDICATED; + original_sample_freq = 0; + break; + } + } else { + /* 22.5792MHz */ + switch (div) { + /* 22.05KHZ */ + case 8: + sample_freq = SUNXI_SPDIF_SAMFREQ_22_05KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_22_05KHZ); + break; + + /* 44.1KHZ */ + case 4: + sample_freq = SUNXI_SPDIF_SAMFREQ_44_1KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_44_1KHZ); + break; + + /* 88.2KHZ */ + case 2: + sample_freq = SUNXI_SPDIF_SAMFREQ_88_2KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_88_2KHZ); + break; + + /* 176.4KHZ */ + case 1: + sample_freq = SUNXI_SPDIF_SAMFREQ_176_4KHZ; + original_sample_freq + = ORIGINAL(SUNXI_SPDIF_SAMFREQ_176_4KHZ); + break; + + default: + sample_freq = SUNXI_SPDIF_SAMFREQ_NOT_INDICATED; + original_sample_freq = 0; + break; + } + } + + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCHSTA0, + SUNXI_SPDIF_TXCHSTA0_SAMFREQ_MASK, + SUNXI_SPDIF_TXCHSTA0_SAMFREQ(sample_freq)); + + regmap_update_bits(host->regmap, SUNXI_SPDIF_TXCHSTA1, + SUNXI_SPDIF_TXCHSTA1_ORISAMFREQ_MASK, + SUNXI_SPDIF_TXCHSTA1_ORISAMFREQ(original_sample_freq)); + + return 0; +} + +static int sunxi_spdif_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *cpu_dai) +{ + int ret = 0; + int fmt; + unsigned long rate = params_rate(params); + u32 mclk_div = 0; + unsigned int mclk = 0; + + /* Add the PCM and raw data select interface */ + switch (params_channels(params)) { + case 1: /* PCM mode */ + case 2: + fmt = 0; + break; + case 4: /* raw data mode */ + fmt = SUNXI_SPDIF_TXCFG_NONAUDIO; + break; + default: + return -EINVAL; + } + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + fmt |= SUNXI_SPDIF_TXCFG_FMT16BIT; + break; + case SNDRV_PCM_FORMAT_S20_3LE: + fmt |= SUNXI_SPDIF_TXCFG_FMT20BIT; + break; + case SNDRV_PCM_FORMAT_S24_LE: + fmt |= SUNXI_SPDIF_TXCFG_FMT24BIT; + break; + default: + return -EINVAL; + } + + ret = snd_soc_dai_set_fmt(cpu_dai, fmt); + if (ret < 0) + return ret; + + switch (rate) { + case 22050: + case 44100: + case 88200: + case 176400: + mclk = 22579200; + break; + case 24000: + case 32000: + case 48000: + case 96000: + case 192000: + mclk = 24576000; + break; + default: + return -EINVAL; + } + + ret = sunxi_spdif_set_sysclk(cpu_dai, mclk); + if (ret < 0) + return ret; + + switch (rate) { + case 22050: + case 24000: + mclk_div = 8; + break; + case 32000: + mclk_div = 6; + break; + case 44100: + case 48000: + mclk_div = 4; + break; + case 88200: + case 96000: + mclk_div = 2; + break; + case 176400: + case 192000: + mclk_div = 1; + break; + default: + return -EINVAL; + } + + ret = sunxi_spdif_set_clkdiv(cpu_dai, mclk, mclk_div); + if (ret < 0) + return ret; + + return 0; +} + +static int sunxi_spdif_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + int ret = 0; + struct sunxi_spdif_dev *host = snd_soc_dai_get_drvdata(dai); + + if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) + return -EINVAL; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + sunxi_snd_txctrl(substream, host, 1); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + sunxi_snd_txctrl(substream, host, 0); + break; + + default: + ret = -EINVAL; + break; + } + return ret; +} + +static int sunxi_spdif_soc_dai_probe(struct snd_soc_dai *dai) +{ + struct sunxi_spdif_dev *host = snd_soc_dai_get_drvdata(dai); + + snd_soc_dai_init_dma_data(dai, &host->dma_params_tx, + &host->dma_params_rx); + return 0; +} + +static const struct snd_soc_dai_ops sunxi_spdif_dai_ops = { + .startup = sunxi_spdif_startup, + .shutdown = sunxi_spdif_shutdown, + .trigger = sunxi_spdif_trigger, + .hw_params = sunxi_spdif_hw_params, + .set_fmt = sunxi_spdif_set_fmt, +}; + +static const struct regmap_config sunxi_spdif_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = SUNXI_SPDIF_RXCHSTA1, +}; + +#define SUNXI_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | \ + SNDRV_PCM_RATE_192000) +#define SUNXI_FORMATS (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \ + SNDRV_PCM_FORMAT_S24_LE) + +static struct snd_soc_dai_driver sunxi_spdif_dai = { + .playback = { + .channels_min = 2, + .channels_max = 2, + .rates = SUNXI_RATES, + .formats = SUNXI_FORMATS, + }, + .probe = sunxi_spdif_soc_dai_probe, + .ops = &sunxi_spdif_dai_ops, + .name = "spdif", +}; + +static const struct snd_soc_dapm_widget dit_widgets[] = { + SND_SOC_DAPM_OUTPUT("spdif-out"), +}; + +static const struct snd_soc_dapm_route dit_routes[] = { + { "spdif-out", NULL, "Playback" }, +}; + +#ifdef CONFIG_OF +static const struct of_device_id sunxi_spdif_of_match[] = { + { .compatible = "allwinner,sun4i-a10-spdif", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, sunxi_spdif_of_match); +#endif + +static const struct snd_soc_component_driver sunxi_spdif_component = { + .name = "sunxi-spdif", +}; + +static int sunxi_spdif_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct sunxi_spdif_dev *host; + struct resource *res; + int ret; + const struct of_device_id *of_id; + void __iomem *base; + + dev_dbg(&pdev->dev, "Entered %s\n", __func__); + + if (!np) + return -ENODEV; + + of_id = of_match_device(sunxi_spdif_of_match, &pdev->dev); + if (!of_id) { + dev_err(&pdev->dev, "No matched devices found.\n"); + return -EINVAL; + } + + host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); + if (!host) + return -ENOMEM; + + host->pdev = pdev; + + /* Initialize this copy of the CPU DAI driver structure */ + memcpy(&host->cpu_dai_drv, &sunxi_spdif_dai, sizeof(sunxi_spdif_dai)); + host->cpu_dai_drv.name = dev_name(&pdev->dev); + + /* Get the addresses */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); + + host->regmap = devm_regmap_init_mmio(&pdev->dev, base, + &sunxi_spdif_regmap_config); + + /* Clocks */ + host->apb_clk = devm_clk_get(&pdev->dev, "apb"); + if (IS_ERR(host->apb_clk)) { + dev_err(&pdev->dev, "failed to get a apb clock.\n"); + return PTR_ERR(host->apb_clk); + } + + if (clk_prepare_enable(host->apb_clk)) { + dev_err(&pdev->dev, "try to enable apb_spdif_clk failed\n"); + return -EINVAL; + } + + host->audio_clk = devm_clk_get(&pdev->dev, "audio"); + if (IS_ERR(host->audio_clk)) { + dev_err(&pdev->dev, "failed to get an audio clock.\n"); + return PTR_ERR(host->audio_clk); + } + + host->clk = devm_clk_get(&pdev->dev, "spdif"); + if (IS_ERR(host->clk)) { + dev_err(&pdev->dev, "failed to get a spdif clock.\n"); + return PTR_ERR(host->clk); + } + + ret = clk_set_rate(host->audio_clk, 24576000); + if (ret) { + dev_err(&pdev->dev, "set spdif base clock failed!\n"); + return ret; + } + + if (clk_prepare_enable(host->audio_clk)) { + dev_err(&pdev->dev, "try to enable audio clk failed\n"); + ret = -EINVAL; + goto exit_clkdisable_apb_clk; + } + + host->playback_supported = false; + host->capture_supported = false; + + if (of_property_read_bool(np, "spdif-out")) + host->playback_supported = true; + + if (!host->playback_supported) { + dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n"); + goto exit_clkdisable_clk; + } + + host->dma_params_tx.addr = res->start + SUNXI_SPDIF_TXFIFO; + host->dma_params_tx.maxburst = 4; + host->dma_params_tx.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; + host->dma_params_rx.addr = res->start + SUNXI_SPDIF_RXFIFO; + host->dma_params_rx.maxburst = 4; + host->dma_params_rx.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; + + /* Register with ASoC */ + dev_set_drvdata(&pdev->dev, host); + + ret = devm_snd_soc_register_component(&pdev->dev, + &sunxi_spdif_component, &sunxi_spdif_dai, 1); + if (ret) + goto exit_clkdisable_clk; + + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) + goto exit_clkdisable_clk; + return 0; + +exit_clkdisable_clk: + clk_disable_unprepare(host->clk); +exit_clkdisable_apb_clk: + clk_disable_unprepare(host->apb_clk); + return ret; +} + +static int sunxi_spdif_remove(struct platform_device *pdev) +{ + struct sunxi_spdif_dev *host = dev_get_drvdata(&pdev->dev); + + snd_soc_unregister_platform(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); + + if (!IS_ERR(host->clk)) { + clk_disable_unprepare(host->clk); + clk_disable_unprepare(host->apb_clk); + } + + return 0; +} + +#ifdef CONFIG_PM +static int sunxi_spdif_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct sunxi_spdif_dev *host = dev_get_drvdata(&pdev->dev); + + if (host->running) + clk_disable(host->clk); + + return 0; +} + +static int sunxi_spdif_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct sunxi_spdif_dev *host = dev_get_drvdata(&pdev->dev); + + if (host->running) { + clk_enable(host->clk); + sunxi_spdif_configure(host); + } + return 0; +} + +static SIMPLE_DEV_PM_OPS(spdif_dev_pm_ops, sunxi_spdif_suspend, + sunxi_spdif_resume); + +#define SPDIF_DEV_PM_OPS (&spdif_dev_pm_ops) +#else +#define SPDIF_DEV_PM_OPS NULL + +#endif + +static struct platform_driver sunxi_spdif_driver = { + .driver = { + .name = "sunxi-spdif", + .owner = THIS_MODULE, + .pm = SPDIF_DEV_PM_OPS, + .of_match_table = of_match_ptr(sunxi_spdif_of_match), + }, + .probe = sunxi_spdif_probe, + .remove = sunxi_spdif_remove, +}; + +module_platform_driver(sunxi_spdif_driver); + +MODULE_AUTHOR("Marcus Cooper <codekipper(a)gmail.com>"); +MODULE_AUTHOR("Andrea Venturi <be17068(a)iperbole.bo.it>"); +MODULE_DESCRIPTION("Allwinner Sunxi SPDIF SoC Interface"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:sunxi-spdif"); -- 1.9.1

4 5

[alsa-devel] [sound:topic/firewire-update 15/15] sound/firewire/amdtp-am824.c:402:14: sparse: symbol 'process_rx_data_blocks' was not declared. Should it be static?
by kbuild test robot 29 Sep '15

29 Sep '15

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/firewire-update head: df075feefbd347f13fba5198294cda619532c237 commit: df075feefbd347f13fba5198294cda619532c237 [15/15] ALSA: firewire-lib: complete AM824 data block processing layer reproduce: # apt-get install sparse git checkout df075feefbd347f13fba5198294cda619532c237 make ARCH=x86_64 allmodconfig make C=1 CF=-D__CHECK_ENDIAN__ sparse warnings: (new ones prefixed by >>) >> sound/firewire/amdtp-am824.c:402:14: sparse: symbol 'process_rx_data_blocks' was not declared. Should it be static? >> sound/firewire/amdtp-am824.c:423:14: sparse: symbol 'process_tx_data_blocks' was not declared. Should it be static? Please review and possibly fold the followup patch. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 2

[alsa-devel] [RFC 0/5] another generic audio hdmi codec proposal
by Arnaud Pouliquen 29 Sep '15

29 Sep '15

I 'm working on HDMI implementation for sti platform. As some discussions are on going for audio on HDMI. Here is the begin of my work... This patch set is a tentative to implement a generic code for the HDMI audio. Main concept are aligned with solution proposeded for TI platform. - ASoC codec driver registered by DRM driver - ASOC driver is a generic driver. - compatible with simple card Difference is that i propose a DRM generic interface based on bridge structure. Advantage is that all data exchanges are done through the DRM API. I think also that some helper functions could been used for N and CTS parameters calculation, as suggested by Russell King in a previous mail. I full aware that some features (like ELD and info frame) are partially or not implemented in my patches. This patch set is more a skeleton than a full implementation... I just post it to suggest a possible DRM API. Arnaud Pouliquen (5): video: hdmi: add help function for N and cts drm: add helper functionto add audio capabilities for bridge ASoC: codec: hdmi drm codec driver drm: sti: connect audio driver DT: sti: add audio HDMI dai link in audio card arch/arm/boot/dts/stih410.dtsi | 4 +- arch/arm/boot/dts/stihxxx-b2120.dtsi | 21 +++++ arch/arm/configs/multi_v7_defconfig | 1 + drivers/gpu/drm/drm_bridge.c | 114 +++++++++++++++++++++++++++ drivers/gpu/drm/sti/sti_hdmi.c | 146 +++++++++++++++++++++++++++++++--- drivers/gpu/drm/sti/sti_hdmi.h | 3 + drivers/video/hdmi.c | 148 +++++++++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 31 ++++++++ include/linux/hdmi.h | 24 ++++++ include/sound/hdmi_drm.h | 16 ++++ sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdmi_drm.c | 125 +++++++++++++++++++++++++++++ 13 files changed, 625 insertions(+), 14 deletions(-) create mode 100644 include/sound/hdmi_drm.h create mode 100644 sound/soc/codecs/hdmi_drm.c -- 1.9.1

2 8

[alsa-devel] [PATCH 0/2] ASoc: add driver for Atmel I2S controller
by Cyrille Pitchen 29 Sep '15

29 Sep '15

This series of patches add support to the new Atmel I2S controller embedded on sama5d2 SoCs. Cyrille Pitchen (2): ASoC: atmel-i2s: add DT bindings for I2S controller ASoC: atmel-i2s: add driver for the new Atmel I2S controller .../devicetree/bindings/sound/atmel-i2s.txt | 43 ++ sound/soc/atmel/Kconfig | 10 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel-i2s.c | 760 +++++++++++++++++++++ 4 files changed, 815 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/atmel-i2s.txt create mode 100644 sound/soc/atmel/atmel-i2s.c -- 1.8.2.2

1 3

[alsa-devel] [PATCH 00/15 v3] ALSA: firewire-lib: separate to packet streaming layer and data block processing layer
by Takashi Sakamoto 29 Sep '15

29 Sep '15

This patchset updates a part of my previous post (patch 01 and 02): [alsa-devel] [PATCH 00/25 v2] ALSA: support AMDTP variants http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096739.html The aim of this patchset is to allow current amdtp implementation to handle several data block processing backends. For this aim, this patchset separates the implementation to packet streaming layer and AM824 data block processing layer. The communication between these two layers is done by callback function. This patchset adds an overhead to call the functions as the same frequently as 8,000 times per second. Takashi Sakamoto (15): ALSA: firewire-lib: arrange structure for AMDTP stream ALSA: firewire-lib: return error code when amdtp_stream_set_parameters() detects error ALSA: firewire-lib: add an argument for Dice's dual wire mode ALSA: firewire-lib: add a member of frame_multiplier instead of double_pcm_frames ALSA: firewire-lib: add helper functions as interfaces between packet streaming layer and data block processing layer ALSA: firewire-lib: add support arbitrary value for fmt/fdf fields in CIP header ALSA: firewire-lib: rename 'amdtp' to 'amdtp-stream' to prepare for functional separation ALSA: firewire-lib: add data block processing layer for AM824 format ALSA: firewire-lib: rename parameter setting function for AM824 with FDF field ALSA: firewire-lib: move PCM substream constraint to AM824 layer ALSA: firewire-lib: add helper functions to set positions of data channels ALSA: firewire-lib: move MIDI trigger helper function to AM824 layer ALSA: firewire-lib: rename PCM format helper function ALSA: firewire-lib: rename macros with AM824 prefix ALSA: firewire-lib: complete AM824 data block processing layer sound/firewire/Makefile | 2 +- sound/firewire/amdtp-am824.c | 465 ++++++++++++++++++++++++++++ sound/firewire/amdtp-am824.h | 52 ++++ sound/firewire/{amdtp.c => amdtp-stream.c} | 377 ++++------------------ sound/firewire/{amdtp.h => amdtp-stream.h} | 116 +++---- sound/firewire/bebob/bebob.h | 2 +- sound/firewire/bebob/bebob_midi.c | 16 +- sound/firewire/bebob/bebob_pcm.c | 14 +- sound/firewire/bebob/bebob_stream.c | 34 +- sound/firewire/dice/dice-midi.c | 12 +- sound/firewire/dice/dice-pcm.c | 12 +- sound/firewire/dice/dice-stream.c | 22 +- sound/firewire/dice/dice.h | 2 +- sound/firewire/fcp.c | 2 +- sound/firewire/fireworks/fireworks.c | 12 +- sound/firewire/fireworks/fireworks.h | 2 +- sound/firewire/fireworks/fireworks_midi.c | 12 +- sound/firewire/fireworks/fireworks_pcm.c | 12 +- sound/firewire/fireworks/fireworks_stream.c | 8 +- sound/firewire/oxfw/oxfw-midi.c | 16 +- sound/firewire/oxfw/oxfw-pcm.c | 10 +- sound/firewire/oxfw/oxfw-stream.c | 11 +- sound/firewire/oxfw/oxfw.h | 2 +- 23 files changed, 730 insertions(+), 483 deletions(-) create mode 100644 sound/firewire/amdtp-am824.c create mode 100644 sound/firewire/amdtp-am824.h rename sound/firewire/{amdtp.c => amdtp-stream.c} (70%) rename sound/firewire/{amdtp.h => amdtp-stream.h} (78%) -- 2.1.4

2 19

[alsa-devel] [PATCH 1/1] ASoC: ad193x: add support to ad1934
by Cyrille Pitchen 29 Sep '15

29 Sep '15

The AD1934 codec has no DAC feature. Hence it register mapping is slightly different from the register mapping of other members of the AD193x family. Some ASoC controls and widgets are related to the DAC feature so are not relevant in the case of an AD1934 codec. Signed-off-by: Cyrille Pitchen <cyrille.pitchen(a)atmel.com> --- Hi all, This patch adds support to the AD1934 codec, which is DAC only. Best Regards, Cyrille --- sound/soc/codecs/ad193x-i2c.c | 8 +-- sound/soc/codecs/ad193x-spi.c | 16 +++++- sound/soc/codecs/ad193x.c | 121 ++++++++++++++++++++++++++++++++---------- sound/soc/codecs/ad193x.h | 9 +++- 4 files changed, 120 insertions(+), 34 deletions(-) diff --git a/sound/soc/codecs/ad193x-i2c.c b/sound/soc/codecs/ad193x-i2c.c index df3a1a415825..8aa50d35662f 100644 --- a/sound/soc/codecs/ad193x-i2c.c +++ b/sound/soc/codecs/ad193x-i2c.c @@ -15,8 +15,8 @@ #include "ad193x.h" static const struct i2c_device_id ad193x_id[] = { - { "ad1936", 0 }, - { "ad1937", 0 }, + { "ad1936", AD193x }, + { "ad1937", AD193x }, { } }; MODULE_DEVICE_TABLE(i2c, ad193x_id); @@ -30,7 +30,9 @@ static int ad193x_i2c_probe(struct i2c_client *client, config.val_bits = 8; config.reg_bits = 8; - return ad193x_probe(&client->dev, devm_regmap_init_i2c(client, &config)); + return ad193x_probe(&client->dev, + devm_regmap_init_i2c(client, &config), + (enum ad193x_type)id->driver_data); } static int ad193x_i2c_remove(struct i2c_client *client) diff --git a/sound/soc/codecs/ad193x-spi.c b/sound/soc/codecs/ad193x-spi.c index 390cef9b9dc2..364e82112e8c 100644 --- a/sound/soc/codecs/ad193x-spi.c +++ b/sound/soc/codecs/ad193x-spi.c @@ -16,6 +16,7 @@ static int ad193x_spi_probe(struct spi_device *spi) { + const struct spi_device_id *id = spi_get_device_id(spi); struct regmap_config config; config = ad193x_regmap_config; @@ -24,7 +25,8 @@ static int ad193x_spi_probe(struct spi_device *spi) config.read_flag_mask = 0x09; config.write_flag_mask = 0x08; - return ad193x_probe(&spi->dev, devm_regmap_init_spi(spi, &config)); + return ad193x_probe(&spi->dev, devm_regmap_init_spi(spi, &config), + (enum ad193x_type)id->driver_data); } static int ad193x_spi_remove(struct spi_device *spi) @@ -33,6 +35,17 @@ static int ad193x_spi_remove(struct spi_device *spi) return 0; } +static const struct spi_device_id ad193x_spi_id[] = { + { "ad193x", AD193X }, + { "ad1933", AD1933 }, + { "ad1934", AD1934 }, + { "ad1936", AD193X }, + { "ad1937", AD193X }, + { "ad1938", AD193X }, + { } +}; +MODULE_DEVICE_TABLE(spi, ad193x_spi_id); + static struct spi_driver ad193x_spi_driver = { .driver = { .name = "ad193x", @@ -40,6 +53,7 @@ static struct spi_driver ad193x_spi_driver = { }, .probe = ad193x_spi_probe, .remove = ad193x_spi_remove, + .id_table = ad193x_spi_id, }; module_spi_driver(ad193x_spi_driver); diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 17c953595660..80ffecf98673 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -23,6 +23,7 @@ /* codec private data */ struct ad193x_priv { struct regmap *regmap; + enum ad193x_type type; int sysclk; }; @@ -47,12 +48,6 @@ static const struct snd_kcontrol_new ad193x_snd_controls[] = { SOC_DOUBLE_R_TLV("DAC4 Volume", AD193X_DAC_L4_VOL, AD193X_DAC_R4_VOL, 0, 0xFF, 1, adau193x_tlv), - /* ADC switch control */ - SOC_DOUBLE("ADC1 Switch", AD193X_ADC_CTRL0, AD193X_ADCL1_MUTE, - AD193X_ADCR1_MUTE, 1, 1), - SOC_DOUBLE("ADC2 Switch", AD193X_ADC_CTRL0, AD193X_ADCL2_MUTE, - AD193X_ADCR2_MUTE, 1, 1), - /* DAC switch control */ SOC_DOUBLE("DAC1 Switch", AD193X_DAC_CHNL_MUTE, AD193X_DACL1_MUTE, AD193X_DACR1_MUTE, 1, 1), @@ -63,26 +58,37 @@ static const struct snd_kcontrol_new ad193x_snd_controls[] = { SOC_DOUBLE("DAC4 Switch", AD193X_DAC_CHNL_MUTE, AD193X_DACL4_MUTE, AD193X_DACR4_MUTE, 1, 1), + /* DAC de-emphasis */ + SOC_ENUM("Playback Deemphasis", ad193x_deemp_enum), +}; + +static const struct snd_kcontrol_new ad193x_adc_snd_controls[] = { + /* ADC switch control */ + SOC_DOUBLE("ADC1 Switch", AD193X_ADC_CTRL0, AD193X_ADCL1_MUTE, + AD193X_ADCR1_MUTE, 1, 1), + SOC_DOUBLE("ADC2 Switch", AD193X_ADC_CTRL0, AD193X_ADCL2_MUTE, + AD193X_ADCR2_MUTE, 1, 1), + /* ADC high-pass filter */ SOC_SINGLE("ADC High Pass Filter Switch", AD193X_ADC_CTRL0, AD193X_ADC_HIGHPASS_FILTER, 1, 0), - - /* DAC de-emphasis */ - SOC_ENUM("Playback Deemphasis", ad193x_deemp_enum), }; static const struct snd_soc_dapm_widget ad193x_dapm_widgets[] = { SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_PGA("DAC Output", AD193X_DAC_CTRL0, 0, 1, NULL, 0), - SND_SOC_DAPM_ADC("ADC", "Capture", SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_SUPPLY("PLL_PWR", AD193X_PLL_CLK_CTRL0, 0, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("ADC_PWR", AD193X_ADC_CTRL0, 0, 1, NULL, 0), SND_SOC_DAPM_SUPPLY("SYSCLK", AD193X_PLL_CLK_CTRL0, 7, 0, NULL, 0), SND_SOC_DAPM_VMID("VMID"), SND_SOC_DAPM_OUTPUT("DAC1OUT"), SND_SOC_DAPM_OUTPUT("DAC2OUT"), SND_SOC_DAPM_OUTPUT("DAC3OUT"), SND_SOC_DAPM_OUTPUT("DAC4OUT"), +}; + +static const struct snd_soc_dapm_widget ad193x_adc_widgets[] = { + SND_SOC_DAPM_ADC("ADC", "Capture", SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_SUPPLY("ADC_PWR", AD193X_ADC_CTRL0, 0, 1, NULL, 0), SND_SOC_DAPM_INPUT("ADC1IN"), SND_SOC_DAPM_INPUT("ADC2IN"), }; @@ -91,18 +97,33 @@ static const struct snd_soc_dapm_route audio_paths[] = { { "DAC", NULL, "SYSCLK" }, { "DAC Output", NULL, "DAC" }, { "DAC Output", NULL, "VMID" }, - { "ADC", NULL, "SYSCLK" }, - { "DAC", NULL, "ADC_PWR" }, - { "ADC", NULL, "ADC_PWR" }, { "DAC1OUT", NULL, "DAC Output" }, { "DAC2OUT", NULL, "DAC Output" }, { "DAC3OUT", NULL, "DAC Output" }, { "DAC4OUT", NULL, "DAC Output" }, + { "SYSCLK", NULL, "PLL_PWR" }, +}; + +static const struct snd_soc_dapm_route adc_audio_paths[] = { + { "ADC", NULL, "SYSCLK" }, + { "ADC", NULL, "ADC_PWR" }, { "ADC", NULL, "ADC1IN" }, { "ADC", NULL, "ADC2IN" }, - { "SYSCLK", NULL, "PLL_PWR" }, }; +static inline bool ad193x_has_adc(const struct ad193x_priv *ad193x) +{ + switch (ad193x->type) { + case AD1933: + case AD1934: + return false; + default: + break; + } + + return true; +} + /* * DAI ops entries */ @@ -147,8 +168,10 @@ static int ad193x_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, regmap_update_bits(ad193x->regmap, AD193X_DAC_CTRL1, AD193X_DAC_CHAN_MASK, channels << AD193X_DAC_CHAN_SHFT); - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, - AD193X_ADC_CHAN_MASK, channels << AD193X_ADC_CHAN_SHFT); + if (ad193x_has_adc(ad193x)) + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, + AD193X_ADC_CHAN_MASK, + channels << AD193X_ADC_CHAN_SHFT); return 0; } @@ -172,7 +195,9 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, adc_serfmt |= AD193X_ADC_SERFMT_AUX; break; default: - return -EINVAL; + if (ad193x_has_adc(ad193x)) + return -EINVAL; + break; } switch (fmt & SND_SOC_DAIFMT_INV_MASK) { @@ -217,10 +242,12 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, return -EINVAL; } - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, - AD193X_ADC_SERFMT_MASK, adc_serfmt); - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, - AD193X_ADC_FMT_MASK, adc_fmt); + if (ad193x_has_adc(ad193x)) { + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, + AD193X_ADC_SERFMT_MASK, adc_serfmt); + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, + AD193X_ADC_FMT_MASK, adc_fmt); + } regmap_update_bits(ad193x->regmap, AD193X_DAC_CTRL1, AD193X_DAC_FMT_MASK, dac_fmt); @@ -287,8 +314,9 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream, AD193X_DAC_WORD_LEN_MASK, word_len << AD193X_DAC_WORD_LEN_SHFT); - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, - AD193X_ADC_WORD_LEN_MASK, word_len); + if (ad193x_has_adc(ad193x)) + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, + AD193X_ADC_WORD_LEN_MASK, word_len); return 0; } @@ -326,6 +354,7 @@ static struct snd_soc_dai_driver ad193x_dai = { static int ad193x_codec_probe(struct snd_soc_codec *codec) { struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec); + int num, ret; /* default setting for ad193x */ @@ -335,14 +364,46 @@ static int ad193x_codec_probe(struct snd_soc_codec *codec) regmap_write(ad193x->regmap, AD193X_DAC_CTRL2, 0x1A); /* dac in tdm mode */ regmap_write(ad193x->regmap, AD193X_DAC_CTRL0, 0x40); - /* 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); + + /* 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); + /* adc only */ + if (ad193x_has_adc(ad193x)) { + /* add adc controls */ + num = ARRAY_SIZE(ad193x_adc_snd_controls); + ret = snd_soc_add_codec_controls(codec, + ad193x_adc_snd_controls, + num); + if (ret) + return ret; + + /* add adc widgets */ + num = ARRAY_SIZE(ad193x_adc_widgets); + ret = snd_soc_dapm_new_controls(&codec->dapm, + ad193x_adc_widgets, + num); + if (ret) + return ret; + + /* add adc routes */ + num = ARRAY_SIZE(adc_audio_paths); + ret = snd_soc_dapm_add_routes(&codec->dapm, + adc_audio_paths, + num); + if (ret) + return ret; + } + return 0; } @@ -367,7 +428,8 @@ const struct regmap_config ad193x_regmap_config = { }; EXPORT_SYMBOL_GPL(ad193x_regmap_config); -int ad193x_probe(struct device *dev, struct regmap *regmap) +int ad193x_probe(struct device *dev, struct regmap *regmap, + enum ad193x_type type) { struct ad193x_priv *ad193x; @@ -379,6 +441,7 @@ int ad193x_probe(struct device *dev, struct regmap *regmap) return -ENOMEM; ad193x->regmap = regmap; + ad193x->type = type; dev_set_drvdata(dev, ad193x); diff --git a/sound/soc/codecs/ad193x.h b/sound/soc/codecs/ad193x.h index ab9a998f15be..8b1e65f928d2 100644 --- a/sound/soc/codecs/ad193x.h +++ b/sound/soc/codecs/ad193x.h @@ -13,8 +13,15 @@ struct device; +enum ad193x_type { + AD193X, + AD1933, + AD1934, +}; + extern const struct regmap_config ad193x_regmap_config; -int ad193x_probe(struct device *dev, struct regmap *regmap); +int ad193x_probe(struct device *dev, struct regmap *regmap, + enum ad193x_type type); #define AD193X_PLL_CLK_CTRL0 0x00 #define AD193X_PLL_POWERDOWN 0x01 -- 1.8.2.2

2 2

[alsa-devel] [PATCH v2 1/1] ASoC: ad193x: add support to ad1934
by Cyrille Pitchen 29 Sep '15

29 Sep '15

The AD1934 codec has no DAC feature. Hence it register mapping is slightly different from the register mapping of other members of the AD193x family. Some ASoC controls and widgets are related to the DAC feature so are not relevant in the case of an AD1934 codec. Signed-off-by: Cyrille Pitchen <cyrille.pitchen(a)atmel.com> --- Hi all, This patch adds support to the AD1934 codec, which is DAC only. Best Regards, Cyrille ChangeLog v2: - replace AD193x by AD193X in ad193x-i2c.c - add ad193x_ prefix to adc_audio_paths --- sound/soc/codecs/ad193x-i2c.c | 8 +-- sound/soc/codecs/ad193x-spi.c | 16 +++++- sound/soc/codecs/ad193x.c | 121 ++++++++++++++++++++++++++++++++---------- sound/soc/codecs/ad193x.h | 9 +++- 4 files changed, 120 insertions(+), 34 deletions(-) diff --git a/sound/soc/codecs/ad193x-i2c.c b/sound/soc/codecs/ad193x-i2c.c index df3a1a415825..171313664bc8 100644 --- a/sound/soc/codecs/ad193x-i2c.c +++ b/sound/soc/codecs/ad193x-i2c.c @@ -15,8 +15,8 @@ #include "ad193x.h" static const struct i2c_device_id ad193x_id[] = { - { "ad1936", 0 }, - { "ad1937", 0 }, + { "ad1936", AD193X }, + { "ad1937", AD193X }, { } }; MODULE_DEVICE_TABLE(i2c, ad193x_id); @@ -30,7 +30,9 @@ static int ad193x_i2c_probe(struct i2c_client *client, config.val_bits = 8; config.reg_bits = 8; - return ad193x_probe(&client->dev, devm_regmap_init_i2c(client, &config)); + return ad193x_probe(&client->dev, + devm_regmap_init_i2c(client, &config), + (enum ad193x_type)id->driver_data); } static int ad193x_i2c_remove(struct i2c_client *client) diff --git a/sound/soc/codecs/ad193x-spi.c b/sound/soc/codecs/ad193x-spi.c index 390cef9b9dc2..364e82112e8c 100644 --- a/sound/soc/codecs/ad193x-spi.c +++ b/sound/soc/codecs/ad193x-spi.c @@ -16,6 +16,7 @@ static int ad193x_spi_probe(struct spi_device *spi) { + const struct spi_device_id *id = spi_get_device_id(spi); struct regmap_config config; config = ad193x_regmap_config; @@ -24,7 +25,8 @@ static int ad193x_spi_probe(struct spi_device *spi) config.read_flag_mask = 0x09; config.write_flag_mask = 0x08; - return ad193x_probe(&spi->dev, devm_regmap_init_spi(spi, &config)); + return ad193x_probe(&spi->dev, devm_regmap_init_spi(spi, &config), + (enum ad193x_type)id->driver_data); } static int ad193x_spi_remove(struct spi_device *spi) @@ -33,6 +35,17 @@ static int ad193x_spi_remove(struct spi_device *spi) return 0; } +static const struct spi_device_id ad193x_spi_id[] = { + { "ad193x", AD193X }, + { "ad1933", AD1933 }, + { "ad1934", AD1934 }, + { "ad1936", AD193X }, + { "ad1937", AD193X }, + { "ad1938", AD193X }, + { } +}; +MODULE_DEVICE_TABLE(spi, ad193x_spi_id); + static struct spi_driver ad193x_spi_driver = { .driver = { .name = "ad193x", @@ -40,6 +53,7 @@ static struct spi_driver ad193x_spi_driver = { }, .probe = ad193x_spi_probe, .remove = ad193x_spi_remove, + .id_table = ad193x_spi_id, }; module_spi_driver(ad193x_spi_driver); diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 17c953595660..fa0a053bda58 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -23,6 +23,7 @@ /* codec private data */ struct ad193x_priv { struct regmap *regmap; + enum ad193x_type type; int sysclk; }; @@ -47,12 +48,6 @@ static const struct snd_kcontrol_new ad193x_snd_controls[] = { SOC_DOUBLE_R_TLV("DAC4 Volume", AD193X_DAC_L4_VOL, AD193X_DAC_R4_VOL, 0, 0xFF, 1, adau193x_tlv), - /* ADC switch control */ - SOC_DOUBLE("ADC1 Switch", AD193X_ADC_CTRL0, AD193X_ADCL1_MUTE, - AD193X_ADCR1_MUTE, 1, 1), - SOC_DOUBLE("ADC2 Switch", AD193X_ADC_CTRL0, AD193X_ADCL2_MUTE, - AD193X_ADCR2_MUTE, 1, 1), - /* DAC switch control */ SOC_DOUBLE("DAC1 Switch", AD193X_DAC_CHNL_MUTE, AD193X_DACL1_MUTE, AD193X_DACR1_MUTE, 1, 1), @@ -63,26 +58,37 @@ static const struct snd_kcontrol_new ad193x_snd_controls[] = { SOC_DOUBLE("DAC4 Switch", AD193X_DAC_CHNL_MUTE, AD193X_DACL4_MUTE, AD193X_DACR4_MUTE, 1, 1), + /* DAC de-emphasis */ + SOC_ENUM("Playback Deemphasis", ad193x_deemp_enum), +}; + +static const struct snd_kcontrol_new ad193x_adc_snd_controls[] = { + /* ADC switch control */ + SOC_DOUBLE("ADC1 Switch", AD193X_ADC_CTRL0, AD193X_ADCL1_MUTE, + AD193X_ADCR1_MUTE, 1, 1), + SOC_DOUBLE("ADC2 Switch", AD193X_ADC_CTRL0, AD193X_ADCL2_MUTE, + AD193X_ADCR2_MUTE, 1, 1), + /* ADC high-pass filter */ SOC_SINGLE("ADC High Pass Filter Switch", AD193X_ADC_CTRL0, AD193X_ADC_HIGHPASS_FILTER, 1, 0), - - /* DAC de-emphasis */ - SOC_ENUM("Playback Deemphasis", ad193x_deemp_enum), }; static const struct snd_soc_dapm_widget ad193x_dapm_widgets[] = { SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_PGA("DAC Output", AD193X_DAC_CTRL0, 0, 1, NULL, 0), - SND_SOC_DAPM_ADC("ADC", "Capture", SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_SUPPLY("PLL_PWR", AD193X_PLL_CLK_CTRL0, 0, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("ADC_PWR", AD193X_ADC_CTRL0, 0, 1, NULL, 0), SND_SOC_DAPM_SUPPLY("SYSCLK", AD193X_PLL_CLK_CTRL0, 7, 0, NULL, 0), SND_SOC_DAPM_VMID("VMID"), SND_SOC_DAPM_OUTPUT("DAC1OUT"), SND_SOC_DAPM_OUTPUT("DAC2OUT"), SND_SOC_DAPM_OUTPUT("DAC3OUT"), SND_SOC_DAPM_OUTPUT("DAC4OUT"), +}; + +static const struct snd_soc_dapm_widget ad193x_adc_widgets[] = { + SND_SOC_DAPM_ADC("ADC", "Capture", SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_SUPPLY("ADC_PWR", AD193X_ADC_CTRL0, 0, 1, NULL, 0), SND_SOC_DAPM_INPUT("ADC1IN"), SND_SOC_DAPM_INPUT("ADC2IN"), }; @@ -91,18 +97,33 @@ static const struct snd_soc_dapm_route audio_paths[] = { { "DAC", NULL, "SYSCLK" }, { "DAC Output", NULL, "DAC" }, { "DAC Output", NULL, "VMID" }, - { "ADC", NULL, "SYSCLK" }, - { "DAC", NULL, "ADC_PWR" }, - { "ADC", NULL, "ADC_PWR" }, { "DAC1OUT", NULL, "DAC Output" }, { "DAC2OUT", NULL, "DAC Output" }, { "DAC3OUT", NULL, "DAC Output" }, { "DAC4OUT", NULL, "DAC Output" }, + { "SYSCLK", NULL, "PLL_PWR" }, +}; + +static const struct snd_soc_dapm_route ad193x_adc_audio_paths[] = { + { "ADC", NULL, "SYSCLK" }, + { "ADC", NULL, "ADC_PWR" }, { "ADC", NULL, "ADC1IN" }, { "ADC", NULL, "ADC2IN" }, - { "SYSCLK", NULL, "PLL_PWR" }, }; +static inline bool ad193x_has_adc(const struct ad193x_priv *ad193x) +{ + switch (ad193x->type) { + case AD1933: + case AD1934: + return false; + default: + break; + } + + return true; +} + /* * DAI ops entries */ @@ -147,8 +168,10 @@ static int ad193x_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, regmap_update_bits(ad193x->regmap, AD193X_DAC_CTRL1, AD193X_DAC_CHAN_MASK, channels << AD193X_DAC_CHAN_SHFT); - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, - AD193X_ADC_CHAN_MASK, channels << AD193X_ADC_CHAN_SHFT); + if (ad193x_has_adc(ad193x)) + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, + AD193X_ADC_CHAN_MASK, + channels << AD193X_ADC_CHAN_SHFT); return 0; } @@ -172,7 +195,9 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, adc_serfmt |= AD193X_ADC_SERFMT_AUX; break; default: - return -EINVAL; + if (ad193x_has_adc(ad193x)) + return -EINVAL; + break; } switch (fmt & SND_SOC_DAIFMT_INV_MASK) { @@ -217,10 +242,12 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, return -EINVAL; } - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, - AD193X_ADC_SERFMT_MASK, adc_serfmt); - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, - AD193X_ADC_FMT_MASK, adc_fmt); + if (ad193x_has_adc(ad193x)) { + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, + AD193X_ADC_SERFMT_MASK, adc_serfmt); + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2, + AD193X_ADC_FMT_MASK, adc_fmt); + } regmap_update_bits(ad193x->regmap, AD193X_DAC_CTRL1, AD193X_DAC_FMT_MASK, dac_fmt); @@ -287,8 +314,9 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream, AD193X_DAC_WORD_LEN_MASK, word_len << AD193X_DAC_WORD_LEN_SHFT); - regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, - AD193X_ADC_WORD_LEN_MASK, word_len); + if (ad193x_has_adc(ad193x)) + regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1, + AD193X_ADC_WORD_LEN_MASK, word_len); return 0; } @@ -326,6 +354,7 @@ static struct snd_soc_dai_driver ad193x_dai = { static int ad193x_codec_probe(struct snd_soc_codec *codec) { struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec); + int num, ret; /* default setting for ad193x */ @@ -335,14 +364,46 @@ static int ad193x_codec_probe(struct snd_soc_codec *codec) regmap_write(ad193x->regmap, AD193X_DAC_CTRL2, 0x1A); /* dac in tdm mode */ regmap_write(ad193x->regmap, AD193X_DAC_CTRL0, 0x40); - /* 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); + + /* 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); + /* adc only */ + if (ad193x_has_adc(ad193x)) { + /* add adc controls */ + num = ARRAY_SIZE(ad193x_adc_snd_controls); + ret = snd_soc_add_codec_controls(codec, + ad193x_adc_snd_controls, + num); + if (ret) + return ret; + + /* add adc widgets */ + num = ARRAY_SIZE(ad193x_adc_widgets); + ret = snd_soc_dapm_new_controls(&codec->dapm, + ad193x_adc_widgets, + num); + if (ret) + return ret; + + /* add adc routes */ + num = ARRAY_SIZE(ad193x_adc_audio_paths); + ret = snd_soc_dapm_add_routes(&codec->dapm, + ad193x_adc_audio_paths, + num); + if (ret) + return ret; + } + return 0; } @@ -367,7 +428,8 @@ const struct regmap_config ad193x_regmap_config = { }; EXPORT_SYMBOL_GPL(ad193x_regmap_config); -int ad193x_probe(struct device *dev, struct regmap *regmap) +int ad193x_probe(struct device *dev, struct regmap *regmap, + enum ad193x_type type) { struct ad193x_priv *ad193x; @@ -379,6 +441,7 @@ int ad193x_probe(struct device *dev, struct regmap *regmap) return -ENOMEM; ad193x->regmap = regmap; + ad193x->type = type; dev_set_drvdata(dev, ad193x); diff --git a/sound/soc/codecs/ad193x.h b/sound/soc/codecs/ad193x.h index ab9a998f15be..8b1e65f928d2 100644 --- a/sound/soc/codecs/ad193x.h +++ b/sound/soc/codecs/ad193x.h @@ -13,8 +13,15 @@ struct device; +enum ad193x_type { + AD193X, + AD1933, + AD1934, +}; + extern const struct regmap_config ad193x_regmap_config; -int ad193x_probe(struct device *dev, struct regmap *regmap); +int ad193x_probe(struct device *dev, struct regmap *regmap, + enum ad193x_type type); #define AD193X_PLL_CLK_CTRL0 0x00 #define AD193X_PLL_POWERDOWN 0x01 -- 1.8.2.2

1 0

[alsa-devel] [PATCH] ALSA: pcm: Avoid double hw_free calls at releasing a stream
by Takashi Iwai 29 Sep '15

29 Sep '15

snd_pcm_release_substream() always calls hw_free op when the stream was opened. This is superfluous in most cases because it's been already released via explicit hw_free ioctl. Although this double call is usually OK as this callback should be written to be called multiple times, it's better to avoid superfluous calls. Reported-by: Vinod Koul <vinod.koul(a)intel.com> Tested-by: Jeeja Kp <jeeja.kp(a)intel.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- 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 4863af5e7b26..139887011ba2 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2227,7 +2227,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream) snd_pcm_drop(substream); if (substream->hw_opened) { - if (substream->ops->hw_free != NULL) + if (substream->ops->hw_free && + substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) substream->ops->hw_free(substream); substream->ops->close(substream); substream->hw_opened = 0; -- 2.5.3

1 0

[alsa-devel] [RESEND PATCH v2 0/2] ASoC: atmel-classd: add driver for Atmel CLASSD
by Songjun Wu 29 Sep '15

29 Sep '15

The Audio Class D Amplifier driver includes two parts. 1) Driver code to implement the Audio Class D Amplifier function. 2) Device tree binding document, it describes how to add the Audio Class D Amplifier in device tree. Changes in v2: - Change the "Mono", "Swap" and "Deemphasis" controls to "Mono Switch", "Swap Switch" and "Deemphasis Switch". - Merge "EQ Bass", "EQ Medium" and "EQ Treble" controls into one "EQ" control. - Change the "single-ended" and "differential" to "Single ended", "Differential". - Merge separate left and right controls into one single stereo control. - Add a warning if the user trys to specify an invalid value in function "atmel_classd_codec_probe". - Use the "dev_get_regmap()" in function "atmel_classd_codec_get_remap". - Check for errors when invoking the "clk_prepare_enable". - Remove the "dev_info" in function "atmel_classd_probe". - Add some code to create a sound card in function "atmel_classd_probe". - Remove the DT node "Sound" and the related code. - Delete the device node "Sound" in dts. Songjun Wu (2): ASoC: atmel-classd: add the Audio Class D Amplifier SoC: atmel-classd: DT binding for Class D audio amplifier driver .../devicetree/bindings/sound/atmel-classd.txt | 52 ++ sound/soc/atmel/Kconfig | 9 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel-classd.c | 680 ++++++++++++++++++++ sound/soc/atmel/atmel-classd.h | 120 ++++ 5 files changed, 863 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt create mode 100644 sound/soc/atmel/atmel-classd.c create mode 100644 sound/soc/atmel/atmel-classd.h -- 1.7.9.5

4 5

[alsa-devel] [PATCH V4 1/2] ACPI / EC: Fix broken 64bit big-endian users of 'global_lock'
by Viresh Kumar 28 Sep '15

28 Sep '15

global_lock is defined as an unsigned long and accessing only its lower 32 bits from sysfs is incorrect, as we need to consider other 32 bits for big endian 64 bit systems. There are no such platforms yet, but the code needs to be robust for such a case. Fix that by passing a local variable to debugfs_create_bool() and assigning its value to global_lock later. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- V3->V4: - Create a local variable instead of changing type of global_lock (Rafael) - Drop the stable tag - BCC'd a lot of people (rather than cc'ing them) to make sure - the series reaches them - mailing lists do not block the patchset due to long cc list - and we don't spam the BCC'd people for every reply --- drivers/acpi/ec_sys.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c index b4c216bab22b..b44b91331a56 100644 --- a/drivers/acpi/ec_sys.c +++ b/drivers/acpi/ec_sys.c @@ -110,6 +110,7 @@ static int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count) struct dentry *dev_dir; char name[64]; umode_t mode = 0400; + u32 val; if (ec_device_count == 0) { acpi_ec_debugfs_dir = debugfs_create_dir("ec", NULL); @@ -127,10 +128,11 @@ static int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count) if (!debugfs_create_x32("gpe", 0444, dev_dir, (u32 *)&first_ec->gpe)) goto error; - if (!debugfs_create_bool("use_global_lock", 0444, dev_dir, - (u32 *)&first_ec->global_lock)) + if (!debugfs_create_bool("use_global_lock", 0444, dev_dir, &val)) goto error; + first_ec->global_lock = val; + if (write_support) mode = 0600; if (!debugfs_create_file("io", mode, dev_dir, ec, &acpi_ec_io_ops)) -- 2.4.0

8 27