Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next

Driver model tidy-up for livetree
Driver model big rename for consistency
Python 3 clean-ups for patman
Update sandbox serial driver to use membuff

9 files changed, 23 insertions, 23 deletions

diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index e55fcceafd..1afaf784da 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -88,7 +88,7 @@ static int exynos_pwm_probe(struct udevice *dev)
 	return 0;
 }
 
-static int exynos_pwm_ofdata_to_platdata(struct udevice *dev)
+static int exynos_pwm_of_to_plat(struct udevice *dev)
 {
 	struct exynos_pwm_priv *priv = dev_get_priv(dev);
 
@@ -113,6 +113,6 @@ U_BOOT_DRIVER(exynos_pwm) = {
 	.of_match = exynos_channels,
 	.ops	= &exynos_pwm_ops,
 	.probe	= exynos_pwm_probe,
-	.ofdata_to_platdata	= exynos_pwm_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct exynos_pwm_priv),
+	.of_to_plat	= exynos_pwm_of_to_plat,
+	.priv_auto	= sizeof(struct exynos_pwm_priv),
 };
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 77a1907fd3..2008c1520e 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -126,7 +126,7 @@ static int imx_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 };
 
-static int imx_pwm_ofdata_to_platdata(struct udevice *dev)
+static int imx_pwm_of_to_plat(struct udevice *dev)
 {
 	struct imx_pwm_priv *priv = dev_get_priv(dev);
 
@@ -156,8 +156,8 @@ U_BOOT_DRIVER(imx_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = imx_pwm_ids,
 	.ops	= &imx_pwm_ops,
-	.ofdata_to_platdata	= imx_pwm_ofdata_to_platdata,
+	.of_to_plat	= imx_pwm_of_to_plat,
 	.probe		= imx_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct imx_pwm_priv),
+	.priv_auto	= sizeof(struct imx_pwm_priv),
 };
 #endif
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index cafb571f16..58b7469f97 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -249,7 +249,7 @@ static int meson_pwm_set_invert(struct udevice *dev, uint channeln, bool polarit
 	return meson_pwm_set_config(dev, channeln, channel->period_ns, channel->duty_ns);
 }
 
-static int meson_pwm_ofdata_to_platdata(struct udevice *dev)
+static int meson_pwm_of_to_plat(struct udevice *dev)
 {
 	struct meson_pwm *priv = dev_get_priv(dev);
 
@@ -522,7 +522,7 @@ U_BOOT_DRIVER(meson_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = meson_pwm_ids,
 	.ops	= &meson_pwm_ops,
-	.ofdata_to_platdata = meson_pwm_ofdata_to_platdata,
+	.of_to_plat = meson_pwm_of_to_plat,
 	.probe	 = meson_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct meson_pwm),
+	.priv_auto	= sizeof(struct meson_pwm),
 };
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 7bd82518d6..aee1d825a0 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -184,5 +184,5 @@ U_BOOT_DRIVER(mtk_pwm) = {
 	.of_match = mtk_pwm_ids,
 	.ops = &mtk_pwm_ops,
 	.probe = mtk_pwm_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pwm_priv),
+	.priv_auto	= sizeof(struct mtk_pwm_priv),
 };
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 77bc659fef..30c30430be 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -115,7 +115,7 @@ static int pwm_sifive_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int pwm_sifive_ofdata_to_platdata(struct udevice *dev)
+static int pwm_sifive_of_to_plat(struct udevice *dev)
 {
 	struct pwm_sifive_priv *priv = dev_get_priv(dev);
 
@@ -166,7 +166,7 @@ U_BOOT_DRIVER(pwm_sifive) = {
 	.id	= UCLASS_PWM,
 	.of_match = pwm_sifive_ids,
 	.ops	= &pwm_sifive_ops,
-	.ofdata_to_platdata     = pwm_sifive_ofdata_to_platdata,
+	.of_to_plat     = pwm_sifive_of_to_plat,
 	.probe		= pwm_sifive_probe,
-	.priv_auto_alloc_size	= sizeof(struct pwm_sifive_priv),
+	.priv_auto	= sizeof(struct pwm_sifive_priv),
 };
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 911da1d426..a64fc4a052 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -121,7 +121,7 @@ static int rk_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int rk_pwm_ofdata_to_platdata(struct udevice *dev)
+static int rk_pwm_of_to_plat(struct udevice *dev)
 {
 	struct rk_pwm_priv *priv = dev_get_priv(dev);
 
@@ -213,7 +213,7 @@ U_BOOT_DRIVER(rk_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = rk_pwm_ids,
 	.ops	= &rk_pwm_ops,
-	.ofdata_to_platdata	= rk_pwm_ofdata_to_platdata,
+	.of_to_plat	= rk_pwm_of_to_plat,
 	.probe		= rk_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct rk_pwm_priv),
+	.priv_auto	= sizeof(struct rk_pwm_priv),
 };
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 28988187e0..318dce7c14 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -109,5 +109,5 @@ U_BOOT_DRIVER(warm_pwm_sandbox) = {
 	.id		= UCLASS_PWM,
 	.of_match	= sandbox_pwm_ids,
 	.ops		= &sandbox_pwm_ops,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_pwm_priv),
+	.priv_auto	= sizeof(struct sandbox_pwm_priv),
 };
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index e2ae1a8009..614635526f 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -148,7 +148,7 @@ static int sunxi_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int sunxi_pwm_ofdata_to_platdata(struct udevice *dev)
+static int sunxi_pwm_of_to_plat(struct udevice *dev)
 {
 	struct sunxi_pwm_priv *priv = dev_get_priv(dev);
 
@@ -179,7 +179,7 @@ U_BOOT_DRIVER(sunxi_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = sunxi_pwm_ids,
 	.ops	= &sunxi_pwm_ops,
-	.ofdata_to_platdata	= sunxi_pwm_ofdata_to_platdata,
+	.of_to_plat	= sunxi_pwm_of_to_plat,
 	.probe		= sunxi_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct sunxi_pwm_priv),
+	.priv_auto	= sizeof(struct sunxi_pwm_priv),
 };
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 5e98d0fc2c..36c35c608b 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -53,7 +53,7 @@ static int tegra_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int tegra_pwm_ofdata_to_platdata(struct udevice *dev)
+static int tegra_pwm_of_to_plat(struct udevice *dev)
 {
 	struct tegra_pwm_priv *priv = dev_get_priv(dev);
 
@@ -78,6 +78,6 @@ U_BOOT_DRIVER(tegra_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = tegra_pwm_ids,
 	.ops	= &tegra_pwm_ops,
-	.ofdata_to_platdata	= tegra_pwm_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct tegra_pwm_priv),
+	.of_to_plat	= tegra_pwm_of_to_plat,
+	.priv_auto	= sizeof(struct tegra_pwm_priv),
 };