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

7 files changed, 27 insertions, 27 deletions

diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c
index 0a30e0eabb..16501cfe5d 100644
--- a/drivers/rtc/ds3232.c
+++ b/drivers/rtc/ds3232.c
@@ -272,5 +272,5 @@ U_BOOT_DRIVER(rtc_ds3232) = {
 	.probe = ds3232_probe,
 	.of_match = ds3232_rtc_ids,
 	.ops = &ds3232_rtc_ops,
-	.priv_auto_alloc_size = sizeof(struct ds3232_priv_data),
+	.priv_auto	= sizeof(struct ds3232_priv_data),
 };
diff --git a/drivers/rtc/emul_rtc.c b/drivers/rtc/emul_rtc.c
index 7e522103fd..1dc80ca127 100644
--- a/drivers/rtc/emul_rtc.c
+++ b/drivers/rtc/emul_rtc.c
@@ -88,7 +88,7 @@ U_BOOT_DRIVER(rtc_emul) = {
 	.id	= UCLASS_RTC,
 	.ops	= &emul_rtc_ops,
 	.probe	= emul_rtc_probe,
-	.priv_auto_alloc_size = sizeof(struct emul_rtc),
+	.priv_auto	= sizeof(struct emul_rtc),
 };
 
 U_BOOT_DEVICE(rtc_emul) = {
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index 7f78ff83cb..5a2a154e65 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -50,7 +50,7 @@ struct sandbox_i2c_rtc {
 long sandbox_i2c_rtc_set_offset(struct udevice *dev, bool use_system_time,
 				int offset)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev);
 	long old_offset;
 
 	old_offset = plat->offset;
@@ -63,7 +63,7 @@ long sandbox_i2c_rtc_set_offset(struct udevice *dev, bool use_system_time,
 
 long sandbox_i2c_rtc_get_set_base_time(struct udevice *dev, long base_time)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev);
 	long old_base_time;
 
 	old_base_time = plat->base_time;
@@ -75,7 +75,7 @@ long sandbox_i2c_rtc_get_set_base_time(struct udevice *dev, long base_time)
 
 static void reset_time(struct udevice *dev)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev);
 	struct rtc_time now;
 
 	os_localtime(&now);
@@ -86,7 +86,7 @@ static void reset_time(struct udevice *dev)
 
 static int sandbox_i2c_rtc_get(struct udevice *dev, struct rtc_time *time)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev);
 	struct rtc_time tm_now;
 	long now;
 
@@ -104,7 +104,7 @@ static int sandbox_i2c_rtc_get(struct udevice *dev, struct rtc_time *time)
 
 static int sandbox_i2c_rtc_set(struct udevice *dev, const struct rtc_time *time)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev);
 	struct rtc_time tm_now;
 	long now;
 
@@ -122,7 +122,7 @@ static int sandbox_i2c_rtc_set(struct udevice *dev, const struct rtc_time *time)
 /* Update the current time in the registers */
 static int sandbox_i2c_rtc_prepare_read(struct udevice *emul)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(emul);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(emul);
 	struct rtc_time time;
 	int ret;
 
@@ -143,7 +143,7 @@ static int sandbox_i2c_rtc_prepare_read(struct udevice *emul)
 
 static int sandbox_i2c_rtc_complete_write(struct udevice *emul)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(emul);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(emul);
 	struct rtc_time time;
 	int ret;
 
@@ -165,7 +165,7 @@ static int sandbox_i2c_rtc_complete_write(struct udevice *emul)
 static int sandbox_i2c_rtc_xfer(struct udevice *emul, struct i2c_msg *msg,
 				int nmsgs)
 {
-	struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(emul);
+	struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(emul);
 	uint offset = 0;
 	int ret;
 
@@ -230,7 +230,7 @@ U_BOOT_DRIVER(sandbox_i2c_rtc_emul) = {
 	.id		= UCLASS_I2C_EMUL,
 	.of_match	= sandbox_i2c_rtc_ids,
 	.bind		= sandbox_i2c_rtc_bind,
-	.priv_auto_alloc_size = sizeof(struct sandbox_i2c_rtc),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_i2c_rtc_plat_data),
+	.priv_auto	= sizeof(struct sandbox_i2c_rtc),
+	.plat_auto	= sizeof(struct sandbox_i2c_rtc_plat_data),
 	.ops		= &sandbox_i2c_rtc_emul_ops,
 };
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index ed057f7bc4..50240d57fa 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -133,7 +133,7 @@ void rtc_reset(void)
 #ifdef CONFIG_DM_RTC
 static int mv_rtc_get(struct udevice *dev, struct rtc_time *tm)
 {
-	struct mvrtc_pdata *pdata = dev_get_platdata(dev);
+	struct mvrtc_pdata *pdata = dev_get_plat(dev);
 	struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;
 
 	return __mv_rtc_get(regs, tm);
@@ -141,7 +141,7 @@ static int mv_rtc_get(struct udevice *dev, struct rtc_time *tm)
 
 static int mv_rtc_set(struct udevice *dev, const struct rtc_time *tm)
 {
-	struct mvrtc_pdata *pdata = dev_get_platdata(dev);
+	struct mvrtc_pdata *pdata = dev_get_plat(dev);
 	struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;
 
 	return __mv_rtc_set(regs, tm);
@@ -149,7 +149,7 @@ static int mv_rtc_set(struct udevice *dev, const struct rtc_time *tm)
 
 static int mv_rtc_reset(struct udevice *dev)
 {
-	struct mvrtc_pdata *pdata = dev_get_platdata(dev);
+	struct mvrtc_pdata *pdata = dev_get_plat(dev);
 	struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;
 
 	__mv_rtc_reset(regs);
@@ -168,9 +168,9 @@ static const struct udevice_id mv_rtc_ids[] = {
 	{ }
 };
 
-static int mv_rtc_ofdata_to_platdata(struct udevice *dev)
+static int mv_rtc_of_to_plat(struct udevice *dev)
 {
-	struct mvrtc_pdata *pdata = dev_get_platdata(dev);
+	struct mvrtc_pdata *pdata = dev_get_plat(dev);
 
 	pdata->iobase = dev_read_addr(dev);
 	return 0;
@@ -179,7 +179,7 @@ static int mv_rtc_ofdata_to_platdata(struct udevice *dev)
 U_BOOT_DRIVER(rtc_mv) = {
 	.name	= "rtc-mv",
 	.id	= UCLASS_RTC,
-	.ofdata_to_platdata = mv_rtc_ofdata_to_platdata,
+	.of_to_plat = mv_rtc_of_to_plat,
 	.of_match = mv_rtc_ids,
 	.ops	= &mv_rtc_ops,
 };
diff --git a/drivers/rtc/pcf2127.c b/drivers/rtc/pcf2127.c
index 88ff8c52c3..57f86401d3 100644
--- a/drivers/rtc/pcf2127.c
+++ b/drivers/rtc/pcf2127.c
@@ -25,7 +25,7 @@
 
 static int pcf2127_rtc_read(struct udevice *dev, uint offset, u8 *buffer, uint len)
 {
-	struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
+	struct dm_i2c_chip *chip = dev_get_parent_plat(dev);
 	struct i2c_msg msg;
 	int ret;
 
diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c
index 1b6717232c..a1d376611d 100644
--- a/drivers/rtc/pl031.c
+++ b/drivers/rtc/pl031.c
@@ -29,20 +29,20 @@
 
 #define RTC_CR_START	(1 << 0)
 
-struct pl031_platdata {
+struct pl031_plat {
 	phys_addr_t base;
 };
 
 static inline u32 pl031_read_reg(struct udevice *dev, int reg)
 {
-	struct pl031_platdata *pdata = dev_get_platdata(dev);
+	struct pl031_plat *pdata = dev_get_plat(dev);
 
 	return readl(pdata->base + reg);
 }
 
 static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value)
 {
-	struct pl031_platdata *pdata = dev_get_platdata(dev);
+	struct pl031_plat *pdata = dev_get_plat(dev);
 
 	return writel(value, pdata->base + reg);
 }
@@ -122,9 +122,9 @@ static const struct udevice_id pl031_ids[] = {
 	{ }
 };
 
-static int pl031_ofdata_to_platdata(struct udevice *dev)
+static int pl031_of_to_plat(struct udevice *dev)
 {
-	struct pl031_platdata *pdata = dev_get_platdata(dev);
+	struct pl031_plat *pdata = dev_get_plat(dev);
 
 	pdata->base = dev_read_addr(dev);
 
@@ -136,7 +136,7 @@ U_BOOT_DRIVER(rtc_pl031) = {
 	.id	= UCLASS_RTC,
 	.of_match = pl031_ids,
 	.probe	= pl031_probe,
-	.ofdata_to_platdata = pl031_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct pl031_platdata),
+	.of_to_plat = pl031_of_to_plat,
+	.plat_auto	= sizeof(struct pl031_plat),
 	.ops	= &pl031_ops,
 };
diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c
index f9db318af1..f1d0ea90d3 100644
--- a/drivers/rtc/stm32_rtc.c
+++ b/drivers/rtc/stm32_rtc.c
@@ -327,5 +327,5 @@ U_BOOT_DRIVER(rtc_stm32) = {
 	.probe	= stm32_rtc_probe,
 	.of_match = stm32_rtc_ids,
 	.ops	= &stm32_rtc_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32_rtc_priv),
+	.priv_auto	= sizeof(struct stm32_rtc_priv),
 };