* [PATCH v2 1/7] ASoC: Add Google Chameleon v3 i2s driver
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
@ 2023-05-08 11:30 ` Paweł Anikiel
2023-05-08 11:30 ` [PATCH v2 2/7] ASoC: Add Google Chameleon v3 codec driver Paweł Anikiel
` (7 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-08 11:30 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan, Paweł Anikiel
Add driver for the i2s IP present on Google Chameleon v3
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
sound/soc/Kconfig | 1 +
sound/soc/Makefile | 1 +
sound/soc/google/Kconfig | 6 +
sound/soc/google/Makefile | 2 +
sound/soc/google/chv3-i2s.c | 338 ++++++++++++++++++++++++++++++++++++
5 files changed, 348 insertions(+)
create mode 100644 sound/soc/google/Kconfig
create mode 100644 sound/soc/google/Makefile
create mode 100644 sound/soc/google/chv3-i2s.c
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 848fbae26c3b..48e778c18912 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -75,6 +75,7 @@ source "sound/soc/bcm/Kconfig"
source "sound/soc/cirrus/Kconfig"
source "sound/soc/dwc/Kconfig"
source "sound/soc/fsl/Kconfig"
+source "sound/soc/google/Kconfig"
source "sound/soc/hisilicon/Kconfig"
source "sound/soc/jz4740/Kconfig"
source "sound/soc/kirkwood/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 507eaed1d6a1..d5cc3eb710f9 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_SND_SOC) += bcm/
obj-$(CONFIG_SND_SOC) += cirrus/
obj-$(CONFIG_SND_SOC) += dwc/
obj-$(CONFIG_SND_SOC) += fsl/
+obj-$(CONFIG_SND_SOC) += google/
obj-$(CONFIG_SND_SOC) += hisilicon/
obj-$(CONFIG_SND_SOC) += jz4740/
obj-$(CONFIG_SND_SOC) += img/
diff --git a/sound/soc/google/Kconfig b/sound/soc/google/Kconfig
new file mode 100644
index 000000000000..7603782fb060
--- /dev/null
+++ b/sound/soc/google/Kconfig
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config SND_SOC_CHV3_I2S
+ tristate "Google Chameleon v3 I2S device"
+ help
+ Enable support for the Google Chameleon v3 I2S device.
diff --git a/sound/soc/google/Makefile b/sound/soc/google/Makefile
new file mode 100644
index 000000000000..862496af1ae1
--- /dev/null
+++ b/sound/soc/google/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_SND_SOC_CHV3_I2S) += chv3-i2s.o
diff --git a/sound/soc/google/chv3-i2s.c b/sound/soc/google/chv3-i2s.c
new file mode 100644
index 000000000000..0f6513444906
--- /dev/null
+++ b/sound/soc/google/chv3-i2s.c
@@ -0,0 +1,338 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+#include <sound/soc.h>
+
+/*
+ * The I2S interface consists of two ring buffers - one for RX and one for
+ * TX. A ring buffer has a producer index and a consumer index. Depending
+ * on which way the data is flowing, either the software or the hardware
+ * writes data and updates the producer index, and the other end reads data
+ * and updates the consumer index.
+ *
+ * The pointer managed by software is updated using the .ack callback
+ * (see chv3_dma_ack). This seems to be the only way to reliably obtain
+ * the appl_ptr from within the driver and pass it to hardware.
+ *
+ * Because of the two pointer design, the ring buffer can never be full. With
+ * capture this isn't a problem, because the hardware being the producer
+ * will wait for the consumer index to move out of the way. With playback,
+ * however, this is problematic, because ALSA wants to fill up the buffer
+ * completely when waiting for hardware. In the .ack callback, the driver
+ * would have to wait for the consumer index to move out of the way by
+ * busy-waiting, which would keep stalling the kernel for quite a long time.
+ *
+ * The workaround to this problem is to "lie" to ALSA that the hw_pointer
+ * is one frame behind what it actually is (see chv3_dma_pointer). This
+ * way, ALSA will not try to fill up the entire buffer, and all callbacks
+ * are wait-free.
+ */
+
+#define I2S_TX_ENABLE 0x00
+#define I2S_TX_BASE_ADDR 0x04
+#define I2S_TX_BUFFER_SIZE 0x08
+#define I2S_TX_PRODUCER_IDX 0x0c
+#define I2S_TX_CONSUMER_IDX 0x10
+#define I2S_RX_ENABLE 0x14
+#define I2S_RX_BASE_ADDR 0x18
+#define I2S_RX_BUFFER_SIZE 0x1c
+#define I2S_RX_PRODUCER_IDX 0x20
+#define I2S_RX_CONSUMER_IDX 0x24
+
+#define I2S_SOFT_RESET 0x2c
+#define I2S_SOFT_RESET_RX_BIT 0x1
+#define I2S_SOFT_RESET_TX_BIT 0x2
+
+#define I2S_RX_IRQ 0x4c
+#define I2S_RX_IRQ_CONST 0x50
+#define I2S_TX_IRQ 0x54
+#define I2S_TX_IRQ_CONST 0x58
+
+#define I2S_IRQ_MASK 0x8
+#define I2S_IRQ_CLR 0xc
+#define I2S_IRQ_RX_BIT 0x1
+#define I2S_IRQ_TX_BIT 0x2
+
+#define I2S_MAX_BUFFER_SIZE 0x200000
+
+struct chv3_i2s_dev {
+ struct device *dev;
+ void __iomem *iobase;
+ void __iomem *iobase_irq;
+ struct snd_pcm_substream *rx_substream;
+ struct snd_pcm_substream *tx_substream;
+ int tx_bytes_to_fetch;
+};
+
+static struct snd_soc_dai_driver chv3_i2s_dai = {
+ .name = "chv3-i2s",
+ .capture = {
+ .channels_min = 1,
+ .channels_max = 128,
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
+ .rate_min = 8000,
+ .rate_max = 96000,
+ .formats = SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .playback = {
+ .channels_min = 1,
+ .channels_max = 128,
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
+ .rate_min = 8000,
+ .rate_max = 96000,
+ .formats = SNDRV_PCM_FMTBIT_S32_LE,
+ },
+};
+
+static const struct snd_pcm_hardware chv3_dma_hw = {
+ .info = SNDRV_PCM_INFO_INTERLEAVED |
+ SNDRV_PCM_INFO_MMAP |
+ SNDRV_PCM_INFO_MMAP_VALID |
+ SNDRV_PCM_INFO_BLOCK_TRANSFER,
+ .buffer_bytes_max = I2S_MAX_BUFFER_SIZE,
+ .period_bytes_min = 64,
+ .period_bytes_max = 8192,
+ .periods_min = 4,
+ .periods_max = 256,
+};
+
+static inline void chv3_i2s_wr(struct chv3_i2s_dev *i2s, int offset, u32 val)
+{
+ writel(val, i2s->iobase + offset);
+}
+
+static inline u32 chv3_i2s_rd(struct chv3_i2s_dev *i2s, int offset)
+{
+ return readl(i2s->iobase + offset);
+}
+
+static irqreturn_t chv3_i2s_isr(int irq, void *data)
+{
+ struct chv3_i2s_dev *i2s = data;
+ u32 reg;
+
+ reg = readl(i2s->iobase_irq + I2S_IRQ_CLR);
+ if (!reg)
+ return IRQ_NONE;
+
+ if (reg & I2S_IRQ_RX_BIT)
+ snd_pcm_period_elapsed(i2s->rx_substream);
+
+ if (reg & I2S_IRQ_TX_BIT)
+ snd_pcm_period_elapsed(i2s->tx_substream);
+
+ writel(reg, i2s->iobase_irq + I2S_IRQ_CLR);
+
+ return IRQ_HANDLED;
+}
+
+static int chv3_dma_open(struct snd_soc_component *component,
+ struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+ struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+ int res;
+
+ snd_soc_set_runtime_hwparams(substream, &chv3_dma_hw);
+
+ res = snd_pcm_hw_constraint_pow2(substream->runtime, 0,
+ SNDRV_PCM_HW_PARAM_BUFFER_BYTES);
+ if (res)
+ return res;
+
+ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+ i2s->rx_substream = substream;
+ else
+ i2s->tx_substream = substream;
+
+ return 0;
+}
+static int chv3_dma_close(struct snd_soc_component *component,
+ struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+ struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+
+ if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
+ chv3_i2s_wr(i2s, I2S_RX_ENABLE, 0);
+ else
+ chv3_i2s_wr(i2s, I2S_TX_ENABLE, 0);
+
+ return 0;
+}
+
+static int chv3_dma_pcm_construct(struct snd_soc_component *component,
+ struct snd_soc_pcm_runtime *rtd)
+{
+ struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+ struct snd_pcm_substream *substream;
+ int res;
+
+ substream = rtd->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
+ if (substream) {
+ res = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, i2s->dev,
+ I2S_MAX_BUFFER_SIZE, &substream->dma_buffer);
+ if (res)
+ return res;
+ }
+
+ substream = rtd->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
+ if (substream) {
+ res = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, i2s->dev,
+ I2S_MAX_BUFFER_SIZE, &substream->dma_buffer);
+ if (res)
+ return res;
+ }
+
+ return 0;
+}
+
+static int chv3_dma_hw_params(struct snd_soc_component *component,
+ struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
+ return 0;
+}
+
+static int chv3_dma_prepare(struct snd_soc_component *component,
+ struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+ struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+ unsigned int buffer_bytes, period_bytes, period_size;
+
+ buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
+ period_bytes = snd_pcm_lib_period_bytes(substream);
+ period_size = substream->runtime->period_size;
+
+ if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) {
+ chv3_i2s_wr(i2s, I2S_SOFT_RESET, I2S_SOFT_RESET_RX_BIT);
+ chv3_i2s_wr(i2s, I2S_RX_BASE_ADDR, substream->dma_buffer.addr);
+ chv3_i2s_wr(i2s, I2S_RX_BUFFER_SIZE, buffer_bytes);
+ chv3_i2s_wr(i2s, I2S_RX_IRQ, (period_size << 8) | 1);
+ chv3_i2s_wr(i2s, I2S_RX_ENABLE, 1);
+ } else {
+ chv3_i2s_wr(i2s, I2S_SOFT_RESET, I2S_SOFT_RESET_TX_BIT);
+ chv3_i2s_wr(i2s, I2S_TX_BASE_ADDR, substream->dma_buffer.addr);
+ chv3_i2s_wr(i2s, I2S_TX_BUFFER_SIZE, buffer_bytes);
+ chv3_i2s_wr(i2s, I2S_TX_IRQ, ((period_bytes / i2s->tx_bytes_to_fetch) << 8) | 1);
+ chv3_i2s_wr(i2s, I2S_TX_ENABLE, 1);
+ }
+ writel(I2S_IRQ_RX_BIT | I2S_IRQ_TX_BIT, i2s->iobase_irq + I2S_IRQ_MASK);
+
+ return 0;
+}
+
+static snd_pcm_uframes_t chv3_dma_pointer(struct snd_soc_component *component,
+ struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+ struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+ u32 frame_bytes, buffer_bytes;
+ u32 idx_bytes;
+
+ frame_bytes = substream->runtime->frame_bits * 8;
+ buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
+
+ if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) {
+ idx_bytes = chv3_i2s_rd(i2s, I2S_RX_PRODUCER_IDX);
+ } else {
+ idx_bytes = chv3_i2s_rd(i2s, I2S_TX_CONSUMER_IDX);
+ /* lag the pointer by one frame */
+ idx_bytes = (idx_bytes - frame_bytes) & (buffer_bytes - 1);
+ }
+
+ return bytes_to_frames(substream->runtime, idx_bytes);
+}
+
+static int chv3_dma_ack(struct snd_soc_component *component,
+ struct snd_pcm_substream *substream)
+{
+ struct snd_pcm_runtime *runtime = substream->runtime;
+ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+ struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+ unsigned int bytes, idx;
+
+ bytes = frames_to_bytes(runtime, runtime->control->appl_ptr);
+ idx = bytes & (snd_pcm_lib_buffer_bytes(substream) - 1);
+
+ if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
+ chv3_i2s_wr(i2s, I2S_RX_CONSUMER_IDX, idx);
+ else
+ chv3_i2s_wr(i2s, I2S_TX_PRODUCER_IDX, idx);
+
+ return 0;
+}
+
+static const struct snd_soc_component_driver chv3_i2s_comp = {
+ .name = "chv3-i2s-comp",
+ .open = chv3_dma_open,
+ .close = chv3_dma_close,
+ .pcm_construct = chv3_dma_pcm_construct,
+ .hw_params = chv3_dma_hw_params,
+ .prepare = chv3_dma_prepare,
+ .pointer = chv3_dma_pointer,
+ .ack = chv3_dma_ack,
+};
+
+static int chv3_i2s_probe(struct platform_device *pdev)
+{
+ struct chv3_i2s_dev *i2s;
+ int res;
+ int irq;
+
+ i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
+ if (!i2s)
+ return -ENOMEM;
+
+ i2s->iobase = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(i2s->iobase))
+ return PTR_ERR(i2s->iobase);
+
+ i2s->iobase_irq = devm_platform_ioremap_resource(pdev, 1);
+ if (IS_ERR(i2s->iobase_irq))
+ return PTR_ERR(i2s->iobase_irq);
+
+ i2s->tx_bytes_to_fetch = (chv3_i2s_rd(i2s, I2S_TX_IRQ_CONST) >> 8) & 0xffff;
+
+ i2s->dev = &pdev->dev;
+ dev_set_drvdata(&pdev->dev, i2s);
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0)
+ return -ENXIO;
+ res = devm_request_irq(i2s->dev, irq, chv3_i2s_isr, 0, "chv3-i2s", i2s);
+ if (res)
+ return res;
+
+ res = devm_snd_soc_register_component(&pdev->dev, &chv3_i2s_comp,
+ &chv3_i2s_dai, 1);
+ if (res) {
+ dev_err(&pdev->dev, "couldn't register component: %d\n", res);
+ return res;
+ }
+
+ return 0;
+}
+
+static const struct of_device_id chv3_i2s_of_match[] = {
+ { .compatible = "google,chv3-i2s" },
+ {},
+};
+
+static struct platform_driver chv3_i2s_driver = {
+ .probe = chv3_i2s_probe,
+ .driver = {
+ .name = "chv3-i2s",
+ .of_match_table = chv3_i2s_of_match,
+ },
+};
+
+module_platform_driver(chv3_i2s_driver);
+
+MODULE_AUTHOR("Pawel Anikiel <pan@semihalf.com>");
+MODULE_DESCRIPTION("Chameleon v3 I2S interface");
+MODULE_LICENSE("GPL");
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 2/7] ASoC: Add Google Chameleon v3 codec driver
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
2023-05-08 11:30 ` [PATCH v2 1/7] ASoC: Add Google Chameleon v3 i2s driver Paweł Anikiel
@ 2023-05-08 11:30 ` Paweł Anikiel
2023-05-08 11:30 ` [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device Paweł Anikiel
` (6 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-08 11:30 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan, Paweł Anikiel
Add driver for the codec IP present on Google Chameleon v3
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
sound/soc/codecs/Kconfig | 8 +++++++
sound/soc/codecs/Makefile | 2 ++
sound/soc/codecs/chv3-codec.c | 41 +++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+)
create mode 100644 sound/soc/codecs/chv3-codec.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 79d2362ad055..f8f15e96ade5 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -57,6 +57,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_AW88395
imply SND_SOC_BT_SCO
imply SND_SOC_BD28623
+ imply SND_SOC_CHV3_CODEC
imply SND_SOC_CQ0093VC
imply SND_SOC_CROS_EC_CODEC
imply SND_SOC_CS35L32
@@ -643,6 +644,13 @@ config SND_SOC_BD28623
config SND_SOC_BT_SCO
tristate "Dummy BT SCO codec driver"
+config SND_SOC_CHV3_CODEC
+ tristate "Google Chameleon v3 codec driver"
+ help
+ Enable support for the Google Chameleon v3 audio codec.
+ This codec does not have a control interface, it always outputs
+ 8 channel S32_LE audio.
+
config SND_SOC_CPCAP
tristate "Motorola CPCAP codec"
depends on MFD_CPCAP || COMPILE_TEST
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 5cdbae88e6e3..8cee836f4831 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -51,6 +51,7 @@ snd-soc-aw88395-objs := aw88395/aw88395.o \
aw88395/aw88395_device.o
snd-soc-bd28623-objs := bd28623.o
snd-soc-bt-sco-objs := bt-sco.o
+snd-soc-chv3-codec-objs := chv3-codec.o
snd-soc-cpcap-objs := cpcap.o
snd-soc-cq93vc-objs := cq93vc.o
snd-soc-cros-ec-codec-objs := cros_ec_codec.o
@@ -425,6 +426,7 @@ obj-$(CONFIG_SND_SOC_AW88395_LIB) += snd-soc-aw88395-lib.o
obj-$(CONFIG_SND_SOC_AW88395) +=snd-soc-aw88395.o
obj-$(CONFIG_SND_SOC_BD28623) += snd-soc-bd28623.o
obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o
+obj-$(CONFIG_SND_SOC_CHV3_CODEC) += snd-soc-chv3-codec.o
obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
obj-$(CONFIG_SND_SOC_CPCAP) += snd-soc-cpcap.o
obj-$(CONFIG_SND_SOC_CROS_EC_CODEC) += snd-soc-cros-ec-codec.o
diff --git a/sound/soc/codecs/chv3-codec.c b/sound/soc/codecs/chv3-codec.c
new file mode 100644
index 000000000000..ab99effa6874
--- /dev/null
+++ b/sound/soc/codecs/chv3-codec.c
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/module.h>
+#include <sound/soc.h>
+
+static struct snd_soc_dai_driver chv3_codec_dai = {
+ .name = "chv3-codec-hifi",
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 8,
+ .channels_max = 8,
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
+ .formats = SNDRV_PCM_FMTBIT_S32_LE,
+ },
+};
+
+static const struct snd_soc_component_driver soc_component_dev_chv3_codec = {
+};
+
+static int chv3_codec_probe(struct platform_device *pdev)
+{
+ return devm_snd_soc_register_component(&pdev->dev,
+ &soc_component_dev_chv3_codec, &chv3_codec_dai, 1);
+}
+
+static const struct of_device_id chv3_codec_of_match[] = {
+ { .compatible = "google,chv3-codec", },
+ { }
+};
+
+static struct platform_driver chv3_codec_platform_driver = {
+ .driver = {
+ .name = "chv3-codec",
+ .of_match_table = chv3_codec_of_match,
+ },
+ .probe = chv3_codec_probe,
+};
+module_platform_driver(chv3_codec_platform_driver);
+
+MODULE_DESCRIPTION("ASoC Chameleon v3 codec driver");
+MODULE_AUTHOR("Pawel Anikiel <pan@semihalf.com>");
+MODULE_LICENSE("GPL");
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
2023-05-08 11:30 ` [PATCH v2 1/7] ASoC: Add Google Chameleon v3 i2s driver Paweł Anikiel
2023-05-08 11:30 ` [PATCH v2 2/7] ASoC: Add Google Chameleon v3 codec driver Paweł Anikiel
@ 2023-05-08 11:30 ` Paweł Anikiel
2023-05-08 12:27 ` Rob Herring
2023-05-09 6:15 ` Krzysztof Kozlowski
2023-05-08 11:30 ` [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec Paweł Anikiel
` (5 subsequent siblings)
8 siblings, 2 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-08 11:30 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan, Paweł Anikiel
Add binding for google,chv3-i2s device.
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
.../bindings/sound/google,chv3-i2s.yaml | 44 +++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
diff --git a/Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml b/Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
new file mode 100644
index 000000000000..3ce910f44d39
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/google,chv3-i2s.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Google Chameleon v3 I2S device
+
+maintainers:
+ - Paweł Anikiel <pan@semihalf.com>
+
+description: |
+ I2S device for the Google Chameleon v3. The device handles both RX
+ and TX using a producer/consumer ring buffer design.
+
+properties:
+ compatible:
+ const: google,chv3-i2s
+
+ reg:
+ items:
+ - description: core registers
+ - description: irq registers
+
+ interrupts:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ i2s@c0060300 {
+ compatible = "google,chv3-i2s";
+ reg = <0xc0060300 0x100>,
+ <0xc0060f00 0x10>;
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+ };
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device
2023-05-08 11:30 ` [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device Paweł Anikiel
@ 2023-05-08 12:27 ` Rob Herring
2023-05-09 6:14 ` Krzysztof Kozlowski
2023-05-09 6:15 ` Krzysztof Kozlowski
1 sibling, 1 reply; 17+ messages in thread
From: Rob Herring @ 2023-05-08 12:27 UTC (permalink / raw)
To: Paweł Anikiel
Cc: robh+dt, linux-kernel, krzysztof.kozlowski+dt, devicetree,
dinguyen, broonie, lars, nuno.sa, lgirdwood, tiwai, upstream,
alsa-devel, perex, amstan
On Mon, 08 May 2023 13:30:33 +0200, Paweł Anikiel wrote:
> Add binding for google,chv3-i2s device.
>
> Signed-off-by: Paweł Anikiel <pan@semihalf.com>
> ---
> .../bindings/sound/google,chv3-i2s.yaml | 44 +++++++++++++++++++
> 1 file changed, 44 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.example.dtb: camera-sensor@3c: port:endpoint:data-lanes: [[1]] is too short
From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/rockchip-isp1.example.dtb: camera@3c: port:endpoint:data-lanes: [[1]] is too short
From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.example.dtb: pcie-ep@33800000: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected)
From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
doc reference errors (make refcheckdocs):
Documentation/usb/gadget_uvc.rst: Documentation/userspace-api/media/v4l/pixfmt-packed.yuv.rst
MAINTAINERS: Documentation/devicetree/bindings/pwm/pwm-apple.yaml
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20230508113037.137627-4-pan@semihalf.com
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.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device
2023-05-08 12:27 ` Rob Herring
@ 2023-05-09 6:14 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2023-05-09 6:14 UTC (permalink / raw)
To: Rob Herring, Paweł Anikiel
Cc: robh+dt, linux-kernel, krzysztof.kozlowski+dt, devicetree,
dinguyen, broonie, lars, nuno.sa, lgirdwood, tiwai, upstream,
alsa-devel, perex, amstan
On 08/05/2023 14:27, Rob Herring wrote:
>
> On Mon, 08 May 2023 13:30:33 +0200, Paweł Anikiel wrote:
>> Add binding for google,chv3-i2s device.
>>
>> Signed-off-by: Paweł Anikiel <pan@semihalf.com>
>> ---
>> .../bindings/sound/google,chv3-i2s.yaml | 44 +++++++++++++++++++
>> 1 file changed, 44 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
>>
>
> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
> on your patch (DT_CHECKER_FLAGS is new in v5.13):
>
> yamllint warnings/errors:
>
> dtschema/dtc warnings/errors:
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.example.dtb: camera-sensor@3c: port:endpoint:data-lanes: [[1]] is too short
> From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/rockchip-isp1.example.dtb: camera@3c: port:endpoint:data-lanes: [[1]] is too short
> From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.example.dtb: pcie-ep@33800000: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected)
> From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
>
> doc reference errors (make refcheckdocs):
> Documentation/usb/gadget_uvc.rst: Documentation/userspace-api/media/v4l/pixfmt-packed.yuv.rst
> MAINTAINERS: Documentation/devicetree/bindings/pwm/pwm-apple.yaml
These errors can be ignored.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device
2023-05-08 11:30 ` [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device Paweł Anikiel
2023-05-08 12:27 ` Rob Herring
@ 2023-05-09 6:15 ` Krzysztof Kozlowski
1 sibling, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2023-05-09 6:15 UTC (permalink / raw)
To: Paweł Anikiel, alsa-devel, devicetree, linux-kernel,
lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan
On 08/05/2023 13:30, Paweł Anikiel wrote:
> Add binding for google,chv3-i2s device.
>
> Signed-off-by: Paweł Anikiel <pan@semihalf.com>
> ---
> .../bindings/sound/google,chv3-i2s.yaml | 44 +++++++++++++++++++
> 1 file changed, 44 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
>
> diff --git a/Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml b/Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
> new file mode 100644
> index 000000000000..3ce910f44d39
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
> @@ -0,0 +1,44 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/sound/google,chv3-i2s.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Google Chameleon v3 I2S device
> +
> +maintainers:
> + - Paweł Anikiel <pan@semihalf.com>
> +
> +description: |
If there is going to be resend:
Do not need '|' unless you need to preserve formatting.
Anyway:
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
` (2 preceding siblings ...)
2023-05-08 11:30 ` [PATCH v2 3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device Paweł Anikiel
@ 2023-05-08 11:30 ` Paweł Anikiel
2023-05-08 12:27 ` Rob Herring
2023-05-09 6:18 ` Krzysztof Kozlowski
2023-05-08 11:30 ` [PATCH v2 5/7] ARM: dts: chameleonv3: Add mute gpio hog Paweł Anikiel
` (4 subsequent siblings)
8 siblings, 2 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-08 11:30 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan, Paweł Anikiel
Add binding for google,chv3-codec device.
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
.../bindings/sound/google,chv3-codec.yaml | 31 +++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
diff --git a/Documentation/devicetree/bindings/sound/google,chv3-codec.yaml b/Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
new file mode 100644
index 000000000000..5329dc140b1c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/google,chv3-codec.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Google Chameleon v3 audio codec
+
+maintainers:
+ - Paweł Anikiel <pan@semihalf.com>
+
+allOf:
+ - $ref: dai-common.yaml#
+
+properties:
+ compatible:
+ const: google,chv3-codec
+
+ "#sound-dai-cells":
+ const: 0
+
+required:
+ - compatible
+
+additionalProperties: false
+
+examples:
+ - |
+ audio-codec {
+ compatible = "google,chv3-codec";
+ };
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec
2023-05-08 11:30 ` [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec Paweł Anikiel
@ 2023-05-08 12:27 ` Rob Herring
2023-05-09 6:18 ` Krzysztof Kozlowski
1 sibling, 0 replies; 17+ messages in thread
From: Rob Herring @ 2023-05-08 12:27 UTC (permalink / raw)
To: Paweł Anikiel
Cc: devicetree, lgirdwood, perex, alsa-devel, broonie, tiwai, robh+dt,
lars, amstan, dinguyen, linux-kernel, upstream, nuno.sa,
krzysztof.kozlowski+dt
On Mon, 08 May 2023 13:30:34 +0200, Paweł Anikiel wrote:
> Add binding for google,chv3-codec device.
>
> Signed-off-by: Paweł Anikiel <pan@semihalf.com>
> ---
> .../bindings/sound/google,chv3-codec.yaml | 31 +++++++++++++++++++
> 1 file changed, 31 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.example.dtb: camera-sensor@3c: port:endpoint:data-lanes: [[1]] is too short
From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/rockchip-isp1.example.dtb: camera@3c: port:endpoint:data-lanes: [[1]] is too short
From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.example.dtb: pcie-ep@33800000: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected)
From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
doc reference errors (make refcheckdocs):
Documentation/usb/gadget_uvc.rst: Documentation/userspace-api/media/v4l/pixfmt-packed.yuv.rst
MAINTAINERS: Documentation/devicetree/bindings/pwm/pwm-apple.yaml
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20230508113037.137627-5-pan@semihalf.com
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.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec
2023-05-08 11:30 ` [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec Paweł Anikiel
2023-05-08 12:27 ` Rob Herring
@ 2023-05-09 6:18 ` Krzysztof Kozlowski
2023-05-09 9:54 ` Mark Brown
1 sibling, 1 reply; 17+ messages in thread
From: Krzysztof Kozlowski @ 2023-05-09 6:18 UTC (permalink / raw)
To: Paweł Anikiel, alsa-devel, devicetree, linux-kernel,
lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan
On 08/05/2023 13:30, Paweł Anikiel wrote:
> Add binding for google,chv3-codec device.
>
> Signed-off-by: Paweł Anikiel <pan@semihalf.com>
> ---
> .../bindings/sound/google,chv3-codec.yaml | 31 +++++++++++++++++++
> 1 file changed, 31 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
>
> diff --git a/Documentation/devicetree/bindings/sound/google,chv3-codec.yaml b/Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
> new file mode 100644
> index 000000000000..5329dc140b1c
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
> @@ -0,0 +1,31 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/sound/google,chv3-codec.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Google Chameleon v3 audio codec
> +
> +maintainers:
> + - Paweł Anikiel <pan@semihalf.com>
> +
> +allOf:
> + - $ref: dai-common.yaml#
> +
> +properties:
> + compatible:
> + const: google,chv3-codec
> +
> + "#sound-dai-cells":
> + const: 0
No supplies? How do you get power?
> +
> +required:
> + - compatible
> +
> +additionalProperties: false
unevaluatedProperties: false, because you might want to use name-prefix.
> +
> +examples:
> + - |
> + audio-codec {
> + compatible = "google,chv3-codec";
Extend the example with dai-cells.
> + };
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec
2023-05-09 6:18 ` Krzysztof Kozlowski
@ 2023-05-09 9:54 ` Mark Brown
2023-05-09 10:39 ` Paweł Anikiel
0 siblings, 1 reply; 17+ messages in thread
From: Mark Brown @ 2023-05-09 9:54 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Paweł Anikiel, alsa-devel, devicetree, linux-kernel,
lgirdwood, perex, tiwai, robh+dt, krzysztof.kozlowski+dt,
dinguyen, lars, nuno.sa, upstream, amstan
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
On Tue, May 09, 2023 at 08:18:15AM +0200, Krzysztof Kozlowski wrote:
> On 08/05/2023 13:30, Paweł Anikiel wrote:
> > + "#sound-dai-cells":
> > + const: 0
> No supplies? How do you get power?
My understanding is that this is deployed to a FPGA so the power would
be going into the FPGA. In general a memory mapped I2S controller like
this will be part of a larger SoC of some kind.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec
2023-05-09 9:54 ` Mark Brown
@ 2023-05-09 10:39 ` Paweł Anikiel
0 siblings, 0 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-09 10:39 UTC (permalink / raw)
To: Mark Brown
Cc: Krzysztof Kozlowski, alsa-devel, devicetree, linux-kernel,
lgirdwood, perex, tiwai, robh+dt, krzysztof.kozlowski+dt,
dinguyen, lars, nuno.sa, upstream, amstan
On Tue, May 9, 2023 at 11:54 AM Mark Brown <broonie@kernel.org> wrote:
>
> On Tue, May 09, 2023 at 08:18:15AM +0200, Krzysztof Kozlowski wrote:
> > On 08/05/2023 13:30, Paweł Anikiel wrote:
>
> > > + "#sound-dai-cells":
> > > + const: 0
>
> > No supplies? How do you get power?
>
> My understanding is that this is deployed to a FPGA so the power would
> be going into the FPGA. In general a memory mapped I2S controller like
> this will be part of a larger SoC of some kind.
Yes, both the codec and i2s controller are implemented in the FPGA
part of the Arria 10 SoC.
Regards,
Paweł
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 5/7] ARM: dts: chameleonv3: Add mute gpio hog
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
` (3 preceding siblings ...)
2023-05-08 11:30 ` [PATCH v2 4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec Paweł Anikiel
@ 2023-05-08 11:30 ` Paweł Anikiel
2023-05-08 11:30 ` [PATCH v2 6/7] ARM: dts: chameleonv3: Add Chameleon v3 audio Paweł Anikiel
` (3 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-08 11:30 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan, Paweł Anikiel
Add an output-high gpio hog for the mute pin.
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts b/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
index 422d00cd4c74..f0483ef46a36 100644
--- a/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
+++ b/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
@@ -69,6 +69,12 @@ u80: gpio@21 {
"TP122",
"TP123",
"TP124";
+
+ mute {
+ gpio-hog;
+ gpios = <0 0>;
+ output-high;
+ };
};
};
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 6/7] ARM: dts: chameleonv3: Add Chameleon v3 audio
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
` (4 preceding siblings ...)
2023-05-08 11:30 ` [PATCH v2 5/7] ARM: dts: chameleonv3: Add mute gpio hog Paweł Anikiel
@ 2023-05-08 11:30 ` Paweł Anikiel
2023-05-08 11:30 ` [PATCH v2 7/7] ASoC: ssm2602: Add workaround for playback distortions Paweł Anikiel
` (2 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-08 11:30 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan, Paweł Anikiel
Add dts nodes for i2s, audio codec, and simple-audio-card devices.
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
.../boot/dts/socfpga_arria10_chameleonv3.dts | 56 +++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts b/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
index f0483ef46a36..a69819e26144 100644
--- a/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
+++ b/arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
@@ -15,6 +15,61 @@ aliases {
i2c0 = &i2c0;
i2c1 = &i2c1;
};
+
+ soc {
+ i2s0: i2s@c0060300 {
+ compatible = "google,chv3-i2s";
+ reg = <0xc0060300 0x100>,
+ <0xc0060f00 0x10>;
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+ #sound-dai-cells = <0>;
+ };
+
+ i2s1: i2s@c0060400 {
+ compatible = "google,chv3-i2s";
+ reg = <0xc0060400 0x100>,
+ <0xc0060f10 0x10>;
+ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+ #sound-dai-cells = <0>;
+ };
+ };
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "chv3-audio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ simple-audio-card,dai-link@0 {
+ reg = <0>;
+ cpu {
+ sound-dai = <&i2s0>;
+ };
+ codec {
+ sound-dai = <&chv3_codec>;
+ };
+ };
+
+ simple-audio-card,dai-link@1 {
+ reg = <1>;
+ format = "i2s";
+ cpu {
+ sound-dai = <&i2s1>;
+ };
+ codec {
+ sound-dai = <&ssm2603>;
+ bitclock-master;
+ frame-master;
+ system-clock-frequency = <22579200>;
+ mclk-fs = <512>;
+ };
+ };
+ };
+
+ chv3_codec: audio-codec {
+ compatible = "google,chv3-codec";
+ #sound-dai-cells = <0>;
+ };
};
&gmac0 {
@@ -39,6 +94,7 @@ &i2c0 {
ssm2603: audio-codec@1a {
compatible = "adi,ssm2603";
reg = <0x1a>;
+ #sound-dai-cells = <0>;
};
};
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 7/7] ASoC: ssm2602: Add workaround for playback distortions
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
` (5 preceding siblings ...)
2023-05-08 11:30 ` [PATCH v2 6/7] ARM: dts: chameleonv3: Add Chameleon v3 audio Paweł Anikiel
@ 2023-05-08 11:30 ` Paweł Anikiel
2023-05-12 4:19 ` (subset) [PATCH v2 0/7] Add Chameleon v3 ASoC audio Mark Brown
2023-05-18 22:29 ` Mark Brown
8 siblings, 0 replies; 17+ messages in thread
From: Paweł Anikiel @ 2023-05-08 11:30 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood, broonie
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan, Paweł Anikiel
Apply a workaround for what appears to be a hardware quirk.
The problem seems to happen when enabling "whole chip power" (bit D7
register R6) for the very first time after the chip receives power. If
either "output" (D4) or "DAC" (D3) aren't powered on at that time,
playback becomes very distorted later on.
This happens on the Google Chameleon v3, as well as on a ZYBO Z7-10:
https://ez.analog.com/audio/f/q-a/543726/solved-ssm2603-right-output-offset-issue/480229
I suspect this happens only when using an external MCLK signal (which
is the case for both of these boards).
Here are some experiments run on a Google Chameleon v3. These were run
in userspace using a wrapper around the i2cset utility:
ssmset() {
i2cset -y 0 0x1a $(($1*2)) $2
}
For each of the following sequences, we apply power to the ssm2603
chip, set the configuration registers R0-R5 and R7-R8, run the selected
sequence, and check for distortions on playback.
ssmset 0x09 0x01 # core
ssmset 0x06 0x07 # chip, out, dac
OK
ssmset 0x09 0x01 # core
ssmset 0x06 0x87 # out, dac
ssmset 0x06 0x07 # chip
OK
(disable MCLK)
ssmset 0x09 0x01 # core
ssmset 0x06 0x1f # chip
ssmset 0x06 0x07 # out, dac
(enable MCLK)
OK
ssmset 0x09 0x01 # core
ssmset 0x06 0x1f # chip
ssmset 0x06 0x07 # out, dac
NOT OK
ssmset 0x06 0x1f # chip
ssmset 0x09 0x01 # core
ssmset 0x06 0x07 # out, dac
NOT OK
ssmset 0x09 0x01 # core
ssmset 0x06 0x0f # chip, out
ssmset 0x06 0x07 # dac
NOT OK
ssmset 0x09 0x01 # core
ssmset 0x06 0x17 # chip, dac
ssmset 0x06 0x07 # out
NOT OK
For each of the following sequences, we apply power to the ssm2603
chip, run the selected sequence, issue a reset with R15, configure
R0-R5 and R7-R8, run one of the NOT OK sequences from above, and check
for distortions.
ssmset 0x09 0x01 # core
ssmset 0x06 0x07 # chip, out, dac
OK
(disable MCLK)
ssmset 0x09 0x01 # core
ssmset 0x06 0x07 # chip, out, dac
(enable MCLK after reset)
NOT OK
ssmset 0x09 0x01 # core
ssmset 0x06 0x17 # chip, dac
NOT OK
ssmset 0x09 0x01 # core
ssmset 0x06 0x0f # chip, out
NOT OK
ssmset 0x06 0x07 # chip, out, dac
NOT OK
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
sound/soc/codecs/ssm2602.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 00b60369b029..c29324403e9d 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -53,6 +53,18 @@ static const struct reg_default ssm2602_reg[SSM2602_CACHEREGNUM] = {
{ .reg = 0x09, .def = 0x0000 }
};
+/*
+ * ssm2602 register patch
+ * Workaround for playback distortions after power up: activates digital
+ * core, and then powers on output, DAC, and whole chip at the same time
+ */
+
+static const struct reg_sequence ssm2602_patch[] = {
+ { SSM2602_ACTIVE, 0x01 },
+ { SSM2602_PWR, 0x07 },
+ { SSM2602_RESET, 0x00 },
+};
+
/*Appending several "None"s just for OSS mixer use*/
static const char *ssm2602_input_select[] = {
@@ -598,6 +610,9 @@ static int ssm260x_component_probe(struct snd_soc_component *component)
return ret;
}
+ regmap_register_patch(ssm2602->regmap, ssm2602_patch,
+ ARRAY_SIZE(ssm2602_patch));
+
/* set the update bits */
regmap_update_bits(ssm2602->regmap, SSM2602_LINVOL,
LINVOL_LRIN_BOTH, LINVOL_LRIN_BOTH);
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: (subset) [PATCH v2 0/7] Add Chameleon v3 ASoC audio
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
` (6 preceding siblings ...)
2023-05-08 11:30 ` [PATCH v2 7/7] ASoC: ssm2602: Add workaround for playback distortions Paweł Anikiel
@ 2023-05-12 4:19 ` Mark Brown
2023-05-18 22:29 ` Mark Brown
8 siblings, 0 replies; 17+ messages in thread
From: Mark Brown @ 2023-05-12 4:19 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood,
Paweł Anikiel
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan
On Mon, 08 May 2023 13:30:30 +0200, Paweł Anikiel wrote:
> The Google Chameleon v3 is a device made for testing audio and video
> paths of other devices. This patchset adds support for ASoC audio on
> this device. It has two audio sources: HDMI audio from the it68051 chip
> (RX only), and analog audio from the ssm2603 chip (RX and TX).
>
> The patchset adds the ASoC platform and codec drivers, as well as some
> changes to the existing ssm2602 codec driver.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[7/7] ASoC: ssm2602: Add workaround for playback distortions
commit: f63550e2b165208a2f382afcaf5551df9569e1d4
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: (subset) [PATCH v2 0/7] Add Chameleon v3 ASoC audio
2023-05-08 11:30 [PATCH v2 0/7] Add Chameleon v3 ASoC audio Paweł Anikiel
` (7 preceding siblings ...)
2023-05-12 4:19 ` (subset) [PATCH v2 0/7] Add Chameleon v3 ASoC audio Mark Brown
@ 2023-05-18 22:29 ` Mark Brown
8 siblings, 0 replies; 17+ messages in thread
From: Mark Brown @ 2023-05-18 22:29 UTC (permalink / raw)
To: alsa-devel, devicetree, linux-kernel, lgirdwood,
Paweł Anikiel
Cc: perex, tiwai, robh+dt, krzysztof.kozlowski+dt, dinguyen, lars,
nuno.sa, upstream, amstan
On Mon, 08 May 2023 13:30:30 +0200, Paweł Anikiel wrote:
> The Google Chameleon v3 is a device made for testing audio and video
> paths of other devices. This patchset adds support for ASoC audio on
> this device. It has two audio sources: HDMI audio from the it68051 chip
> (RX only), and analog audio from the ssm2603 chip (RX and TX).
>
> The patchset adds the ASoC platform and codec drivers, as well as some
> changes to the existing ssm2602 codec driver.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/7] ASoC: Add Google Chameleon v3 i2s driver
commit: 702648721db590b3425c31ade294000e18808345
[2/7] ASoC: Add Google Chameleon v3 codec driver
commit: 61ed303496eb7e18491ee617dec2403f75d5168c
[3/7] ASoC: dt-bindings: Add Google Chameleon v3 i2s device
commit: 6f2c1e7c2546f9eab0031843fb7346e49ba69102
[4/7] ASoC: dt-bindings: Add Google Chameleon v3 audio codec
commit: 580bac2a2c6f7d106be6d0ee0f0f310be49368b3
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 17+ messages in thread