diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
| commit | d71be1990218957b9f05dbf13a72859a2abe06d7 (patch) | |
| tree | 99858dc9988f7f7b4c0ab1d8d45738e3abdf38c8 /drivers/clk/meson | |
| parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
| parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/clk/meson')
| -rw-r--r-- | drivers/clk/meson/axg.c | 4 | ||||
| -rw-r--r-- | drivers/clk/meson/g12a.c | 4 | ||||
| -rw-r--r-- | drivers/clk/meson/gxbb.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 6ef8b418d7..d6da59d269 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -289,7 +289,7 @@ static int meson_clk_probe(struct udevice *dev) { struct meson_clk *priv = dev_get_priv(dev); - priv->map = syscon_node_to_regmap(dev_get_parent(dev)->node); + priv->map = syscon_node_to_regmap(dev_ofnode(dev_get_parent(dev))); if (IS_ERR(priv->map)) return PTR_ERR(priv->map); @@ -320,7 +320,7 @@ U_BOOT_DRIVER(meson_clk_axg) = { .name = "meson_clk_axg", .id = UCLASS_CLK, .of_match = meson_clk_ids, - .priv_auto_alloc_size = sizeof(struct meson_clk), + .priv_auto = sizeof(struct meson_clk), .ops = &meson_clk_ops, .probe = meson_clk_probe, }; diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index bf2f357435..5058db1a47 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -979,7 +979,7 @@ static int meson_clk_probe(struct udevice *dev) { struct meson_clk *priv = dev_get_priv(dev); - priv->map = syscon_node_to_regmap(dev_get_parent(dev)->node); + priv->map = syscon_node_to_regmap(dev_ofnode(dev_get_parent(dev))); if (IS_ERR(priv->map)) return PTR_ERR(priv->map); @@ -1014,7 +1014,7 @@ U_BOOT_DRIVER(meson_clk_g12a) = { .name = "meson_clk_g12a", .id = UCLASS_CLK, .of_match = meson_clk_ids, - .priv_auto_alloc_size = sizeof(struct meson_clk), + .priv_auto = sizeof(struct meson_clk), .ops = &meson_clk_ops, .probe = meson_clk_probe, }; diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index b9353c053e..e379540dee 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -885,7 +885,7 @@ static int meson_clk_probe(struct udevice *dev) { struct meson_clk *priv = dev_get_priv(dev); - priv->map = syscon_node_to_regmap(dev_get_parent(dev)->node); + priv->map = syscon_node_to_regmap(dev_ofnode(dev_get_parent(dev))); if (IS_ERR(priv->map)) return PTR_ERR(priv->map); @@ -919,7 +919,7 @@ U_BOOT_DRIVER(meson_clk) = { .name = "meson_clk", .id = UCLASS_CLK, .of_match = meson_clk_ids, - .priv_auto_alloc_size = sizeof(struct meson_clk), + .priv_auto = sizeof(struct meson_clk), .ops = &meson_clk_ops, .probe = meson_clk_probe, }; |