Unverified Commit 66ecce33 authored by Marcus Cooper's avatar Marcus Cooper Committed by Mark Brown
Browse files

ASoC: sun4i-i2s: Add compatibility with A64 codec I2S 



The I2S block used for the audio codec in the A64 differs from other 3
I2S modules in A64 and isn't compatible with H3. But it is very similar
to what is found in A10(sun4i). However, its TX FIFO is
located at a different address.

Signed-off-by: default avatarMarcus Cooper <codekipper@gmail.com>
Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3b991038

Documentation/devicetree/bindings/sound/sun4i-i2s.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
   - "allwinner,sun6i-a31-i2s"

   - "allwinner,sun8i-a83t-i2s"

   - "allwinner,sun8i-h3-i2s"

   - "allwinner,sun50i-a64-codec-i2s"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: should contain the I2S interrupt.
@@ -26,6 +27,7 @@ Required properties for the following compatibles: 
	- "allwinner,sun6i-a31-i2s"

	- "allwinner,sun8i-a83t-i2s"

	- "allwinner,sun8i-h3-i2s"

	- "allwinner,sun50i-a64-codec-i2s"

- resets: phandle to the reset line for this codec



Example:

sound/soc/sunxi/sun4i-i2s.c

+21 −0
Original line number Diff line number Diff line
@@ -961,6 +961,23 @@ static const struct sun4i_i2s_quirks sun8i_h3_i2s_quirks = { 
	.field_rxchansel	= REG_FIELD(SUN8I_I2S_RX_CHAN_SEL_REG, 0, 2),

};



static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {

	.has_reset		= true,

	.reg_offset_txdata	= SUN8I_I2S_FIFO_TX_REG,

	.sun4i_i2s_regmap	= &sun4i_i2s_regmap_config,

	.has_slave_select_bit	= true,

	.field_clkdiv_mclk_en	= REG_FIELD(SUN4I_I2S_CLK_DIV_REG, 7, 7),

	.field_fmt_wss		= REG_FIELD(SUN4I_I2S_FMT0_REG, 2, 3),

	.field_fmt_sr		= REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 5),

	.field_fmt_bclk		= REG_FIELD(SUN4I_I2S_FMT0_REG, 6, 6),

	.field_fmt_lrclk	= REG_FIELD(SUN4I_I2S_FMT0_REG, 7, 7),

	.field_fmt_mode		= REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 1),

	.field_txchanmap	= REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31),

	.field_rxchanmap	= REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),

	.field_txchansel	= REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),

	.field_rxchansel	= REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2),

};



static int sun4i_i2s_init_regmap_fields(struct device *dev,

					struct sun4i_i2s *i2s)

{
@@ -1169,6 +1186,10 @@ static const struct of_device_id sun4i_i2s_match[] = { 
		.compatible = "allwinner,sun8i-h3-i2s",

		.data = &sun8i_h3_i2s_quirks,

	},

	{

		.compatible = "allwinner,sun50i-a64-codec-i2s",

		.data = &sun50i_a64_codec_i2s_quirks,

	},

	{}

};

MODULE_DEVICE_TABLE(of, sun4i_i2s_match);

CRA Git | Maintained and supported by SUSTech CRA and CCSE