* [PATCH v2 01/20] Revert "ASoC: sun4i-i2s: Fix the LRCK polarity"
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:57 ` Maxime Ripard
2020-09-03 20:30 ` [PATCH v2 02/20] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
` (18 subsequent siblings)
19 siblings, 1 reply; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
This reverts commit dd657eae8164f7e4bafe8b875031a7c6c50646a9.
There was a misinterpretation of the analysis using a scope.
After rechecking this using a logical analyzer the LRCK polarity is
fine.
Fixes: dd657eae8164 ("ASoC: sun4i-i2s: Fix the LRCK polarity")
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index f23ff29e7c1d..fabff7bcccbc 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -603,29 +603,23 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
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.
- */
+ /* DAI clock polarity */
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
case SND_SOC_DAIFMT_IB_IF:
/* Invert both clocks */
- val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED;
+ val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED |
+ SUN8I_I2S_FMT0_LRCLK_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;
+ val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED;
break;
case SND_SOC_DAIFMT_NB_IF:
/* Invert frame clock */
- val = 0;
+ val = SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED;
break;
case SND_SOC_DAIFMT_NB_NF:
- val = SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED;
+ val = 0;
break;
default:
return -EINVAL;
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v2 01/20] Revert "ASoC: sun4i-i2s: Fix the LRCK polarity"
2020-09-03 20:30 ` [PATCH v2 01/20] Revert "ASoC: sun4i-i2s: Fix the LRCK polarity" Clément Péron
@ 2020-09-03 20:57 ` Maxime Ripard
0 siblings, 0 replies; 25+ messages in thread
From: Maxime Ripard @ 2020-09-03 20:57 UTC (permalink / raw)
To: Clément Péron
Cc: Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood, devicetree,
Jernej Skrabec, alsa-devel, linux-kernel, Takashi Iwai,
Marcus Cooper, linux-sunxi, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
Hi
On Thu, Sep 03, 2020 at 10:30:15PM +0200, Clément Péron wrote:
> This reverts commit dd657eae8164f7e4bafe8b875031a7c6c50646a9.
>
> There was a misinterpretation of the analysis using a scope.
> After rechecking this using a logical analyzer the LRCK polarity is
> fine.
Yes, it's fine indeed, so there's no need to change anything?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v2 02/20] ASoC: sun4i-i2s: Add support for H6 I2S
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-03 20:30 ` [PATCH v2 01/20] Revert "ASoC: sun4i-i2s: Fix the LRCK polarity" Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-04 3:16 ` Samuel Holland
2020-09-03 20:30 ` [PATCH v2 03/20] ASoC: sun4i-i2s: Adjust LRCLK width Clément Péron
` (17 subsequent siblings)
19 siblings, 1 reply; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Jernej Skrabec <jernej.skrabec@siol.net>
H6 I2S is very similar to that in H3, except it supports up to 16
channels.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 221 ++++++++++++++++++++++++++++++++++++
1 file changed, 221 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index fabff7bcccbc..acf24f512f2c 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -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,65 @@ 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;
+ }
+
+ 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)
@@ -693,6 +767,102 @@ 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 */
+ switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+ case SND_SOC_DAIFMT_IB_IF:
+ /* Invert both clocks */
+ val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED |
+ SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED;
+ break;
+ case SND_SOC_DAIFMT_IB_NF:
+ /* Invert bit clock */
+ val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED;
+ break;
+ case SND_SOC_DAIFMT_NB_IF:
+ /* Invert frame clock */
+ val = SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED;
+ break;
+ case SND_SOC_DAIFMT_NB_NF:
+ val = 0;
+ 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);
@@ -973,6 +1143,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,
@@ -1000,6 +1186,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);
@@ -1158,6 +1357,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)
{
@@ -1327,6 +1544,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);
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v2 02/20] ASoC: sun4i-i2s: Add support for H6 I2S
2020-09-03 20:30 ` [PATCH v2 02/20] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
@ 2020-09-04 3:16 ` Samuel Holland
2020-09-05 9:44 ` Clément Péron
0 siblings, 1 reply; 25+ messages in thread
From: Samuel Holland @ 2020-09-04 3:16 UTC (permalink / raw)
To: Clément Péron, Maxime Ripard, Chen-Yu Tsai,
Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel
Clément,
On 9/3/20 3:30 PM, Clément Péron wrote:
> From: Jernej Skrabec <jernej.skrabec@siol.net>
>
> H6 I2S is very similar to that in H3, except it supports up to 16
> channels.
>
> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
> Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> Signed-off-by: Clément Péron <peron.clem@gmail.com>
> ---
> sound/soc/sunxi/sun4i-i2s.c | 221 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 221 insertions(+)
>
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index fabff7bcccbc..acf24f512f2c 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
[snip]
> @@ -474,6 +489,65 @@ 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:
These cases don't match the documentation: LEFT_J and RIGHT_J are documented to
behave like I2S (lrck_period == slot_width), not like DSP_A/B (lrck_period ==
slot_width * slots).
> + 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;
Here, i2s->slot_width is the number of bits for each slot, but in PCM mode, you
need to multiply by the number of slots, like above.
Also, there is already logic in sun4i_i2s_hw_params to use i2s->slot_width and
i2s->slots. You could avoid the duplication by passing slot_width/slots as
parameters to set_chan_cfg.
Regards,
Samuel
> +
> + 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)
[snip]
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v2 02/20] ASoC: sun4i-i2s: Add support for H6 I2S
2020-09-04 3:16 ` Samuel Holland
@ 2020-09-05 9:44 ` Clément Péron
0 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-05 9:44 UTC (permalink / raw)
To: Samuel Holland
Cc: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown,
Liam Girdwood, devicetree, Jernej Skrabec, Linux-ALSA,
linux-kernel, Takashi Iwai, Marcus Cooper, linux-sunxi,
linux-arm-kernel
Hi Samuel,
On Fri, 4 Sep 2020 at 05:16, Samuel Holland <samuel@sholland.org> wrote:
>
> Clément,
>
> On 9/3/20 3:30 PM, Clément Péron wrote:
> > From: Jernej Skrabec <jernej.skrabec@siol.net>
> >
> > H6 I2S is very similar to that in H3, except it supports up to 16
> > channels.
> >
> > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
> > Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> > Signed-off-by: Clément Péron <peron.clem@gmail.com>
> > ---
> > sound/soc/sunxi/sun4i-i2s.c | 221 ++++++++++++++++++++++++++++++++++++
> > 1 file changed, 221 insertions(+)
> >
> > diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> > index fabff7bcccbc..acf24f512f2c 100644
> > --- a/sound/soc/sunxi/sun4i-i2s.c
> > +++ b/sound/soc/sunxi/sun4i-i2s.c
>
> [snip]
>
> > @@ -474,6 +489,65 @@ 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:
>
> These cases don't match the documentation: LEFT_J and RIGHT_J are documented to
> behave like I2S (lrck_period == slot_width), not like DSP_A/B (lrck_period ==
> slot_width * slots).
>
> > + 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;
>
> Here, i2s->slot_width is the number of bits for each slot, but in PCM mode, you
you mean TDM here right?
> need to multiply by the number of slots, like above.
>
> Also, there is already logic in sun4i_i2s_hw_params to use i2s->slot_width and
> i2s->slots. You could avoid the duplication by passing slot_width/slots as
> parameters to set_chan_cfg.
Thanks for the catch, I will fix this.
Regards,
Clement
>
> Regards,
> Samuel
>
> > +
> > + 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)
>
> [snip]
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v2 03/20] ASoC: sun4i-i2s: Adjust LRCLK width
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-03 20:30 ` [PATCH v2 01/20] Revert "ASoC: sun4i-i2s: Fix the LRCK polarity" Clément Péron
2020-09-03 20:30 ` [PATCH v2 02/20] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-04 3:18 ` Samuel Holland
2020-09-03 20:30 ` [PATCH v2 04/20] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
` (16 subsequent siblings)
19 siblings, 1 reply; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron, Maxime Ripard
From: Marcus Cooper <codekipper@gmail.com>
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.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
Acked-by: Maxime Ripard <maxime@cerno.tech>
---
sound/soc/sunxi/sun4i-i2s.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index acf24f512f2c..1b4482b0f4af 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -478,6 +478,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));
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v2 03/20] ASoC: sun4i-i2s: Adjust LRCLK width
2020-09-03 20:30 ` [PATCH v2 03/20] ASoC: sun4i-i2s: Adjust LRCLK width Clément Péron
@ 2020-09-04 3:18 ` Samuel Holland
0 siblings, 0 replies; 25+ messages in thread
From: Samuel Holland @ 2020-09-04 3:18 UTC (permalink / raw)
To: Clément Péron, Maxime Ripard, Chen-Yu Tsai,
Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Maxime Ripard
Clément,
On 9/3/20 3:30 PM, Clément Péron wrote:
> From: Marcus Cooper <codekipper@gmail.com>
>
> 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.
>
> Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> Signed-off-by: Clément Péron <peron.clem@gmail.com>
> Acked-by: Maxime Ripard <maxime@cerno.tech>
> ---
> sound/soc/sunxi/sun4i-i2s.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index acf24f512f2c..1b4482b0f4af 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
> @@ -478,6 +478,9 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
> return -EINVAL;
> }
>
> + if (i2s->slot_width)
> + lrck_period = i2s->slot_width;
> +
Same as patch 2, this duplicates logic in sun4i_i2s_hw_params, and would need to
be multiplied by `slots` for PCM (DSP_A/B) mode.
Regards,
Samuel
> regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG,
> SUN8I_I2S_FMT0_LRCK_PERIOD_MASK,
> SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period));
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v2 04/20] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (2 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 03/20] ASoC: sun4i-i2s: Adjust LRCLK width Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 05/20] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
` (15 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron, Rob Herring
From: Jernej Skrabec <jernej.skrabec@siol.net>
H6 I2S is very similar to H3, except that it supports up to 16 channels
and thus few registers have fields on different position.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
---
.../devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml
index 112ae00d63c1..606ad2d884a8 100644
--- a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml
+++ b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml
@@ -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:
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 05/20] ASoC: sun4i-i2s: Set sign extend sample
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (3 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 04/20] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 06/20] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
` (14 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
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.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 1b4482b0f4af..13e64180e917 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -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
@@ -671,6 +677,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;
}
@@ -767,6 +774,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;
}
@@ -863,6 +875,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;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 06/20] ASoc: sun4i-i2s: Add 20 and 24 bit support
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (4 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 05/20] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
` (13 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Extend the functionality of the driver to include support of 20 and
24 bits per sample.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
---
sound/soc/sunxi/sun4i-i2s.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 13e64180e917..df73cd5751c0 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -585,6 +585,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));
@@ -1054,6 +1057,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 = {
@@ -1061,14 +1068,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,
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (5 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 06/20] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 08/20] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
` (12 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
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.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
---
sound/soc/sunxi/sun4i-i2s.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index df73cd5751c0..aa162e76d671 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1135,12 +1135,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[] = {
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 08/20] arm64: dts: allwinner: h6: Add HDMI audio node
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (6 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 09/20] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
` (11 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Jernej Skrabec <jernej.skrabec@siol.net>
Add a simple-soundcard to link audio between HDMI and I2S.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 32 ++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 9ce78a7b117d..9597f40b25a9 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -67,6 +67,24 @@ 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>;
+ 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";
@@ -608,6 +626,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";
@@ -738,6 +769,7 @@ ohci3: usb@5311400 {
};
hdmi: hdmi@6000000 {
+ #sound-dai-cells = <0>;
compatible = "allwinner,sun50i-h6-dw-hdmi";
reg = <0x06000000 0x10000>;
reg-io-width = <1>;
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 09/20] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (7 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 08/20] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 10/20] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
` (10 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
Now that HDMI sound node is available in the SoC dtsi.
Enable it for this board.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index 3f7ceeb1a767..049c21718846 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@ -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";
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 10/20] arm: dts: sunxi: h3/h5: Add DAI node for HDMI
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (8 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 09/20] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 11/20] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
` (9 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Add the new DAI block for I2S2 which is used for HDMI audio.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 22d533d18992..3dca6d89cab9 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -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";
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 11/20] arm: dts: sunxi: h3/h5: Add HDMI audio
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (9 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 10/20] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 12/20] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
` (8 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Add a simple-soundcard to link audio between HDMI and I2S.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 3dca6d89cab9..ebb109c828d9 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -105,6 +105,24 @@ 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>;
+ 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 +824,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>;
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 12/20] arm64: dts: allwinner: a64: Add DAI node for HDMI
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (10 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 11/20] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 13/20] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
` (7 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Add the new DAI block for I2S2 which is used for HDMI audio.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 8dfbcd144072..bcf808459edf 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -845,6 +845,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";
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 13/20] arm64: dts: allwinner: a64: Add HDMI audio
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (11 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 12/20] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 14/20] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
` (6 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Add a simple-soundcard to link audio between HDMI and I2S.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index bcf808459edf..8c540f4f64b9 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -102,6 +102,24 @@ 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>;
+ 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";
@@ -1155,6 +1173,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>;
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 14/20] arm: sun8i: h3: Add HDMI audio to Orange Pi 2
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (12 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 13/20] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 15/20] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
` (5 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Enable HDMI audio on the Orange Pi 2.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
index 597c425d08ec..64e8e2829f27 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
@@ -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>;
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 15/20] arm: sun8i: h3: Add HDMI audio to Beelink X2
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (13 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 14/20] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 16/20] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
` (4 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Enable HDMI audio on the Beelink X2.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
index 45a24441ff18..f9bec6935120 100644
--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
@@ -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";
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 16/20] arm64: dts: allwinner: a64: Add HDMI audio to Pine64
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (14 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 15/20] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 17/20] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
` (3 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
From: Marcus Cooper <codekipper@gmail.com>
Enable HDMI audio on Pine64.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index 2165f238af13..c5939ba52f19 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -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";
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 17/20] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (15 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 16/20] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 18/20] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
` (2 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Ondrej Jirman, Clément Péron
From: Ondrej Jirman <megous@megous.com>
The board has HDMI output, enable audio on it.
Signed-off-by: Ondrej Jirman <megous@megous.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
index 7d7aad18f078..e6ed8774a17f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
@@ -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>;
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 18/20] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (16 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 17/20] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 19/20] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-03 20:30 ` [PATCH v2 20/20] arm64: defconfig: Enable Allwinner i2s driver Clément Péron
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Ondrej Jirman, Clément Péron
From: Ondrej Jirman <megous@megous.com>
The board has HDMI output, enable audio on it.
Signed-off-by: Ondrej Jirman <megous@megous.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
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(+)
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
index 4759ba3f2986..a5b45655fcf6 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
@@ -146,6 +146,14 @@ hdmi_out_con: endpoint {
};
};
+&hdmi_sound {
+ status = "okay";
+};
+
+&i2s2 {
+ status = "okay";
+};
+
&mmc0 {
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
index 5aff8ecc66cb..ebb12a6f3a9f 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
@@ -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>;
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 19/20] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (17 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 18/20] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
2020-09-03 20:30 ` [PATCH v2 20/20] arm64: defconfig: Enable Allwinner i2s driver Clément Péron
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Ondrej Jirman, Clément Péron
From: Ondrej Jirman <megous@megous.com>
The board has HDMI output, enable audio on it.
Signed-off-by: Ondrej Jirman <megous@megous.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
index 15c9dd8c4479..193587e78031 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
@@ -128,6 +128,14 @@ hdmi_out_con: endpoint {
};
};
+&hdmi_sound {
+ status = "okay";
+};
+
+&i2s1 {
+ status = "okay";
+};
+
&mmc0 {
vmmc-supply = <®_cldo1>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 20/20] arm64: defconfig: Enable Allwinner i2s driver
2020-09-03 20:30 [PATCH v2 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
` (18 preceding siblings ...)
2020-09-03 20:30 ` [PATCH v2 19/20] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
@ 2020-09-03 20:30 ` Clément Péron
19 siblings, 0 replies; 25+ messages in thread
From: Clément Péron @ 2020-09-03 20:30 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Brown, Liam Girdwood
Cc: devicetree, Jernej Skrabec, alsa-devel, linux-kernel,
Takashi Iwai, Marcus Cooper, linux-sunxi, linux-arm-kernel,
Clément Péron
Enable Allwinner I2S driver for arm64 defconfig.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 5828b42f5243..4eaac49dccbb 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -691,6 +691,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_AK4613=m
CONFIG_SND_SOC_ES7134=m
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread