ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

clk: BD718x7: Do not depend on parent driver data

Browse Source 
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>
This commit is contained in:
Matti Vaittinen
2021-01-05 14:47:54 +02:00
committed by Stephen Boyd
parent 5c8fe583cc
commit ddddfafd94
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/clk/clk-bd718x7.c
View File

@@ -31,12 +31,12 @@ struct bd718xx_clk {
u8 reg; u8 reg;
u8 mask; u8 mask;
struct platform_device *pdev; struct platform_device *pdev;
struct rohm_regmap_dev *mfd; struct regmap *regmap;
}; };
static int bd71837_clk_set(struct bd718xx_clk *c, unsigned int status) 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) 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; int rval;
struct bd718xx_clk *c = container_of(hw, struct bd718xx_clk, hw); 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) if (rval)
return rval; return rval;
@@ -82,7 +82,6 @@ static int bd71837_clk_probe(struct platform_device *pdev)
int rval = -ENOMEM; int rval = -ENOMEM;
const char *parent_clk; const char *parent_clk;
struct device *parent = pdev->dev.parent; struct device *parent = pdev->dev.parent;
struct rohm_regmap_dev *mfd = dev_get_drvdata(parent);
struct clk_init_data init = { struct clk_init_data init = {
.name = "bd718xx-32k-out", .name = "bd718xx-32k-out",
.ops = &bd71837_clk_ops, .ops = &bd71837_clk_ops,
@@ -93,6 +92,10 @@ static int bd71837_clk_probe(struct platform_device *pdev)
if (!c) if (!c)
return -ENOMEM; return -ENOMEM;
c->regmap = dev_get_regmap(pdev->dev.parent, NULL);
if (!c->regmap)
return -ENODEV;
init.num_parents = 1; init.num_parents = 1;
parent_clk = of_clk_get_parent_name(parent->of_node, 0); 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"); dev_err(&pdev->dev, "Unknown clk chip\n");
return -EINVAL; return -EINVAL;
} }
c->mfd = mfd;
c->pdev = pdev; c->pdev = pdev;
c->hw.init = &init; c->hw.init = &init;