Skip to contentSkip to conversation

Add Allwinner H3/H5/H6/A64 HDMI audio

PATCH Superseded Clément Péron 4 participants 39 messages Sep 21, 2020 – Nov 2, 2020

Subsystems (4)

v4 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

v4 cover Add Allwinner H3/H5/H6/A64 HDMI audio

Hi,

New test done by Maxime using TDM show that's LRCK is indeed inverted so I drop the patch reverted in v2.

And HDMI requires an inverted LRCK so let's readd the frame-inversion in the device-tree.

I have also added a patch to change set_chan_cfg.

Please note that I can't test TDM and only have a Allwinner H6. So test and comment on other Allwinner chips are welcome!

Regards,
Clement

Change since v3:
- add Samuel Holland patch to reconfigure FIFO_TX_REG when suspend is enabled
- readd inversion to H6 LRCK sun50i_h6_i2s_set_soc_fmt()
- Fix get_wss() for sun4i
- Add a commit to fix checkpatch warning

Change since v2:
- rebase on next-20200918
- drop revert LRCK polarity patch
- readd simple-audio-card,frame-inversion in dts
- Add patch for changing set_chan_cfg params

Change since v1:
- rebase on next-20200828
- add revert LRCK polarity
- remove all simple-audio-card,frame-inversion in dts
- add Ondrej patches for Orange Pi board
- Add arm64 defconfig patch

Clément Péron (6):
ASoC: sun4i-i2s: Change set_chan_cfg() params
ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit
ASoC: sun4i-i2s: Fix sun8i volatile regs
arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1
arm64: defconfig: Enable Allwinner i2s driver
ASoC: sun4i-i2s: fix coding-style for callback definition

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

Marcus Cooper (9):
ASoC: sun4i-i2s: Set sign extend sample
ASoc: sun4i-i2s: Add 20 and 24 bit support
arm: dts: sunxi: h3/h5: Add DAI node for HDMI
arm: dts: sunxi: h3/h5: Add HDMI audio
arm64: dts: allwinner: a64: Add DAI node for HDMI
arm64: dts: allwinner: a64: Add HDMI audio
arm: sun8i: h3: Add HDMI audio to Orange Pi 2
arm: sun8i: h3: Add HDMI audio to Beelink X2
arm64: dts: allwinner: a64: Add HDMI audio to Pine64

Ondrej Jirman (3):
arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2
ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One
arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio

Samuel Holland (1):
ASoC: sun4i-i2s: Fix setting of FIFO modes

 .../sound/allwinner,sun4i-a10-i2s.yaml        |   2 +
 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts     |   8 +
 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts     |   8 +
 arch/arm/boot/dts/sun8i-h3-orangepi-one.dts   |   8 +
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts    |   8 +
 arch/arm/boot/dts/sunxi-h3-h5.dtsi            |  33 ++
 .../boot/dts/allwinner/sun50i-a64-pine64.dts  |   8 +
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi |  34 ++
 .../dts/allwinner/sun50i-h5-orangepi-pc2.dts  |   8 +
 .../dts/allwinner/sun50i-h6-beelink-gs1.dts   |   8 +
 .../dts/allwinner/sun50i-h6-orangepi-3.dts    |   8 +
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi  |  33 ++
 arch/arm64/configs/defconfig                  |   1 +
 sound/soc/sunxi/sun4i-i2s.c                   | 374 +++++++++++++++---
 14 files changed, 487 insertions(+), 54 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/22 ASoC: sun4i-i2s: Add support for H6 I2S

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 | 224 ++++++++++++++++++++++++++++++++++++
 1 file changed, 224 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +224 -0
index f23ff29e7c1d..2baf6c276280 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;
 
 /**
@@ -474,6 +489,62 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 	return 0;
 }
 
+static int sun50i_h6_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;
+	}
+
+	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)
@@ -699,6 +770,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 	return 0;
 }
 
+static int sun50i_h6_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);
@@ -979,6 +1152,22 @@ static const struct reg_default sun8i_i2s_reg_defaults[] = {
 	{ SUN8I_I2S_RX_CHAN_MAP_REG, 0x00000000 },
 };
 
+static const struct reg_default sun50i_h6_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,
@@ -1006,6 +1195,19 @@ static const struct regmap_config sun8i_i2s_regmap_config = {
 	.volatile_reg	= sun8i_i2s_volatile_reg,
 };
 
+static const struct regmap_config sun50i_h6_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_h6_i2s_reg_defaults,
+	.num_reg_defaults	= ARRAY_SIZE(sun50i_h6_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);
@@ -1164,6 +1366,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_h6_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_h6_i2s_set_chan_cfg,
+	.set_fmt		= sun50i_h6_i2s_set_soc_fmt,
+};
+
 static int sun4i_i2s_init_regmap_fields(struct device *dev,
 					struct sun4i_i2s *i2s)
 {
@@ -1333,6 +1553,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.25.1
#2 lore raw

PATCH v4 2/22 ASoC: sun4i-i2s: Change set_chan_cfg() params

In reply to Clément Péron

As slots and slot_width can be overwritter in case set_tdm() is called. Avoid to have this logic in set_chan_cfg().

Instead pass the required values as params to set_chan_cfg().

This also fix a bug when i2s->slot_width is set for TDM but not properly used in set_chan_cfg().

---
 sound/soc/sunxi/sun4i-i2s.c | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +14 -22
index 2baf6c276280..0633b9fba3d7 100644
@@ -177,8 +177,9 @@ struct sun4i_i2s_quirks {
 	unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *);
 	s8	(*get_sr)(const struct sun4i_i2s *, int);
 	s8	(*get_wss)(const struct sun4i_i2s *, int);
-	int	(*set_chan_cfg)(const struct sun4i_i2s *,
-				const struct snd_pcm_hw_params *);
+	int	(*set_chan_cfg)(const struct sun4i_i2s *i2s,
+				unsigned int channels,	unsigned int slots,
+				unsigned int slot_width);
 	int	(*set_fmt)(const struct sun4i_i2s *, unsigned int);
 };
 
@@ -414,10 +415,9 @@ static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width)
 }
 
 static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
-				  const struct snd_pcm_hw_params *params)
+				  unsigned int channels, unsigned int slots,
+				  unsigned int slot_width)
 {
-	unsigned int channels = params_channels(params);
-
 	/* Map the channels for playback and capture */
 	regmap_write(i2s->regmap, SUN4I_I2S_TX_CHAN_MAP_REG, 0x76543210);
 	regmap_write(i2s->regmap, SUN4I_I2S_RX_CHAN_MAP_REG, 0x00003210);
@@ -434,15 +434,11 @@ static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 }
 
 static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
-				  const struct snd_pcm_hw_params *params)
+				  unsigned int channels, unsigned int slots,
+				  unsigned int slot_width)
 {
-	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, SUN8I_I2S_TX_CHAN_MAP_REG, 0x76543210);
 	regmap_write(i2s->regmap, SUN8I_I2S_RX_CHAN_MAP_REG, 0x76543210);
@@ -467,11 +463,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 	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;
+		lrck_period = slot_width * slots;
 		break;
 
 	case SND_SOC_DAIFMT_I2S:
-		lrck_period = params_physical_width(params);
+		lrck_period = slot_width;
 		break;
 
 	default:
@@ -490,15 +486,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 }
 
 static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
-				      const struct snd_pcm_hw_params *params)
+				      unsigned int channels, unsigned int slots,
+				      unsigned int slot_width)
 {
-	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);
@@ -523,11 +515,11 @@ static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
 	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;
+		lrck_period = slot_width * slots;
 		break;
 
 	case SND_SOC_DAIFMT_I2S:
-		lrck_period = params_physical_width(params);
+		lrck_period = slot_width;
 		break;
 
 	default:
@@ -563,7 +555,7 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
 	if (i2s->slot_width)
 		slot_width = i2s->slot_width;
 
-	ret = i2s->variant->set_chan_cfg(i2s, params);
+	ret = i2s->variant->set_chan_cfg(i2s, channels, slots, slot_width);
 	if (ret < 0) {
 		dev_err(dai->dev, "Invalid channel configuration\n");
 		return ret;
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params

Quoted 4 lines · Clément Péron

As slots and slot_width can be overwritter in case set_tdm() is called. Avoid to have this logic in set_chan_cfg().

Instead pass the required values as params to set_chan_cfg().

It's not really clear here what the issue is, and how passing the slots and slot_width as arguments addresses it

Quoted 2 lines

This also fix a bug when i2s->slot_width is set for TDM but not properly used in set_chan_cfg().

Which bug?

Also, Fixes tag?

Thanks!
Maxime

#4 lore raw

Re: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params

Hi Maxime,

Quoted 7 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

As slots and slot_width can be overwritter in case set_tdm() is called. Avoid to have this logic in set_chan_cfg().

Instead pass the required values as params to set_chan_cfg().

Quoted 7 lines

It's not really clear here what the issue is, and how passing the slots and slot_width as arguments addresses it

Quoted 2 lines

This also fix a bug when i2s->slot_width is set for TDM but not properly used in set_chan_cfg().

Which bug?

Do you mean my commit log is too short or is it a real question to understand ?

To answer if set_tdm() is called then we set the i2s->slot_width and i2s->slots. But we use lrck_period = params_physical_width(params)
instead of lrck_period = i2s->slot_width ? i2s->slot_width :
params_physical_width(params);

Quoted 2 lines

Also, Fixes tag?

I think this only happens when 20/24bit is enabled so the issue has been introduced in this series.

Clement

Quoted 3 lines

Thanks!
Maxime

maintainer
#5 lore raw

Re: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params

Quoted 6 lines · Clément Péron
Quoted 1 line · Maxime Ripard

Also, Fixes tag?

I think this only happens when 20/24bit is enabled so the issue has been introduced in this series.

For a situation like that a note in the changelog about "in preparation for adding X support which will make this matter" helps.

#6 lore raw

Re: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params

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

Hi Maxime,

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

As slots and slot_width can be overwritter in case set_tdm() is called. Avoid to have this logic in set_chan_cfg().

Instead pass the required values as params to set_chan_cfg().

It's not really clear here what the issue is, and how passing the slots and slot_width as arguments addresses it

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

This also fix a bug when i2s->slot_width is set for TDM but not properly used in set_chan_cfg().

Which bug?

Do you mean my commit log is too short or is it a real question to understand ?

Both, actually :)

Maxime

#7 lore raw

PATCH v4 3/22 ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit

In reply to Clément Péron

We are actually using a complex formula to just return a bunch of simple values. Also this formula is wrong for sun4i.

Replace this with a simpler switch case.

Also drop the i2s params not used.

---
 sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 25 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +44 -25
index 0633b9fba3d7..11bbcbe24d6b 100644
@@ -175,8 +175,8 @@ struct sun4i_i2s_quirks {
 	unsigned int			num_mclk_dividers;
 
 	unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *);
-	s8	(*get_sr)(const struct sun4i_i2s *, int);
-	s8	(*get_wss)(const struct sun4i_i2s *, int);
+	int	(*get_sr)(unsigned int width);
+	int	(*get_wss)(unsigned int width);
 	int	(*set_chan_cfg)(const struct sun4i_i2s *i2s,
 				unsigned int channels,	unsigned int slots,
 				unsigned int slot_width);
@@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai,
 	return 0;
 }
 
-static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_sr(unsigned int width)
 {
-	if (width < 16 || width > 24)
-		return -EINVAL;
-
-	if (width % 4)
-		return -EINVAL;
+	switch (width) {
+	case 16:
+		return 0x0;
+	case 20:
+		return 0x1;
+	case 24:
+		return 0x2;
+	}
 
-	return (width - 16) / 4;
+	return -EINVAL;
 }
 
-static s8 sun4i_i2s_get_wss(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_wss(unsigned int width)
 {
-	if (width < 16 || width > 32)
-		return -EINVAL;
-
-	if (width % 4)
-		return -EINVAL;
+	switch (width) {
+	case 16:
+		return 0x0;
+	case 20:
+		return 0x1;
+	case 24:
+		return 0x2;
+	case 32:
+		return 0x3;
+	}
 
-	return (width - 16) / 4;
+	return -EINVAL;
 }
 
-static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width)
+static int sun8i_i2s_get_sr_wss(unsigned int width)
 {
-	if (width % 4)
-		return -EINVAL;
-
-	if (width < 8 || width > 32)
-		return -EINVAL;
+	switch (width) {
+	case 8:
+		return 0x1;
+	case 12:
+		return 0x2;
+	case 16:
+		return 0x3;
+	case 20:
+		return 0x4;
+	case 24:
+		return 0x5;
+	case 28:
+		return 0x6;
+	case 32:
+		return 0x7;
+	}
 
-	return (width - 8) / 4 + 1;
+	return -EINVAL;
 }
 
 static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
@@ -572,11 +591,11 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
 	}
 	i2s->playback_dma_data.addr_width = width;
 
-	sr = i2s->variant->get_sr(i2s, word_size);
+	sr = i2s->variant->get_sr(word_size);
 	if (sr < 0)
 		return -EINVAL;
 
-	wss = i2s->variant->get_wss(i2s, slot_width);
+	wss = i2s->variant->get_wss(slot_width);
 	if (wss < 0)
 		return -EINVAL;
 
Signature · 1 line
2.25.1
#8 lore raw

Re: [PATCH v4 03/22] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit

Quoted 2 lines · Clément Péron

We are actually using a complex formula to just return a bunch of simple values. Also this formula is wrong for sun4i.

Just like the previous patch, this could use a bit more explanation, like why it's a good thing, or how it's wrong on sun4i

Quoted 34 lines

Replace this with a simpler switch case.

Also drop the i2s params not used.

---
 sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 25 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +3 -6
index 0633b9fba3d7..11bbcbe24d6b 100644
@@ -175,8 +175,8 @@ struct sun4i_i2s_quirks {
 	unsigned int			num_mclk_dividers;
 
 	unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *);
-	s8	(*get_sr)(const struct sun4i_i2s *, int);
-	s8	(*get_wss)(const struct sun4i_i2s *, int);
+	int	(*get_sr)(unsigned int width);
+	int	(*get_wss)(unsigned int width);
 	int	(*set_chan_cfg)(const struct sun4i_i2s *i2s,
 				unsigned int channels,	unsigned int slots,
 				unsigned int slot_width);
@@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai,
 	return 0;
 }
 
-static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_sr(unsigned int width)
 {
-	if (width < 16 || width > 24)
-		return -EINVAL;
-

sound/soc/sunxi/sun4i-i2s.c static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, · line 393

Quoted 10 lines
sound/soc/sunxi/sun4i-i2s.c +8 -2
-	if (width % 4)
-		return -EINVAL;
+	switch (width) {
+	case 16:
+		return 0x0;
+	case 20:
+		return 0x1;
+	case 24:
+		return 0x2;
+	}

Why do we need an hex number here?

Also, why is the return type change needed?

Maxime

#9 lore raw

Re: [PATCH v4 03/22] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit

Hi Maxime,

Quoted 7 lines · Maxime Ripard
Quoted 2 lines · Clément Péron

We are actually using a complex formula to just return a bunch of simple values. Also this formula is wrong for sun4i.

Just like the previous patch, this could use a bit more explanation, like why it's a good thing, or how it's wrong on sun4i

Okay I will comment a bit more.

Quoted 39 lines
Quoted 39 lines

Replace this with a simpler switch case.

Also drop the i2s params not used.

---
 sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 25 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +5 -8
index 0633b9fba3d7..11bbcbe24d6b 100644
@@ -175,8 +175,8 @@ struct sun4i_i2s_quirks {
      unsigned int                    num_mclk_dividers;
 
      unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *);
-     s8      (*get_sr)(const struct sun4i_i2s *, int);
-     s8      (*get_wss)(const struct sun4i_i2s *, int);
+     int     (*get_sr)(unsigned int width);
+     int     (*get_wss)(unsigned int width);
      int     (*set_chan_cfg)(const struct sun4i_i2s *i2s,
                              unsigned int channels,  unsigned int slots,
                              unsigned int slot_width);
@@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai,
      return 0;
 }
 
-static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_sr(unsigned int width)
 {
-     if (width < 16 || width > 24)
-             return -EINVAL;
-
-     if (width % 4)
-             return -EINVAL;
+     switch (width) {
+     case 16:
Quoted 8 lines

sound/soc/sunxi/sun4i-i2s.c static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, · line 393

Quoted 6 lines
sound/soc/sunxi/sun4i-i2s.c +6 -0
+             return 0x0;
+     case 20:
+             return 0x1;
+     case 24:
+             return 0x2;
+     }

Why do we need an hex number here?

This is a register value, so I thought it's usually written using hexadecimal representation.

Quoted 2 lines

Also, why is the return type change needed?

This function returns a ERROR defined in errno.h which actually could be -133 but S8 only supports -128..127.

There is no real reason to have a S8 here and doesn't give any optimisation.

Clement

Quoted 2 lines

Maxime

#10 lore raw

PATCH v4 4/22 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 · 1 line
2.25.1
#11 lore raw

PATCH v4 5/22 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 consistency and avoid relying on default.

---
 sound/soc/sunxi/sun4i-i2s.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +17 -0
index 11bbcbe24d6b..b31454eee43c 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
 
@@ -676,6 +682,7 @@ 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);
+
 	return 0;
 }
 
@@ -778,6 +785,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;
 }
 
@@ -880,6 +892,11 @@ static int sun50i_h6_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.25.1
#12 lore raw

PATCH v4 6/22 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 b31454eee43c..60b2fec1bbe9 100644
@@ -590,6 +590,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));
@@ -1071,6 +1074,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 = {
@@ -1078,14 +1085,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.25.1
#13 lore raw

PATCH v4 7/22 ASoC: sun4i-i2s: Fix sun8i volatile regs

In reply to Clément Péron

The FIFO TX reg is volatile and sun8i i2s register mapping is different from sun4i.

Even if in this case it's doesn't create an issue, Avoid setting some regs that are undefined in sun8i.

---
 sound/soc/sunxi/sun4i-i2s.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +11 -4
index 60b2fec1bbe9..3f9110d70941 100644
@@ -1152,12 +1152,19 @@ static bool sun8i_i2s_rd_reg(struct device *dev, unsigned int reg)
 
 static bool sun8i_i2s_volatile_reg(struct device *dev, unsigned int reg)
 {
-	if (reg == SUN8I_I2S_INT_STA_REG)
+	switch (reg) {
+	case SUN4I_I2S_FIFO_CTRL_REG:
+	case SUN4I_I2S_FIFO_RX_REG:
+	case SUN4I_I2S_FIFO_STA_REG:
+	case SUN4I_I2S_RX_CNT_REG:
+	case SUN4I_I2S_TX_CNT_REG:
+	case SUN8I_I2S_FIFO_TX_REG:
+	case SUN8I_I2S_INT_STA_REG:
 		return true;
-	if (reg == SUN8I_I2S_FIFO_TX_REG)
-		return false;
 
-	return sun4i_i2s_volatile_reg(dev, reg);
+	default:
+		return false;
+	}
 }
 
 static const struct reg_default sun4i_i2s_reg_defaults[] = {
Signature · 1 line
2.25.1
#14 lore raw

PATCH v4 8/22 ASoC: sun4i-i2s: Fix setting of FIFO modes

In reply to Clément Péron

From: Samuel Holland <[email protected]>

Because SUN4I_I2S_FIFO_CTRL_REG is volatile, writes done while the regmap is cache-only are ignored. To work around this, move the configuration to a callback that runs while the ASoC core has a runtime PM reference to the device.

---
 sound/soc/sunxi/sun4i-i2s.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +7 -7
index 3f9110d70941..9cd6cd1cd284 100644
@@ -586,6 +586,13 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
 		return ret;
 	}
 
+	/* Set significant bits in our FIFOs */
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG,
+			   SUN4I_I2S_FIFO_CTRL_TX_MODE_MASK |
+			   SUN4I_I2S_FIFO_CTRL_RX_MODE_MASK,
+			   SUN4I_I2S_FIFO_CTRL_TX_MODE(1) |
+			   SUN4I_I2S_FIFO_CTRL_RX_MODE(1));
+
 	switch (params_physical_width(params)) {
 	case 16:
 		width = DMA_SLAVE_BUSWIDTH_2_BYTES;
@@ -914,13 +921,6 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 		return ret;
 	}
 
-	/* Set significant bits in our FIFOs */
-	regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG,
-			   SUN4I_I2S_FIFO_CTRL_TX_MODE_MASK |
-			   SUN4I_I2S_FIFO_CTRL_RX_MODE_MASK,
-			   SUN4I_I2S_FIFO_CTRL_TX_MODE(1) |
-			   SUN4I_I2S_FIFO_CTRL_RX_MODE(1));
-
 	i2s->format = fmt;
 
 	return 0;
Signature · 1 line
2.25.1
#15 lore raw

PATCH v4 9/22 arm64: dts: allwinner: h6: Add HDMI audio node

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 | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +33 -0
index 28c77d6872f6..a8853ee7885a 100644
@@ -67,6 +67,25 @@ de: display-engine {
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "sun50i-h6-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s1>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	osc24M: osc24M_clk {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
@@ -609,6 +628,19 @@ mdio: mdio {
 			};
 		};
 
+		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";
+			status = "disabled";
+		};
+
 		spdif: spdif@5093000 {
 			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-h6-spdif";
@@ -739,6 +771,7 @@ ohci3: usb@5311400 {
 		};
 
 		hdmi: hdmi@6000000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-h6-dw-hdmi";
 			reg = <0x06000000 0x10000>;
 			reg-io-width = <1>;
Signature · 1 line
2.25.1
#16 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Quoted 25 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 | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +6 -0
index 28c77d6872f6..a8853ee7885a 100644
@@ -67,6 +67,25 @@ de: display-engine {
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "sun50i-h6-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +10 -0
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s1>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

Maxime

#17 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Hi Maxime,

Quoted 32 lines · Maxime Ripard
Quoted 30 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 | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +11 -0
index 28c77d6872f6..a8853ee7885a 100644
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
Quoted 8 lines

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

Yes, I agree I will check if it's really needed.

Clement

Quoted 2 lines

Maxime

#18 lore raw

Re: Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Dne ponedeljek, 21. september 2020 ob 19:23:49 CEST je Clément Péron napisal(a):

Quoted 9 lines

Hi Maxime,

Quoted 6 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

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

Quoted 8 lines
Quoted 8 lines

arch/arm64/

Quoted 8 lines
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/ renamed from arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0

boot/dts/allwinner/sun50i-h6.dtsi

Quoted 27 lines
Quoted 18 lines
Quoted 18 lines

index 28c77d6872f6..a8853ee7885a 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +11 -0
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
Quoted 8 lines

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

Quoted 1 line

Yes, I agree I will check if it's really needed.

I think this was explained before. Anyway, this is needed to force width to 32, no matter actual sample width. That's a requirement of HDMI codec. I believe Marcus Cooper have another codec which also needs fixed width.

There is no similar property for I2S, so TDM one is used here.

Best regards,
Jernej

Quoted 6 lines

Clement

Quoted 2 lines

Maxime

#19 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Quoted 47 lines · Jernej Škrabec

Dne ponedeljek, 21. september 2020 ob 19:23:49 CEST je Clément Péron napisal(a):

Quoted 9 lines

Hi Maxime,

Quoted 6 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

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

Quoted 8 lines
Quoted 8 lines

arch/arm64/

Quoted 8 lines
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/ renamed from arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0

boot/dts/allwinner/sun50i-h6.dtsi

Quoted 27 lines
Quoted 26 lines
Quoted 13 lines

index 28c77d6872f6..a8853ee7885a 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +6 -0
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +10 -0
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

Quoted 3 lines
Quoted 1 line

Yes, I agree I will check if it's really needed.

I think this was explained before.

Possibly, but this should be in a comment or at least the commit log

Quoted 5 lines

Anyway, this is needed to force width to 32, no matter actual sample width. That's a requirement of HDMI codec. I believe Marcus Cooper have another codec which also needs fixed width.

There is no similar property for I2S, so TDM one is used here.

Except it's really dedicated to the TDM mode and doesn't really make much sense here.

If we have special requirements like this on the codec setup, that sounds like a good justification for creating a custom codec instead of shoehorning it into simple-card

Maxime

#20 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Hi Maxime,

Quoted 59 lines · Maxime Ripard
Quoted 47 lines · Jernej Škrabec

Dne ponedeljek, 21. september 2020 ob 19:23:49 CEST je Clément Péron napisal(a):

Quoted 9 lines

Hi Maxime,

Quoted 6 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

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

Quoted 8 lines
Quoted 8 lines

arch/arm64/

Quoted 8 lines
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/ renamed from arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0

boot/dts/allwinner/sun50i-h6.dtsi

Quoted 27 lines
Quoted 26 lines
Quoted 13 lines

index 28c77d6872f6..a8853ee7885a 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +6 -0
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +10 -0
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

Quoted 3 lines
Quoted 1 line

Yes, I agree I will check if it's really needed.

I think this was explained before.

Possibly, but this should be in a comment or at least the commit log

Quoted 4 lines

Anyway, this is needed to force width to 32, no matter actual sample width. That's a requirement of HDMI codec. I believe Marcus Cooper have another codec which also needs fixed width.

Quoted 8 lines
Quoted 1 line

There is no similar property for I2S, so TDM one is used here.

Except it's really dedicated to the TDM mode and doesn't really make much sense here.

If we have special requirements like this on the codec setup, that sounds like a good justification for creating a custom codec instead of shoehorning it into simple-card

When all the remarks are fixed would it be possible to merge the rest of the series without the dts changes ?

I will propose another series to introduce a dedicated codec for that.

Quoted 2 lines

Maxime

#21 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Quoted 65 lines · Clément Péron
Quoted 64 lines · Maxime Ripard
Quoted 47 lines · Jernej Škrabec

Dne ponedeljek, 21. september 2020 ob 19:23:49 CEST je Clément Péron napisal(a):

Quoted 9 lines

Hi Maxime,

Quoted 6 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

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

Quoted 8 lines
Quoted 8 lines

arch/arm64/

Quoted 8 lines
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/ renamed from arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0

boot/dts/allwinner/sun50i-h6.dtsi

Quoted 27 lines
Quoted 26 lines
Quoted 13 lines

index 28c77d6872f6..a8853ee7885a 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +6 -0
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +10 -0
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

Quoted 3 lines
Quoted 1 line

Yes, I agree I will check if it's really needed.

I think this was explained before.

Possibly, but this should be in a comment or at least the commit log

Quoted 5 lines

Anyway, this is needed to force width to 32, no matter actual sample width. That's a requirement of HDMI codec. I believe Marcus Cooper have another codec which also needs fixed width.

There is no similar property for I2S, so TDM one is used here.

Except it's really dedicated to the TDM mode and doesn't really make much sense here.

Quoted 8 lines
Quoted 3 lines

If we have special requirements like this on the codec setup, that sounds like a good justification for creating a custom codec instead of shoehorning it into simple-card

When all the remarks are fixed would it be possible to merge the rest of the series without the dts changes ?

I will propose another series to introduce a dedicated codec for that.

Yeah, sure

Maxime

#22 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Hi Maxime,

Quoted 43 lines · Maxime Ripard
Quoted 41 lines · Clément Péron
Quoted 40 lines · Maxime Ripard
Quoted 38 lines · Jernej Škrabec

Dne ponedeljek, 21. september 2020 ob 19:23:49 CEST je Clément Péron napisal(a):

Quoted 9 lines

Hi Maxime,

Quoted 6 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

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

Quoted 8 lines
Quoted 8 lines

arch/arm64/

Quoted 8 lines
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/ renamed from arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0

boot/dts/allwinner/sun50i-h6.dtsi

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines

index 28c77d6872f6..a8853ee7885a 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +11 -0
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

I was looking at sound documentation regarding how I can properly write the multi-lane I2S support.
And I think we made a wrong interpretation here.

TDM slot-num and slot-width are not referencing the format called PCM or DSP_A / DSP_B.
But really the physical time division representation of a format.

For example Amlogic do the following representation for Multi-lane I2S:

dai-link-7 {
    sound-dai = <&tdmif_b>;
    dai-format = "i2s";
    dai-tdm-slot-tx-mask-0 = <1 1>;
    dai-tdm-slot-tx-mask-1 = <1 1>;
    dai-tdm-slot-tx-mask-2 = <1 1>;
    dai-tdm-slot-tx-mask-3 = <1 1>;
    mclk-fs = <256>;

    codec {
        sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
    };
};

So i think for 2 channels HDMI using the simple sound card with TDM property is not a hack but the correct way to represent it.

Do you agree ?

If so, can I resend the simple sound card for HDMI audio ?

Thanks,
Clement

Quoted 28 lines
Quoted 16 lines
Quoted 16 lines
Quoted 4 lines
Quoted 2 lines

Yes, I agree I will check if it's really needed.

I think this was explained before.

Possibly, but this should be in a comment or at least the commit log

Quoted 5 lines

Anyway, this is needed to force width to 32, no matter actual sample width. That's a requirement of HDMI codec. I believe Marcus Cooper have another codec which also needs fixed width.

There is no similar property for I2S, so TDM one is used here.

Except it's really dedicated to the TDM mode and doesn't really make much sense here.

Quoted 8 lines
Quoted 3 lines

If we have special requirements like this on the codec setup, that sounds like a good justification for creating a custom codec instead of shoehorning it into simple-card

When all the remarks are fixed would it be possible to merge the rest of the series without the dts changes ?

I will propose another series to introduce a dedicated codec for that.

Yeah, sure

Maxime

#23 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Quoted 78 lines · Clément Péron
Quoted 43 lines · Maxime Ripard
Quoted 41 lines · Clément Péron
Quoted 40 lines · Maxime Ripard
Quoted 38 lines · Jernej Škrabec

Dne ponedeljek, 21. september 2020 ob 19:23:49 CEST je Clément Péron napisal(a):

Quoted 9 lines

Hi Maxime,

Quoted 6 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

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

Quoted 8 lines
Quoted 8 lines

arch/arm64/

Quoted 8 lines
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/ renamed from arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0

boot/dts/allwinner/sun50i-h6.dtsi

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines

index 28c77d6872f6..a8853ee7885a 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +11 -0
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

I was looking at sound documentation regarding how I can properly write the multi-lane I2S support.
And I think we made a wrong interpretation here.

TDM slot-num and slot-width are not referencing the format called PCM or DSP_A / DSP_B.
But really the physical time division representation of a format.

For example Amlogic do the following representation for Multi-lane I2S:

dai-link-7 {
    sound-dai = <&tdmif_b>;
    dai-format = "i2s";
    dai-tdm-slot-tx-mask-0 = <1 1>;
    dai-tdm-slot-tx-mask-1 = <1 1>;
    dai-tdm-slot-tx-mask-2 = <1 1>;
    dai-tdm-slot-tx-mask-3 = <1 1>;
    mclk-fs = <256>;

    codec {
        sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
    };
};
Quoted 6 lines

So i think for 2 channels HDMI using the simple sound card with TDM property is not a hack but the correct way to represent it.

Do you agree ?

If so, can I resend the simple sound card for HDMI audio ?

I mean, it's not less weird :)

And like I said before we still have the option to write a card driver ourselves that doesn't take anything from the DT beside the phandle of the i2s controller and the HDMI controller.

If it's a fixed configuration, I'm not sure why we bother trying to make it dynamic in the DT.

Maxime

#24 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

Hi Maxime,

Quoted 87 lines · Maxime Ripard
Quoted 78 lines · Clément Péron
Quoted 43 lines · Maxime Ripard
Quoted 41 lines · Clément Péron
Quoted 40 lines · Maxime Ripard
Quoted 38 lines · Jernej Škrabec

Dne ponedeljek, 21. september 2020 ob 19:23:49 CEST je Clément Péron napisal(a):

Quoted 9 lines

Hi Maxime,

Quoted 6 lines · Maxime Ripard
Quoted 4 lines · Clément Péron

From: Jernej Skrabec <[email protected]>

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

Quoted 8 lines
Quoted 8 lines

arch/arm64/

Quoted 8 lines
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/ renamed from arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0 -0

boot/dts/allwinner/sun50i-h6.dtsi

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines

index 28c77d6872f6..a8853ee7885a 100644

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +11 -0
@@ -67,6 +67,25 @@ de: display-engine {
              status = "disabled";
      };
 
+     hdmi_sound: hdmi-sound {
+             compatible = "simple-audio-card";
+             simple-audio-card,format = "i2s";
+             simple-audio-card,name = "sun50i-h6-hdmi";
+             simple-audio-card,mclk-fs = <128>;
+             simple-audio-card,frame-inversion;
+             status = "disabled";
+
+             simple-audio-card,codec {
+                     sound-dai = <&hdmi>;
+             };
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi de: display-engine { · line 85

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
+
+             simple-audio-card,cpu {
+                     sound-dai = <&i2s1>;
+                     dai-tdm-slot-num = <2>;
+                     dai-tdm-slot-width = <32>;

It looks weird to have both some TDM setup here, and yet the format in i2s?

I was looking at sound documentation regarding how I can properly write the multi-lane I2S support.
And I think we made a wrong interpretation here.

TDM slot-num and slot-width are not referencing the format called PCM or DSP_A / DSP_B.
But really the physical time division representation of a format.

For example Amlogic do the following representation for Multi-lane I2S:

dai-link-7 {
    sound-dai = <&tdmif_b>;
    dai-format = "i2s";
    dai-tdm-slot-tx-mask-0 = <1 1>;
    dai-tdm-slot-tx-mask-1 = <1 1>;
    dai-tdm-slot-tx-mask-2 = <1 1>;
    dai-tdm-slot-tx-mask-3 = <1 1>;
    mclk-fs = <256>;

    codec {
        sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
    };
};
Quoted 6 lines

So i think for 2 channels HDMI using the simple sound card with TDM property is not a hack but the correct way to represent it.

Do you agree ?

If so, can I resend the simple sound card for HDMI audio ?

Quoted 8 lines

I mean, it's not less weird :)

And like I said before we still have the option to write a card driver ourselves that doesn't take anything from the DT beside the phandle of the i2s controller and the HDMI controller.

If it's a fixed configuration, I'm not sure why we bother trying to make it dynamic in the DT.

Ok I see what you mean here, as the link is hardcoded in the SoC it's a better representation to hardcode it in the sound card driver than having it dynamically represented in each board device-tree.

Sounds correct for me,
Thanks :)

Quoted 2 lines

Maxime

maintainer
#25 lore raw

Re: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node

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

From: Jernej Skrabec <[email protected]>

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

It makes life a lot easier if you batch all the DTS changes together rather than randomly mixing them in with code changes, it both makes it clearer what's going on and makes things easier to handle.

#26 lore raw

PATCH v4 10/22 arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1

In reply to Clément Péron

Now that HDMI sound node is available in the SoC dtsi. Enable it for this board.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +8 -0
index 3f7ceeb1a767..049c21718846 100644
@@ -118,6 +118,14 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
+&i2s1 {
+	status = "okay";
+};
+
 &mdio {
 	ext_rgmii_phy: ethernet-phy@1 {
 		compatible = "ethernet-phy-ieee802.3-c22";
Signature · 1 line
2.25.1
#27 lore raw

PATCH v4 11/22 arm: dts: sunxi: h3/h5: Add DAI node for HDMI

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

Add the new DAI block for I2S2 which is used for HDMI audio.

---
 arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)
arch/arm/boot/dts/sunxi-h3-h5.dtsi +13 -0
index 22d533d18992..3dca6d89cab9 100644
@@ -662,6 +662,19 @@ i2s1: i2s@1c22400 {
 			status = "disabled";
 		};
 
+		i2s2: i2s@1c22800 {
+			#sound-dai-cells = <0>;
+			compatible = "allwinner,sun8i-h3-i2s";
+			reg = <0x01c22800 0x400>;
+			interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>;
+			clock-names = "apb", "mod";
+			dmas = <&dma 27>, <&dma 27>;
+			resets = <&ccu RST_BUS_I2S2>;
+			dma-names = "rx", "tx";
+			status = "disabled";
+		};
+
 		codec: codec@1c22c00 {
 			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun8i-h3-codec";
Signature · 1 line
2.25.1
#28 lore raw

PATCH v4 12/22 arm: dts: sunxi: h3/h5: Add HDMI audio

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

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

---
 arch/arm/boot/dts/sunxi-h3-h5.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm/boot/dts/sunxi-h3-h5.dtsi +20 -0
index 3dca6d89cab9..7168e9412410 100644
@@ -105,6 +105,25 @@ de: display-engine {
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "sun8i-h3-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -806,6 +825,7 @@ csi: camera@1cb0000 {
 		};
 
 		hdmi: hdmi@1ee0000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun8i-h3-dw-hdmi",
 				     "allwinner,sun8i-a83t-dw-hdmi";
 			reg = <0x01ee0000 0x10000>;
Signature · 1 line
2.25.1
#29 lore raw

PATCH v4 13/22 arm64: dts: allwinner: a64: Add DAI node for HDMI

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

Add the new DAI block for I2S2 which is used for HDMI audio.

---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +14 -0
index dc238814013c..51cc30e84e26 100644
@@ -846,6 +846,20 @@ i2s1: i2s@1c22400 {
 			status = "disabled";
 		};
 
+		i2s2: i2s@1c22800 {
+			#sound-dai-cells = <0>;
+			compatible = "allwinner,sun50i-a64-i2s",
+				     "allwinner,sun8i-h3-i2s";
+			reg = <0x01c22800 0x400>;
+			interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>;
+			clock-names = "apb", "mod";
+			resets = <&ccu RST_BUS_I2S2>;
+			dma-names = "rx", "tx";
+			dmas = <&dma 27>, <&dma 27>;
+			status = "disabled";
+		};
+
 		dai: dai@1c22c00 {
 			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-a64-codec-i2s";
Signature · 1 line
2.25.1
#30 lore raw

PATCH v4 14/22 arm64: dts: allwinner: a64: Add HDMI audio

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

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

---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +20 -0
index 51cc30e84e26..ba8a84e6e993 100644
@@ -102,6 +102,25 @@ de: display-engine {
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "sun50i-a64-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	osc24M: osc24M_clk {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
@@ -1157,6 +1176,7 @@ deinterlace: deinterlace@1e00000 {
 		};
 
 		hdmi: hdmi@1ee0000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-a64-dw-hdmi",
 				     "allwinner,sun8i-a83t-dw-hdmi";
 			reg = <0x01ee0000 0x10000>;
Signature · 1 line
2.25.1
#31 lore raw

PATCH v4 15/22 arm: sun8i: h3: Add HDMI audio to Orange Pi 2

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

Enable HDMI audio on the Orange Pi 2.

---
 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +8 -0
index 597c425d08ec..64e8e2829f27 100644
@@ -144,6 +144,14 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
+&i2s2 {
+	status = "okay";
+};
+
 &ir {
 	pinctrl-names = "default";
 	pinctrl-0 = <&r_ir_rx_pin>;
Signature · 1 line
2.25.1
#32 lore raw

PATCH v4 16/22 arm: sun8i: h3: Add HDMI audio to Beelink X2

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

Enable HDMI audio on the Beelink X2.

---
 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +8 -0
index 45a24441ff18..f9bec6935120 100644
@@ -142,6 +142,14 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
+&i2s2 {
+	status = "okay";
+};
+
 &ir {
 	linux,rc-map-name = "rc-tanix-tx3mini";
 	pinctrl-names = "default";
Signature · 1 line
2.25.1
#33 lore raw

PATCH v4 17/22 arm64: dts: allwinner: a64: Add HDMI audio to Pine64

In reply to Clément Péron

From: Marcus Cooper <[email protected]>

Enable HDMI audio on Pine64.

---
 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +8 -0
index 329cf276561e..b54b02e59085 100644
@@ -99,6 +99,10 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
 &i2c1 {
 	status = "okay";
 };
@@ -107,6 +111,10 @@ &i2c1_pins {
 	bias-pull-up;
 };
 
+&i2s2 {
+	status = "okay";
+};
+
 &mdio {
 	ext_rmii_phy1: ethernet-phy@1 {
 		compatible = "ethernet-phy-ieee802.3-c22";
Signature · 1 line
2.25.1
#34 lore raw

PATCH v4 18/22 arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2

In reply to Clément Péron

From: Ondrej Jirman <[email protected]>

The board has HDMI output, enable audio on it.

---
 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +8 -0
index 7d7aad18f078..e6ed8774a17f 100644
@@ -144,6 +144,14 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
+&i2s2 {
+	status = "okay";
+};
+
 &ir {
 	pinctrl-names = "default";
 	pinctrl-0 = <&r_ir_rx_pin>;
Signature · 1 line
2.25.1
#35 lore raw

PATCH v4 19/22 ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One

In reply to Clément Péron

From: Ondrej Jirman <[email protected]>

The board has HDMI output, enable audio on it.

---
 arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 ++++++++
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts  | 8 ++++++++
 2 files changed, 16 insertions(+)
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts +8 -0
index 4759ba3f2986..a5b45655fcf6 100644
@@ -146,6 +146,14 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
+&i2s2 {
+	status = "okay";
+};
+
 &mmc0 {
 	vmmc-supply = <&reg_vcc3v3>;
 	bus-width = <4>;
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts +8 -0
index 5aff8ecc66cb..ebb12a6f3a9f 100644
@@ -146,6 +146,14 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
+&i2s2 {
+	status = "okay";
+};
+
 &ir {
 	pinctrl-names = "default";
 	pinctrl-0 = <&r_ir_rx_pin>;
Signature · 1 line
2.25.1
#36 lore raw

PATCH v4 20/22 arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio

In reply to Clément Péron

From: Ondrej Jirman <[email protected]>

The board has HDMI output, enable audio on it.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +8 -0
index 15c9dd8c4479..193587e78031 100644
@@ -128,6 +128,14 @@ hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
+&i2s1 {
+	status = "okay";
+};
+
 &mmc0 {
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
Signature · 1 line
2.25.1
#37 lore raw

PATCH v4 21/22 arm64: defconfig: Enable Allwinner i2s driver

In reply to Clément Péron

Enable Allwinner I2S driver for arm64 defconfig.

---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
index 63003ec116ee..9a3c3bbe60e4 100644
@@ -696,6 +696,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 CONFIG_SND_SOC_SAMSUNG=y
 CONFIG_SND_SOC_RCAR=m
+CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA210_AHUB=m
Signature · 1 line
2.25.1
#38 lore raw

PATCH v4 22/22 ASoC: sun4i-i2s: fix coding-style for callback definition

In reply to Clément Péron

Checkpatch script produces warning:
WARNING: function definition argument 'const struct sun4i_i2s *' should also have an identifier name.

Let's fix this by adding identifier name to get_bclk_parent_rate() and set_fmt() callback definition.

---
 sound/soc/sunxi/sun4i-i2s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +2 -2
index 9cd6cd1cd284..a6fd9bef30d1 100644
@@ -180,13 +180,13 @@ struct sun4i_i2s_quirks {
 	const struct sun4i_i2s_clk_div	*mclk_dividers;
 	unsigned int			num_mclk_dividers;
 
-	unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *);
+	unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *i2s);
 	int	(*get_sr)(unsigned int width);
 	int	(*get_wss)(unsigned int width);
 	int	(*set_chan_cfg)(const struct sun4i_i2s *i2s,
 				unsigned int channels,	unsigned int slots,
 				unsigned int slot_width);
-	int	(*set_fmt)(const struct sun4i_i2s *, unsigned int);
+	int	(*set_fmt)(const struct sun4i_i2s *i2s, unsigned int fmt);
 };
 
 struct sun4i_i2s {
Signature · 1 line
2.25.1