| Message ID | 20181013165329.13363-2-anarsoul@gmail.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Add support for audiocodec in Allwinner A64 | expand |
On Sat, Oct 13, 2018 at 09:53:21AM -0700, Vasily Khoruzhick wrote: > From: Marcus Cooper <codekipper@gmail.com> > > 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: Marcus Cooper <codekipper@gmail.com> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Maxime
On Monday, October 15, 2018 1:18:36 AM PDT Maxime Ripard wrote: > On Sat, Oct 13, 2018 at 09:53:21AM -0700, Vasily Khoruzhick wrote: > > From: Marcus Cooper <codekipper@gmail.com> > > > > 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: Marcus Cooper <codekipper@gmail.com> > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Mark, can you pick this patch up please? Thanks! Regards, Vasily > > Maxime
On Fri, Oct 19, 2018 at 9:14 AM Vasily Khoruzhick <anarsoul@gmail.com> wrote: > > On Monday, October 15, 2018 1:18:36 AM PDT Maxime Ripard wrote: > > On Sat, Oct 13, 2018 at 09:53:21AM -0700, Vasily Khoruzhick wrote: > > > From: Marcus Cooper <codekipper@gmail.com> > > > > > > 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: Marcus Cooper <codekipper@gmail.com> > > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > > > Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> > > Mark, can you pick this patch up please? Ooops, wrong patch, please ignore this message. > > Thanks! > > Regards, > Vasily > > > > > Maxime > > > >
diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt index b9d50d6cdef3..61e71c1729e0 100644 --- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt +++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt @@ -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: diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index ed30d30ac720..83374617962c 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -967,6 +967,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) { @@ -1175,6 +1192,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);