diff options
author | Dario Binacchi <dariobin@libero.it> | 2021-01-15 11:10:26 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-01-15 21:12:38 +0300 |
commit | b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b (patch) | |
tree | 9cd2774a53249733c571b51b60bc40da662d201c /drivers/clk | |
parent | 83e13c3469c710af03bf43f53aede0f9b7ba2dd0 (diff) | |
download | u-boot-b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b.tar.xz |
dm: fix build errors generated by last merges
Something was wrong in the merge process into the mainline.
Some added patches access driver structure fields and functions that
have been modified by previous patches.
The patch renames:
- dev_get_platdata to dev_get_plat
- dev_get_uclass_platdata to dev_get_uclass_plat
- ofdata_to_platdata to of_to_plat
- plat_data_alloc_size to plat_auto
- priv_auto_alloc_size to priv_auto
- video_uc_platdata to video_uc_plat
Signed-off-by: Dario Binacchi <dariobin@libero.it>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/ti/clk-am3-dpll.c | 2 | ||||
-rw-r--r-- | drivers/clk/ti/clk-ctrl.c | 2 | ||||
-rw-r--r-- | drivers/clk/ti/clk-divider.c | 2 | ||||
-rw-r--r-- | drivers/clk/ti/clk-gate.c | 2 | ||||
-rw-r--r-- | drivers/clk/ti/clk-mux.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/clk/ti/clk-am3-dpll.c b/drivers/clk/ti/clk-am3-dpll.c index 7916a24538..90b4cc69ef 100644 --- a/drivers/clk/ti/clk-am3-dpll.c +++ b/drivers/clk/ti/clk-am3-dpll.c @@ -260,7 +260,7 @@ U_BOOT_DRIVER(clk_ti_am3_dpll) = { .name = "ti_am3_dpll_clock", .id = UCLASS_CLK, .of_match = clk_ti_am3_dpll_of_match, - .ofdata_to_platdata = clk_ti_am3_dpll_of_to_plat, + .of_to_plat = clk_ti_am3_dpll_of_to_plat, .probe = clk_ti_am3_dpll_probe, .remove = clk_ti_am3_dpll_remove, .priv_auto = sizeof(struct clk_ti_am3_dpll_priv), diff --git a/drivers/clk/ti/clk-ctrl.c b/drivers/clk/ti/clk-ctrl.c index 940e8d6caf..3c6195b208 100644 --- a/drivers/clk/ti/clk-ctrl.c +++ b/drivers/clk/ti/clk-ctrl.c @@ -148,7 +148,7 @@ U_BOOT_DRIVER(clk_ti_ctrl) = { .name = "ti_ctrl_clk", .id = UCLASS_CLK, .of_match = clk_ti_ctrl_ids, - .ofdata_to_platdata = clk_ti_ctrl_of_to_plat, + .of_to_plat = clk_ti_ctrl_of_to_plat, .ops = &clk_ti_ctrl_ops, .priv_auto = sizeof(struct clk_ti_ctrl_priv), }; diff --git a/drivers/clk/ti/clk-divider.c b/drivers/clk/ti/clk-divider.c index a862637785..270f2fbdf0 100644 --- a/drivers/clk/ti/clk-divider.c +++ b/drivers/clk/ti/clk-divider.c @@ -373,7 +373,7 @@ U_BOOT_DRIVER(clk_ti_divider) = { .name = "ti_divider_clock", .id = UCLASS_CLK, .of_match = clk_ti_divider_of_match, - .ofdata_to_platdata = clk_ti_divider_of_to_plat, + .of_to_plat = clk_ti_divider_of_to_plat, .probe = clk_ti_divider_probe, .remove = clk_ti_divider_remove, .priv_auto = sizeof(struct clk_ti_divider_priv), diff --git a/drivers/clk/ti/clk-gate.c b/drivers/clk/ti/clk-gate.c index 236eaed6df..0ca453c8de 100644 --- a/drivers/clk/ti/clk-gate.c +++ b/drivers/clk/ti/clk-gate.c @@ -87,7 +87,7 @@ U_BOOT_DRIVER(clk_ti_gate) = { .name = "ti_gate_clock", .id = UCLASS_CLK, .of_match = clk_ti_gate_of_match, - .ofdata_to_platdata = clk_ti_gate_of_to_plat, + .of_to_plat = clk_ti_gate_of_to_plat, .priv_auto = sizeof(struct clk_ti_gate_priv), .ops = &clk_ti_gate_ops, }; diff --git a/drivers/clk/ti/clk-mux.c b/drivers/clk/ti/clk-mux.c index 419502c389..bb5e49e114 100644 --- a/drivers/clk/ti/clk-mux.c +++ b/drivers/clk/ti/clk-mux.c @@ -245,7 +245,7 @@ U_BOOT_DRIVER(clk_ti_mux) = { .name = "ti_mux_clock", .id = UCLASS_CLK, .of_match = clk_ti_mux_of_match, - .ofdata_to_platdata = clk_ti_mux_of_to_plat, + .of_to_plat = clk_ti_mux_of_to_plat, .probe = clk_ti_mux_probe, .remove = clk_ti_mux_remove, .priv_auto = sizeof(struct clk_ti_mux_priv), |