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

5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/pinctrl/mscc/pinctrl-jr2.c b/drivers/pinctrl/mscc/pinctrl-jr2.c
index 72a9470854..cb340581cc 100644
--- a/drivers/pinctrl/mscc/pinctrl-jr2.c
+++ b/drivers/pinctrl/mscc/pinctrl-jr2.c
@@ -300,7 +300,7 @@ static int jr2_pinctrl_probe(struct udevice *dev)
 		return ret;
 
 	ret = device_bind(dev, &jr2_gpio_driver, "jr2-gpio", NULL,
-			  dev_of_offset(dev), NULL);
+			  dev_ofnode(dev), NULL);
 
 	if (ret)
 		return ret;
@@ -318,6 +318,6 @@ U_BOOT_DRIVER(jr2_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(jr2_pinctrl_of_match),
 	.probe = jr2_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-luton.c b/drivers/pinctrl/mscc/pinctrl-luton.c
index 17fbc53c25..325c9a9705 100644
--- a/drivers/pinctrl/mscc/pinctrl-luton.c
+++ b/drivers/pinctrl/mscc/pinctrl-luton.c
@@ -166,7 +166,7 @@ int luton_pinctrl_probe(struct udevice *dev)
 		return ret;
 
 	ret = device_bind(dev, &luton_gpio_driver, "luton-gpio", NULL,
-			  dev_of_offset(dev), NULL);
+			  dev_ofnode(dev), NULL);
 
 	return 0;
 }
@@ -181,6 +181,6 @@ U_BOOT_DRIVER(luton_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(luton_pinctrl_of_match),
 	.probe = luton_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-ocelot.c b/drivers/pinctrl/mscc/pinctrl-ocelot.c
index 49e026bc98..57e2ef0d7c 100644
--- a/drivers/pinctrl/mscc/pinctrl-ocelot.c
+++ b/drivers/pinctrl/mscc/pinctrl-ocelot.c
@@ -182,7 +182,7 @@ int ocelot_pinctrl_probe(struct udevice *dev)
 		return ret;
 
 	ret = device_bind(dev, &ocelot_gpio_driver, "ocelot-gpio", NULL,
-			  dev_of_offset(dev), NULL);
+			  dev_ofnode(dev), NULL);
 
 	return ret;
 }
@@ -197,6 +197,6 @@ U_BOOT_DRIVER(ocelot_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(ocelot_pinctrl_of_match),
 	.probe = ocelot_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-serval.c b/drivers/pinctrl/mscc/pinctrl-serval.c
index d59f08d4eb..a6b9796df8 100644
--- a/drivers/pinctrl/mscc/pinctrl-serval.c
+++ b/drivers/pinctrl/mscc/pinctrl-serval.c
@@ -210,7 +210,7 @@ static int serval_pinctrl_probe(struct udevice *dev)
 		return ret;
 
 	ret = device_bind(dev, &serval_gpio_driver, "serval-gpio", NULL,
-			  dev_of_offset(dev), NULL);
+			  dev_ofnode(dev), NULL);
 
 	if (ret)
 		return ret;
@@ -228,6 +228,6 @@ U_BOOT_DRIVER(serval_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(serval_pinctrl_of_match),
 	.probe = serval_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-servalt.c b/drivers/pinctrl/mscc/pinctrl-servalt.c
index 592b7c547b..8e8678580d 100644
--- a/drivers/pinctrl/mscc/pinctrl-servalt.c
+++ b/drivers/pinctrl/mscc/pinctrl-servalt.c
@@ -246,7 +246,7 @@ static int servalt_pinctrl_probe(struct udevice *dev)
 		return ret;
 
 	ret = device_bind(dev, &servalt_gpio_driver, "servalt-gpio", NULL,
-			  dev_of_offset(dev), NULL);
+			  dev_ofnode(dev), NULL);
 
 	if (ret)
 		return ret;
@@ -264,6 +264,6 @@ U_BOOT_DRIVER(servalt_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(servalt_pinctrl_of_match),
 	.probe = servalt_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };