[Patch v2 1/2] ASoC: fsl: Add i2s and pcm drivers for LPC32xx CPUs
This driver was ported from an old version in linux 2.6.27 and adjusted for the new ASoC framework and DMA API.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com --- Changes for v2: - Coding Style cleanup - Use dev_err_probe() for error handling in probe function - Removed unneded err_clk_disable label - Removed empty function - Droped of_match_ptr in lpc32xx_i2s_match DT match table - ASoC struct adjustmes for the latest 6.10-rc3 kernel
MAINTAINERS | 7 + arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 4 + arch/arm/mach-lpc32xx/phy3250.c | 60 ++++ sound/soc/fsl/Kconfig | 7 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/lpc3xxx-i2s.c | 383 +++++++++++++++++++++++++ sound/soc/fsl/lpc3xxx-i2s.h | 94 ++++++ sound/soc/fsl/lpc3xxx-pcm.c | 75 +++++ 8 files changed, 632 insertions(+) create mode 100644 sound/soc/fsl/lpc3xxx-i2s.c create mode 100644 sound/soc/fsl/lpc3xxx-i2s.h create mode 100644 sound/soc/fsl/lpc3xxx-pcm.c
diff --git a/MAINTAINERS b/MAINTAINERS index aacccb376c28..7616f61d6327 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8909,6 +8909,13 @@ S: Maintained F: sound/soc/fsl/fsl* F: sound/soc/fsl/imx*
+FREESCALE SOC LPC32XX SOUND DRIVERS +M: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +L: linuxppc-dev@lists.ozlabs.org +S: Orphan +F: sound/soc/fsl/lpc3xxx-* + FREESCALE SOC SOUND QMC DRIVER M: Herve Codina herve.codina@bootlin.com L: alsa-devel@alsa-project.org (moderated for non-subscribers) diff --git a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi index 974410918f35..3fa12e3a0093 100644 --- a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi +++ b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi @@ -221,6 +221,8 @@ spi2: spi@20090000 { i2s0: i2s@20094000 { compatible = "nxp,lpc3220-i2s"; reg = <0x20094000 0x1000>; + clocks = <&clk LPC32XX_CLK_I2S0>; + clock-names = "i2s_clk"; status = "disabled"; };
@@ -237,6 +239,8 @@ sd: sd@20098000 { i2s1: i2s@2009c000 { compatible = "nxp,lpc3220-i2s"; reg = <0x2009c000 0x1000>; + clocks = <&clk LPC32XX_CLK_I2S1>; + clock-names = "i2s_clk"; status = "disabled"; };
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 66701bf43248..b866b9a75558 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -9,6 +9,7 @@ */
#include <linux/amba/pl08x.h> +#include <linux/amba/pl022.h> #include <linux/mtd/lpc32xx_mlc.h> #include <linux/mtd/lpc32xx_slc.h> #include <linux/of_platform.h> @@ -29,6 +30,46 @@ static struct pl08x_channel_data pl08x_slave_channels[] = { .max_signal = 12, .periph_buses = PL08X_AHB1, }, + { + .bus_id = "i2s-tx", + .min_signal = 13, + .max_signal = 13, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "i2s-rx", + .min_signal = 0, + .max_signal = 0, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp0-tx", + .min_signal = 15, + .max_signal = 15, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp0-rx", + .min_signal = 14, + .max_signal = 14, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp1-tx", + .min_signal = 11, + .max_signal = 11, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp1-rx", + .min_signal = 3, + .max_signal = 3, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, };
static int pl08x_get_signal(const struct pl08x_channel_data *cd) @@ -60,12 +101,31 @@ static struct lpc32xx_mlc_platform_data lpc32xx_mlc_data = { .dma_filter = pl08x_filter_id, };
+static struct pl022_ssp_controller lpc32xx_ssp_data[] = { + { + .bus_id = 0, + .enable_dma = 0, + .dma_filter = pl08x_filter_id, + .dma_tx_param = "ssp0-tx", + .dma_rx_param = "ssp0-rx", + }, + { + .bus_id = 1, + .enable_dma = 0, + .dma_filter = pl08x_filter_id, + .dma_tx_param = "ssp1-tx", + .dma_rx_param = "ssp1-rx", + } +}; + static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), OF_DEV_AUXDATA("nxp,lpc3220-slc", 0x20020000, "20020000.flash", &lpc32xx_slc_data), OF_DEV_AUXDATA("nxp,lpc3220-mlc", 0x200a8000, "200a8000.flash", &lpc32xx_mlc_data), + OF_DEV_AUXDATA("arm,pl022", 0x20084000, NULL, &lpc32xx_ssp_data[0]), + OF_DEV_AUXDATA("arm,pl022", 0x2008c000, NULL, &lpc32xx_ssp_data[1]), { } };
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 270726c134b3..0f100df96f63 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -130,6 +130,13 @@ config SND_SOC_FSL_RPMSG This option is only useful for out-of-tree drivers since in-tree drivers select it automatically.
+config SND_SOC_FSL_LPC3XXX + tristate "SoC Audio for NXP LPC32XX CPUs" + depends on ARCH_LPC32XX && SND_SOC + select SND_SOC_GENERIC_DMAENGINE_PCM + help + Say Y or M if you want to add support for the LPC3XXX I2S interface. + config SND_SOC_IMX_PCM_DMA tristate select SND_SOC_GENERIC_DMAENGINE_PCM diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 2fe78eed3a48..6d9636919340 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -25,6 +25,7 @@ snd-soc-fsl-xcvr-y := fsl_xcvr.o snd-soc-fsl-aud2htx-y := fsl_aud2htx.o snd-soc-fsl-rpmsg-y := fsl_rpmsg.o snd-soc-fsl-qmc-audio-y := fsl_qmc_audio.o +snd-soc-fsl-lpc3xxx-y := lpc3xxx-pcm.o lpc3xxx-i2s.o
obj-$(CONFIG_SND_SOC_FSL_AUDMIX) += snd-soc-fsl-audmix.o obj-$(CONFIG_SND_SOC_FSL_ASOC_CARD) += snd-soc-fsl-asoc-card.o @@ -42,6 +43,7 @@ obj-$(CONFIG_SND_SOC_FSL_XCVR) += snd-soc-fsl-xcvr.o obj-$(CONFIG_SND_SOC_FSL_AUD2HTX) += snd-soc-fsl-aud2htx.o obj-$(CONFIG_SND_SOC_FSL_RPMSG) += snd-soc-fsl-rpmsg.o obj-$(CONFIG_SND_SOC_POWERPC_QMC_AUDIO) += snd-soc-fsl-qmc-audio.o +obj-$(CONFIG_SND_SOC_FSL_LPC3XXX) += snd-soc-fsl-lpc3xxx.o
# MPC5200 Platform Support obj-$(CONFIG_SND_MPC52xx_DMA) += mpc5200_dma.o diff --git a/sound/soc/fsl/lpc3xxx-i2s.c b/sound/soc/fsl/lpc3xxx-i2s.c new file mode 100644 index 000000000000..ea5df520ca28 --- /dev/null +++ b/sound/soc/fsl/lpc3xxx-i2s.c @@ -0,0 +1,383 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Author: Kevin Wells kevin.wells@nxp.com + * + * Copyright (C) 2008 NXP Semiconductors + * Copyright 2023 Timesys Corporation piotr.wojtaszczyk@timesys.com + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/clk.h> +#include <linux/io.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include "lpc3xxx-i2s.h" + +#define I2S_PLAYBACK_FLAG 0x1 +#define I2S_CAPTURE_FLAG 0x2 + +#define LPC3XXX_I2S_RATES ( \ + SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \ + SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000) + +#define LPC3XXX_I2S_FORMATS ( \ + SNDRV_PCM_FMTBIT_S8 | \ + SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S32_LE) + +static u32 absd32(u32 v1, u32 v2) +{ + if (v1 > v2) + return v1 - v2; + return v2 - v1; +} + +static void __lpc3xxx_find_clkdiv(u32 *clkx, u32 *clky, int freq, int xbytes, u32 clkrate) +{ + u32 i2srate; + u32 idxx, idyy; + u32 savedbitclkrate, diff, trate, baseclk; + + /* Adjust rate for sample size (bits) and 2 channels and offset for + * divider in clock output + */ + i2srate = (freq / 100) * 2 * (8 * xbytes); + i2srate = i2srate << 1; + clkrate = clkrate / 100; + baseclk = clkrate; + *clkx = 1; + *clky = 1; + + /* Find the best divider */ + *clkx = *clky = 0; + savedbitclkrate = 0; + diff = ~0; + for (idxx = 1; idxx < 0xFF; idxx++) { + for (idyy = 1; idyy < 0xFF; idyy++) { + trate = (baseclk * idxx) / idyy; + if (absd32(trate, i2srate) < diff) { + diff = absd32(trate, i2srate); + savedbitclkrate = trate; + *clkx = idxx; + *clky = idyy; + } + } + } +} + +static int lpc3xxx_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct device *dev = i2s_info_p->dev; + u32 flag; + int ret = 0; + + mutex_lock(&i2s_info_p->lock); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + flag = I2S_PLAYBACK_FLAG; + else + flag = I2S_CAPTURE_FLAG; + + if (flag & i2s_info_p->streams_in_use) { + dev_warn(dev, "I2S channel is busy\n"); + ret = -EBUSY; + goto lpc32xx_unlock; + } + + if (i2s_info_p->streams_in_use == 0) { + ret = clk_prepare_enable(i2s_info_p->clk); + if (ret) { + dev_err(dev, "Can't enable clock, err=%d\n", ret); + goto lpc32xx_unlock; + } + } + + i2s_info_p->streams_in_use |= flag; + +lpc32xx_unlock: + mutex_unlock(&i2s_info_p->lock); + return ret; +} + +static void lpc3xxx_i2s_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct regmap *regs = i2s_info_p->regs; + const u32 stop_bits = (I2S_RESET | I2S_STOP); + u32 flag; + + mutex_lock(&i2s_info_p->lock); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + flag = I2S_PLAYBACK_FLAG; + regmap_write(regs, I2S_TX_RATE, 0); + regmap_update_bits(regs, I2S_DAO, stop_bits, stop_bits); + } else { + flag = I2S_CAPTURE_FLAG; + regmap_write(regs, I2S_RX_RATE, 0); + regmap_update_bits(regs, I2S_DAI, stop_bits, stop_bits); + } + i2s_info_p->streams_in_use &= ~flag; + + if (i2s_info_p->streams_in_use == 0) + clk_disable_unprepare(i2s_info_p->clk); + + mutex_unlock(&i2s_info_p->lock); +} + +static int lpc3xxx_i2s_set_dai_sysclk(struct snd_soc_dai *cpu_dai, + int clk_id, unsigned int freq, int dir) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + + /* Will use in HW params later */ + i2s_info_p->freq = freq; + + return 0; +} + +static int lpc3xxx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct device *dev = i2s_info_p->dev; + + if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) != SND_SOC_DAIFMT_I2S) { + dev_warn(dev, "unsupported bus format %d\n", fmt); + return -EINVAL; + } + return 0; +} + +static int lpc3xxx_i2s_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct device *dev = i2s_info_p->dev; + struct regmap *regs = i2s_info_p->regs; + int xfersize; + u32 tmp, clkx, clky; + + tmp = I2S_RESET | I2S_STOP; + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S8: + tmp |= I2S_WW8 | I2S_WS_HP(I2S_WW8_HP); + xfersize = 1; + break; + + case SNDRV_PCM_FORMAT_S16_LE: + tmp |= I2S_WW16 | I2S_WS_HP(I2S_WW16_HP); + xfersize = 2; + break; + + case SNDRV_PCM_FORMAT_S32_LE: + tmp |= I2S_WW32 | I2S_WS_HP(I2S_WW32_HP); + xfersize = 4; + break; + + default: + dev_warn(dev, "Unsupported audio data format %d\n", params_format(params)); + return -EINVAL; + } + + if (params_channels(params) == 1) + tmp |= I2S_MONO; + + __lpc3xxx_find_clkdiv(&clkx, &clky, i2s_info_p->freq, xfersize, i2s_info_p->clkrate); + + dev_dbg(dev, "Stream : %s\n", + substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? "playback" : "capture"); + dev_dbg(dev, "Desired clock rate : %d\n", i2s_info_p->freq); + dev_dbg(dev, "Base clock rate : %d\n", i2s_info_p->clkrate); + dev_dbg(dev, "Transfer size (bytes) : %d\n", xfersize); + dev_dbg(dev, "Clock divider (x) : %d\n", clkx); + dev_dbg(dev, "Clock divider (y) : %d\n", clky); + dev_dbg(dev, "Channels : %d\n", params_channels(params)); + dev_dbg(dev, "Data format : %s\n", "I2S"); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + regmap_write(regs, I2S_DMA1, I2S_DMA1_TX_EN | I2S_DMA0_TX_DEPTH(4)); + regmap_write(regs, I2S_TX_RATE, (clkx << 8) | clky); + regmap_write(regs, I2S_DAO, tmp); + } else { + regmap_write(regs, I2S_DMA0, I2S_DMA0_RX_EN | I2S_DMA1_RX_DEPTH(4)); + regmap_write(regs, I2S_RX_RATE, (clkx << 8) | clky); + regmap_write(regs, I2S_DAI, tmp); + } + + return 0; +} + +static int lpc3xxx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct regmap *regs = i2s_info_p->regs; + int ret = 0; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + case SNDRV_PCM_TRIGGER_SUSPEND: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + regmap_update_bits(regs, I2S_DAO, I2S_STOP, I2S_STOP); + else + regmap_update_bits(regs, I2S_DAI, I2S_STOP, I2S_STOP); + break; + + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_RESUME: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + regmap_update_bits(regs, I2S_DAO, (I2S_RESET | I2S_STOP), 0); + else + regmap_update_bits(regs, I2S_DAI, (I2S_RESET | I2S_STOP), 0); + break; + default: + ret = -EINVAL; + } + + return ret; +} + +static int lpc3xxx_i2s_dai_probe(struct snd_soc_dai *dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(dai); + + snd_soc_dai_init_dma_data(dai, &i2s_info_p->playback_dma_config, + &i2s_info_p->capture_dma_config); + return 0; +} + +const struct snd_soc_dai_ops lpc3xxx_i2s_dai_ops = { + .probe = lpc3xxx_i2s_dai_probe, + .startup = lpc3xxx_i2s_startup, + .shutdown = lpc3xxx_i2s_shutdown, + .trigger = lpc3xxx_i2s_trigger, + .hw_params = lpc3xxx_i2s_hw_params, + .set_sysclk = lpc3xxx_i2s_set_dai_sysclk, + .set_fmt = lpc3xxx_i2s_set_dai_fmt, +}; + +struct snd_soc_dai_driver lpc3xxx_i2s_dai_driver = { + .playback = { + .channels_min = 1, + .channels_max = 2, + .rates = LPC3XXX_I2S_RATES, + .formats = LPC3XXX_I2S_FORMATS, + }, + .capture = { + .channels_min = 1, + .channels_max = 2, + .rates = LPC3XXX_I2S_RATES, + .formats = LPC3XXX_I2S_FORMATS, + }, + .ops = &lpc3xxx_i2s_dai_ops, + .symmetric_rate = 1, + .symmetric_channels = 1, + .symmetric_sample_bits = 1, +}; + +static const struct snd_soc_component_driver lpc32xx_i2s_component = { + .name = "lpc32xx-i2s", + .legacy_dai_naming = 1, +}; + +static const struct regmap_config lpc32xx_i2s_regconfig = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = I2S_RX_RATE, +}; + +static int lpc32xx_i2s_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct lpc3xxx_i2s_info *i2s_info_p; + struct resource *res; + void __iomem *iomem; + int ret; + + i2s_info_p = devm_kzalloc(dev, sizeof(*i2s_info_p), GFP_KERNEL); + if (!i2s_info_p) + return -ENOMEM; + + platform_set_drvdata(pdev, i2s_info_p); + i2s_info_p->dev = dev; + + iomem = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(iomem)) + return dev_err_probe(dev, PTR_ERR(iomem), "Can't map registers\n"); + + i2s_info_p->regs = devm_regmap_init_mmio(dev, iomem, &lpc32xx_i2s_regconfig); + if (IS_ERR(i2s_info_p->regs)) + return dev_err_probe(dev, PTR_ERR(i2s_info_p->regs), + "failed to init register map: %d\n", ret); + + i2s_info_p->clk = devm_clk_get(dev, "i2s_clk"); + if (IS_ERR(i2s_info_p->clk)) + return dev_err_probe(dev, PTR_ERR(i2s_info_p->clk), "Can't get clock\n"); + + i2s_info_p->clkrate = clk_get_rate(i2s_info_p->clk); + if (i2s_info_p->clkrate == 0) + return dev_err_probe(dev, -EINVAL, "Invalid returned clock rate\n"); + + mutex_init(&i2s_info_p->lock); + + ret = devm_snd_soc_register_component(dev, &lpc32xx_i2s_component, + &lpc3xxx_i2s_dai_driver, 1); + if (ret) + return dev_err_probe(dev, ret, "Can't register cpu_dai component\n"); + + i2s_info_p->playback_dma_config.addr = (dma_addr_t)(res->start + I2S_TX_FIFO); + i2s_info_p->playback_dma_config.maxburst = 4; + i2s_info_p->playback_dma_config.filter_data = "i2s-tx"; + i2s_info_p->capture_dma_config.addr = (dma_addr_t)(res->start + I2S_RX_FIFO); + i2s_info_p->capture_dma_config.maxburst = 4; + i2s_info_p->capture_dma_config.filter_data = "i2s-rx"; + + ret = lpc3xxx_pcm_register(pdev); + if (ret) + return dev_err_probe(dev, ret, "Can't register pcm component\n"); + + return 0; +} + +static int lpc32xx_i2s_remove(struct platform_device *pdev) +{ + return 0; +} + +static const struct of_device_id lpc32xx_i2s_match[] = { + { .compatible = "nxp,lpc3220-i2s" }, + {}, +}; +MODULE_DEVICE_TABLE(of, lpc32xx_i2s_match); + +static struct platform_driver lpc32xx_i2s_driver = { + .probe = lpc32xx_i2s_probe, + .remove = lpc32xx_i2s_remove, + .driver = { + .name = "lpc3xxx-i2s", + .of_match_table = lpc32xx_i2s_match, + }, +}; + +module_platform_driver(lpc32xx_i2s_driver); + +MODULE_AUTHOR("Kevin Wells kevin.wells@nxp.com"); +MODULE_AUTHOR("Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com"); +MODULE_DESCRIPTION("ASoC LPC3XXX I2S interface"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/fsl/lpc3xxx-i2s.h b/sound/soc/fsl/lpc3xxx-i2s.h new file mode 100644 index 000000000000..2796e8782de9 --- /dev/null +++ b/sound/soc/fsl/lpc3xxx-i2s.h @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Author: Kevin Wells kevin.wells@nxp.com + * + * Copyright (C) 2008 NXP Semiconductors + * Copyright 2023 Timesys Corporation piotr.wojtaszczyk@timesys.com + */ + +#ifndef __SOUND_SOC_LPC3XXX_I2S_H +#define __SOUND_SOC_LPC3XXX_I2S_H + +#include <linux/types.h> +#include <linux/regmap.h> + +struct lpc3xxx_i2s_info { + struct device *dev; + struct clk *clk; + struct mutex lock; /* To serialize user-space access */ + struct regmap *regs; + u32 streams_in_use; + u32 clkrate; + int freq; + struct snd_dmaengine_dai_dma_data playback_dma_config; + struct snd_dmaengine_dai_dma_data capture_dma_config; +}; + +int lpc3xxx_pcm_register(struct platform_device *pdev); + +#define _SBF(f, v) ((v) << (f)) +#define _BIT(n) _SBF(n, 1) + +/* I2S controller register offsets */ +#define I2S_DAO 0x00 +#define I2S_DAI 0x04 +#define I2S_TX_FIFO 0x08 +#define I2S_RX_FIFO 0x0C +#define I2S_STAT 0x10 +#define I2S_DMA0 0x14 +#define I2S_DMA1 0x18 +#define I2S_IRQ 0x1C +#define I2S_TX_RATE 0x20 +#define I2S_RX_RATE 0x24 + +/* i2s_daO i2s_dai register definitions */ +#define I2S_WW8 _SBF(0, 0) /* Word width is 8bit*/ +#define I2S_WW16 _SBF(0, 1) /* Word width is 16bit*/ +#define I2S_WW32 _SBF(0, 3) /* Word width is 32bit*/ +#define I2S_MONO _BIT(2) /* Mono */ +#define I2S_STOP _BIT(3) /* Stop, diables the access to FIFO, mutes the channel */ +#define I2S_RESET _BIT(4) /* Reset the channel */ +#define I2S_WS_SEL _BIT(5) /* Channel Master(0) or slave(1) mode select*/ +#define I2S_WS_HP(s) _SBF(6, s) /* Word select half period - 1 */ + +#define I2S_MUTE _BIT(15) /* Mute the channel, Transmit channel only */ + +#define I2S_WW32_HP 0x1f /* Word select half period for 32bit word width */ +#define I2S_WW16_HP 0x0f /* Word select half period for 16bit word width */ +#define I2S_WW8_HP 0x7 /* Word select half period for 8bit word width */ + +#define WSMASK_HP 0X7FC /* Mask for WS half period bits */ + +/* i2s_tx_fifo register definitions */ +#define I2S_FIFO_TX_WRITE(d) (d) + +/* i2s_rx_fifo register definitions */ +#define I2S_FIFO_RX_WRITE(d) (d) + +/* i2s_stat register definitions */ +#define I2S_IRQ_STAT _BIT(0) +#define I2S_DMA0_REQ _BIT(1) +#define I2S_DMA1_REQ _BIT(2) + +#define I2S_RX_STATE_MASK 0x0000ff00 +#define I2S_TX_STATE_MASK 0x00ff0000 + +/* i2s_dma0 Configuration register definitions */ +#define I2S_DMA0_RX_EN _BIT(0) /* Enable RX DMA1*/ +#define I2S_DMA0_TX_EN _BIT(1) /* Enable TX DMA1*/ +#define I2S_DMA0_RX_DEPTH(s) _SBF(8, s) /* Set the level for DMA1 RX Request */ +#define I2S_DMA0_TX_DEPTH(s) _SBF(16, s) /* Set the level for DMA1 TX Request */ + +/* i2s_dma1 Configuration register definitions */ +#define I2S_DMA1_RX_EN _BIT(0) /* Enable RX DMA1*/ +#define I2S_DMA1_TX_EN _BIT(1) /* Enable TX DMA1*/ +#define I2S_DMA1_RX_DEPTH(s) _SBF(8, s) /* Set the level for DMA1 RX Request */ +#define I2S_DMA1_TX_DEPTH(s) _SBF(16, s) /* Set the level for DMA1 TX Request */ + +/* i2s_irq register definitions */ +#define I2S_RX_IRQ_EN _BIT(0) /* Enable RX IRQ*/ +#define I2S_TX_IRQ_EN _BIT(1) /* Enable TX IRQ*/ +#define I2S_IRQ_RX_DEPTH(s) _SBF(8, s) /* valid values ar 0 to 7 */ +#define I2S_IRQ_TX_DEPTH(s) _SBF(16, s) /* valid values ar 0 to 7 */ + +#endif diff --git a/sound/soc/fsl/lpc3xxx-pcm.c b/sound/soc/fsl/lpc3xxx-pcm.c new file mode 100644 index 000000000000..3ccf1473cd76 --- /dev/null +++ b/sound/soc/fsl/lpc3xxx-pcm.c @@ -0,0 +1,75 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Author: Kevin Wells kevin.wells@nxp.com + * + * Copyright (C) 2008 NXP Semiconductors + * Copyright 2023 Timesys Corporation piotr.wojtaszczyk@timesys.com + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> +#include <linux/amba/pl08x.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> +#include <sound/soc.h> + +#include "lpc3xxx-i2s.h" + +#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ + SNDRV_PCM_FMTBIT_U8 | \ + SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_U16_LE | \ + SNDRV_PCM_FMTBIT_S24_LE | \ + SNDRV_PCM_FMTBIT_U24_LE | \ + SNDRV_PCM_FMTBIT_S32_LE | \ + SNDRV_PCM_FMTBIT_U32_LE | \ + SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) + +static const struct snd_pcm_hardware lpc3xxx_pcm_hardware = { + .info = (SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME), + .formats = STUB_FORMATS, + .period_bytes_min = 128, + .period_bytes_max = 2048, + .periods_min = 2, + .periods_max = 1024, + .buffer_bytes_max = 128 * 1024 +}; + +static const struct snd_dmaengine_pcm_config lpc3xxx_dmaengine_pcm_config = { + .pcm_hardware = &lpc3xxx_pcm_hardware, + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, + .compat_filter_fn = pl08x_filter_id, + .prealloc_buffer_size = 128 * 1024, +}; + +const struct snd_soc_component_driver lpc3xxx_soc_platform_driver = { + .name = "lpc32xx-pcm", +}; + +int lpc3xxx_pcm_register(struct platform_device *pdev) +{ + int ret; + int flags; + + flags = SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT; + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, &lpc3xxx_dmaengine_pcm_config, flags); + if (ret) { + dev_err(&pdev->dev, "failed to register dmaengine: %d\n", ret); + return ret; + } + + return devm_snd_soc_register_component(&pdev->dev, &lpc3xxx_soc_platform_driver, + NULL, 0); +} +EXPORT_SYMBOL(lpc3xxx_pcm_register);
Add nxp,lpc3220-i2s DT binding documentation.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com --- Changes for v2: - Added maintainers field - Dropped clock-names - Dropped unused unneded interrupts field
.../bindings/sound/nxp,lpc3220-i2s.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml
diff --git a/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml b/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml new file mode 100644 index 000000000000..66e48d8a5a1b --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/nxp,lpc3220-i2s.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP LPC32XX I2S Controller + +description: + The I2S controller in LPC32XX SoCs to interface codecs and other audo devices. + +maintainers: + - Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com + +properties: + compatible: + enum: + - nxp,lpc3220-i2s + + reg: + maxItems: 1 + + clocks: + items: + - description: input clock of the peripheral. + +required: + - compatible + - reg + - clocks + - clock-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/lpc32xx-clock.h> + + i2s0: i2s@20094000 { + compatible = "nxp,lpc3220-i2s"; + reg = <0x20094000 0x1000>; + clocks = <&clk LPC32XX_CLK_I2S0>; + clock-names = "i2s_clk"; + status = "disabled"; + }; + +...
On 11/06/2024 11:47, Piotr Wojtaszczyk wrote:
Add nxp,lpc3220-i2s DT binding documentation.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com
+maintainers:
- Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com
+properties:
- compatible:
- enum:
- nxp,lpc3220-i2s- reg:
- maxItems: 1
- clocks:
- items:
- description: input clock of the peripheral.
I do not see my comment about DAI being addressed.
<form letter> This is a friendly reminder during the review process.
It seems my or other reviewer's previous comments were not fully addressed. Maybe the feedback got lost between the quotes, maybe you just forgot to apply it. Please go back to the previous discussion and either implement all requested changes or keep discussing them. </<form letter>
+required:
- compatible
- reg
- clocks
- clock-names
Drop
+additionalProperties: false
+examples:
- |
- #include <dt-bindings/clock/lpc32xx-clock.h>
- i2s0: i2s@20094000 {
Drop label, not used.
compatible = "nxp,lpc3220-i2s";reg = <0x20094000 0x1000>;clocks = <&clk LPC32XX_CLK_I2S0>;clock-names = "i2s_clk";
Not tested. Drop.
status = "disabled";
Then what is the point of example? Drop.
Your DTS was also not tested.
It does not look like you tested the DTS against bindings. Please run `make dtbs_check W=1` (see Documentation/devicetree/bindings/writing-schema.rst or https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-source... for instructions).
Best regards, Krzysztof
On Tue, Jun 11, 2024 at 12:18 PM Krzysztof Kozlowski krzk@kernel.org wrote:
I do not see my comment about DAI being addressed.
Were you asking if it's a DAI? yes it is.
On 12/06/2024 10:02, Piotr Wojtaszczyk wrote:
On Tue, Jun 11, 2024 at 12:18 PM Krzysztof Kozlowski krzk@kernel.org wrote:
I do not see my comment about DAI being addressed.
Were you asking if it's a DAI? yes it is.
Then you miss $ref to dai-common and defining sound-dai-cells like in other bindings.
Best regards, Krzysztof
On Tue, Jun 11, 2024 at 11:47:52AM +0200, Piotr Wojtaszczyk wrote:
Changes for v2:
- Added maintainers field
- Dropped clock-names
- Dropped unused unneded interrupts field
+required:
- compatible
- reg
- clocks
- clock-names
Some of the dropping of clock-names was missed.
On 11/06/2024 11:47, Piotr Wojtaszczyk wrote:
Add nxp,lpc3220-i2s DT binding documentation.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com
Changes for v2:
- Added maintainers field
- Dropped clock-names
- Dropped unused unneded interrupts field
Does the device has interrupts or not? This should justify decision, not current usage by drivers.
Best regards, Krzysztof
On Tue, Jun 11, 2024 at 12:45 PM Krzysztof Kozlowski krzk@kernel.org wrote:
Changes for v2:
- Added maintainers field
- Dropped clock-names
- Dropped unused unneded interrupts field
Does the device has interrupts or not? This should justify decision, not current usage by drivers.
Yes the device has interrupts but feeding data FIFOs is handled by DMA (amba-pl08x.c). Should I declare interrupts despite they are not used in the compatible driver?
On 12/06/2024 10:06, Piotr Wojtaszczyk wrote:
On Tue, Jun 11, 2024 at 12:45 PM Krzysztof Kozlowski krzk@kernel.org wrote:
Changes for v2:
- Added maintainers field
- Dropped clock-names
- Dropped unused unneded interrupts field
Does the device has interrupts or not? This should justify decision, not current usage by drivers.
Yes the device has interrupts but feeding data FIFOs is handled by DMA (amba-pl08x.c). Should I declare interrupts despite they are not used in the compatible driver?
Yes.
Best regards, Krzysztof
On Tue, 11 Jun 2024 11:47:52 +0200, Piotr Wojtaszczyk wrote:
Add nxp,lpc3220-i2s DT binding documentation.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com
Changes for v2:
- Added maintainers field
- Dropped clock-names
- Dropped unused unneded interrupts field
.../bindings/sound/nxp,lpc3220-i2s.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.example.dtb: i2s@20094000: 'clock-names' does not match any of the regexes: 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/sound/nxp,lpc3220-i2s.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/2024061109481...
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
On 11/06/2024 11:47, Piotr Wojtaszczyk wrote:
This driver was ported from an old version in linux 2.6.27 and adjusted for the new ASoC framework and DMA API.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com
Changes for v2:
- Coding Style cleanup
- Use dev_err_probe() for error handling in probe function
- Removed unneded err_clk_disable label
- Removed empty function
- Droped of_match_ptr in lpc32xx_i2s_match DT match table
- ASoC struct adjustmes for the latest 6.10-rc3 kernel
MAINTAINERS | 7 +
1:
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 4 +
2:
arch/arm/mach-lpc32xx/phy3250.c | 60 ++++
3:
sound/soc/fsl/Kconfig | 7 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/lpc3xxx-i2s.c | 383 +++++++++++++++++++++++++ sound/soc/fsl/lpc3xxx-i2s.h | 94 ++++++ sound/soc/fsl/lpc3xxx-pcm.c | 75 +++++
Three separate subsystems, so three separate patches.
8 files changed, 632 insertions(+) create mode 100644 sound/soc/fsl/lpc3xxx-i2s.c create mode 100644 sound/soc/fsl/lpc3xxx-i2s.h create mode 100644 sound/soc/fsl/lpc3xxx-pcm.c
diff --git a/MAINTAINERS b/MAINTAINERS index aacccb376c28..7616f61d6327 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8909,6 +8909,13 @@ S: Maintained F: sound/soc/fsl/fsl* F: sound/soc/fsl/imx*
+FREESCALE SOC LPC32XX SOUND DRIVERS +M: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +L: linuxppc-dev@lists.ozlabs.org +S: Orphan
Not sure if we want it in the first place. Why would we like to support orphaned drivers? Sorry, if there is no one to care about it, then it should not be merged.
...
+static int lpc32xx_i2s_probe(struct platform_device *pdev) +{
- struct device *dev = &pdev->dev;
- struct lpc3xxx_i2s_info *i2s_info_p;
- struct resource *res;
- void __iomem *iomem;
- int ret;
- i2s_info_p = devm_kzalloc(dev, sizeof(*i2s_info_p), GFP_KERNEL);
- if (!i2s_info_p)
return -ENOMEM;- platform_set_drvdata(pdev, i2s_info_p);
- i2s_info_p->dev = dev;
- iomem = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
- if (IS_ERR(iomem))
return dev_err_probe(dev, PTR_ERR(iomem), "Can't map registers\n");- i2s_info_p->regs = devm_regmap_init_mmio(dev, iomem, &lpc32xx_i2s_regconfig);
- if (IS_ERR(i2s_info_p->regs))
return dev_err_probe(dev, PTR_ERR(i2s_info_p->regs),"failed to init register map: %d\n", ret);- i2s_info_p->clk = devm_clk_get(dev, "i2s_clk");
- if (IS_ERR(i2s_info_p->clk))
return dev_err_probe(dev, PTR_ERR(i2s_info_p->clk), "Can't get clock\n");- i2s_info_p->clkrate = clk_get_rate(i2s_info_p->clk);
- if (i2s_info_p->clkrate == 0)
return dev_err_probe(dev, -EINVAL, "Invalid returned clock rate\n");- mutex_init(&i2s_info_p->lock);
- ret = devm_snd_soc_register_component(dev, &lpc32xx_i2s_component,
&lpc3xxx_i2s_dai_driver, 1);- if (ret)
return dev_err_probe(dev, ret, "Can't register cpu_dai component\n");- i2s_info_p->playback_dma_config.addr = (dma_addr_t)(res->start + I2S_TX_FIFO);
- i2s_info_p->playback_dma_config.maxburst = 4;
- i2s_info_p->playback_dma_config.filter_data = "i2s-tx";
- i2s_info_p->capture_dma_config.addr = (dma_addr_t)(res->start + I2S_RX_FIFO);
- i2s_info_p->capture_dma_config.maxburst = 4;
- i2s_info_p->capture_dma_config.filter_data = "i2s-rx";
- ret = lpc3xxx_pcm_register(pdev);
- if (ret)
return dev_err_probe(dev, ret, "Can't register pcm component\n");- return 0;
+}
+static int lpc32xx_i2s_remove(struct platform_device *pdev) +{
- return 0;
+}
You did not respond to comment about this. Drop.
Best regards, Krzysztof
On Tue, Jun 11, 2024 at 12:15 PM Krzysztof Kozlowski krzk@kernel.org wrote:
diff --git a/MAINTAINERS b/MAINTAINERS index aacccb376c28..7616f61d6327 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8909,6 +8909,13 @@ S: Maintained F: sound/soc/fsl/fsl* F: sound/soc/fsl/imx*
+FREESCALE SOC LPC32XX SOUND DRIVERS +M: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +L: linuxppc-dev@lists.ozlabs.org +S: Orphan
Not sure if we want it in the first place. Why would we like to support orphaned drivers? Sorry, if there is no one to care about it, then it should not be merged.
I contacted Nautel Ltd they agreed to maintain this driver so I will add J.M.B. Downing jonathan.downing@nautel.com as a maintainer.
+static int lpc32xx_i2s_remove(struct platform_device *pdev) +{
return 0;+}
You did not respond to comment about this. Drop.
I will remove empty functions
-- Piotr Wojtaszczyk Timesys
On Tue, Jun 11, 2024 at 11:47:51AM +0200, Piotr Wojtaszczyk wrote:
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 4 + arch/arm/mach-lpc32xx/phy3250.c | 60 ++++
These architecture changes are separate and should at least be separate commits, copied to the architecture maintainers.
+FREESCALE SOC LPC32XX SOUND DRIVERS +M: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +L: linuxppc-dev@lists.ozlabs.org +S: Orphan +F: sound/soc/fsl/lpc3xxx-*
It seems a bit odd to add yourself as a maintainer while also marking the driver as orphan?
+config SND_SOC_FSL_LPC3XXX
- tristate "SoC Audio for NXP LPC32XX CPUs"
- depends on ARCH_LPC32XX && SND_SOC
On a quick scan I can't see any architecture dependency for build, please add an || COMPILE_TEST for improved coverage. As for all the other things enabled in this Kconfig file there is no need to explicitly depend on SND_SOC.
@@ -42,6 +43,7 @@ obj-$(CONFIG_SND_SOC_FSL_XCVR) += snd-soc-fsl-xcvr.o obj-$(CONFIG_SND_SOC_FSL_AUD2HTX) += snd-soc-fsl-aud2htx.o obj-$(CONFIG_SND_SOC_FSL_RPMSG) += snd-soc-fsl-rpmsg.o obj-$(CONFIG_SND_SOC_POWERPC_QMC_AUDIO) += snd-soc-fsl-qmc-audio.o +obj-$(CONFIG_SND_SOC_FSL_LPC3XXX) += snd-soc-fsl-lpc3xxx.o
Please try to keep these files sorted alphabetically (it's not 100% at the minute but no need to make it worse).
--- /dev/null +++ b/sound/soc/fsl/lpc3xxx-i2s.c @@ -0,0 +1,383 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/*
- Author: Kevin Wells kevin.wells@nxp.com
Please make the entire comment a C++ one so things look more intentional.
+static u32 absd32(u32 v1, u32 v2) +{
- if (v1 > v2)
return v1 - v2;- return v2 - v1;
+}
Just use abs()?
+static int lpc3xxx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) +{
- struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai);
- struct device *dev = i2s_info_p->dev;
- if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) != SND_SOC_DAIFMT_I2S) {
dev_warn(dev, "unsupported bus format %d\n", fmt);return -EINVAL;- }
- return 0;
+}
If we're validating for I2S we should probably validate for clock provider too. Or just remove the function, it's not really needed?
- i2s_info_p->clk = devm_clk_get(dev, "i2s_clk");
- if (IS_ERR(i2s_info_p->clk))
return dev_err_probe(dev, PTR_ERR(i2s_info_p->clk), "Can't get clock\n");- i2s_info_p->clkrate = clk_get_rate(i2s_info_p->clk);
- if (i2s_info_p->clkrate == 0)
return dev_err_probe(dev, -EINVAL, "Invalid returned clock rate\n");
Nothing ever enables this clock.
+static int lpc32xx_i2s_remove(struct platform_device *pdev) +{
- return 0;
+}
Remove empty functions, if they can legitimately be empty the framework will support them being absent.
+#define _SBF(f, v) ((v) << (f))
FIELD_PREP()
+#define _BIT(n) _SBF(n, 1)
BIT().
+/* I2S controller register offsets */ +#define I2S_DAO 0x00 +#define I2S_DAI 0x04 +#define I2S_TX_FIFO 0x08 +#define I2S_RX_FIFO 0x0C +#define I2S_STAT 0x10 +#define I2S_DMA0 0x14 +#define I2S_DMA1 0x18 +#define I2S_IRQ 0x1C +#define I2S_TX_RATE 0x20 +#define I2S_RX_RATE 0x24
Add a prefix to all these I2S_ names in case of collisions.
On Tue, Jun 11, 2024 at 12:36 PM Mark Brown broonie@kernel.org wrote:
+FREESCALE SOC LPC32XX SOUND DRIVERS +M: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +L: linuxppc-dev@lists.ozlabs.org +S: Orphan +F: sound/soc/fsl/lpc3xxx-*
It seems a bit odd to add yourself as a maintainer while also marking the driver as orphan?
Nautel Ltd agreed to maintain this driver, I will add them.
i2s_info_p->clk = devm_clk_get(dev, "i2s_clk");if (IS_ERR(i2s_info_p->clk))return dev_err_probe(dev, PTR_ERR(i2s_info_p->clk), "Can't get clock\n");i2s_info_p->clkrate = clk_get_rate(i2s_info_p->clk);if (i2s_info_p->clkrate == 0)return dev_err_probe(dev, -EINVAL, "Invalid returned clock rate\n");Nothing ever enables this clock.
It's enabled in lpc3xxx_i2s_startup() and disabled in lpc3xxx_i2s_shutdown(). When the clock is enabled the bit clock on I2S interface always runs. So this is to avoid active clock when the interface isn't used.
On Tue, Jun 11, 2024 at 12:36 PM Mark Brown broonie@kernel.org wrote:
+config SND_SOC_FSL_LPC3XXX
tristate "SoC Audio for NXP LPC32XX CPUs"depends on ARCH_LPC32XX && SND_SOCOn a quick scan I can't see any architecture dependency for build, please add an || COMPILE_TEST for improved coverage. As for all the other things enabled in this Kconfig file there is no need to explicitly depend on SND_SOC.
Ok. Later I will add a sound card driver to phytec3250 board which uses arch/arm/configs/lpc32xx_defconfig config file so that the COMPILE_TEST won't be needed.
-- Piotr Wojtaszczyk Timesys
On Fri, Jun 14, 2024 at 06:24:50PM +0200, Piotr Wojtaszczyk wrote:
On Tue, Jun 11, 2024 at 12:36 PM Mark Brown broonie@kernel.org wrote:
On a quick scan I can't see any architecture dependency for build, please add an || COMPILE_TEST for improved coverage. As for all the other things enabled in this Kconfig file there is no need to explicitly depend on SND_SOC.
Ok. Later I will add a sound card driver to phytec3250 board which uses arch/arm/configs/lpc32xx_defconfig config file so that the COMPILE_TEST won't be needed.
Why would a defconfig affect the Kconfig?
On Fri, Jun 14, 2024 at 6:42 PM Mark Brown broonie@kernel.org wrote:
On Fri, Jun 14, 2024 at 06:24:50PM +0200, Piotr Wojtaszczyk wrote:
On Tue, Jun 11, 2024 at 12:36 PM Mark Brown broonie@kernel.org wrote:
On a quick scan I can't see any architecture dependency for build, please add an || COMPILE_TEST for improved coverage. As for all the other things enabled in this Kconfig file there is no need to explicitly depend on SND_SOC.
Ok. Later I will add a sound card driver to phytec3250 board which uses arch/arm/configs/lpc32xx_defconfig config file so that the COMPILE_TEST won't be needed.
Why would a defconfig affect the Kconfig?
I guess when lpc32xx_defconfig enables the SND_SOC_FSL_LPC3XXX then the COMPILE_TEST won't be needed or does it?
On Fri, Jun 14, 2024 at 06:46:46PM +0200, Piotr Wojtaszczyk wrote:
On Fri, Jun 14, 2024 at 6:42 PM Mark Brown broonie@kernel.org wrote:
On Fri, Jun 14, 2024 at 06:24:50PM +0200, Piotr Wojtaszczyk wrote:
Ok. Later I will add a sound card driver to phytec3250 board which uses arch/arm/configs/lpc32xx_defconfig config file so that the COMPILE_TEST won't be needed.
Why would a defconfig affect the Kconfig?
I guess when lpc32xx_defconfig enables the SND_SOC_FSL_LPC3XXX then the COMPILE_TEST won't be needed or does it?
The whole point of COMPILE_TEST is to allow the driver to be covered when people aren't building for whatever specific platform would actually use it.
This pach set is to bring back audio to machines with a LPC32XX CPU. The legacy LPC32XX SoC used to have audio spport in linux 2.6.27. The support was dropped due to lack of interest from mainaeners.
Piotr Wojtaszczyk (4): ASoC: dt-bindings: lpc32xx: Add lpc32xx i2s DT binding ARM: dts: lpc32xx: Add missing properties for the i2s interfaces ARM: lpc32xx: Add pl08x virtual dma channels for spi and i2s ASoC: fsl: Add i2s and pcm drivers for LPC32xx CPUs
.../bindings/sound/nxp,lpc3220-i2s.yaml | 69 +++ MAINTAINERS | 8 + arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 8 + arch/arm/mach-lpc32xx/phy3250.c | 111 ++++- sound/soc/fsl/Kconfig | 7 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/lpc3xxx-i2s.c | 393 ++++++++++++++++++ sound/soc/fsl/lpc3xxx-i2s.h | 79 ++++ sound/soc/fsl/lpc3xxx-pcm.c | 74 ++++ 9 files changed, 750 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml create mode 100644 sound/soc/fsl/lpc3xxx-i2s.c create mode 100644 sound/soc/fsl/lpc3xxx-i2s.h create mode 100644 sound/soc/fsl/lpc3xxx-pcm.c
Add nxp,lpc3220-i2s DT binding documentation.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com --- Changes for v3: - Added '$ref: dai-common.yaml#' and '#sound-dai-cells' - Dropped all clock-names, references - Dropped status property from the example - Added interrupts property - 'make dt_binding_check' pass
Changes for v2: - Added maintainers field - Dropped clock-names - Dropped unused unneded interrupts field
.../bindings/sound/nxp,lpc3220-i2s.yaml | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml
diff --git a/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml b/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml new file mode 100644 index 000000000000..04a1090f70cc --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/nxp,lpc3220-i2s.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP LPC32XX I2S Controller + +description: + The I2S controller in LPC32XX SoCs, ASoC DAI. + +maintainers: + - J.M.B. Downing jonathan.downing@nautel.com + - Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + enum: + - nxp,lpc3220-i2s + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: input clock of the peripheral. + + dma-vc-names: + $ref: /schemas/types.yaml#/definitions/string-array + description: | + names of virtual pl08x dma channels for tx and rx + directions in this order. + minItems: 2 + maxItems: 2 + + "#sound-dai-cells": + const: 0 + +required: + - compatible + - reg + - interrupts + - clocks + - dma-vc-names + - '#sound-dai-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/lpc32xx-clock.h> + #include <dt-bindings/interrupt-controller/irq.h> + + i2s@20094000 { + compatible = "nxp,lpc3220-i2s"; + reg = <0x20094000 0x1000>; + interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk LPC32XX_CLK_I2S0>; + dma-vc-names = "i2s0-tx", "i2s0-rx"; + #sound-dai-cells = <0>; + }; + +...
On 14/06/2024 18:34, Piotr Wojtaszczyk wrote:
Add nxp,lpc3220-i2s DT binding documentation.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com
Do not attach (thread) your patchsets to some other threads (unrelated or older versions). This buries them deep in the mailbox and might interfere with applying entire sets.
b4 diff '20240614163500.386747-2-piotr.wojtaszczyk@timesys.com' Grabbing thread from lore.kernel.org/all/20240614163500.386747-2-piotr.wojtaszczyk@timesys.com/t.mbox.gz Checking for older revisions Grabbing search results from lore.kernel.org Nothing matching that query. --- Analyzing 24 messages in the thread Preparing fake-am for v2: ASoC: fsl: Add i2s and pcm drivers for LPC32xx CPUs range: dda6bddbafe9..33a2a5c8fb4c Preparing fake-am for v3: ASoC: dt-bindings: lpc32xx: Add lpc32xx i2s DT binding ERROR: Could not fake-am version v3 --- Could not create fake-am range for upper series v3
You are making review more difficult.
Changes for v3:
- Added '$ref: dai-common.yaml#' and '#sound-dai-cells'
- Dropped all clock-names, references
- Dropped status property from the example
- Added interrupts property
- 'make dt_binding_check' pass
Changes for v2:
- Added maintainers field
- Dropped clock-names
- Dropped unused unneded interrupts field
.../bindings/sound/nxp,lpc3220-i2s.yaml | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml
diff --git a/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml b/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml new file mode 100644 index 000000000000..04a1090f70cc --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/nxp,lpc3220-i2s.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml#
+title: NXP LPC32XX I2S Controller
+description:
- The I2S controller in LPC32XX SoCs, ASoC DAI.
+maintainers:
- J.M.B. Downing jonathan.downing@nautel.com
- Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com
+allOf:
- $ref: dai-common.yaml#
+properties:
- compatible:
- enum:
- nxp,lpc3220-i2s- reg:
- maxItems: 1
- interrupts:
- maxItems: 1
- clocks:
- items:
- description: input clock of the peripheral.- dma-vc-names:
Missing vendor prefix... but I don't really get what's the point of this property.
- $ref: /schemas/types.yaml#/definitions/string-array
- description: |
names of virtual pl08x dma channels for tx and rxdirections in this order.- minItems: 2
- maxItems: 2
What part of hardware or board configuration this represents?
It wasn't here and nothing in changelog explained it.
Drop.
- "#sound-dai-cells":
- const: 0
Best regards, Krzysztof
On Sat, Jun 15, 2024 at 12:01 PM Krzysztof Kozlowski krzk@kernel.org wrote:
Do not attach (thread) your patchsets to some other threads (unrelated or older versions). This buries them deep in the mailbox and might interfere with applying entire sets.
I'm sorry about that, it won't happen again.
- dma-vc-names:
Missing vendor prefix... but I don't really get what's the point of this property.
Is "nxp,lpc3xxx-dma-vc-names" acceptable?
- $ref: /schemas/types.yaml#/definitions/string-array
- description: |
names of virtual pl08x dma channels for tx and rxdirections in this order.- minItems: 2
- maxItems: 2
What part of hardware or board configuration this represents?
It wasn't here and nothing in changelog explained it.
That's information which DMA signal and mux setting an I2S interface uses. It's a name (bus_id field) of platform data entry from phy3250.c in [PATCH v3 3/4]. It's used by snd_soc_dai_init_dma_data() in [PATCH v3 4/4] to give the dmaengine a hint which dma config to use. The LPC32xx doesn't have yet a dmamux driver like lpc18xx-dmamux.c therefore it still uses platform data entries for pl08x dma channels and 'SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT' flags in the devm_snd_dmaengine_pcm_register(). Typically instead of this platform data you would use regular 'dma' and 'dma-names' if it had proper dmamux driver like lpc18xx-dmamux.c
Drop.
- "#sound-dai-cells":
- const: 0
The "dai-common.yam" doesn't declare a default value for this so isn't it required? It's declared in others yaml files like: Documentation/devicetree/bindings/sound/qcom,q6apm.yaml
-- Piotr Wojtaszczyk Timesys
On 17/06/2024 11:33, Piotr Wojtaszczyk wrote:
On Sat, Jun 15, 2024 at 12:01 PM Krzysztof Kozlowski krzk@kernel.org wrote:
Do not attach (thread) your patchsets to some other threads (unrelated or older versions). This buries them deep in the mailbox and might interfere with applying entire sets.
I'm sorry about that, it won't happen again.
- dma-vc-names:
Missing vendor prefix... but I don't really get what's the point of this property.
Is "nxp,lpc3xxx-dma-vc-names" acceptable?
No, because it does not help me to understand: " what's the point of this property."
- $ref: /schemas/types.yaml#/definitions/string-array
- description: |
names of virtual pl08x dma channels for tx and rxdirections in this order.- minItems: 2
- maxItems: 2
What part of hardware or board configuration this represents?
It wasn't here and nothing in changelog explained it.
That's information which DMA signal and mux setting an I2S interface uses. It's a name (bus_id field) of platform data entry from phy3250.c in [PATCH v3 3/4].
platform entries from driver do not seem related at all to hardware description. You know encode driver model into bindings, so obviously no-go.
It's used by snd_soc_dai_init_dma_data() in [PATCH v3 4/4] to give the dmaengine a hint which dma config to use. The LPC32xx doesn't have yet a dmamux driver like
and if I change driver platform data to foo and bar, does the DTS work? No.
lpc18xx-dmamux.c therefore it still uses platform data entries for pl08x dma channels and 'SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT' flags in the devm_snd_dmaengine_pcm_register(). Typically instead of this platform data you would use regular 'dma' and 'dma-names' if it had proper dmamux driver like lpc18xx-dmamux.c
Exactly. Use these.
Drop.
- "#sound-dai-cells":
- const: 0
The "dai-common.yam" doesn't declare a default value for this so
Where is my comment to which you refer to? Please do not drop context from replies. I have no clue what you want to discuss here.
isn't it required? It's declared in others yaml files like: Documentation/devicetree/bindings/sound/qcom,q6apm.yaml
Best regards, Krzysztof
On Mon, Jun 17, 2024 at 2:14 PM Krzysztof Kozlowski krzk@kernel.org wrote:
On 17/06/2024 11:33, Piotr Wojtaszczyk wrote:
On Sat, Jun 15, 2024 at 12:01 PM Krzysztof Kozlowski krzk@kernel.org wrote:
Do not attach (thread) your patchsets to some other threads (unrelated or older versions). This buries them deep in the mailbox and might interfere with applying entire sets.
I'm sorry about that, it won't happen again.
- dma-vc-names:
Missing vendor prefix... but I don't really get what's the point of this property.
Is "nxp,lpc3xxx-dma-vc-names" acceptable?
No, because it does not help me to understand: " what's the point of this property."
- $ref: /schemas/types.yaml#/definitions/string-array
- description: |
names of virtual pl08x dma channels for tx and rxdirections in this order.- minItems: 2
- maxItems: 2
What part of hardware or board configuration this represents?
It wasn't here and nothing in changelog explained it.
That's information which DMA signal and mux setting an I2S interface uses. It's a name (bus_id field) of platform data entry from phy3250.c in [PATCH v3 3/4].
platform entries from driver do not seem related at all to hardware description. You know encode driver model into bindings, so obviously no-go.
In this case platform entries do exactly that, they define which dma signal number is routed to peripherals in LPC32xx. They describe hardware capabilities of the pl08x dma and which AHB bus the dma is connected to. This was carried over from linux versions before DT was introduced.
It's used by snd_soc_dai_init_dma_data() in [PATCH v3 4/4] to give the dmaengine a hint which dma config to use. The LPC32xx doesn't have yet a dmamux driver like
and if I change driver platform data to foo and bar, does the DTS work? No.
They shouldn't change the same way as expected dma-names shouldn't change. Lots of drivers expect the dma-names to be "rx", "tx"
lpc18xx-dmamux.c therefore it still uses platform data entries for pl08x dma channels and 'SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT' flags in the devm_snd_dmaengine_pcm_register(). Typically instead of this platform data you would use regular 'dma' and 'dma-names' if it had proper dmamux driver like lpc18xx-dmamux.c
Exactly. Use these.
Then I need to write a lpc32xx dma mux driver, device tree binding for it and adjust the LPC32xx I2S driver for it. Is this a hard requirement to accept this patch set for the legacy LPC32xx SoC?
Drop.
- "#sound-dai-cells":
- const: 0
The "dai-common.yam" doesn't declare a default value for this so
Where is my comment to which you refer to? Please do not drop context from replies. I have no clue what you want to discuss here.
Well I didn't remove the context, you said: " Drop. (...) + "#sound-dai-cells": + const: 0 " So I'm confused whether the "#sound-dai-cells" should be in the dt binding or not.
On 17/06/2024 16:04, Piotr Wojtaszczyk wrote:
It's used by snd_soc_dai_init_dma_data() in [PATCH v3 4/4] to give the dmaengine a hint which dma config to use. The LPC32xx doesn't have yet a dmamux driver like
and if I change driver platform data to foo and bar, does the DTS work? No.
They shouldn't change the same way as expected dma-names shouldn't change. Lots of drivers expect the dma-names to be "rx", "tx"
lpc18xx-dmamux.c therefore it still uses platform data entries for pl08x dma channels and 'SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT' flags in the devm_snd_dmaengine_pcm_register(). Typically instead of this platform data you would use regular 'dma' and 'dma-names' if it had proper dmamux driver like lpc18xx-dmamux.c
Exactly. Use these.
Then I need to write a lpc32xx dma mux driver, device tree binding for it and adjust the LPC32xx I2S driver for it. Is this a hard requirement to accept this patch set for the legacy LPC32xx SoC?
I do not see at all analogy with dma-names. dma-names are used ONLY by the consumer to pick up proper property "dmas" from DT. They are not passed to DMA code. They are not used to configure DMA provider at all.
You parse string from DT and pass it further as DMA filtering code. This is abuse of hardware description for programming your driver and their dependencies.
Why you cannot hard-code them?
Sorry, to be clear: NAK
Drop.
- "#sound-dai-cells":
- const: 0
The "dai-common.yam" doesn't declare a default value for this so
Where is my comment to which you refer to? Please do not drop context from replies. I have no clue what you want to discuss here.
Well I didn't remove the context, you said: " Drop. (...)
- "#sound-dai-cells":
- const: 0
" So I'm confused whether the "#sound-dai-cells" should be in the dt binding or not.
??? Drop is above the text so why do you refer to dai cells? We use here text-based mailing list style of discussions, not corporate MS Office.
Best regards, Krzysztof
On Mon, Jun 17, 2024 at 5:48 PM Krzysztof Kozlowski krzk@kernel.org wrote:
On 17/06/2024 16:04, Piotr Wojtaszczyk wrote:
It's used by snd_soc_dai_init_dma_data() in [PATCH v3 4/4] to give the dmaengine a hint which dma config to use. The LPC32xx doesn't have yet a dmamux driver like
and if I change driver platform data to foo and bar, does the DTS work? No.
They shouldn't change the same way as expected dma-names shouldn't change. Lots of drivers expect the dma-names to be "rx", "tx"
lpc18xx-dmamux.c therefore it still uses platform data entries for pl08x dma channels and 'SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT' flags in the devm_snd_dmaengine_pcm_register(). Typically instead of this platform data you would use regular 'dma' and 'dma-names' if it had proper dmamux driver like lpc18xx-dmamux.c
Exactly. Use these.
Then I need to write a lpc32xx dma mux driver, device tree binding for it and adjust the LPC32xx I2S driver for it. Is this a hard requirement to accept this patch set for the legacy LPC32xx SoC?
I do not see at all analogy with dma-names. dma-names are used ONLY by the consumer to pick up proper property "dmas" from DT. They are not passed to DMA code. They are not used to configure DMA provider at all.
You parse string from DT and pass it further as DMA filtering code. This is abuse of hardware description for programming your driver and their dependencies.
Why you cannot hard-code them?
Sorry, to be clear: NAK
That's fine, clear answers are always good. I considered to hardcode this as it was in the first version of the patch set but LPC32XX has two I2S interfaces which use different DMA signals and mux settings and I really didn't want to pick the virtual DMA channel name based on hardcoded I2S node name therefore I thought having a DT property to select proper dma channel is a better solution.
The 'dma-vc-names' correspond to virtual pl08x dma channels declared in the 'phy3250.c' platform file.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com --- Changes for v3: - Split previous commit for separate subsystems - Add properties to match dt binding
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi index 974410918f35..bbd2b8b6963c 100644 --- a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi +++ b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi @@ -221,6 +221,10 @@ spi2: spi@20090000 { i2s0: i2s@20094000 { compatible = "nxp,lpc3220-i2s"; reg = <0x20094000 0x1000>; + interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk LPC32XX_CLK_I2S0>; + dma-vc-names = "i2s0-tx", "i2s0-rx"; + #sound-dai-cells = <0>; status = "disabled"; };
@@ -237,6 +241,10 @@ sd: sd@20098000 { i2s1: i2s@2009c000 { compatible = "nxp,lpc3220-i2s"; reg = <0x2009c000 0x1000>; + interrupts = <23 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk LPC32XX_CLK_I2S1>; + dma-vc-names = "i2s1-tx", "i2s1-rx"; + #sound-dai-cells = <0>; status = "disabled"; };
Some of the signals are multiplexed, multiplexer configured at a signal request.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com --- Changes for v3: - Split previous commit for separate subsystems - Add pl08x virtual dma channels for i2s1 - Add dma mux handling, required when requesting tx dma signal for i2s1
arch/arm/mach-lpc32xx/phy3250.c | 111 +++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 5371bfaed799..2ec0411964f9 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -9,14 +9,18 @@ */
#include <linux/amba/pl08x.h> +#include <linux/amba/pl022.h> #include <linux/mtd/lpc32xx_mlc.h> #include <linux/mtd/lpc32xx_slc.h> #include <linux/of_platform.h> +#include <linux/spinlock.h>
#include <asm/mach/arch.h> #include "common.h" #include "lpc32xx.h"
+static DEFINE_SPINLOCK(lpc32xx_pl08x_lock); + static struct pl08x_channel_data pl08x_slave_channels[] = { { .bus_id = "nand-slc", @@ -30,11 +34,97 @@ static struct pl08x_channel_data pl08x_slave_channels[] = { .max_signal = 12, .periph_buses = PL08X_AHB1, }, + { + .bus_id = "i2s0-tx", + .min_signal = 13, + .max_signal = 13, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "i2s0-rx", + .min_signal = 0, + .max_signal = 0, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "i2s1-tx", + .min_signal = 10, + .max_signal = 10, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "i2s1-rx", + .min_signal = 2, + .max_signal = 2, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp0-tx", + .min_signal = 15, + .max_signal = 15, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp0-rx", + .min_signal = 14, + .max_signal = 14, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp1-tx", + .min_signal = 11, + .max_signal = 11, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, + { + .bus_id = "ssp1-rx", + .min_signal = 3, + .max_signal = 3, + .muxval = 1, + .periph_buses = PL08X_AHB1, + }, +}; + +struct lpc32xx_pl08x_mux { + int signal; + void __iomem *addr; + int bit; +}; + +/* From LPC32x0 User manual "3.2.1 DMA request signals" */ +static const struct lpc32xx_pl08x_mux dma_mux[] = { + {3, LPC32XX_CLKPWR_SSP_CLK_CTRL, 5}, + {10, LPC32XX_CLKPWR_I2S_CLK_CTRL, 4}, + {11, LPC32XX_CLKPWR_SSP_CLK_CTRL, 4}, + {14, LPC32XX_CLKPWR_SSP_CLK_CTRL, 3}, + {15, LPC32XX_CLKPWR_SSP_CLK_CTRL, 2}, };
static int pl08x_get_signal(const struct pl08x_channel_data *cd) { - return cd->min_signal; + const int signal = cd->min_signal; + unsigned long flags; + int i, tmp; + + /* Set corresponding dma mux bit if muxed */ + for (i = 0; i < ARRAY_SIZE(dma_mux); i++) { + if (dma_mux[i].signal == signal) { + spin_lock_irqsave(&lpc32xx_pl08x_lock, flags); + tmp = __raw_readl(dma_mux[i].addr); + if (cd->muxval) + tmp |= BIT(dma_mux[i].bit); + else + tmp &= ~BIT(dma_mux[i].bit); + __raw_writel(tmp, dma_mux[i].addr); + spin_unlock_irqrestore(&lpc32xx_pl08x_lock, flags); + break; + } + } + return signal; }
static void pl08x_put_signal(const struct pl08x_channel_data *cd, int ch) @@ -61,12 +151,31 @@ static struct lpc32xx_mlc_platform_data lpc32xx_mlc_data = { .dma_filter = pl08x_filter_id, };
+static struct pl022_ssp_controller lpc32xx_ssp_data[] = { + { + .bus_id = 0, + .enable_dma = 0, + .dma_filter = pl08x_filter_id, + .dma_tx_param = "ssp0-tx", + .dma_rx_param = "ssp0-rx", + }, + { + .bus_id = 1, + .enable_dma = 0, + .dma_filter = pl08x_filter_id, + .dma_tx_param = "ssp1-tx", + .dma_rx_param = "ssp1-rx", + } +}; + static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), OF_DEV_AUXDATA("nxp,lpc3220-slc", 0x20020000, "20020000.flash", &lpc32xx_slc_data), OF_DEV_AUXDATA("nxp,lpc3220-mlc", 0x200a8000, "200a8000.flash", &lpc32xx_mlc_data), + OF_DEV_AUXDATA("arm,pl022", 0x20084000, NULL, &lpc32xx_ssp_data[0]), + OF_DEV_AUXDATA("arm,pl022", 0x2008c000, NULL, &lpc32xx_ssp_data[1]), { } };
This driver was ported from an old version in linux 2.6.27 and adjusted for the new ASoC framework and DMA API.
Signed-off-by: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com --- Changes for v3: - Split previous commit for separate subsystems - Add support and jonathan.downing@nautel.com as a maintainer for the driver - Replaced `SND_SOC` config dependency with COMPILE_TEST - Moved `snd-soc-fsl-lpc3xxx-y` in Makefile up in the list to maintain alfabedical order - Changed comment to c++ format - replaced custom absd32() with standard abs() function - Added clock provider check in lpc3xxx_i2s_set_dai_fmt() - Removed empty lpc32xx_i2s_remove() function - Reworked i2s regs definitions to include LPC3XXX prefix - Replaced custom _BIT, _SBD with standard BIT and FIELD_PREP macros
Changes for v2: - Coding Style cleanup - Use dev_err_probe() for error handling in probe function - Removed unneded err_clk_disable label - Removed empty function - Droped of_match_ptr in lpc32xx_i2s_match DT match table - ASoC struct adjustmes for the latest 6.10-rc3 kernel
MAINTAINERS | 8 + sound/soc/fsl/Kconfig | 7 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/lpc3xxx-i2s.c | 393 ++++++++++++++++++++++++++++++++++++ sound/soc/fsl/lpc3xxx-i2s.h | 79 ++++++++ sound/soc/fsl/lpc3xxx-pcm.c | 74 +++++++ 6 files changed, 563 insertions(+) create mode 100644 sound/soc/fsl/lpc3xxx-i2s.c create mode 100644 sound/soc/fsl/lpc3xxx-i2s.h create mode 100644 sound/soc/fsl/lpc3xxx-pcm.c
diff --git a/MAINTAINERS b/MAINTAINERS index aacccb376c28..9789c1e4e291 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8909,6 +8909,14 @@ S: Maintained F: sound/soc/fsl/fsl* F: sound/soc/fsl/imx*
+FREESCALE SOC LPC32XX SOUND DRIVERS +M: J.M.B. Downing jonathan.downing@nautel.com +M: Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +L: linuxppc-dev@lists.ozlabs.org +S: Maintained +F: sound/soc/fsl/lpc3xxx-* + FREESCALE SOC SOUND QMC DRIVER M: Herve Codina herve.codina@bootlin.com L: alsa-devel@alsa-project.org (moderated for non-subscribers) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index acadec3e8947..839a35214acb 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -136,6 +136,13 @@ config SND_SOC_FSL_RPMSG This option is only useful for out-of-tree drivers since in-tree drivers select it automatically.
+config SND_SOC_FSL_LPC3XXX + tristate "SoC Audio for NXP LPC32XX CPUs" + depends on ARCH_LPC32XX || COMPILE_TEST + select SND_SOC_GENERIC_DMAENGINE_PCM + help + Say Y or M if you want to add support for the LPC3XXX I2S interface. + config SND_SOC_IMX_PCM_DMA tristate select SND_SOC_GENERIC_DMAENGINE_PCM diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 550d1e3aced1..7b1ca557e953 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_SND_SOC_P1022_RDK) += snd-soc-p1022-rdk.o snd-soc-fsl-audmix-y := fsl_audmix.o snd-soc-fsl-asoc-card-y := fsl-asoc-card.o snd-soc-fsl-asrc-y := fsl_asrc.o fsl_asrc_dma.o +snd-soc-fsl-lpc3xxx-y := lpc3xxx-pcm.o lpc3xxx-i2s.o snd-soc-fsl-sai-y := fsl_sai.o snd-soc-fsl-ssi-y := fsl_ssi.o snd-soc-fsl-ssi-$(CONFIG_DEBUG_FS) += fsl_ssi_dbg.o @@ -30,6 +31,7 @@ snd-soc-fsl-qmc-audio-y := fsl_qmc_audio.o obj-$(CONFIG_SND_SOC_FSL_AUDMIX) += snd-soc-fsl-audmix.o obj-$(CONFIG_SND_SOC_FSL_ASOC_CARD) += snd-soc-fsl-asoc-card.o obj-$(CONFIG_SND_SOC_FSL_ASRC) += snd-soc-fsl-asrc.o +obj-$(CONFIG_SND_SOC_FSL_LPC3XXX) += snd-soc-fsl-lpc3xxx.o obj-$(CONFIG_SND_SOC_FSL_SAI) += snd-soc-fsl-sai.o obj-$(CONFIG_SND_SOC_FSL_SSI) += snd-soc-fsl-ssi.o obj-$(CONFIG_SND_SOC_FSL_SPDIF) += snd-soc-fsl-spdif.o diff --git a/sound/soc/fsl/lpc3xxx-i2s.c b/sound/soc/fsl/lpc3xxx-i2s.c new file mode 100644 index 000000000000..480e1e8deded --- /dev/null +++ b/sound/soc/fsl/lpc3xxx-i2s.c @@ -0,0 +1,393 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// +// Author: Kevin Wells kevin.wells@nxp.com +// +// Copyright (C) 2008 NXP Semiconductors +// Copyright 2023 Timesys Corporation piotr.wojtaszczyk@timesys.com + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/clk.h> +#include <linux/io.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include "lpc3xxx-i2s.h" + +#define I2S_PLAYBACK_FLAG 0x1 +#define I2S_CAPTURE_FLAG 0x2 + +#define LPC3XXX_I2S_RATES ( \ + SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \ + SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000) + +#define LPC3XXX_I2S_FORMATS ( \ + SNDRV_PCM_FMTBIT_S8 | \ + SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S32_LE) + +static void __lpc3xxx_find_clkdiv(u32 *clkx, u32 *clky, int freq, int xbytes, u32 clkrate) +{ + u32 i2srate; + u32 idxx, idyy; + u32 savedbitclkrate, diff, trate, baseclk; + + /* Adjust rate for sample size (bits) and 2 channels and offset for + * divider in clock output + */ + i2srate = (freq / 100) * 2 * (8 * xbytes); + i2srate = i2srate << 1; + clkrate = clkrate / 100; + baseclk = clkrate; + *clkx = 1; + *clky = 1; + + /* Find the best divider */ + *clkx = *clky = 0; + savedbitclkrate = 0; + diff = ~0; + for (idxx = 1; idxx < 0xFF; idxx++) { + for (idyy = 1; idyy < 0xFF; idyy++) { + trate = (baseclk * idxx) / idyy; + if (abs(trate - i2srate) < diff) { + diff = abs(trate - i2srate); + savedbitclkrate = trate; + *clkx = idxx; + *clky = idyy; + } + } + } +} + +static int lpc3xxx_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct device *dev = i2s_info_p->dev; + u32 flag; + int ret = 0; + + mutex_lock(&i2s_info_p->lock); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + flag = I2S_PLAYBACK_FLAG; + else + flag = I2S_CAPTURE_FLAG; + + if (flag & i2s_info_p->streams_in_use) { + dev_warn(dev, "I2S channel is busy\n"); + ret = -EBUSY; + goto lpc32xx_unlock; + } + + if (i2s_info_p->streams_in_use == 0) { + ret = clk_prepare_enable(i2s_info_p->clk); + if (ret) { + dev_err(dev, "Can't enable clock, err=%d\n", ret); + goto lpc32xx_unlock; + } + } + + i2s_info_p->streams_in_use |= flag; + +lpc32xx_unlock: + mutex_unlock(&i2s_info_p->lock); + return ret; +} + +static void lpc3xxx_i2s_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct regmap *regs = i2s_info_p->regs; + const u32 stop_bits = (LPC3XXX_I2S_RESET | LPC3XXX_I2S_STOP); + u32 flag; + + mutex_lock(&i2s_info_p->lock); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + flag = I2S_PLAYBACK_FLAG; + regmap_write(regs, LPC3XXX_REG_I2S_TX_RATE, 0); + regmap_update_bits(regs, LPC3XXX_REG_I2S_DAO, stop_bits, stop_bits); + } else { + flag = I2S_CAPTURE_FLAG; + regmap_write(regs, LPC3XXX_REG_I2S_RX_RATE, 0); + regmap_update_bits(regs, LPC3XXX_REG_I2S_DAI, stop_bits, stop_bits); + } + i2s_info_p->streams_in_use &= ~flag; + + if (i2s_info_p->streams_in_use == 0) + clk_disable_unprepare(i2s_info_p->clk); + + mutex_unlock(&i2s_info_p->lock); +} + +static int lpc3xxx_i2s_set_dai_sysclk(struct snd_soc_dai *cpu_dai, + int clk_id, unsigned int freq, int dir) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + + /* Will use in HW params later */ + i2s_info_p->freq = freq; + + return 0; +} + +static int lpc3xxx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct device *dev = i2s_info_p->dev; + + if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) != SND_SOC_DAIFMT_I2S) { + dev_warn(dev, "unsupported bus format %d\n", fmt); + return -EINVAL; + } + + if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_BP_FP) { + dev_warn(dev, "unsupported clock provider %d\n", fmt); + return -EINVAL; + } + + return 0; +} + +static int lpc3xxx_i2s_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct device *dev = i2s_info_p->dev; + struct regmap *regs = i2s_info_p->regs; + int xfersize; + u32 tmp, clkx, clky; + + tmp = LPC3XXX_I2S_RESET | LPC3XXX_I2S_STOP; + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S8: + tmp |= LPC3XXX_I2S_WW8 | LPC3XXX_I2S_WS_HP(LPC3XXX_I2S_WW8_HP); + xfersize = 1; + break; + + case SNDRV_PCM_FORMAT_S16_LE: + tmp |= LPC3XXX_I2S_WW16 | LPC3XXX_I2S_WS_HP(LPC3XXX_I2S_WW16_HP); + xfersize = 2; + break; + + case SNDRV_PCM_FORMAT_S32_LE: + tmp |= LPC3XXX_I2S_WW32 | LPC3XXX_I2S_WS_HP(LPC3XXX_I2S_WW32_HP); + xfersize = 4; + break; + + default: + dev_warn(dev, "Unsupported audio data format %d\n", params_format(params)); + return -EINVAL; + } + + if (params_channels(params) == 1) + tmp |= LPC3XXX_I2S_MONO; + + __lpc3xxx_find_clkdiv(&clkx, &clky, i2s_info_p->freq, xfersize, i2s_info_p->clkrate); + + dev_dbg(dev, "Stream : %s\n", + substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? "playback" : "capture"); + dev_dbg(dev, "Desired clock rate : %d\n", i2s_info_p->freq); + dev_dbg(dev, "Base clock rate : %d\n", i2s_info_p->clkrate); + dev_dbg(dev, "Transfer size (bytes) : %d\n", xfersize); + dev_dbg(dev, "Clock divider (x) : %d\n", clkx); + dev_dbg(dev, "Clock divider (y) : %d\n", clky); + dev_dbg(dev, "Channels : %d\n", params_channels(params)); + dev_dbg(dev, "Data format : %s\n", "I2S"); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + regmap_write(regs, LPC3XXX_REG_I2S_DMA1, + LPC3XXX_I2S_DMA1_TX_EN | LPC3XXX_I2S_DMA0_TX_DEPTH(4)); + regmap_write(regs, LPC3XXX_REG_I2S_TX_RATE, (clkx << 8) | clky); + regmap_write(regs, LPC3XXX_REG_I2S_DAO, tmp); + } else { + regmap_write(regs, LPC3XXX_REG_I2S_DMA0, + LPC3XXX_I2S_DMA0_RX_EN | LPC3XXX_I2S_DMA1_RX_DEPTH(4)); + regmap_write(regs, LPC3XXX_REG_I2S_RX_RATE, (clkx << 8) | clky); + regmap_write(regs, LPC3XXX_REG_I2S_DAI, tmp); + } + + return 0; +} + +static int lpc3xxx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *cpu_dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(cpu_dai); + struct regmap *regs = i2s_info_p->regs; + int ret = 0; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + case SNDRV_PCM_TRIGGER_SUSPEND: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + regmap_update_bits(regs, LPC3XXX_REG_I2S_DAO, + LPC3XXX_I2S_STOP, LPC3XXX_I2S_STOP); + else + regmap_update_bits(regs, LPC3XXX_REG_I2S_DAI, + LPC3XXX_I2S_STOP, LPC3XXX_I2S_STOP); + break; + + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_RESUME: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + regmap_update_bits(regs, LPC3XXX_REG_I2S_DAO, + (LPC3XXX_I2S_RESET | LPC3XXX_I2S_STOP), 0); + else + regmap_update_bits(regs, LPC3XXX_REG_I2S_DAI, + (LPC3XXX_I2S_RESET | LPC3XXX_I2S_STOP), 0); + break; + default: + ret = -EINVAL; + } + + return ret; +} + +static int lpc3xxx_i2s_dai_probe(struct snd_soc_dai *dai) +{ + struct lpc3xxx_i2s_info *i2s_info_p = snd_soc_dai_get_drvdata(dai); + + snd_soc_dai_init_dma_data(dai, &i2s_info_p->playback_dma_config, + &i2s_info_p->capture_dma_config); + return 0; +} + +const struct snd_soc_dai_ops lpc3xxx_i2s_dai_ops = { + .probe = lpc3xxx_i2s_dai_probe, + .startup = lpc3xxx_i2s_startup, + .shutdown = lpc3xxx_i2s_shutdown, + .trigger = lpc3xxx_i2s_trigger, + .hw_params = lpc3xxx_i2s_hw_params, + .set_sysclk = lpc3xxx_i2s_set_dai_sysclk, + .set_fmt = lpc3xxx_i2s_set_dai_fmt, +}; + +struct snd_soc_dai_driver lpc3xxx_i2s_dai_driver = { + .playback = { + .channels_min = 1, + .channels_max = 2, + .rates = LPC3XXX_I2S_RATES, + .formats = LPC3XXX_I2S_FORMATS, + }, + .capture = { + .channels_min = 1, + .channels_max = 2, + .rates = LPC3XXX_I2S_RATES, + .formats = LPC3XXX_I2S_FORMATS, + }, + .ops = &lpc3xxx_i2s_dai_ops, + .symmetric_rate = 1, + .symmetric_channels = 1, + .symmetric_sample_bits = 1, +}; + +static const struct snd_soc_component_driver lpc32xx_i2s_component = { + .name = "lpc32xx-i2s", + .legacy_dai_naming = 1, +}; + +static const struct regmap_config lpc32xx_i2s_regconfig = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = LPC3XXX_REG_I2S_RX_RATE, +}; + +static int lpc32xx_i2s_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct lpc3xxx_i2s_info *i2s_info_p; + struct resource *res; + void __iomem *iomem; + const char *filter_data; + int ret; + + i2s_info_p = devm_kzalloc(dev, sizeof(*i2s_info_p), GFP_KERNEL); + if (!i2s_info_p) + return -ENOMEM; + + platform_set_drvdata(pdev, i2s_info_p); + i2s_info_p->dev = dev; + + iomem = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(iomem)) + return dev_err_probe(dev, PTR_ERR(iomem), "Can't map registers\n"); + + i2s_info_p->regs = devm_regmap_init_mmio(dev, iomem, &lpc32xx_i2s_regconfig); + if (IS_ERR(i2s_info_p->regs)) + return dev_err_probe(dev, PTR_ERR(i2s_info_p->regs), + "failed to init register map: %d\n", ret); + + i2s_info_p->clk = devm_clk_get(dev, NULL); + if (IS_ERR(i2s_info_p->clk)) + return dev_err_probe(dev, PTR_ERR(i2s_info_p->clk), "Can't get clock\n"); + + i2s_info_p->clkrate = clk_get_rate(i2s_info_p->clk); + if (i2s_info_p->clkrate == 0) + return dev_err_probe(dev, -EINVAL, "Invalid returned clock rate\n"); + + ret = of_property_count_strings(dev->of_node, "dma-vc-names"); + if (ret != 2) + return dev_err_probe(dev, -EINVAL, "Requires two 'dma-vc-names' entries\n"); + + mutex_init(&i2s_info_p->lock); + + ret = devm_snd_soc_register_component(dev, &lpc32xx_i2s_component, + &lpc3xxx_i2s_dai_driver, 1); + if (ret) + return dev_err_probe(dev, ret, "Can't register cpu_dai component\n"); + + i2s_info_p->playback_dma_config.addr = (dma_addr_t)(res->start + LPC3XXX_REG_I2S_TX_FIFO); + i2s_info_p->playback_dma_config.maxburst = 4; + ret = of_property_read_string_index(dev->of_node, "dma-vc-names", 0, &filter_data); + if (ret) + return dev_err_probe(dev, ret, "Can't get tx virtual dma channel\n"); + i2s_info_p->playback_dma_config.filter_data = (void *)filter_data; + + i2s_info_p->capture_dma_config.addr = (dma_addr_t)(res->start + LPC3XXX_REG_I2S_RX_FIFO); + i2s_info_p->capture_dma_config.maxburst = 4; + ret = of_property_read_string_index(dev->of_node, "dma-vc-names", 1, &filter_data); + if (ret) + return dev_err_probe(dev, ret, "Can't get rx virtual dma channel\n"); + i2s_info_p->capture_dma_config.filter_data = (void *)filter_data; + + ret = lpc3xxx_pcm_register(pdev); + if (ret) + return dev_err_probe(dev, ret, "Can't register pcm component\n"); + + return 0; +} + +static const struct of_device_id lpc32xx_i2s_match[] = { + { .compatible = "nxp,lpc3220-i2s" }, + {}, +}; +MODULE_DEVICE_TABLE(of, lpc32xx_i2s_match); + +static struct platform_driver lpc32xx_i2s_driver = { + .probe = lpc32xx_i2s_probe, + .driver = { + .name = "lpc3xxx-i2s", + .of_match_table = lpc32xx_i2s_match, + }, +}; + +module_platform_driver(lpc32xx_i2s_driver); + +MODULE_AUTHOR("Kevin Wells kevin.wells@nxp.com"); +MODULE_AUTHOR("Piotr Wojtaszczyk piotr.wojtaszczyk@timesys.com"); +MODULE_DESCRIPTION("ASoC LPC3XXX I2S interface"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/fsl/lpc3xxx-i2s.h b/sound/soc/fsl/lpc3xxx-i2s.h new file mode 100644 index 000000000000..eec755448478 --- /dev/null +++ b/sound/soc/fsl/lpc3xxx-i2s.h @@ -0,0 +1,79 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Author: Kevin Wells kevin.wells@nxp.com + * + * Copyright (C) 2008 NXP Semiconductors + * Copyright 2023 Timesys Corporation piotr.wojtaszczyk@timesys.com + */ + +#ifndef __SOUND_SOC_LPC3XXX_I2S_H +#define __SOUND_SOC_LPC3XXX_I2S_H + +#include <linux/types.h> +#include <linux/regmap.h> + +struct lpc3xxx_i2s_info { + struct device *dev; + struct clk *clk; + struct mutex lock; /* To serialize user-space access */ + struct regmap *regs; + u32 streams_in_use; + u32 clkrate; + int freq; + struct snd_dmaengine_dai_dma_data playback_dma_config; + struct snd_dmaengine_dai_dma_data capture_dma_config; +}; + +int lpc3xxx_pcm_register(struct platform_device *pdev); + +/* I2S controller register offsets */ +#define LPC3XXX_REG_I2S_DAO 0x00 +#define LPC3XXX_REG_I2S_DAI 0x04 +#define LPC3XXX_REG_I2S_TX_FIFO 0x08 +#define LPC3XXX_REG_I2S_RX_FIFO 0x0C +#define LPC3XXX_REG_I2S_STAT 0x10 +#define LPC3XXX_REG_I2S_DMA0 0x14 +#define LPC3XXX_REG_I2S_DMA1 0x18 +#define LPC3XXX_REG_I2S_IRQ 0x1C +#define LPC3XXX_REG_I2S_TX_RATE 0x20 +#define LPC3XXX_REG_I2S_RX_RATE 0x24 + +/* i2s_daO i2s_dai register definitions */ +#define LPC3XXX_I2S_WW8 FIELD_PREP(0x3, 0) /* Word width is 8bit */ +#define LPC3XXX_I2S_WW16 FIELD_PREP(0x3, 1) /* Word width is 16bit */ +#define LPC3XXX_I2S_WW32 FIELD_PREP(0x3, 3) /* Word width is 32bit */ +#define LPC3XXX_I2S_MONO BIT(2) /* Mono */ +#define LPC3XXX_I2S_STOP BIT(3) /* Stop, diables the access to FIFO, mutes the channel */ +#define LPC3XXX_I2S_RESET BIT(4) /* Reset the channel */ +#define LPC3XXX_I2S_WS_SEL BIT(5) /* Channel Master(0) or slave(1) mode select */ +#define LPC3XXX_I2S_WS_HP(s) FIELD_PREP(0x7FC0, s) /* Word select half period - 1 */ +#define LPC3XXX_I2S_MUTE BIT(15) /* Mute the channel, Transmit channel only */ + +#define LPC3XXX_I2S_WW32_HP 0x1f /* Word select half period for 32bit word width */ +#define LPC3XXX_I2S_WW16_HP 0x0f /* Word select half period for 16bit word width */ +#define LPC3XXX_I2S_WW8_HP 0x7 /* Word select half period for 8bit word width */ + +/* i2s_stat register definitions */ +#define LPC3XXX_I2S_IRQ_STAT BIT(0) +#define LPC3XXX_I2S_DMA0_REQ BIT(1) +#define LPC3XXX_I2S_DMA1_REQ BIT(2) + +/* i2s_dma0 Configuration register definitions */ +#define LPC3XXX_I2S_DMA0_RX_EN BIT(0) /* Enable RX DMA1 */ +#define LPC3XXX_I2S_DMA0_TX_EN BIT(1) /* Enable TX DMA1 */ +#define LPC3XXX_I2S_DMA0_RX_DEPTH(s) FIELD_PREP(0xF00, s) /* Set the DMA1 RX Request level */ +#define LPC3XXX_I2S_DMA0_TX_DEPTH(s) FIELD_PREP(0xF0000, s) /* Set the DMA1 TX Request level */ + +/* i2s_dma1 Configuration register definitions */ +#define LPC3XXX_I2S_DMA1_RX_EN BIT(0) /* Enable RX DMA1 */ +#define LPC3XXX_I2S_DMA1_TX_EN BIT(1) /* Enable TX DMA1 */ +#define LPC3XXX_I2S_DMA1_RX_DEPTH(s) FIELD_PREP(0x700, s) /* Set the DMA1 RX Request level */ +#define LPC3XXX_I2S_DMA1_TX_DEPTH(s) FIELD_PREP(0x70000, s) /* Set the DMA1 TX Request level */ + +/* i2s_irq register definitions */ +#define LPC3XXX_I2S_RX_IRQ_EN BIT(0) /* Enable RX IRQ */ +#define LPC3XXX_I2S_TX_IRQ_EN BIT(1) /* Enable TX IRQ */ +#define LPC3XXX_I2S_IRQ_RX_DEPTH(s) FIELD_PREP(0xFF00, s) /* valid values ar 0 to 7 */ +#define LPC3XXX_I2S_IRQ_TX_DEPTH(s) FIELD_PREP(0xFF0000, s) /* valid values ar 0 to 7 */ + +#endif diff --git a/sound/soc/fsl/lpc3xxx-pcm.c b/sound/soc/fsl/lpc3xxx-pcm.c new file mode 100644 index 000000000000..59d64cae4e05 --- /dev/null +++ b/sound/soc/fsl/lpc3xxx-pcm.c @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// +// Author: Kevin Wells kevin.wells@nxp.com +// +// Copyright (C) 2008 NXP Semiconductors +// Copyright 2023 Timesys Corporation piotr.wojtaszczyk@timesys.com + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> +#include <linux/amba/pl08x.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> +#include <sound/soc.h> + +#include "lpc3xxx-i2s.h" + +#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ + SNDRV_PCM_FMTBIT_U8 | \ + SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_U16_LE | \ + SNDRV_PCM_FMTBIT_S24_LE | \ + SNDRV_PCM_FMTBIT_U24_LE | \ + SNDRV_PCM_FMTBIT_S32_LE | \ + SNDRV_PCM_FMTBIT_U32_LE | \ + SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) + +static const struct snd_pcm_hardware lpc3xxx_pcm_hardware = { + .info = (SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME), + .formats = STUB_FORMATS, + .period_bytes_min = 128, + .period_bytes_max = 2048, + .periods_min = 2, + .periods_max = 1024, + .buffer_bytes_max = 128 * 1024 +}; + +static const struct snd_dmaengine_pcm_config lpc3xxx_dmaengine_pcm_config = { + .pcm_hardware = &lpc3xxx_pcm_hardware, + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, + .compat_filter_fn = pl08x_filter_id, + .prealloc_buffer_size = 128 * 1024, +}; + +const struct snd_soc_component_driver lpc3xxx_soc_platform_driver = { + .name = "lpc32xx-pcm", +}; + +int lpc3xxx_pcm_register(struct platform_device *pdev) +{ + int ret; + int flags; + + flags = SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT; + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, &lpc3xxx_dmaengine_pcm_config, flags); + if (ret) { + dev_err(&pdev->dev, "failed to register dmaengine: %d\n", ret); + return ret; + } + + return devm_snd_soc_register_component(&pdev->dev, &lpc3xxx_soc_platform_driver, + NULL, 0); +} +EXPORT_SYMBOL(lpc3xxx_pcm_register);
I suggest to specify email addresses for message recipients not only in the header field “Cc”.
…
+++ b/sound/soc/fsl/lpc3xxx-i2s.c @@ -0,0 +1,393 @@
…
+static int lpc3xxx_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) +{
…
- int ret = 0;
- mutex_lock(&i2s_info_p->lock);
…
+lpc32xx_unlock:
- mutex_unlock(&i2s_info_p->lock);
- return ret;
+}
…
Would you become interested to apply a statement like “guard(mutex)(&i2s_info_p->lock);”? https://elixir.bootlin.com/linux/v6.10-rc4/source/include/linux/mutex.h#L196
Regards, Markus
On Mon, Jun 17, 2024 at 9:30 PM Markus Elfring Markus.Elfring@web.de wrote:
Would you become interested to apply a statement like “guard(mutex)(&i2s_info_p->lock);”? https://elixir.bootlin.com/linux/v6.10-rc4/source/include/linux/mutex.h#L196
I take it. Thanks.
On Fri, Jun 14, 2024 at 06:34:48PM +0200, Piotr Wojtaszczyk wrote:
This pach set is to bring back audio to machines with a LPC32XX CPU. The legacy LPC32XX SoC used to have audio spport in linux 2.6.27. The support was dropped due to lack of interest from mainaeners.
Please don't send new patches in reply to old patches or serieses, this makes it harder for both people and tools to understand what is going on - it can bury things in mailboxes and make it difficult to keep track of what current patches are, both for the new patches and the old ones.
participants (5)
-
Krzysztof Kozlowski -
Mark Brown -
Markus Elfring -
Piotr Wojtaszczyk -
Rob Herring (Arm)