lkml.org 
[lkml]   [2017]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 03/12] ASoC: sun4i-i2s: Add regmap config to quirks
    Date
    From: Marcus Cooper <codekipper@gmail.com>

    The newer SoCs have a larger range than the original SoC that this
    driver was developed for. By adding the regmap config to the quirks
    then the driver can initialise the managed register map correctly.

    Signed-off-by: Marcus Cooper <codekipper@gmail.com>
    ---
    sound/soc/sunxi/sun4i-i2s.c | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
    index 1d538de4e4d0..73e991f5a81e 100644
    --- a/sound/soc/sunxi/sun4i-i2s.c
    +++ b/sound/soc/sunxi/sun4i-i2s.c
    @@ -94,11 +94,13 @@
    * struct sun4i_i2s_quirks - Differences between SoC variants.
    *
    * @has_reset: SoC needs reset deasserted.
    + * @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.
    */
    struct sun4i_i2s_quirks {
    bool has_reset;
    + const struct regmap_config *sun4i_i2s_regmap;
    unsigned int mclk_offset;
    unsigned int bclk_offset;
    };
    @@ -670,11 +672,13 @@ static int sun4i_i2s_runtime_suspend(struct device *dev)
    }

    static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = {
    - .has_reset = false,
    + .has_reset = false,
    + .sun4i_i2s_regmap = &sun4i_i2s_regmap_config,
    };

    static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = {
    - .has_reset = true,
    + .has_reset = true,
    + .sun4i_i2s_regmap = &sun4i_i2s_regmap_config,
    };

    static int sun4i_i2s_probe(struct platform_device *pdev)
    @@ -713,7 +717,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
    }

    i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
    - &sun4i_i2s_regmap_config);
    + i2s->variant->sun4i_i2s_regmap);
    if (IS_ERR(i2s->regmap)) {
    dev_err(&pdev->dev, "Regmap initialisation failed\n");
    return PTR_ERR(i2s->regmap);
    --
    2.13.3
    \
     
     \ /
      Last update: 2017-07-29 17:44    [W:4.049 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site