Skip to contentSkip to conversation

Add H6 I2S support

PATCH In review Clément Péron 6 participants 35 messages Apr 26, 2020 – Sep 20, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v3 cover Add H6 I2S support

Hi,

This is a sequel of Marcus Cooper serie[0], where remarks made by Maxime have been fixed.

I have tested it on my Beelink GS1 board.

Thanks,
Clement

0: https://lore.kernel.org/patchwork/cover/1139949/

Changes since v2 (thanks Maxime):
- Add details in commit log about sign extend sample
- Only set FIFO regs as volatile in regmap
- Missing a space (detected by checkpatch)

Changes since v1:
- Fix missing header in set sign extend sample

Jernej Skrabec (3):
dt-bindings: ASoC: sun4i-i2s: Add H6 compatible
ASoC: sun4i-i2s: Add support for H6 I2S
arm64: dts: sun50i-h6: Add HDMI audio to H6 DTSI

Marcus Cooper (4):
ASoC: sun4i-i2s: Adjust LRCLK width
ASoC: sun4i-i2s: Set sign extend sample
ASoc: sun4i-i2s: Add 20 and 24 bit support
ASoC: sun4i-i2s: Adjust regmap settings

 .../sound/allwinner,sun4i-a10-i2s.yaml        |   2 +
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi  |  31 ++
 sound/soc/sunxi/sun4i-i2s.c                   | 265 +++++++++++++++++-
 3 files changed, 296 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 1/7 ASoC: sun4i-i2s: Adjust LRCLK width

From: Marcus Cooper <[email protected]>

Some codecs such as i2s based HDMI audio and the Pine64 DAC require a different amount of bit clocks per frame than what is calculated by the sample width. Use the values obtained by the tdm slot bindings to adjust the LRCLK width accordingly.

---
 sound/soc/sunxi/sun4i-i2s.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +3 -0
index d0a8d5810c0a..4198a5410bf9 100644
@@ -455,6 +455,9 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 		return -EINVAL;
 	}
 
+	if (i2s->slot_width)
+		lrck_period = i2s->slot_width;
+
 	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG,
 			   SUN8I_I2S_FMT0_LRCK_PERIOD_MASK,
 			   SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period));
Signature · 1 line
2.20.1
#6 lore raw

PATCH v3 3/7 ASoC: sun4i-i2s: Add support for H6 I2S

In reply to Clément Péron

From: Jernej Skrabec <[email protected]>

H6 I2S is very similar to that in H3, except it supports up to 16 channels.

---
 sound/soc/sunxi/sun4i-i2s.c | 227 ++++++++++++++++++++++++++++++++++++
 1 file changed, 227 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +227 -0
index 4198a5410bf9..a23c9f2a3f8c 100644
@@ -124,6 +124,21 @@
 #define SUN8I_I2S_RX_CHAN_SEL_REG	0x54
 #define SUN8I_I2S_RX_CHAN_MAP_REG	0x58
 
+/* Defines required for sun50i-h6 support */
+#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK	GENMASK(21, 20)
+#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset)	((offset) << 20)
+#define SUN50I_H6_I2S_TX_CHAN_SEL_MASK		GENMASK(19, 16)
+#define SUN50I_H6_I2S_TX_CHAN_SEL(chan)		((chan - 1) << 16)
+#define SUN50I_H6_I2S_TX_CHAN_EN_MASK		GENMASK(15, 0)
+#define SUN50I_H6_I2S_TX_CHAN_EN(num_chan)	(((1 << num_chan) - 1))
+
+#define SUN50I_H6_I2S_TX_CHAN_MAP0_REG	0x44
+#define SUN50I_H6_I2S_TX_CHAN_MAP1_REG	0x48
+
+#define SUN50I_H6_I2S_RX_CHAN_SEL_REG	0x64
+#define SUN50I_H6_I2S_RX_CHAN_MAP0_REG	0x68
+#define SUN50I_H6_I2S_RX_CHAN_MAP1_REG	0x6C
+
 struct sun4i_i2s;
 
 /**
@@ -469,6 +484,65 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 	return 0;
 }
 
+static int sun50i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
+				   const struct snd_pcm_hw_params *params)
+{
+	unsigned int channels = params_channels(params);
+	unsigned int slots = channels;
+	unsigned int lrck_period;
+
+	if (i2s->slots)
+		slots = i2s->slots;
+
+	/* Map the channels for playback and capture */
+	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210);
+	regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210);
+
+	/* Configure the channels */
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_SEL(channels));
+	regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_SEL(channels));
+
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG,
+			   SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK,
+			   SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(channels));
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG,
+			   SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK,
+			   SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(channels));
+
+	switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case SND_SOC_DAIFMT_DSP_A:
+	case SND_SOC_DAIFMT_DSP_B:
+	case SND_SOC_DAIFMT_LEFT_J:
+	case SND_SOC_DAIFMT_RIGHT_J:
+		lrck_period = params_physical_width(params) * slots;
+		break;
+
+	case SND_SOC_DAIFMT_I2S:
+		lrck_period = params_physical_width(params);
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	if (i2s->slot_width)
+		lrck_period = i2s->slot_width;
+
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG,
+			   SUN8I_I2S_FMT0_LRCK_PERIOD_MASK,
+			   SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period));
+
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_EN_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_EN(channels));
+
+	return 0;
+}
+
 static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
 			       struct snd_pcm_hw_params *params,
 			       struct snd_soc_dai *dai)
@@ -694,6 +768,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 	return 0;
 }
 
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+				 unsigned int fmt)
+{
+	u32 mode, val;
+	u8 offset;
+
+	/*
+	 * DAI clock polarity
+	 *
+	 * The setup for LRCK contradicts the datasheet, but under a
+	 * scope it's clear that the LRCK polarity is reversed
+	 * compared to the expected polarity on the bus.
+	 */
+	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+	case SND_SOC_DAIFMT_IB_IF:
+		/* Invert both clocks */
+		val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED;
+		break;
+	case SND_SOC_DAIFMT_IB_NF:
+		/* Invert bit clock */
+		val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED |
+		      SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED;
+		break;
+	case SND_SOC_DAIFMT_NB_IF:
+		/* Invert frame clock */
+		val = 0;
+		break;
+	case SND_SOC_DAIFMT_NB_NF:
+		val = SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG,
+			   SUN8I_I2S_FMT0_LRCLK_POLARITY_MASK |
+			   SUN8I_I2S_FMT0_BCLK_POLARITY_MASK,
+			   val);
+
+	/* DAI Mode */
+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case SND_SOC_DAIFMT_DSP_A:
+		mode = SUN8I_I2S_CTRL_MODE_PCM;
+		offset = 1;
+		break;
+
+	case SND_SOC_DAIFMT_DSP_B:
+		mode = SUN8I_I2S_CTRL_MODE_PCM;
+		offset = 0;
+		break;
+
+	case SND_SOC_DAIFMT_I2S:
+		mode = SUN8I_I2S_CTRL_MODE_LEFT;
+		offset = 1;
+		break;
+
+	case SND_SOC_DAIFMT_LEFT_J:
+		mode = SUN8I_I2S_CTRL_MODE_LEFT;
+		offset = 0;
+		break;
+
+	case SND_SOC_DAIFMT_RIGHT_J:
+		mode = SUN8I_I2S_CTRL_MODE_RIGHT;
+		offset = 0;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
+			   SUN8I_I2S_CTRL_MODE_MASK, mode);
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset));
+	regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset));
+
+	/* DAI clock master masks */
+	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+	case SND_SOC_DAIFMT_CBS_CFS:
+		/* BCLK and LRCLK master */
+		val = SUN8I_I2S_CTRL_BCLK_OUT |	SUN8I_I2S_CTRL_LRCK_OUT;
+		break;
+
+	case SND_SOC_DAIFMT_CBM_CFM:
+		/* BCLK and LRCLK slave */
+		val = 0;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
+			   SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT,
+			   val);
+
+	return 0;
+}
+
 static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
 	struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
@@ -974,6 +1150,22 @@ static const struct reg_default sun8i_i2s_reg_defaults[] = {
 	{ SUN8I_I2S_RX_CHAN_MAP_REG, 0x00000000 },
 };
 
+static const struct reg_default sun50i_i2s_reg_defaults[] = {
+	{ SUN4I_I2S_CTRL_REG, 0x00060000 },
+	{ SUN4I_I2S_FMT0_REG, 0x00000033 },
+	{ SUN4I_I2S_FMT1_REG, 0x00000030 },
+	{ SUN4I_I2S_FIFO_CTRL_REG, 0x000400f0 },
+	{ SUN4I_I2S_DMA_INT_CTRL_REG, 0x00000000 },
+	{ SUN4I_I2S_CLK_DIV_REG, 0x00000000 },
+	{ SUN8I_I2S_CHAN_CFG_REG, 0x00000000 },
+	{ SUN8I_I2S_TX_CHAN_SEL_REG, 0x00000000 },
+	{ SUN50I_H6_I2S_TX_CHAN_MAP0_REG, 0x00000000 },
+	{ SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x00000000 },
+	{ SUN50I_H6_I2S_RX_CHAN_SEL_REG, 0x00000000 },
+	{ SUN50I_H6_I2S_RX_CHAN_MAP0_REG, 0x00000000 },
+	{ SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x00000000 },
+};
+
 static const struct regmap_config sun4i_i2s_regmap_config = {
 	.reg_bits	= 32,
 	.reg_stride	= 4,
@@ -1001,6 +1193,19 @@ static const struct regmap_config sun8i_i2s_regmap_config = {
 	.volatile_reg	= sun8i_i2s_volatile_reg,
 };
 
+static const struct regmap_config sun50i_i2s_regmap_config = {
+	.reg_bits	= 32,
+	.reg_stride	= 4,
+	.val_bits	= 32,
+	.max_register	= SUN50I_H6_I2S_RX_CHAN_MAP1_REG,
+	.cache_type	= REGCACHE_FLAT,
+	.reg_defaults	= sun50i_i2s_reg_defaults,
+	.num_reg_defaults	= ARRAY_SIZE(sun50i_i2s_reg_defaults),
+	.writeable_reg	= sun4i_i2s_wr_reg,
+	.readable_reg	= sun8i_i2s_rd_reg,
+	.volatile_reg	= sun8i_i2s_volatile_reg,
+};
+
 static int sun4i_i2s_runtime_resume(struct device *dev)
 {
 	struct sun4i_i2s *i2s = dev_get_drvdata(dev);
@@ -1159,6 +1364,24 @@ static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {
 	.set_fmt		= sun4i_i2s_set_soc_fmt,
 };
 
+static const struct sun4i_i2s_quirks sun50i_h6_i2s_quirks = {
+	.has_reset		= true,
+	.reg_offset_txdata	= SUN8I_I2S_FIFO_TX_REG,
+	.sun4i_i2s_regmap	= &sun50i_i2s_regmap_config,
+	.field_clkdiv_mclk_en	= REG_FIELD(SUN4I_I2S_CLK_DIV_REG, 8, 8),
+	.field_fmt_wss		= REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 2),
+	.field_fmt_sr		= REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 6),
+	.bclk_dividers		= sun8i_i2s_clk_div,
+	.num_bclk_dividers	= ARRAY_SIZE(sun8i_i2s_clk_div),
+	.mclk_dividers		= sun8i_i2s_clk_div,
+	.num_mclk_dividers	= ARRAY_SIZE(sun8i_i2s_clk_div),
+	.get_bclk_parent_rate	= sun8i_i2s_get_bclk_parent_rate,
+	.get_sr			= sun8i_i2s_get_sr_wss,
+	.get_wss		= sun8i_i2s_get_sr_wss,
+	.set_chan_cfg		= sun50i_i2s_set_chan_cfg,
+	.set_fmt		= sun50i_i2s_set_soc_fmt,
+};
+
 static int sun4i_i2s_init_regmap_fields(struct device *dev,
 					struct sun4i_i2s *i2s)
 {
@@ -1328,6 +1551,10 @@ static const struct of_device_id sun4i_i2s_match[] = {
 		.compatible = "allwinner,sun50i-a64-codec-i2s",
 		.data = &sun50i_a64_codec_i2s_quirks,
 	},
+	{
+		.compatible = "allwinner,sun50i-h6-i2s",
+		.data = &sun50i_h6_i2s_quirks,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, sun4i_i2s_match);
Signature · 1 line
2.20.1
#26 lore raw

PATCH v3 4/7 ASoC: sun4i-i2s: Set sign extend sample

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

On the newer SoCs such as the H3 and A64 this is set by default to transfer a 0 after each sample in each slot. However the A10 and A20 SoCs that this driver was developed on had a default setting where it padded the audio gain with zeros.

This isn't a problem while we have only support for 16bit audio but with larger sample resolution rates in the pipeline then SEXT bits should be cleared so that they also pad at the LSB. Without this the audio gets distorted.

Set sign extend sample for all the sunxi generations even if they are not affected. This will keep coherency and avoid relying on default.

---
 sound/soc/sunxi/sun4i-i2s.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +22 -0
index a23c9f2a3f8c..8ea08b49e7fe 100644
@@ -48,6 +48,9 @@
 #define SUN4I_I2S_FMT0_FMT_I2S				(0 << 0)
 
 #define SUN4I_I2S_FMT1_REG		0x08
+#define SUN4I_I2S_FMT1_REG_SEXT_MASK		BIT(8)
+#define SUN4I_I2S_FMT1_REG_SEXT(sext)			((sext) << 8)
+
 #define SUN4I_I2S_FIFO_TX_REG		0x0c
 #define SUN4I_I2S_FIFO_RX_REG		0x10
 
@@ -105,6 +108,9 @@
 #define SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED		(1 << 7)
 #define SUN8I_I2S_FMT0_BCLK_POLARITY_NORMAL		(0 << 7)
 
+#define SUN8I_I2S_FMT1_REG_SEXT_MASK		GENMASK(5, 4)
+#define SUN8I_I2S_FMT1_REG_SEXT(sext)			((sext) << 4)
+
 #define SUN8I_I2S_INT_STA_REG		0x0c
 #define SUN8I_I2S_FIFO_TX_REG		0x20
 
@@ -663,6 +669,12 @@ static int sun4i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 	}
 	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
 			   SUN4I_I2S_CTRL_MODE_MASK, val);
+
+	/* Set sign extension to pad out LSB with 0 */
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT1_REG,
+			   SUN4I_I2S_FMT1_REG_SEXT_MASK,
+			   SUN4I_I2S_FMT1_REG_SEXT(0));
+
 	return 0;
 }
 
@@ -765,6 +777,11 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 			   SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT,
 			   val);
 
+	/* Set sign extension to pad out LSB with 0 */
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT1_REG,
+			   SUN8I_I2S_FMT1_REG_SEXT_MASK,
+			   SUN8I_I2S_FMT1_REG_SEXT(0));
+
 	return 0;
 }
 
@@ -867,6 +884,11 @@ static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 			   SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT,
 			   val);
 
+	/* Set sign extension to pad out LSB with 0 */
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT1_REG,
+			   SUN8I_I2S_FMT1_REG_SEXT_MASK,
+			   SUN8I_I2S_FMT1_REG_SEXT(0));
+
 	return 0;
 }
 
Signature · 1 line
2.20.1
#31 lore raw

PATCH v3 7/7 arm64: dts: sun50i-h6: Add HDMI audio to H6 DTSI

In reply to Clément Péron

From: Jernej Skrabec <[email protected]>

Add a simple-soundcard to link audio between HDMI and I2S.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +31 -0
index a5ee68388bd3..558fe63739cb 100644
@@ -88,6 +88,24 @@
 			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	sound_hdmi: sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "allwinner-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s1>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -581,6 +599,18 @@
 			};
 		};
 
+		i2s1: i2s@5091000 {
+			#sound-dai-cells = <0>;
+			compatible = "allwinner,sun50i-h6-i2s";
+			reg = <0x05091000 0x1000>;
+			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>;
+			clock-names = "apb", "mod";
+			dmas = <&dma 4>, <&dma 4>;
+			resets = <&ccu RST_BUS_I2S1>;
+			dma-names = "rx", "tx";
+		};
+
 		spdif: spdif@5093000 {
 			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-h6-spdif";
@@ -711,6 +741,7 @@
 		};
 
 		hdmi: hdmi@6000000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-h6-dw-hdmi";
 			reg = <0x06000000 0x10000>;
 			reg-io-width = <1>;
Signature · 1 line
2.20.1
#27 lore raw

PATCH v3 5/7 ASoc: sun4i-i2s: Add 20 and 24 bit support

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

Extend the functionality of the driver to include support of 20 and 24 bits per sample.

---
 sound/soc/sunxi/sun4i-i2s.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +9 -2
index 8ea08b49e7fe..277bf566c154 100644
@@ -577,6 +577,9 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
 	case 16:
 		width = DMA_SLAVE_BUSWIDTH_2_BYTES;
 		break;
+	case 32:
+		width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+		break;
 	default:
 		dev_err(dai->dev, "Unsupported physical sample width: %d\n",
 			params_physical_width(params));
@@ -1063,6 +1066,10 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
 	return 0;
 }
 
+#define SUN4I_FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | \
+			 SNDRV_PCM_FMTBIT_S20_LE | \
+			 SNDRV_PCM_FMTBIT_S24_LE)
+
 static struct snd_soc_dai_driver sun4i_i2s_dai = {
 	.probe = sun4i_i2s_dai_probe,
 	.capture = {
@@ -1070,14 +1077,14 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = {
 		.channels_min = 1,
 		.channels_max = 8,
 		.rates = SNDRV_PCM_RATE_8000_192000,
-		.formats = SNDRV_PCM_FMTBIT_S16_LE,
+		.formats = SUN4I_FORMATS,
 	},
 	.playback = {
 		.stream_name = "Playback",
 		.channels_min = 1,
 		.channels_max = 8,
 		.rates = SNDRV_PCM_RATE_8000_192000,
-		.formats = SNDRV_PCM_FMTBIT_S16_LE,
+		.formats = SUN4I_FORMATS,
 	},
 	.ops = &sun4i_i2s_dai_ops,
 	.symmetric_rates = 1,
Signature · 1 line
2.20.1
#28 lore raw

PATCH v3 6/7 ASoC: sun4i-i2s: Adjust regmap settings

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

Bypass the regmap cache when flushing or reading the i2s FIFOs.

---
 sound/soc/sunxi/sun4i-i2s.c | 2 ++
 1 file changed, 2 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +2 -0
index 277bf566c154..b5ab25483a9b 100644
@@ -1121,6 +1121,8 @@ static bool sun4i_i2s_volatile_reg(struct device *dev, unsigned int reg)
 {
 	switch (reg) {
 	case SUN4I_I2S_FIFO_RX_REG:
+	case SUN4I_I2S_FIFO_TX_REG:
+	case SUN4I_I2S_FIFO_STA_REG:
 	case SUN4I_I2S_INT_STA_REG:
 	case SUN4I_I2S_RX_CNT_REG:
 	case SUN4I_I2S_TX_CNT_REG:
Signature · 1 line
2.20.1
#3 lore raw

PATCH v3 2/7 dt-bindings: ASoC: sun4i-i2s: Add H6 compatible

In reply to Clément Péron

From: Jernej Skrabec <[email protected]>

H6 I2S is very similar to H3, except that it supports up to 16 channels and thus few registers have fields on different position.

---
 .../devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml      | 2 ++
 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml +2 -0
index 112ae00d63c1..606ad2d884a8 100644
@@ -24,6 +24,7 @@ properties:
       - items:
           - const: allwinner,sun50i-a64-i2s
           - const: allwinner,sun8i-h3-i2s
+      - const: allwinner,sun50i-h6-i2s
 
   reg:
     maxItems: 1
@@ -59,6 +60,7 @@ allOf:
               - allwinner,sun8i-a83t-i2s
               - allwinner,sun8i-h3-i2s
               - allwinner,sun50i-a64-codec-i2s
+              - allwinner,sun50i-h6-i2s
 
     then:
       required:
Signature · 7 lines
2.20.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#32 lore raw

Re: [PATCH v3 7/7] arm64: dts: sun50i-h6: Add HDMI audio to H6 DTSI

In reply to Clément Péron

Hi,

Quoted 17 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

Add a simple-soundcard to link audio between HDMI and I2S.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0
index a5ee68388bd3..558fe63739cb 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi line 91

Quoted 4 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -0
@@ -88,6 +88,24 @@
                        (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
        };
 
+       sound_hdmi: sound {

I will rename this to
hdmi_sound: hdmi-sound {

in the next version

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi line 96

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
+               compatible = "simple-audio-card";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,name = "allwinner-hdmi";
+               simple-audio-card,mclk-fs = <128>;
+               simple-audio-card,frame-inversion;

And I will add a status="disabled" here as not all board have an hdmi connector

Regards,
Clement

Quoted 45 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +25 -1
+
+               simple-audio-card,codec {
+                       sound-dai = <&hdmi>;
+               };
+
+               simple-audio-card,cpu {
+                       sound-dai = <&i2s1>;
+                       dai-tdm-slot-num = <2>;
+                       dai-tdm-slot-width = <32>;
+               };
+       };
+
        soc {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -581,6 +599,18 @@
                        };
                };
 
+               i2s1: i2s@5091000 {
+                       #sound-dai-cells = <0>;
+                       compatible = "allwinner,sun50i-h6-i2s";
+                       reg = <0x05091000 0x1000>;
+                       interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>;
+                       clock-names = "apb", "mod";
+                       dmas = <&dma 4>, <&dma 4>;
+                       resets = <&ccu RST_BUS_I2S1>;
+                       dma-names = "rx", "tx";
+               };
+
                spdif: spdif@5093000 {
                        #sound-dai-cells = <0>;
                        compatible = "allwinner,sun50i-h6-spdif";
@@ -711,6 +741,7 @@
                };
 
                hdmi: hdmi@6000000 {
+                       #sound-dai-cells = <0>;
                        compatible = "allwinner,sun50i-h6-dw-hdmi";
                        reg = <0x06000000 0x10000>;
                        reg-io-width = <1>;
--

2.20.1

Acked-by on v3 1/7
#2 lore raw

Re: [PATCH v3 1/7] ASoC: sun4i-i2s: Adjust LRCLK width

In reply to Clément Péron
Quoted 18 lines · Clément Péron

From: Marcus Cooper <[email protected]>

Some codecs such as i2s based HDMI audio and the Pine64 DAC require a different amount of bit clocks per frame than what is calculated by the sample width. Use the values obtained by the tdm slot bindings to adjust the LRCLK width accordingly.

---
 sound/soc/sunxi/sun4i-i2s.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +0 -0
index d0a8d5810c0a..4198a5410bf9 100644

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, · line 460

Quoted 6 lines
sound/soc/sunxi/sun4i-i2s.c +3 -0
@@ -455,6 +455,9 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 		return -EINVAL;
 	}
 
+	if (i2s->slot_width)
+		lrck_period = i2s->slot_width;
+

Thanks!
Maxime

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Acked-by on v3 2/7
#4 lore raw

Re: [PATCH v3 2/7] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible

In reply to Clément Péron
Quoted 8 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

H6 I2S is very similar to H3, except that it supports up to 16 channels and thus few registers have fields on different position.

Thanks!
Maxime

#7 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

In reply to Clément Péron

Hi,

Quoted 105 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

H6 I2S is very similar to that in H3, except it supports up to 16 channels.

---
 sound/soc/sunxi/sun4i-i2s.c | 227 ++++++++++++++++++++++++++++++++++++
 1 file changed, 227 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +74 -0
index 4198a5410bf9..a23c9f2a3f8c 100644
@@ -124,6 +124,21 @@
 #define SUN8I_I2S_RX_CHAN_SEL_REG	0x54
 #define SUN8I_I2S_RX_CHAN_MAP_REG	0x58
 
+/* Defines required for sun50i-h6 support */
+#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK	GENMASK(21, 20)
+#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset)	((offset) << 20)
+#define SUN50I_H6_I2S_TX_CHAN_SEL_MASK		GENMASK(19, 16)
+#define SUN50I_H6_I2S_TX_CHAN_SEL(chan)		((chan - 1) << 16)
+#define SUN50I_H6_I2S_TX_CHAN_EN_MASK		GENMASK(15, 0)
+#define SUN50I_H6_I2S_TX_CHAN_EN(num_chan)	(((1 << num_chan) - 1))
+
+#define SUN50I_H6_I2S_TX_CHAN_MAP0_REG	0x44
+#define SUN50I_H6_I2S_TX_CHAN_MAP1_REG	0x48
+
+#define SUN50I_H6_I2S_RX_CHAN_SEL_REG	0x64
+#define SUN50I_H6_I2S_RX_CHAN_MAP0_REG	0x68
+#define SUN50I_H6_I2S_RX_CHAN_MAP1_REG	0x6C
+
 struct sun4i_i2s;
 
 /**
@@ -469,6 +484,65 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 	return 0;
 }
 
+static int sun50i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
+				   const struct snd_pcm_hw_params *params)
+{
+	unsigned int channels = params_channels(params);
+	unsigned int slots = channels;
+	unsigned int lrck_period;
+
+	if (i2s->slots)
+		slots = i2s->slots;
+
+	/* Map the channels for playback and capture */
+	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210);
+	regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210);
+
+	/* Configure the channels */
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_SEL(channels));
+	regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_SEL(channels));
+
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG,
+			   SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK,
+			   SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(channels));
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG,
+			   SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK,
+			   SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(channels));
+
+	switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case SND_SOC_DAIFMT_DSP_A:
+	case SND_SOC_DAIFMT_DSP_B:
+	case SND_SOC_DAIFMT_LEFT_J:
+	case SND_SOC_DAIFMT_RIGHT_J:
+		lrck_period = params_physical_width(params) * slots;
+		break;
+
+	case SND_SOC_DAIFMT_I2S:
+		lrck_period = params_physical_width(params);
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	if (i2s->slot_width)
+		lrck_period = i2s->slot_width;
+
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG,
+			   SUN8I_I2S_FMT0_LRCK_PERIOD_MASK,
+			   SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period));
+
+	regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+			   SUN50I_H6_I2S_TX_CHAN_EN_MASK,
+			   SUN50I_H6_I2S_TX_CHAN_EN(channels));
+
+	return 0;
+}
+
 static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
 			       struct snd_pcm_hw_params *params,
 			       struct snd_soc_dai *dai)

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 772

Quoted 5 lines
sound/soc/sunxi/sun4i-i2s.c +2 -0
@@ -694,6 +768,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 	return 0;
 }
 
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+				 unsigned int fmt)

The alignment is off here

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 783

Quoted 11 lines
sound/soc/sunxi/sun4i-i2s.c +11 -0
+{
+	u32 mode, val;
+	u8 offset;
+
+	/*
+	 * DAI clock polarity
+	 *
+	 * The setup for LRCK contradicts the datasheet, but under a
+	 * scope it's clear that the LRCK polarity is reversed
+	 * compared to the expected polarity on the bus.
+	 */

Did you check this or has it been copy-pasted?

Thanks!
Maxime

#33 lore raw

Re: [PATCH v3 7/7] arm64: dts: sun50i-h6: Add HDMI audio to H6 DTSI

In reply to Clément Péron
Quoted 16 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

Add a simple-soundcard to link audio between HDMI and I2S.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0
index a5ee68388bd3..558fe63739cb 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi line 94

Quoted 7 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +4 -0
@@ -88,6 +88,24 @@
 			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	sound_hdmi: sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "allwinner-hdmi";

It doesn't seem to be on purpose, but the name is different from the other series you sent.

Maxime

#8 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

In reply to Maxime Ripard

Hi Maxime,

Quoted 117 lines · Maxime Ripard

Hi,

Quoted 105 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

H6 I2S is very similar to that in H3, except it supports up to 16 channels.

---
 sound/soc/sunxi/sun4i-i2s.c | 227 ++++++++++++++++++++++++++++++++++++
 1 file changed, 227 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +74 -0
index 4198a5410bf9..a23c9f2a3f8c 100644
@@ -124,6 +124,21 @@
 #define SUN8I_I2S_RX_CHAN_SEL_REG    0x54
 #define SUN8I_I2S_RX_CHAN_MAP_REG    0x58
 
+/* Defines required for sun50i-h6 support */
+#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK        GENMASK(21, 20)
+#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset)     ((offset) << 20)
+#define SUN50I_H6_I2S_TX_CHAN_SEL_MASK               GENMASK(19, 16)
+#define SUN50I_H6_I2S_TX_CHAN_SEL(chan)              ((chan - 1) << 16)
+#define SUN50I_H6_I2S_TX_CHAN_EN_MASK                GENMASK(15, 0)
+#define SUN50I_H6_I2S_TX_CHAN_EN(num_chan)   (((1 << num_chan) - 1))
+
+#define SUN50I_H6_I2S_TX_CHAN_MAP0_REG       0x44
+#define SUN50I_H6_I2S_TX_CHAN_MAP1_REG       0x48
+
+#define SUN50I_H6_I2S_RX_CHAN_SEL_REG        0x64
+#define SUN50I_H6_I2S_RX_CHAN_MAP0_REG       0x68
+#define SUN50I_H6_I2S_RX_CHAN_MAP1_REG       0x6C
+
 struct sun4i_i2s;
 
 /**
@@ -469,6 +484,65 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
      return 0;
 }
 
+static int sun50i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
+                                const struct snd_pcm_hw_params *params)
+{
+     unsigned int channels = params_channels(params);
+     unsigned int slots = channels;
+     unsigned int lrck_period;
+
+     if (i2s->slots)
+             slots = i2s->slots;
+
+     /* Map the channels for playback and capture */
+     regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210);
+     regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210);
+
+     /* Configure the channels */
+     regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+                        SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
+                        SUN50I_H6_I2S_TX_CHAN_SEL(channels));
+     regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_SEL_REG,
+                        SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
+                        SUN50I_H6_I2S_TX_CHAN_SEL(channels));
+
+     regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG,
+                        SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK,
+                        SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(channels));
+     regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG,
+                        SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK,
+                        SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(channels));
+
+     switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) {
+     case SND_SOC_DAIFMT_DSP_A:
+     case SND_SOC_DAIFMT_DSP_B:
+     case SND_SOC_DAIFMT_LEFT_J:
+     case SND_SOC_DAIFMT_RIGHT_J:
+             lrck_period = params_physical_width(params) * slots;
+             break;
+
+     case SND_SOC_DAIFMT_I2S:
+             lrck_period = params_physical_width(params);
+             break;
+
+     default:
+             return -EINVAL;
+     }
+
+     if (i2s->slot_width)
+             lrck_period = i2s->slot_width;
+
+     regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG,
+                        SUN8I_I2S_FMT0_LRCK_PERIOD_MASK,
+                        SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period));
+
+     regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+                        SUN50I_H6_I2S_TX_CHAN_EN_MASK,
+                        SUN50I_H6_I2S_TX_CHAN_EN(channels));
+
+     return 0;
+}
+
 static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
                             struct snd_pcm_hw_params *params,
                             struct snd_soc_dai *dai)

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 772

Quoted 5 lines
sound/soc/sunxi/sun4i-i2s.c +2 -0
@@ -694,6 +768,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
      return 0;
 }
 
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+                              unsigned int fmt)

The alignment is off here

Quoted 13 lines

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 783

Quoted 11 lines
sound/soc/sunxi/sun4i-i2s.c +11 -0
+{
+     u32 mode, val;
+     u8 offset;
+
+     /*
+      * DAI clock polarity
+      *
+      * The setup for LRCK contradicts the datasheet, but under a
+      * scope it's clear that the LRCK polarity is reversed
+      * compared to the expected polarity on the bus.
+      */

Did you check this or has it been copy-pasted?

copy-pasted, I will check this.

Thanks,
Clement

Quoted 3 lines

Thanks!
Maxime

#34 lore raw

Re: [PATCH v3 7/7] arm64: dts: sun50i-h6: Add HDMI audio to H6 DTSI

In reply to Maxime Ripard

Hi Maxime,

Quoted 21 lines · Maxime Ripard
Quoted 19 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

Add a simple-soundcard to link audio between HDMI and I2S.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0
index a5ee68388bd3..558fe63739cb 100644
@@ -88,6 +88,24 @@
                      (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
      };
 
Quoted 7 lines

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi line 94

Quoted 4 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +4 -0
+     sound_hdmi: sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "allwinner-hdmi";

It doesn't seem to be on purpose, but the name is different from the other series you sent.

Indeed, I have sent this serie before looking at the other.

I will change this to keep coherency, once we agree on the correct card name.

Thanks for the review,
Clement

Quoted 2 lines

Maxime

#9 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

In reply to Clément Péron
Quoted 19 lines · Clément Péron
Quoted 5 lines

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 772

Quoted 2 lines
sound/soc/sunxi/sun4i-i2s.c +2 -0
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+                              unsigned int fmt)

The alignment is off here

Quoted 13 lines

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 783

Quoted 11 lines
sound/soc/sunxi/sun4i-i2s.c +11 -0
+{
+     u32 mode, val;
+     u8 offset;
+
+     /*
+      * DAI clock polarity
+      *
+      * The setup for LRCK contradicts the datasheet, but under a
+      * scope it's clear that the LRCK polarity is reversed
+      * compared to the expected polarity on the bus.
+      */

Did you check this or has it been copy-pasted?

Quoted 1 line

copy-pasted, I will check this.

It's not going to be easy to do this if you only have a board with HDMI. If you can't test that easily, just remove the comment (or make it explicit that you copy pasted it?), no comment is better than a wrong one.

Maxime

#10 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Maxime,

Quoted 21 lines · Maxime Ripard
Quoted 19 lines · Clément Péron
Quoted 18 lines

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 772

Quoted 2 lines
sound/soc/sunxi/sun4i-i2s.c +2 -0
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+                              unsigned int fmt)

The alignment is off here

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 783

Quoted 11 lines
sound/soc/sunxi/sun4i-i2s.c +11 -0
+{
+     u32 mode, val;
+     u8 offset;
+
+     /*
+      * DAI clock polarity
+      *
+      * The setup for LRCK contradicts the datasheet, but under a
+      * scope it's clear that the LRCK polarity is reversed
+      * compared to the expected polarity on the bus.
+      */

Did you check this or has it been copy-pasted?

Quoted 5 lines
Quoted 1 line

copy-pasted, I will check this.

It's not going to be easy to do this if you only have a board with HDMI. If you can't test that easily, just remove the comment (or make it explicit that you copy pasted it?), no comment is better than a wrong one.

I have talked with Marcus Cooper it may be able to test this this week-end. Also this can explain why we need the " simple-audio-card,frame-inversion;" in the device-tree.

If think this fix has been introduced by you, correct? Could you say on which SoC did you see this issue?

Thanks
Clement

Quoted 2 lines

Maxime

#11 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi,

Quoted 28 lines · Clément Péron
Quoted 21 lines · Maxime Ripard
Quoted 19 lines · Clément Péron
Quoted 18 lines

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 772

Quoted 2 lines
sound/soc/sunxi/sun4i-i2s.c +2 -0
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+                              unsigned int fmt)

The alignment is off here

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 783

Quoted 11 lines
sound/soc/sunxi/sun4i-i2s.c +11 -0
+{
+     u32 mode, val;
+     u8 offset;
+
+     /*
+      * DAI clock polarity
+      *
+      * The setup for LRCK contradicts the datasheet, but under a
+      * scope it's clear that the LRCK polarity is reversed
+      * compared to the expected polarity on the bus.
+      */

Did you check this or has it been copy-pasted?

Quoted 5 lines
Quoted 1 line

copy-pasted, I will check this.

It's not going to be easy to do this if you only have a board with HDMI. If you can't test that easily, just remove the comment (or make it explicit that you copy pasted it?), no comment is better than a wrong one.

Quoted 6 lines

I have talked with Marcus Cooper it may be able to test this this week-end. Also this can explain why we need the " simple-audio-card,frame-inversion;" in the device-tree.

If think this fix has been introduced by you, correct? Could you say on which SoC did you see this issue?

This was seen on an H3

Maxime

#12 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Maxime,

Quoted 32 lines · Maxime Ripard

Hi,

Quoted 28 lines · Clément Péron
Quoted 26 lines · Maxime Ripard
Quoted 19 lines · Clément Péron
Quoted 5 lines

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 772

Quoted 2 lines
sound/soc/sunxi/sun4i-i2s.c +2 -0
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+                              unsigned int fmt)

The alignment is off here

Quoted 13 lines

sound/soc/sunxi/sun4i-i2s.c static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, · line 783

Quoted 11 lines
sound/soc/sunxi/sun4i-i2s.c +11 -0
+{
+     u32 mode, val;
+     u8 offset;
+
+     /*
+      * DAI clock polarity
+      *
+      * The setup for LRCK contradicts the datasheet, but under a
+      * scope it's clear that the LRCK polarity is reversed
+      * compared to the expected polarity on the bus.
+      */

Did you check this or has it been copy-pasted?

Quoted 1 line

copy-pasted, I will check this.

It's not going to be easy to do this if you only have a board with HDMI. If you can't test that easily, just remove the comment (or make it explicit that you copy pasted it?), no comment is better than a wrong one.

Quoted 8 lines
Quoted 6 lines

I have talked with Marcus Cooper it may be able to test this this week-end. Also this can explain why we need the " simple-audio-card,frame-inversion;" in the device-tree.

If think this fix has been introduced by you, correct? Could you say on which SoC did you see this issue?

This was seen on an H3

Just two more questions:
- Did you observe this issue on both TDM and I2S mode?
- On which DAI node?

Since recent change in sun4i-i2s.c, we had to introduce the "simple-audio-card,frame-inversion" in LibreElec tree.
H3 boards are quite common in LibreElec community so I think:
- This fix is only needed in TDM mode
- Or this fix is not required for the HDMI DAI node (HDMI DAI is a
little bit different compare to other DAI but I think the first guess is more likely)

Regards,
Clement

Quoted 2 lines

Maxime

#30 lore raw

Re: [PATCH v3 6/7] ASoC: sun4i-i2s: Adjust regmap settings

In reply to Chen-Yu Tsai

Hi,

Quoted 11 lines · Chen-Yu Tsai
Quoted 7 lines · Clément Péron

From: Marcus Cooper <[email protected]>

Bypass the regmap cache when flushing or reading the i2s FIFOs.

The SUN4I_I2S_FIFO_CTRL_REG is also missing.
As some bits can self-clear by themselves.

I will fix this in v4.

Regards,
Clement

#13 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

In reply to Clément Péron

Hi Clement,

Quoted 34 lines · Clément Péron
Quoted 33 lines · Maxime Ripard
Quoted 32 lines · Clément Péron
Quoted 21 lines · Maxime Ripard
Quoted 19 lines · Clément Péron
Quoted 18 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+                              unsigned int fmt)

The alignment is off here

Review

Quoted 11 lines
(quoted diff) +11 -0
+{
+     u32 mode, val;
+     u8 offset;
+
+     /*
+      * DAI clock polarity
+      *
+      * The setup for LRCK contradicts the datasheet, but under a
+      * scope it's clear that the LRCK polarity is reversed
+      * compared to the expected polarity on the bus.
+      */

Did you check this or has it been copy-pasted?

Quoted 5 lines
Quoted 1 line

copy-pasted, I will check this.

It's not going to be easy to do this if you only have a board with HDMI. If you can't test that easily, just remove the comment (or make it explicit that you copy pasted it?), no comment is better than a wrong one.

I have talked with Marcus Cooper it may be able to test this this week-end. Also this can explain why we need the " simple-audio-card,frame-inversion;" in the device-tree.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

If think this fix has been introduced by you, correct? Could you say on which SoC did you see this issue?

This was seen on an H3

Just two more questions:
- Did you observe this issue on both TDM and I2S mode?
- On which DAI node?

This is fairly fuzzy now and I don't remember if I tested it in I2S. Let's assume I didn't. And similarly, I'm not sure what the exact controller was, but it was one of the regular controllers (so not either connected to the codec or the HDMI, one that goes out of the SoC).

We had pretty much the same issue on the A33 in I2S for the codec though:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/sound/soc/sunxi/sun8i-codec.c?id=18c1bf35c1c09bca05cf70bc984a4764e0b0372b

I didn't think of it that way then, but it might very well have been the i2s controller suffering the same issue.

Quoted 2 lines

Since recent change in sun4i-i2s.c, we had to introduce the "simple-audio-card,frame-inversion" in LibreElec tree.

Do you have a link to that commit ? I couldn't find anything on libreelec's github repo.

Quoted 5 lines

H3 boards are quite common in LibreElec community so I think:
- This fix is only needed in TDM mode
- Or this fix is not required for the HDMI DAI node (HDMI DAI is a
little bit different compare to other DAI but I think the first guess is more likely)

Given what we know about the A33, I'd be inclined to say the latter. I'd don't have the tools to check anymore, but if you have even a cheap logical analyzer, i2s being pretty slow you can definitely see it.

Maxime

#14 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Maxime,

Quoted 55 lines · Maxime Ripard

Hi Clement,

Quoted 34 lines · Clément Péron
Quoted 33 lines · Maxime Ripard
Quoted 32 lines · Clément Péron
Quoted 21 lines · Maxime Ripard
Quoted 19 lines · Clément Péron
Quoted 18 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
+                              unsigned int fmt)

The alignment is off here

Review

Quoted 11 lines
(quoted diff) +11 -0
+{
+     u32 mode, val;
+     u8 offset;
+
+     /*
+      * DAI clock polarity
+      *
+      * The setup for LRCK contradicts the datasheet, but under a
+      * scope it's clear that the LRCK polarity is reversed
+      * compared to the expected polarity on the bus.
+      */

Did you check this or has it been copy-pasted?

Quoted 5 lines
Quoted 1 line

copy-pasted, I will check this.

It's not going to be easy to do this if you only have a board with HDMI. If you can't test that easily, just remove the comment (or make it explicit that you copy pasted it?), no comment is better than a wrong one.

I have talked with Marcus Cooper it may be able to test this this week-end. Also this can explain why we need the " simple-audio-card,frame-inversion;" in the device-tree.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

If think this fix has been introduced by you, correct? Could you say on which SoC did you see this issue?

This was seen on an H3

Just two more questions:
- Did you observe this issue on both TDM and I2S mode?
- On which DAI node?

This is fairly fuzzy now and I don't remember if I tested it in I2S. Let's assume I didn't. And similarly, I'm not sure what the exact controller was, but it was one of the regular controllers (so not either connected to the codec or the HDMI, one that goes out of the SoC).

We had pretty much the same issue on the A33 in I2S for the codec though:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/sound/soc/sunxi/sun8i-codec.c?id=18c1bf35c1c09bca05cf70bc984a4764e0b0372b

Quoted 8 lines

I didn't think of it that way then, but it might very well have been the i2s controller suffering the same issue.

Quoted 2 lines

Since recent change in sun4i-i2s.c, we had to introduce the "simple-audio-card,frame-inversion" in LibreElec tree.

Do you have a link to that commit ? I couldn't find anything on libreelec's github repo.

These commits:
https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Allwinner/devices/A64/patches/linux/04-Add-frame-inversion-to-correct-multi-channel-audio.patch
https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Allwinner/devices/H3/patches/linux/17-Add-frame-inversion-to-correct-multi-channel-audio.patch
https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Allwinner/devices/H6/patches/linux/16-Add-frame-inversion-to-correct-multi-channel-audio.patch

Quoted 10 lines
Quoted 6 lines

H3 boards are quite common in LibreElec community so I think:
- This fix is only needed in TDM mode
- Or this fix is not required for the HDMI DAI node (HDMI DAI is a
little bit different compare to other DAI but I think the first guess is more likely)

Given what we know about the A33, I'd be inclined to say the latter. I'd don't have the tools to check anymore, but if you have even a cheap logical analyzer, i2s being pretty slow you can definitely see it.

Me neither but maybe Marcus will be able to check this. Thanks for all these informations.

Quoted 2 lines

Maxime

maintainer Acked-by on v3 2/7
#5 lore raw

Re: [PATCH v3 2/7] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible

In reply to Clément Péron
Quoted 5 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

H6 I2S is very similar to H3, except that it supports up to 16 channels and thus few registers have fields on different position.

Quoted 7 lines
---
 .../devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml      | 2 ++
 1 file changed, 2 insertions(+)
#15 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

In reply to Clément Péron
Quoted 6 lines · Clément Péron
Quoted 6 lines
Quoted 5 lines

H3 boards are quite common in LibreElec community so I think:
- This fix is only needed in TDM mode
- Or this fix is not required for the HDMI DAI node (HDMI DAI is a
little bit different compare to other DAI but I think the first guess is more likely)

Quoted 6 lines
Quoted 3 lines

Given what we know about the A33, I'd be inclined to say the latter. I'd don't have the tools to check anymore, but if you have even a cheap logical analyzer, i2s being pretty slow you can definitely see it.

Me neither but maybe Marcus will be able to check this. Thanks for all these informations.

I finally got my hangs on a logical analyzer and gave it a try.

You'll find the start of the playback on H6's i2s0 attached.

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Something that is fairly odd though is that there's a delay of about 8ms (about 387 LRCK periods) between the time where SCK and LRCK start to output something, and then when the data starts being output.

However, the signal seems to be dephased and will start being output on the channel 1, which might lead to the behaviour that is seen? you can see that on the second screenshot attached.

Maxime

maintainer
#16 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Yes, that's normal.

#17 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Maxime,

Quoted 8 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Regards,
Clement

#18 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Quoted 12 lines · Clément Péron

Hi Maxime,

Quoted 8 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Yes, that's normal.

Quoted 7 lines

Thank you very much for this test.

So I will revert the following commit:

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

But the LRCK polarity is fine.

Maxime

maintainer
#19 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Maxime,

Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Clément Péron

Hi Maxime,

Quoted 6 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Which image file is this in reference to?

Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

Quoted 7 lines
Quoted 3 lines

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

Since an I2S LRCK frame is radially symmetric, "wrong phase" and "inverted polarity" look the same. The only way to definitively distinguish them is by looking at the sample data.

In "i2s-h6.png", the samples are all zeroes, so you're assuming that the first sample transmitted (that is, when the bit clock starts transitioning) was a "left" sample.

However, in "h6-i2s-start-data.png", there are pairs of samples we can look at. I'm still assuming that similar samples are a left/right pair, but that's probably a safe assumption. Here we see the first sample in each pair is transmitted with LRCK *high*, and the second sample in the pair is transmitted with LRCK *low*. This is the opposite of your claim above.

An ideal test would put left/right markers and frame numbers in the data channel. The Python script below can generate such a file. Then you would know how much startup delay there is, which channel the "first sample" came from, and how each channel maps to the LRCK level.

It would also be helpful to test DSP_A mode, where the LRCK signal is asymmetric and an inversion would be obvious.

Quoted 4 lines

But the LRCK polarity is fine.

Maxime

Samuel

----8<----
import wave
from struct import Struct

markers = (0x2, 0xe)
rate = 8000
seconds = 10

struct = Struct('<' + 'H' * len(markers))
nframes = seconds * rate
data = bytearray(nframes * struct.size)

for i in range(nframes):
frame = [(m << 12) + (i % 2**12) for m in markers] offset = i * struct.size struct.pack_into(data, offset, *frame)

with wave.open('test.wav', 'wb') as wf:

    wf.setparams((len(markers), 2, rate, nframes, 'NONE', ''))
    wf.writeframes(data)
#20 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Samuel,

Quoted 42 lines · Samuel Holland
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Clément Péron

Hi Maxime,

Quoted 6 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Which image file is this in reference to?

Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

Quoted 7 lines
Quoted 3 lines

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

Since an I2S LRCK frame is radially symmetric, "wrong phase" and "inverted polarity" look the same. The only way to definitively distinguish them is by looking at the sample data.

In "i2s-h6.png", the samples are all zeroes, so you're assuming that the first sample transmitted (that is, when the bit clock starts transitioning) was a "left" sample.

However, in "h6-i2s-start-data.png", there are pairs of samples we can look at. I'm still assuming that similar samples are a left/right pair, but that's probably a safe assumption. Here we see the first sample in each pair is transmitted with LRCK *high*, and the second sample in the pair is transmitted with LRCK *low*. This is the opposite of your claim above.

Quoted 7 lines

An ideal test would put left/right markers and frame numbers in the data channel. The Python script below can generate such a file. Then you would know how much startup delay there is, which channel the "first sample" came from, and how each channel maps to the LRCK level.

It would also be helpful to test DSP_A mode, where the LRCK signal is asymmetric and an inversion would be obvious.

I had no idea that there was a wave module in Python, that's a great suggestion, thanks!

You'll find attached the screenshots for both the I2S and DSP_A formats. I zoomed out a bit to be able to have the first valid samples, but it should be readable.

The code I used is there:
https://github.com/mripard/linux/tree/sunxi/h6-i2s-test

It's basically the v3, plus the DT bits.

As you can see, in the i2s case, LRCK starts low and then goes up, with the first channel (0x2*** samples) transmitted first, so everything looks right here.

On the DSP_A screenshot, LRCK will be low with small bursts high, and once again with the first channel being transmitted first, so it looks right to me too.

Maxime

maintainer
#21 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Maxime,

Quoted 63 lines · Maxime Ripard
Quoted 42 lines · Samuel Holland
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Clément Péron

Hi Maxime,

Quoted 6 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Which image file is this in reference to?

Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

Quoted 7 lines
Quoted 3 lines

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

Since an I2S LRCK frame is radially symmetric, "wrong phase" and "inverted polarity" look the same. The only way to definitively distinguish them is by looking at the sample data.

In "i2s-h6.png", the samples are all zeroes, so you're assuming that the first sample transmitted (that is, when the bit clock starts transitioning) was a "left" sample.

However, in "h6-i2s-start-data.png", there are pairs of samples we can look at. I'm still assuming that similar samples are a left/right pair, but that's probably a safe assumption. Here we see the first sample in each pair is transmitted with LRCK *high*, and the second sample in the pair is transmitted with LRCK *low*. This is the opposite of your claim above.

Quoted 7 lines

An ideal test would put left/right markers and frame numbers in the data channel. The Python script below can generate such a file. Then you would know how much startup delay there is, which channel the "first sample" came from, and how each channel maps to the LRCK level.

It would also be helpful to test DSP_A mode, where the LRCK signal is asymmetric and an inversion would be obvious.

I had no idea that there was a wave module in Python, that's a great suggestion, thanks!

You'll find attached the screenshots for both the I2S and DSP_A formats. I zoomed out a bit to be able to have the first valid samples, but it should be readable.

The code I used is there:
https://github.com/mripard/linux/tree/sunxi/h6-i2s-test

It's basically the v3, plus the DT bits.

Quoted 7 lines

As you can see, in the i2s case, LRCK starts low and then goes up, with the first channel (0x2*** samples) transmitted first, so everything looks right here.

On the DSP_A screenshot, LRCK will be low with small bursts high, and once again with the first channel being transmitted first, so it looks right to me too.

Indeed, for H6 i2s0 with LRCK inversion in software, everything looks correct on the wire.

It's still concerning to me that the BSP has no evidence of this inversion, either for i2s0 or i2s1[1]. And the inversion seems not to be required for HDMI audio on mainline either (but there could be an inversion on the HDMI side or on the interconnect).

Even so, your research is sufficient justification for me that the code is correct as-is (with the inversion). Thank you very much for collecting the data!

Cheers,
Samuel

[1]:
https://github.com/Allwinner-Homlet/H6-BSP4.9-linux/blob/e634a960316dddd1eb50f2a6cf237f2f1c6da3e6/sound/soc/sunxi/sunxi-daudio.c#L1062
where 1 == SND_SOC_DAIFMT_NB_NF, and there's no inversion in sunxi_daudio_init_fmt().

#22 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi,

Quoted 72 lines · Samuel Holland
Quoted 63 lines · Maxime Ripard
Quoted 42 lines · Samuel Holland
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Clément Péron

Hi Maxime,

Quoted 6 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Which image file is this in reference to?

Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

Quoted 7 lines
Quoted 3 lines

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

Since an I2S LRCK frame is radially symmetric, "wrong phase" and "inverted polarity" look the same. The only way to definitively distinguish them is by looking at the sample data.

In "i2s-h6.png", the samples are all zeroes, so you're assuming that the first sample transmitted (that is, when the bit clock starts transitioning) was a "left" sample.

However, in "h6-i2s-start-data.png", there are pairs of samples we can look at. I'm still assuming that similar samples are a left/right pair, but that's probably a safe assumption. Here we see the first sample in each pair is transmitted with LRCK *high*, and the second sample in the pair is transmitted with LRCK *low*. This is the opposite of your claim above.

Quoted 7 lines

An ideal test would put left/right markers and frame numbers in the data channel. The Python script below can generate such a file. Then you would know how much startup delay there is, which channel the "first sample" came from, and how each channel maps to the LRCK level.

It would also be helpful to test DSP_A mode, where the LRCK signal is asymmetric and an inversion would be obvious.

I had no idea that there was a wave module in Python, that's a great suggestion, thanks!

You'll find attached the screenshots for both the I2S and DSP_A formats. I zoomed out a bit to be able to have the first valid samples, but it should be readable.

The code I used is there:
https://github.com/mripard/linux/tree/sunxi/h6-i2s-test

It's basically the v3, plus the DT bits.

Quoted 7 lines

As you can see, in the i2s case, LRCK starts low and then goes up, with the first channel (0x2*** samples) transmitted first, so everything looks right here.

On the DSP_A screenshot, LRCK will be low with small bursts high, and once again with the first channel being transmitted first, so it looks right to me too.

Quoted 7 lines

Indeed, for H6 i2s0 with LRCK inversion in software, everything looks correct on the wire.

It's still concerning to me that the BSP has no evidence of this inversion, either for i2s0 or i2s1[1]. And the inversion seems not to be required for HDMI audio on mainline either (but there could be an inversion on the HDMI side or on the interconnect).

One can only guess here, but it's also quite easy to fix it at the card level (or maybe there's a similar inversion in the codecs, or whatever).

Quoted 2 lines

Even so, your research is sufficient justification for me that the code is correct as-is (with the inversion). Thank you very much for collecting the data!

You're welcome, thanks for that script :)

maxime

#23 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Maxime and Samuel,

Quoted 79 lines · Maxime Ripard

Hi,

Quoted 75 lines · Samuel Holland
Quoted 63 lines · Maxime Ripard
Quoted 42 lines · Samuel Holland
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Clément Péron

Hi Maxime,

Quoted 6 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Which image file is this in reference to?

Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

Quoted 7 lines
Quoted 3 lines

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

Since an I2S LRCK frame is radially symmetric, "wrong phase" and "inverted polarity" look the same. The only way to definitively distinguish them is by looking at the sample data.

In "i2s-h6.png", the samples are all zeroes, so you're assuming that the first sample transmitted (that is, when the bit clock starts transitioning) was a "left" sample.

However, in "h6-i2s-start-data.png", there are pairs of samples we can look at. I'm still assuming that similar samples are a left/right pair, but that's probably a safe assumption. Here we see the first sample in each pair is transmitted with LRCK *high*, and the second sample in the pair is transmitted with LRCK *low*. This is the opposite of your claim above.

Quoted 7 lines

An ideal test would put left/right markers and frame numbers in the data channel. The Python script below can generate such a file. Then you would know how much startup delay there is, which channel the "first sample" came from, and how each channel maps to the LRCK level.

It would also be helpful to test DSP_A mode, where the LRCK signal is asymmetric and an inversion would be obvious.

I had no idea that there was a wave module in Python, that's a great suggestion, thanks!

You'll find attached the screenshots for both the I2S and DSP_A formats. I zoomed out a bit to be able to have the first valid samples, but it should be readable.

The code I used is there:
https://github.com/mripard/linux/tree/sunxi/h6-i2s-test

It's basically the v3, plus the DT bits.

Quoted 7 lines

As you can see, in the i2s case, LRCK starts low and then goes up, with the first channel (0x2*** samples) transmitted first, so everything looks right here.

On the DSP_A screenshot, LRCK will be low with small bursts high, and once again with the first channel being transmitted first, so it looks right to me too.

Indeed, for H6 i2s0 with LRCK inversion in software, everything looks correct on the wire.

Quoted 7 lines
Quoted 4 lines

It's still concerning to me that the BSP has no evidence of this inversion, either for i2s0 or i2s1[1]. And the inversion seems not to be required for HDMI audio on mainline either (but there could be an inversion on the HDMI side or on the interconnect).

One can only guess here, but it's also quite easy to fix it at the card level (or maybe there's a similar inversion in the codecs, or whatever).

Thanks for the test and the explanation.

Quite disturbing that there is no evidence of the LRCK inversion in kernel vendor indeed...
Could it be an issue with the mainline code?

But still regarding the kernel vendor, it seems logical to have a frame-inversion in the device-tree for the HDMI I2S node.
I will drop the revert patch and re-add the frame inversion in the next series.

Regards,
Clement

Quoted 7 lines
Quoted 3 lines

Even so, your research is sufficient justification for me that the code is correct as-is (with the inversion). Thank you very much for collecting the data!

You're welcome, thanks for that script :)

maxime

#24 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Clement,

Quoted 87 lines · Clément Péron

Hi Maxime and Samuel,

Quoted 84 lines · Maxime Ripard

Hi,

Quoted 79 lines · Samuel Holland
Quoted 63 lines · Maxime Ripard
Quoted 42 lines · Samuel Holland
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Clément Péron

Hi Maxime,

Quoted 6 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Which image file is this in reference to?

Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

Quoted 7 lines
Quoted 3 lines

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

Since an I2S LRCK frame is radially symmetric, "wrong phase" and "inverted polarity" look the same. The only way to definitively distinguish them is by looking at the sample data.

In "i2s-h6.png", the samples are all zeroes, so you're assuming that the first sample transmitted (that is, when the bit clock starts transitioning) was a "left" sample.

However, in "h6-i2s-start-data.png", there are pairs of samples we can look at. I'm still assuming that similar samples are a left/right pair, but that's probably a safe assumption. Here we see the first sample in each pair is transmitted with LRCK *high*, and the second sample in the pair is transmitted with LRCK *low*. This is the opposite of your claim above.

Quoted 7 lines

An ideal test would put left/right markers and frame numbers in the data channel. The Python script below can generate such a file. Then you would know how much startup delay there is, which channel the "first sample" came from, and how each channel maps to the LRCK level.

It would also be helpful to test DSP_A mode, where the LRCK signal is asymmetric and an inversion would be obvious.

I had no idea that there was a wave module in Python, that's a great suggestion, thanks!

You'll find attached the screenshots for both the I2S and DSP_A formats. I zoomed out a bit to be able to have the first valid samples, but it should be readable.

The code I used is there:
https://github.com/mripard/linux/tree/sunxi/h6-i2s-test

It's basically the v3, plus the DT bits.

Quoted 7 lines

As you can see, in the i2s case, LRCK starts low and then goes up, with the first channel (0x2*** samples) transmitted first, so everything looks right here.

On the DSP_A screenshot, LRCK will be low with small bursts high, and once again with the first channel being transmitted first, so it looks right to me too.

Indeed, for H6 i2s0 with LRCK inversion in software, everything looks correct on the wire.

It's still concerning to me that the BSP has no evidence of this inversion, either for i2s0 or i2s1[1]. And the inversion seems not to be required for HDMI audio on mainline either (but there could be an inversion on the HDMI side or on the interconnect).

Quoted 8 lines
Quoted 2 lines

One can only guess here, but it's also quite easy to fix it at the card level (or maybe there's a similar inversion in the codecs, or whatever).

Thanks for the test and the explanation.

Quite disturbing that there is no evidence of the LRCK inversion in kernel vendor indeed...
Could it be an issue with the mainline code?

I'm not sure what you mean here, this was tested with mainline?

Maxime

#25 lore raw

Re: [PATCH v3 3/7] ASoC: sun4i-i2s: Add support for H6 I2S

Hi Maxime,

Quoted 94 lines · Maxime Ripard

Hi Clement,

Quoted 90 lines · Clément Péron

Hi Maxime and Samuel,

Quoted 86 lines · Maxime Ripard

Hi,

Quoted 72 lines · Samuel Holland
Quoted 63 lines · Maxime Ripard
Quoted 42 lines · Samuel Holland
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Clément Péron

Hi Maxime,

Quoted 6 lines · Mark Brown
Quoted 3 lines · Maxime Ripard

It really looks like the polarity of LRCK is fine though. The first word is sent with LRCK low, and then high, so we have channel 0 and then channel 1 which seems to be the proper ordering?

Which image file is this in reference to?

Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Yes, that's normal.

Thank you very much for this test.

So I will revert the following commit:

Quoted 7 lines
Quoted 3 lines

ASoC: sun4i-i2s: Fix the LRCK polarity

https://github.com/clementperon/linux/commit/dd657eae8164f7e4bafe8b875031a7c6c50646a9

Like I said, the current code is working as expected with regard to the LRCK polarity. The issue is that the samples are delayed and start to be transmitted on the wrong phase of the signal.

Since an I2S LRCK frame is radially symmetric, "wrong phase" and "inverted polarity" look the same. The only way to definitively distinguish them is by looking at the sample data.

In "i2s-h6.png", the samples are all zeroes, so you're assuming that the first sample transmitted (that is, when the bit clock starts transitioning) was a "left" sample.

However, in "h6-i2s-start-data.png", there are pairs of samples we can look at. I'm still assuming that similar samples are a left/right pair, but that's probably a safe assumption. Here we see the first sample in each pair is transmitted with LRCK *high*, and the second sample in the pair is transmitted with LRCK *low*. This is the opposite of your claim above.

Quoted 7 lines

An ideal test would put left/right markers and frame numbers in the data channel. The Python script below can generate such a file. Then you would know how much startup delay there is, which channel the "first sample" came from, and how each channel maps to the LRCK level.

It would also be helpful to test DSP_A mode, where the LRCK signal is asymmetric and an inversion would be obvious.

I had no idea that there was a wave module in Python, that's a great suggestion, thanks!

You'll find attached the screenshots for both the I2S and DSP_A formats. I zoomed out a bit to be able to have the first valid samples, but it should be readable.

The code I used is there:
https://github.com/mripard/linux/tree/sunxi/h6-i2s-test

It's basically the v3, plus the DT bits.

Quoted 7 lines

As you can see, in the i2s case, LRCK starts low and then goes up, with the first channel (0x2*** samples) transmitted first, so everything looks right here.

On the DSP_A screenshot, LRCK will be low with small bursts high, and once again with the first channel being transmitted first, so it looks right to me too.

Quoted 7 lines

Indeed, for H6 i2s0 with LRCK inversion in software, everything looks correct on the wire.

It's still concerning to me that the BSP has no evidence of this inversion, either for i2s0 or i2s1[1]. And the inversion seems not to be required for HDMI audio on mainline either (but there could be an inversion on the HDMI side or on the interconnect).

One can only guess here, but it's also quite easy to fix it at the card level (or maybe there's a similar inversion in the codecs, or whatever).

Quoted 7 lines
Quoted 5 lines

Thanks for the test and the explanation.

Quite disturbing that there is no evidence of the LRCK inversion in kernel vendor indeed...
Could it be an issue with the mainline code?

I'm not sure what you mean here, this was tested with mainline?

Sorry i was not clear, I meant either there is an issue in the vendor kernel that doesn't set properly the LRCK or maybe we did something or forgot to do it that set this inversion.

But I just checked a device-tree used with a kernel vendor and indeed codecs are inverted but not hdmi so the vendor kernel has an issue here...

E.g this is what is used for Tanix TX6

daudio@0x05091000 {
    compatible = "allwinner,sunxi-tdmhdmi";
    reg = <0x00 0x5091000 0x00 0x74>;
    clocks = <0x04 0x4d>;
    status = "okay";
    phandle = <0x63>;
    device_type = "audiohdmi";
};
daudio@0x05092000 {
    compatible = "allwinner,sunxi-daudio";
    reg = <0x00 0x5092000 0x00 0x74>;
    clocks = <0x04 0x4e>;
    pinctrl-names = "default\0sleep";
    pinctrl-0 = <0x4f>;
    pinctrl-1 = <0x50>;
    pcm_lrck_period = <0x40>;
    slot_width_select = <0x20>;
    daudio_master = <0x04>;
    audio_format = <0x04>;
    signal_inversion = <0x03>;
    tdm_config = <0x01>;
    frametype = <0x00>;
    tdm_num = <0x02>;
    mclk_div = <0x01>;
    status = "okay";
    phandle = <0x65>;
    device_type = "daudio2";
};
daudio@0x0508f000 {
    compatible = "allwinner,sunxi-daudio";
    reg = <0x00 0x508f000 0x00 0x74>;
    clocks = <0x04 0x51>;
    pinctrl-names = "default\0sleep";
    pinctrl-0 = <0x52>;
    pinctrl-1 = <0x53>;
    pcm_lrck_period = <0x20>;
    slot_width_select = <0x20>;
    daudio_master = <0x04>;
    audio_format = <0x01>;
    signal_inversion = <0x01>;
    tdm_config = <0x01>;
    frametype = <0x00>;
    tdm_num = <0x03>;
    mclk_div = <0x01>;
    status = "okay";
    phandle = <0x67>;
    device_type = "daudio3";
};

Clement

Quoted 2 lines

Maxime