clk: BD718x7: Do not depend on parent driver data

The bd718x7 only needs a regmap from parent device. This can be
obtained by call to dev_get_regmap. Do not require parent to
populate the driver data for this.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Link: https://lore.kernel.org/r/20210105123028.GA3409663@localhost.localdomain
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/clk-bd718x7.c b/drivers/clk/clk-bd718x7.c
index b52e8d6f660c4a9e71c4904331b285aa0077af7a..17d90e09f1c0f2480a2046d797c82831a0cc0c88 100644 (file)
--- a/drivers/clk/clk-bd718x7.c
+++ b/drivers/clk/clk-bd718x7.c
@@ -31,12 +31,12 @@ struct bd718xx_clk {
        u8 reg;
        u8 mask;
        struct platform_device *pdev;
-       struct rohm_regmap_dev *mfd;
+       struct regmap *regmap;
 };
 
 static int bd71837_clk_set(struct bd718xx_clk *c, unsigned int status)
 {
-       return regmap_update_bits(c->mfd->regmap, c->reg, c->mask, status);
+       return regmap_update_bits(c->regmap, c->reg, c->mask, status);
 }
 
 static void bd71837_clk_disable(struct clk_hw *hw)
@@ -62,7 +62,7 @@ static int bd71837_clk_is_enabled(struct clk_hw *hw)
        int rval;
        struct bd718xx_clk *c = container_of(hw, struct bd718xx_clk, hw);
 
-       rval = regmap_read(c->mfd->regmap, c->reg, &enabled);
+       rval = regmap_read(c->regmap, c->reg, &enabled);
 
        if (rval)
                return rval;
@@ -82,7 +82,6 @@ static int bd71837_clk_probe(struct platform_device *pdev)
        int rval = -ENOMEM;
        const char *parent_clk;
        struct device *parent = pdev->dev.parent;
-       struct rohm_regmap_dev *mfd = dev_get_drvdata(parent);
        struct clk_init_data init = {
                .name = "bd718xx-32k-out",
                .ops = &bd71837_clk_ops,
@@ -93,6 +92,10 @@ static int bd71837_clk_probe(struct platform_device *pdev)
        if (!c)
                return -ENOMEM;
 
+       c->regmap = dev_get_regmap(pdev->dev.parent, NULL);
+       if (!c->regmap)
+               return -ENODEV;
+
        init.num_parents = 1;
        parent_clk = of_clk_get_parent_name(parent->of_node, 0);
 
@@ -119,7 +122,6 @@ static int bd71837_clk_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "Unknown clk chip\n");
                return -EINVAL;
        }
-       c->mfd = mfd;
        c->pdev = pdev;
        c->hw.init = &init;