dm: treewide: Rename auto_alloc_size members to be shorter

This construct is quite long-winded. In earlier days it made some sense
since auto-allocation was a strange concept. But with driver model now
used pretty universally, we can shorten this to 'auto'. This reduces
verbosity and makes it easier to read.

Coincidentally it also ensures that every declaration is on one line,
thus making dtoc's job easier.

Signed-off-by: Simon Glass <sjg@chromium.org>

78 files changed, 121 insertions, 121 deletions

diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index a539889..8a71e2f 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -658,5 +658,5 @@ U_BOOT_DRIVER(socfpga_agilex_clk) = {
 	.ops		= &socfpga_clk_ops,
 	.probe		= socfpga_clk_probe,
 	.ofdata_to_platdata = socfpga_clk_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct socfpga_clk_platdata),
+	.platdata_auto	= sizeof(struct socfpga_clk_platdata),
 };
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 732ed4d..1d853cd 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -359,5 +359,5 @@ U_BOOT_DRIVER(socfpga_a10_clk) = {
 	.probe		= socfpga_a10_clk_probe,
 	.ofdata_to_platdata = socfpga_a10_ofdata_to_platdata,
 
-	.platdata_auto_alloc_size = sizeof(struct socfpga_a10_clk_platdata),
+	.platdata_auto	= sizeof(struct socfpga_a10_clk_platdata),
 };
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index aab7d14..e2e8d49 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -523,7 +523,7 @@ U_BOOT_DRIVER(aspeed_ast2500_scu) = {
 	.name		= "aspeed_ast2500_scu",
 	.id		= UCLASS_CLK,
 	.of_match	= ast2500_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct ast2500_clk_priv),
+	.priv_auto	= sizeof(struct ast2500_clk_priv),
 	.ops		= &ast2500_clk_ops,
 	.bind		= ast2500_clk_bind,
 	.ofdata_to_platdata		= ast2500_clk_ofdata_to_platdata,
diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c
index afd67b2..1b43711 100644
--- a/drivers/clk/at91/compat.c
+++ b/drivers/clk/at91/compat.c
@@ -225,7 +225,7 @@ U_BOOT_DRIVER(at91sam9x5_main_osc_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = main_osc_clk_match,
 	.probe = main_osc_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &main_osc_clk_ops,
 };
 
@@ -266,7 +266,7 @@ U_BOOT_DRIVER(at91_plla_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = plla_clk_match,
 	.probe = plla_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &plla_clk_ops,
 };
 
@@ -340,7 +340,7 @@ U_BOOT_DRIVER(at91_plladiv_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = at91_plladiv_clk_match,
 	.probe = at91_plladiv_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &at91_plladiv_clk_ops,
 };
 
@@ -437,7 +437,7 @@ U_BOOT_DRIVER(system_clk) = {
 	.name = "system-clk",
 	.id = UCLASS_CLK,
 	.probe = at91_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &system_clk_ops,
 };
 
@@ -536,7 +536,7 @@ static struct clk_ops periph_clk_ops = {
 U_BOOT_DRIVER(clk_periph) = {
 	.name	= "periph-clk",
 	.id	= UCLASS_CLK,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.probe = at91_clk_probe,
 	.ops	= &periph_clk_ops,
 };
@@ -668,7 +668,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = {
 	.of_match = utmi_clk_match,
 	.probe = utmi_clk_probe,
 	.ofdata_to_platdata = utmi_clk_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &utmi_clk_ops,
 };
 
@@ -713,7 +713,7 @@ U_BOOT_DRIVER(sama5d4_h32mx_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = sama5d4_h32mx_clk_match,
 	.probe = sama5d4_h32mx_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &sama5d4_h32mx_clk_ops,
 };
 
@@ -876,8 +876,8 @@ U_BOOT_DRIVER(generic_clk) = {
 	.id = UCLASS_CLK,
 	.probe = at91_clk_probe,
 	.ofdata_to_platdata = generic_clk_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct generic_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.priv_auto	= sizeof(struct generic_clk_priv),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &generic_clk_ops,
 };
 
@@ -1012,8 +1012,8 @@ U_BOOT_DRIVER(at91_usb_clk) = {
 	.of_match = at91_usb_clk_match,
 	.probe = at91_usb_clk_probe,
 	.ofdata_to_platdata = at91_usb_clk_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct at91_usb_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.priv_auto	= sizeof(struct at91_usb_clk_priv),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &at91_usb_clk_ops,
 };
 
diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c
index dd62dc5..34ce611 100644
--- a/drivers/clk/at91/sckc.c
+++ b/drivers/clk/at91/sckc.c
@@ -165,7 +165,7 @@ U_BOOT_DRIVER(at91_sckc) = {
 	.name = UBOOT_DM_CLK_AT91_SCKC,
 	.id = UCLASS_CLK,
 	.of_match = sam9x60_sckc_ids,
-	.priv_auto_alloc_size = sizeof(struct sam9x60_sckc) * 2,
+	.priv_auto	= sizeof(struct sam9x60_sckc) * 2,
 	.ops = &sam9x60_sckc_ops,
 	.probe = at91_sam9x60_sckc_probe,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c
index fd47872..6634b7b 100644
--- a/drivers/clk/clk-cdce9xx.c
+++ b/drivers/clk/clk-cdce9xx.c
@@ -251,6 +251,6 @@ U_BOOT_DRIVER(cdce9xx_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = cdce9xx_clk_of_match,
 	.probe = cdce9xx_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct cdce9xx_clk_data),
+	.priv_auto	= sizeof(struct cdce9xx_clk_data),
 	.ops = &cdce9xx_clk_ops,
 };
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 3eb93a5..449b430 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -774,6 +774,6 @@ U_BOOT_DRIVER(hsdk_cgu_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = hsdk_cgu_clk_id,
 	.probe = hsdk_cgu_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct hsdk_cgu_clk),
+	.priv_auto	= sizeof(struct hsdk_cgu_clk),
 	.ops = &hsdk_cgu_ops,
 };
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 7a9a645..6f0fdaa 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -220,6 +220,6 @@ U_BOOT_DRIVER(ti_sci_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = ti_sci_clk_of_match,
 	.probe = ti_sci_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_clk_data),
+	.priv_auto	= sizeof(struct ti_sci_clk_data),
 	.ops = &ti_sci_clk_ops,
 };
diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c
index b850b9f..8c22ed2 100644
--- a/drivers/clk/clk_bcm6345.c
+++ b/drivers/clk/clk_bcm6345.c
@@ -70,5 +70,5 @@ U_BOOT_DRIVER(clk_bcm6345) = {
 	.of_match = bcm6345_clk_ids,
 	.ops = &bcm6345_clk_ops,
 	.probe = bcm63xx_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_clk_priv),
+	.priv_auto	= sizeof(struct bcm6345_clk_priv),
 };
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index 2318dcf..99edaec 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -92,6 +92,6 @@ U_BOOT_DRIVER(clk_boston) = {
 	.id = UCLASS_CLK,
 	.of_match = clk_boston_match,
 	.ofdata_to_platdata = clk_boston_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct clk_boston),
+	.platdata_auto	= sizeof(struct clk_boston),
 	.ops = &clk_boston_ops,
 };
diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c
index cf9c4ae..4519e05 100644
--- a/drivers/clk/clk_fixed_factor.c
+++ b/drivers/clk/clk_fixed_factor.c
@@ -67,6 +67,6 @@ U_BOOT_DRIVER(clk_fixed_factor) = {
 	.id = UCLASS_CLK,
 	.of_match = clk_fixed_factor_match,
 	.ofdata_to_platdata = clk_fixed_factor_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct clk_fixed_factor),
+	.platdata_auto	= sizeof(struct clk_fixed_factor),
 	.ops = &clk_fixed_factor_ops,
 };
diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c
index f86b4a0..54e5e09 100644
--- a/drivers/clk/clk_fixed_rate.c
+++ b/drivers/clk/clk_fixed_rate.c
@@ -51,7 +51,7 @@ U_BOOT_DRIVER(fixed_clock) = {
 	.id = UCLASS_CLK,
 	.of_match = clk_fixed_rate_match,
 	.ofdata_to_platdata = clk_fixed_rate_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct clk_fixed_rate),
+	.platdata_auto	= sizeof(struct clk_fixed_rate),
 	.ops = &clk_fixed_rate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/clk_octeon.c b/drivers/clk/clk_octeon.c
index fd559e0..ce27454 100644
--- a/drivers/clk/clk_octeon.c
+++ b/drivers/clk/clk_octeon.c
@@ -68,5 +68,5 @@ U_BOOT_DRIVER(clk_octeon) = {
 	.of_match = octeon_clk_ids,
 	.ops = &octeon_clk_ops,
 	.probe = octeon_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct octeon_clk_priv),
+	.priv_auto	= sizeof(struct octeon_clk_priv),
 };
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index dc46de2..5a10d46 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -423,5 +423,5 @@ U_BOOT_DRIVER(pic32_clk) = {
 	.of_match	= pic32_clk_ids,
 	.ops		= &pic32_pic32_clk_ops,
 	.probe		= pic32_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct pic32_clk_priv),
+	.priv_auto	= sizeof(struct pic32_clk_priv),
 };
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index 0ff1b49..2c6c0e2 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -130,7 +130,7 @@ U_BOOT_DRIVER(sandbox_clk) = {
 	.of_match	= sandbox_clk_ids,
 	.ops		= &sandbox_clk_ops,
 	.probe		= sandbox_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_clk_priv),
+	.priv_auto	= sizeof(struct sandbox_clk_priv),
 };
 
 ulong sandbox_clk_query_rate(struct udevice *dev, int id)
diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c
index 8733838..e9eb738 100644
--- a/drivers/clk/clk_sandbox_test.c
+++ b/drivers/clk/clk_sandbox_test.c
@@ -189,5 +189,5 @@ U_BOOT_DRIVER(sandbox_clk_test) = {
 	.id = UCLASS_MISC,
 	.of_match = sandbox_clk_test_ids,
 	.probe = sandbox_clk_test_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_clk_test),
+	.priv_auto	= sizeof(struct sandbox_clk_test),
 };
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 93722f7..7e67895 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -726,6 +726,6 @@ U_BOOT_DRIVER(stm32fx_clk) = {
 	.id			= UCLASS_CLK,
 	.ops			= &stm32_clk_ops,
 	.probe			= stm32_clk_probe,
-	.priv_auto_alloc_size	= sizeof(struct stm32_clk),
+	.priv_auto	= sizeof(struct stm32_clk),
 	.flags			= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index 5e6abca..842925f 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -868,6 +868,6 @@ U_BOOT_DRIVER(stm32h7_clk) = {
 	.id			= UCLASS_CLK,
 	.ops			= &stm32_clk_ops,
 	.probe			= stm32_clk_probe,
-	.priv_auto_alloc_size	= sizeof(struct stm32_clk),
+	.priv_auto	= sizeof(struct stm32_clk),
 	.flags			= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index c8840b9..72cbcdf 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -2332,6 +2332,6 @@ U_BOOT_DRIVER(stm32mp1_clock) = {
 	.name = "stm32mp1_clk",
 	.id = UCLASS_CLK,
 	.ops = &stm32mp1_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32mp1_clk_priv),
+	.priv_auto	= sizeof(struct stm32mp1_clk_priv),
 	.probe = stm32mp1_clk_probe,
 };
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index d93b860..908bc75 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -734,5 +734,5 @@ U_BOOT_DRIVER(versal_clk) = {
 	.of_match = versal_clk_ids,
 	.probe = versal_clk_probe,
 	.ops = &versal_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct versal_clk_priv),
+	.priv_auto	= sizeof(struct versal_clk_priv),
 };
diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c
index b48319b..3b1e020 100644
--- a/drivers/clk/clk_vexpress_osc.c
+++ b/drivers/clk/clk_vexpress_osc.c
@@ -107,6 +107,6 @@ U_BOOT_DRIVER(vexpress_osc_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = vexpress_osc_clk_ids,
 	.ops = &vexpress_osc_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct vexpress_osc_clk_priv),
+	.priv_auto	= sizeof(struct vexpress_osc_clk_priv),
 	.probe = vexpress_osc_clk_probe,
 };
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index a699a36..bf32d83 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -485,6 +485,6 @@ U_BOOT_DRIVER(zynq_clk) = {
 	.id		= UCLASS_CLK,
 	.of_match	= zynq_clk_ids,
 	.ops		= &zynq_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct zynq_clk_priv),
+	.priv_auto	= sizeof(struct zynq_clk_priv),
 	.probe		= zynq_clk_probe,
 };
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 7795119..a9988d8 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -715,5 +715,5 @@ U_BOOT_DRIVER(zynqmp_clk) = {
 	.of_match = zynqmp_clk_ids,
 	.probe = zynqmp_clk_probe,
 	.ops = &zynqmp_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct zynqmp_clk_priv),
+	.priv_auto	= sizeof(struct zynqmp_clk_priv),
 };
diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c
index 4a023ea..7d869eb 100644
--- a/drivers/clk/exynos/clk-exynos7420.c
+++ b/drivers/clk/exynos/clk-exynos7420.c
@@ -199,7 +199,7 @@ U_BOOT_DRIVER(exynos7420_clk_topc) = {
 	.id = UCLASS_CLK,
 	.of_match = exynos7420_clk_topc_compat,
 	.probe = exynos7420_clk_topc_probe,
-	.priv_auto_alloc_size = sizeof(struct exynos7420_clk_topc_priv),
+	.priv_auto	= sizeof(struct exynos7420_clk_topc_priv),
 	.ops = &exynos7420_clk_topc_ops,
 };
 
@@ -213,7 +213,7 @@ U_BOOT_DRIVER(exynos7420_clk_top0) = {
 	.id = UCLASS_CLK,
 	.of_match = exynos7420_clk_top0_compat,
 	.probe = exynos7420_clk_top0_probe,
-	.priv_auto_alloc_size = sizeof(struct exynos7420_clk_top0_priv),
+	.priv_auto	= sizeof(struct exynos7420_clk_top0_priv),
 	.ops = &exynos7420_clk_top0_ops,
 };
 
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 76b27ad..6bc1b8b 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -226,5 +226,5 @@ U_BOOT_DRIVER(ics8n3qv01) = {
 	.ops		= &ics8n3qv01_ops,
 	.of_match       = ics8n3qv01_ids,
 	.probe		= ics8n3qv01_probe,
-	.priv_auto_alloc_size	= sizeof(struct ics8n3qv01_priv),
+	.priv_auto	= sizeof(struct ics8n3qv01_priv),
 };
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index 0246149..259ea33 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -716,7 +716,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_apmixed_compat,
 	.probe = mt7622_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -726,7 +726,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_topckgen_compat,
 	.probe = mt7622_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -736,7 +736,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_infracfg_compat,
 	.probe = mt7622_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -746,7 +746,7 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_pericfg_compat,
 	.probe = mt7622_pericfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -757,7 +757,7 @@ U_BOOT_DRIVER(mtk_clk_pciesys) = {
 	.of_match = mt7622_pciesys_compat,
 	.probe = mt7622_pciesys_probe,
 	.bind = mt7622_pciesys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -767,7 +767,7 @@ U_BOOT_DRIVER(mtk_clk_ethsys) = {
 	.of_match = mt7622_ethsys_compat,
 	.probe = mt7622_ethsys_probe,
 	.bind = mt7622_ethsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -776,7 +776,7 @@ U_BOOT_DRIVER(mtk_clk_sgmiisys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_sgmiisys_compat,
 	.probe = mt7622_sgmiisys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -785,6 +785,6 @@ U_BOOT_DRIVER(mtk_clk_ssusbsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_ssusbsys_compat,
 	.probe = mt7622_ssusbsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c
index a15fb45..0c7411e 100644
--- a/drivers/clk/mediatek/clk-mt7623.c
+++ b/drivers/clk/mediatek/clk-mt7623.c
@@ -859,7 +859,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_apmixed_compat,
 	.probe = mt7623_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -869,7 +869,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_topckgen_compat,
 	.probe = mt7623_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -879,7 +879,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_infracfg_compat,
 	.probe = mt7623_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -889,7 +889,7 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_pericfg_compat,
 	.probe = mt7623_pericfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -900,7 +900,7 @@ U_BOOT_DRIVER(mtk_clk_hifsys) = {
 	.of_match = mt7623_hifsys_compat,
 	.probe = mt7623_hifsys_probe,
 	.bind = mt7623_ethsys_hifsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -910,6 +910,6 @@ U_BOOT_DRIVER(mtk_clk_ethsys) = {
 	.of_match = mt7623_ethsys_compat,
 	.probe = mt7623_ethsys_probe,
 	.bind = mt7623_ethsys_hifsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c
index 5b2aa5f..31b6fa0 100644
--- a/drivers/clk/mediatek/clk-mt7629.c
+++ b/drivers/clk/mediatek/clk-mt7629.c
@@ -704,7 +704,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_apmixed_compat,
 	.probe = mt7629_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -714,7 +714,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_topckgen_compat,
 	.probe = mt7629_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -724,7 +724,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_infracfg_compat,
 	.probe = mt7629_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -734,7 +734,7 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_pericfg_compat,
 	.probe = mt7629_pericfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -745,7 +745,7 @@ U_BOOT_DRIVER(mtk_clk_ethsys) = {
 	.of_match = mt7629_ethsys_compat,
 	.probe = mt7629_ethsys_probe,
 	.bind = mt7629_ethsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -754,7 +754,7 @@ U_BOOT_DRIVER(mtk_clk_sgmiisys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_sgmiisys_compat,
 	.probe = mt7629_sgmiisys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -763,6 +763,6 @@ U_BOOT_DRIVER(mtk_clk_ssusbsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_ssusbsys_compat,
 	.probe = mt7629_ssusbsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
diff --git a/drivers/clk/mediatek/clk-mt8512.c b/drivers/clk/mediatek/clk-mt8512.c
index ad254d1..193e069 100644
--- a/drivers/clk/mediatek/clk-mt8512.c
+++ b/drivers/clk/mediatek/clk-mt8512.c
@@ -838,7 +838,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_apmixed_compat,
 	.probe = mt8512_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -848,7 +848,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_topckgen_compat,
 	.probe = mt8512_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -858,7 +858,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen_cg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_topckgen_cg_compat,
 	.probe = mt8512_topckgen_cg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -868,7 +868,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_infracfg_compat,
 	.probe = mt8512_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/mediatek/clk-mt8516.c b/drivers/clk/mediatek/clk-mt8516.c
index cd1db25..29f7062 100644
--- a/drivers/clk/mediatek/clk-mt8516.c
+++ b/drivers/clk/mediatek/clk-mt8516.c
@@ -777,7 +777,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8516_apmixed_compat,
 	.probe = mt8516_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -787,7 +787,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8516_topckgen_compat,
 	.probe = mt8516_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -797,7 +797,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen_cg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8516_topckgen_cg_compat,
 	.probe = mt8516_topckgen_cg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/mediatek/clk-mt8518.c b/drivers/clk/mediatek/clk-mt8518.c
index 985a0c1..2386514 100644
--- a/drivers/clk/mediatek/clk-mt8518.c
+++ b/drivers/clk/mediatek/clk-mt8518.c
@@ -1533,7 +1533,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8518_apmixed_compat,
 	.probe = mt8518_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -1543,7 +1543,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8518_topckgen_compat,
 	.probe = mt8518_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -1553,7 +1553,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen_cg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8518_topckgen_cg_compat,
 	.probe = mt8518_topckgen_cg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 6ef8b41..8206857 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -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 bf2f357..01b22ab 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -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 b9353c0..2a20541 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -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,
 };
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 8d96ec7..c5ced1f 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -389,7 +389,7 @@ U_BOOT_DRIVER(mpc83xx_clk) = {
 	.of_match = mpc83xx_clk_match,
 	.ops = &mpc83xx_clk_ops,
 	.probe = mpc83xx_clk_probe,
-	.priv_auto_alloc_size	= sizeof(struct mpc83xx_clk_priv),
+	.priv_auto	= sizeof(struct mpc83xx_clk_priv),
 	.bind = mpc83xx_clk_bind,
 };
 
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index 35780de..4d3ac84 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -153,6 +153,6 @@ U_BOOT_DRIVER(mt7628_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7628_clk_ids,
 	.probe = mt7628_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct mt7628_clk_priv),
+	.priv_auto	= sizeof(struct mt7628_clk_priv),
 	.ops = &mt7628_clk_ops,
 };
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 223da22..0132fcb 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -624,6 +624,6 @@ U_BOOT_DRIVER(armada_37xx_periph_clk) = {
 	.id		= UCLASS_CLK,
 	.of_match	= armada_37xx_periph_clk_ids,
 	.ops		= &armada_37xx_periph_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct a37xx_periphclk),
+	.priv_auto	= sizeof(struct a37xx_periphclk),
 	.probe		= armada_37xx_periph_clk_probe,
 };
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index 233926e..b1c0852 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -150,6 +150,6 @@ U_BOOT_DRIVER(armada_37xx_tbg_clk) = {
 	.id		= UCLASS_CLK,
 	.of_match	= armada_37xx_tbg_clk_ids,
 	.ops		= &armada_37xx_tbg_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct a37xx_tbgclk),
+	.priv_auto	= sizeof(struct a37xx_tbgclk),
 	.probe		= armada_37xx_tbg_clk_probe,
 };
diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c
index 1999c87..96ab7fe 100644
--- a/drivers/clk/owl/clk_owl.c
+++ b/drivers/clk/owl/clk_owl.c
@@ -161,6 +161,6 @@ U_BOOT_DRIVER(clk_owl) = {
 	.id		= UCLASS_CLK,
 	.of_match	= owl_clk_ids,
 	.ops		= &owl_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct owl_clk_priv),
+	.priv_auto	= sizeof(struct owl_clk_priv),
 	.probe		= owl_clk_probe,
 };
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
index 6997054..1c54eca 100644
--- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
@@ -336,7 +336,7 @@ U_BOOT_DRIVER(clk_r8a774a1) = {
 	.name		= "clk_r8a774a1",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774a1_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a774b1-cpg-mssr.c b/drivers/clk/renesas/r8a774b1-cpg-mssr.c
index 7b6947b..03851d0 100644
--- a/drivers/clk/renesas/r8a774b1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774b1-cpg-mssr.c
@@ -329,7 +329,7 @@ U_BOOT_DRIVER(clk_r8a774b1) = {
 	.name		= "clk_r8a774b1",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774b1_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a774c0-cpg-mssr.c b/drivers/clk/renesas/r8a774c0-cpg-mssr.c
index c9f0f72..37a7123 100644
--- a/drivers/clk/renesas/r8a774c0-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774c0-cpg-mssr.c
@@ -301,7 +301,7 @@ U_BOOT_DRIVER(clk_r8a774c0) = {
 	.name		= "clk_r8a774c0",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774c0_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a774e1-cpg-mssr.c b/drivers/clk/renesas/r8a774e1-cpg-mssr.c
index 6cce007..c969ec6 100644
--- a/drivers/clk/renesas/r8a774e1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774e1-cpg-mssr.c
@@ -351,7 +351,7 @@ U_BOOT_DRIVER(clk_r8a774e1) = {
 	.name		= "clk_r8a774e1",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774e1_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a7790-cpg-mssr.c b/drivers/clk/renesas/r8a7790-cpg-mssr.c
index 7451f53..09e7dbd 100644
--- a/drivers/clk/renesas/r8a7790-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7790-cpg-mssr.c
@@ -283,7 +283,7 @@ U_BOOT_DRIVER(clk_r8a7790) = {
 	.name		= "clk_r8a7790",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7790_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7791-cpg-mssr.c b/drivers/clk/renesas/r8a7791-cpg-mssr.c
index 25fd489..675ac83 100644
--- a/drivers/clk/renesas/r8a7791-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7791-cpg-mssr.c
@@ -289,7 +289,7 @@ U_BOOT_DRIVER(clk_r8a7791) = {
 	.name		= "clk_r8a7791",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7791_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c
index d47ab99..d2225a3 100644
--- a/drivers/clk/renesas/r8a7792-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c
@@ -235,7 +235,7 @@ U_BOOT_DRIVER(clk_r8a7792) = {
 	.name		= "clk_r8a7792",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7792_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7794-cpg-mssr.c b/drivers/clk/renesas/r8a7794-cpg-mssr.c
index 7093e0d..1fcac9b 100644
--- a/drivers/clk/renesas/r8a7794-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7794-cpg-mssr.c
@@ -264,7 +264,7 @@ U_BOOT_DRIVER(clk_r8a7794) = {
 	.name		= "clk_r8a7794",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7794_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index dcd96ad..101f658 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -373,7 +373,7 @@ U_BOOT_DRIVER(clk_r8a7795) = {
 	.name		= "clk_r8a7795",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7795_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index 89dc141..3c17bcb 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -351,7 +351,7 @@ U_BOOT_DRIVER(clk_r8a7796) = {
 	.name		= "clk_r8a7796",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7796_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c
index 6ed8829..5f37f62 100644
--- a/drivers/clk/renesas/r8a77965-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c
@@ -349,7 +349,7 @@ U_BOOT_DRIVER(clk_r8a77965) = {
 	.name		= "clk_r8a77965",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77965_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c
index df07120..bafe4bb 100644
--- a/drivers/clk/renesas/r8a77970-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c
@@ -226,7 +226,7 @@ U_BOOT_DRIVER(clk_r8a77970) = {
 	.name		= "clk_r8a77970",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77970_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77980-cpg-mssr.c b/drivers/clk/renesas/r8a77980-cpg-mssr.c
index c8d7a94..a202005 100644
--- a/drivers/clk/renesas/r8a77980-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77980-cpg-mssr.c
@@ -249,7 +249,7 @@ U_BOOT_DRIVER(clk_r8a77980) = {
 	.name		= "clk_r8a77980",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77980_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c
index 357e7b5..5cc9270 100644
--- a/drivers/clk/renesas/r8a77990-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c
@@ -308,7 +308,7 @@ U_BOOT_DRIVER(clk_r8a77990) = {
 	.name		= "clk_r8a77990",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77990_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c
index d62aeba..eef154b 100644
--- a/drivers/clk/renesas/r8a77995-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c
@@ -247,7 +247,7 @@ U_BOOT_DRIVER(clk_r8a77995) = {
 	.name		= "clk_r8a77995",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77995_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 71916db..f12b010 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -1480,7 +1480,7 @@ U_BOOT_DRIVER(rockchip_px30_cru) = {
 	.name		= "rockchip_px30_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= px30_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct px30_clk_priv),
+	.priv_auto	= sizeof(struct px30_clk_priv),
 	.ofdata_to_platdata = px30_clk_ofdata_to_platdata,
 	.ops		= &px30_clk_ops,
 	.bind		= px30_clk_bind,
@@ -1627,7 +1627,7 @@ U_BOOT_DRIVER(rockchip_px30_pmucru) = {
 	.name		= "rockchip_px30_pmucru",
 	.id		= UCLASS_CLK,
 	.of_match	= px30_pmuclk_ids,
-	.priv_auto_alloc_size = sizeof(struct px30_pmuclk_priv),
+	.priv_auto	= sizeof(struct px30_pmuclk_priv),
 	.ofdata_to_platdata = px30_pmuclk_ofdata_to_platdata,
 	.ops		= &px30_pmuclk_ops,
 	.probe		= px30_pmuclk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 274572f..8d11e24 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -375,7 +375,7 @@ U_BOOT_DRIVER(rockchip_rk3036_cru) = {
 	.name		= "clk_rk3036",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3036_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3036_clk_priv),
+	.priv_auto	= sizeof(struct rk3036_clk_priv),
 	.ofdata_to_platdata = rk3036_clk_ofdata_to_platdata,
 	.ops		= &rk3036_clk_ops,
 	.bind		= rk3036_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 61f823e..ac44ab4 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -597,7 +597,7 @@ U_BOOT_DRIVER(rockchip_rk3128_cru) = {
 	.name		= "clk_rk3128",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3128_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3128_clk_priv),
+	.priv_auto	= sizeof(struct rk3128_clk_priv),
 	.ofdata_to_platdata = rk3128_clk_ofdata_to_platdata,
 	.ops		= &rk3128_clk_ops,
 	.bind		= rk3128_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index aacc8cf..5940cb3 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -616,8 +616,8 @@ U_BOOT_DRIVER(rockchip_rk3188_cru) = {
 	.name			= "rockchip_rk3188_cru",
 	.id			= UCLASS_CLK,
 	.of_match		= rk3188_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct rk3188_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct rk3188_clk_plat),
+	.priv_auto	= sizeof(struct rk3188_clk_priv),
+	.platdata_auto	= sizeof(struct rk3188_clk_plat),
 	.ops			= &rk3188_clk_ops,
 	.bind			= rk3188_clk_bind,
 	.ofdata_to_platdata	= rk3188_clk_ofdata_to_platdata,
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index 054b2fd..92e7ff3 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -532,7 +532,7 @@ U_BOOT_DRIVER(rockchip_rk322x_cru) = {
 	.name		= "clk_rk322x",
 	.id		= UCLASS_CLK,
 	.of_match	= rk322x_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk322x_clk_priv),
+	.priv_auto	= sizeof(struct rk322x_clk_priv),
 	.ofdata_to_platdata = rk322x_clk_ofdata_to_platdata,
 	.ops		= &rk322x_clk_ops,
 	.bind		= rk322x_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a1dd642..7c91e00 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -1040,8 +1040,8 @@ U_BOOT_DRIVER(rockchip_rk3288_cru) = {
 	.name		= "rockchip_rk3288_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3288_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3288_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct rk3288_clk_plat),
+	.priv_auto	= sizeof(struct rk3288_clk_priv),
+	.platdata_auto	= sizeof(struct rk3288_clk_plat),
 	.ops		= &rk3288_clk_ops,
 	.bind		= rk3288_clk_bind,
 	.ofdata_to_platdata	= rk3288_clk_ofdata_to_platdata,
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index d3633b6..c36512b 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -1067,7 +1067,7 @@ U_BOOT_DRIVER(rockchip_rk3308_cru) = {
 	.name		= "rockchip_rk3308_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3308_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3308_clk_priv),
+	.priv_auto	= sizeof(struct rk3308_clk_priv),
 	.ofdata_to_platdata = rk3308_clk_ofdata_to_platdata,
 	.ops		= &rk3308_clk_ops,
 	.bind		= rk3308_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index bf4f106..e28e099 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -845,7 +845,7 @@ U_BOOT_DRIVER(rockchip_rk3328_cru) = {
 	.name		= "rockchip_rk3328_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3328_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3328_clk_priv),
+	.priv_auto	= sizeof(struct rk3328_clk_priv),
 	.ofdata_to_platdata = rk3328_clk_ofdata_to_platdata,
 	.ops		= &rk3328_clk_ops,
 	.bind		= rk3328_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index d1804c6..84b55ac 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -643,9 +643,9 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = {
 	.name		= "rockchip_rk3368_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3368_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3368_clk_priv),
+	.priv_auto	= sizeof(struct rk3368_clk_priv),
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rk3368_clk_plat),
+	.platdata_auto	= sizeof(struct rk3368_clk_plat),
 #endif
 	.ofdata_to_platdata = rk3368_clk_ofdata_to_platdata,
 	.ops		= &rk3368_clk_ops,
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 3fd863e..2e2613f 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -1447,13 +1447,13 @@ U_BOOT_DRIVER(clk_rk3399) = {
 	.name		= "rockchip_rk3399_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3399_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3399_clk_priv),
+	.priv_auto	= sizeof(struct rk3399_clk_priv),
 	.ofdata_to_platdata = rk3399_clk_ofdata_to_platdata,
 	.ops		= &rk3399_clk_ops,
 	.bind		= rk3399_clk_bind,
 	.probe		= rk3399_clk_probe,
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rk3399_clk_plat),
+	.platdata_auto	= sizeof(struct rk3399_clk_plat),
 #endif
 };
 
@@ -1642,12 +1642,12 @@ U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = {
 	.name		= "rockchip_rk3399_pmucru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3399_pmuclk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3399_pmuclk_priv),
+	.priv_auto	= sizeof(struct rk3399_pmuclk_priv),
 	.ofdata_to_platdata = rk3399_pmuclk_ofdata_to_platdata,
 	.ops		= &rk3399_pmuclk_ops,
 	.probe		= rk3399_pmuclk_probe,
 	.bind		= rk3399_pmuclk_bind,
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rk3399_pmuclk_plat),
+	.platdata_auto	= sizeof(struct rk3399_pmuclk_plat),
 #endif
 };
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index aa1d98c..efc07a0 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -719,7 +719,7 @@ U_BOOT_DRIVER(clk_rv1108) = {
 	.name		= "clk_rv1108",
 	.id		= UCLASS_CLK,
 	.of_match	= rv1108_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rv1108_clk_priv),
+	.priv_auto	= sizeof(struct rv1108_clk_priv),
 	.ops		= &rv1108_clk_ops,
 	.bind		= rv1108_clk_bind,
 	.ofdata_to_platdata	= rv1108_clk_ofdata_to_platdata,
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index 1b4d81d..9a08c14 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -807,6 +807,6 @@ U_BOOT_DRIVER(sifive_fu540_prci) = {
 	.of_match = sifive_fu540_prci_ids,
 	.probe = sifive_fu540_prci_probe,
 	.ops = &sifive_fu540_prci_ops,
-	.priv_auto_alloc_size = sizeof(struct __prci_data),
+	.priv_auto	= sizeof(struct __prci_data),
 	.bind = sifive_fu540_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
index 67507c5..1b5de86 100644
--- a/drivers/clk/sunxi/clk_a10.c
+++ b/drivers/clk/sunxi/clk_a10.c
@@ -79,7 +79,7 @@ U_BOOT_DRIVER(clk_sun4i_a10) = {
 	.name		= "sun4i_a10_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a10_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a10_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
index d11a4b5..184f61a 100644
--- a/drivers/clk/sunxi/clk_a10s.c
+++ b/drivers/clk/sunxi/clk_a10s.c
@@ -66,7 +66,7 @@ U_BOOT_DRIVER(clk_sun5i_a10s) = {
 	.name		= "sun5i_a10s_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a10s_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a10s_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
index 4d562bf..5750514 100644
--- a/drivers/clk/sunxi/clk_a23.c
+++ b/drivers/clk/sunxi/clk_a23.c
@@ -82,7 +82,7 @@ U_BOOT_DRIVER(clk_sun8i_a23) = {
 	.name		= "sun8i_a23_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a23_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a23_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
index 4a9454e..9226112 100644
--- a/drivers/clk/sunxi/clk_a31.c
+++ b/drivers/clk/sunxi/clk_a31.c
@@ -99,7 +99,7 @@ U_BOOT_DRIVER(clk_sun6i_a31) = {
 	.name		= "sun6i_a31_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a31_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a31_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
index d96cb1a..0553ffa 100644
--- a/drivers/clk/sunxi/clk_a64.c
+++ b/drivers/clk/sunxi/clk_a64.c
@@ -87,7 +87,7 @@ U_BOOT_DRIVER(clk_sun50i_a64) = {
 	.name		= "sun50i_a64_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a64_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a64_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
index 80d7407..68973d5 100644
--- a/drivers/clk/sunxi/clk_a80.c
+++ b/drivers/clk/sunxi/clk_a80.c
@@ -94,7 +94,7 @@ U_BOOT_DRIVER(clk_sun9i_a80) = {
 	.name		= "sun9i_a80_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a80_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a80_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
index d6f23dd..880c7d7 100644
--- a/drivers/clk/sunxi/clk_a83t.c
+++ b/drivers/clk/sunxi/clk_a83t.c
@@ -84,7 +84,7 @@ U_BOOT_DRIVER(clk_sun8i_a83t) = {
 	.name		= "sun8i_a83t_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a83t_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a83t_clk_bind,
diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
index 7e844f4..f81633b 100644
--- a/drivers/clk/sunxi/clk_h3.c
+++ b/drivers/clk/sunxi/clk_h3.c
@@ -102,7 +102,7 @@ U_BOOT_DRIVER(clk_sun8i_h3) = {
 	.name		= "sun8i_h3_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= h3_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= h3_clk_bind,
diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index a1cb895..ac8656f 100644
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -95,7 +95,7 @@ U_BOOT_DRIVER(clk_sun50i_h6) = {
 	.name		= "sun50i_h6_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= h6_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= h6_clk_bind,
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index ac360b2..ee1e86d 100644
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -107,7 +107,7 @@ U_BOOT_DRIVER(clk_sun8i_r40) = {
 	.name		= "sun8i_r40_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= r40_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= r40_clk_bind,
diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
index f3fc06a..2962219 100644
--- a/drivers/clk/sunxi/clk_v3s.c
+++ b/drivers/clk/sunxi/clk_v3s.c
@@ -65,7 +65,7 @@ U_BOOT_DRIVER(clk_sun8i_v3s) = {
 	.name		= "sun8i_v3s_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= v3s_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= v3s_clk_bind,
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 4e25db3..c31e596 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -342,6 +342,6 @@ U_BOOT_DRIVER(uniphier_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = uniphier_clk_match,
 	.probe = uniphier_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_clk_priv),
+	.priv_auto	= sizeof(struct uniphier_clk_priv),
 	.ops = &uniphier_clk_ops,
 };