Hi,

(I just noticed this, but can you update my mail address, it's not
@free-electrons for quite a while, you probably want to change your
scripts to use mrip...@kernel.org)

On Wed, Aug 14, 2019 at 08:08:42AM +0200, codekip...@gmail.com wrote:
> From: Marcus Cooper <codekip...@gmail.com>
>
> The clock division circuitry is different on the H3 and later SoCs.
> The division of bclk is now based on pll2.
>
> Signed-off-by: Marcus Cooper <codekip...@gmail.com>
> ---
>  sound/soc/sunxi/sun4i-i2s.c | 73 +++++++++++++++++++++++++------------
>  1 file changed, 49 insertions(+), 24 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index 7c37b6291df0..34f31439ae7b 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
> @@ -127,8 +127,6 @@ struct sun4i_i2s;
>   * @has_chsel_offset: SoC uses offset for selecting dai operational mode.
>   * @reg_offset_txdata: offset of the tx fifo.
>   * @sun4i_i2s_regmap: regmap config to use.
> - * @mclk_offset: Value by which mclkdiv needs to be adjusted.
> - * @bclk_offset: Value by which bclkdiv needs to be adjusted.
>   * @field_clkdiv_mclk_en: regmap field to enable mclk output.
>   * @field_fmt_wss: regmap field to set word select size.
>   * @field_fmt_sr: regmap field to set sample resolution.
> @@ -150,8 +148,6 @@ struct sun4i_i2s_quirks {
>       bool                            has_chsel_offset;
>       unsigned int                    reg_offset_txdata;      /* TX FIFO */
>       const struct regmap_config      *sun4i_i2s_regmap;
> -     unsigned int                    mclk_offset;
> -     unsigned int                    bclk_offset;
>
>       /* Register fields for i2s */
>       struct reg_field                field_clkdiv_mclk_en;
> @@ -212,7 +208,25 @@ static const struct sun4i_i2s_clk_div 
> sun4i_i2s_bclk_div[] = {
>       { .div = 8, .val = 3 },
>       { .div = 12, .val = 4 },
>       { .div = 16, .val = 5 },
> -     /* TODO - extend divide ratio supported by newer SoCs */
> +};
> +
> +static const struct sun4i_i2s_clk_div sun8i_i2s_clk_div[] = {
> +     { .div = 0, .val = 0 },

Having a divider of 0 seems like a bad idea.

> +     { .div = 1, .val = 1 },
> +     { .div = 2, .val = 2 },
> +     { .div = 4, .val = 3 },
> +     { .div = 6, .val = 4 },
> +     { .div = 8, .val = 5 },
> +     { .div = 12, .val = 6 },
> +     { .div = 16, .val = 7 },
> +     { .div = 24, .val = 8 },
> +     { .div = 32, .val = 9 },
> +     { .div = 48, .val = 10 },
> +     { .div = 64, .val = 11 },
> +     { .div = 96, .val = 12 },
> +     { .div = 128, .val = 13 },
> +     { .div = 176, .val = 14 },
> +     { .div = 192, .val = 15 },
>  };
>
>  static const struct sun4i_i2s_clk_div sun4i_i2s_mclk_div[] = {
> @@ -224,21 +238,21 @@ static const struct sun4i_i2s_clk_div 
> sun4i_i2s_mclk_div[] = {
>       { .div = 12, .val = 5 },
>       { .div = 16, .val = 6 },
>       { .div = 24, .val = 7 },
> -     /* TODO - extend divide ratio supported by newer SoCs */
>  };
>
>  static int sun4i_i2s_get_bclk_div(struct sun4i_i2s *i2s,
>                                 unsigned int oversample_rate,
> -                               unsigned int word_size)
> +                               unsigned int word_size,
> +                               const struct sun4i_i2s_clk_div *bdiv,
> +                               unsigned int size)

Wouldn't it be simpler to just have the divider list in the variant
structure? It would avoid having to refactor all the functions, and
it's not like it's really going to change from one call to another
anyway.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
To view this discussion on the web, visit 
https://groups.google.com/d/msgid/linux-sunxi/20190814071343.vvjbozrmv5ionwnf%40flea.

Attachment: signature.asc
Description: PGP signature

Reply via email to