aboutsummaryrefslogtreecommitdiff
path: root/drivers/remoteproc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/remoteproc')
-rw-r--r--drivers/remoteproc/k3_system_controller.c2
-rw-r--r--drivers/remoteproc/rproc-uclass.c17
-rw-r--r--drivers/remoteproc/sandbox_testproc.c22
-rw-r--r--drivers/remoteproc/stm32_copro.c2
-rw-r--r--drivers/remoteproc/ti_k3_arm64_rproc.c2
-rw-r--r--drivers/remoteproc/ti_k3_dsp_rproc.c2
-rw-r--r--drivers/remoteproc/ti_k3_r5f_rproc.c4
-rw-r--r--drivers/remoteproc/ti_power_proc.c8
8 files changed, 29 insertions, 30 deletions
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index 702d98d1a8..89cb90207d 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -322,5 +322,5 @@ U_BOOT_DRIVER(k3_sysctrler) = {
.id = UCLASS_REMOTEPROC,
.ops = &k3_sysctrler_ops,
.probe = k3_sysctrler_probe,
- .priv_auto_alloc_size = sizeof(struct k3_sysctrler_privdata),
+ .priv_auto = sizeof(struct k3_sysctrler_privdata),
};
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 9640a81e53..c2d6a4e0c1 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -42,7 +42,7 @@ static int for_each_remoteproc_device(int (*fn) (struct udevice *dev,
ret = uclass_find_next_device(&dev)) {
if (ret || dev == skip_dev)
continue;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ret = fn(dev, uc_pdata, data);
if (ret)
return ret;
@@ -111,11 +111,11 @@ static int rproc_pre_probe(struct udevice *dev)
struct dm_rproc_uclass_pdata *uc_pdata;
const struct dm_rproc_ops *ops;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
/* See if we need to populate via fdt */
- if (!dev->platdata) {
+ if (!dev_get_plat(dev)) {
#if CONFIG_IS_ENABLED(OF_CONTROL)
int node = dev_of_offset(dev);
const void *blob = gd->fdt_blob;
@@ -140,7 +140,7 @@ static int rproc_pre_probe(struct udevice *dev)
#endif
} else {
- struct dm_rproc_uclass_pdata *pdata = dev->platdata;
+ struct dm_rproc_uclass_pdata *pdata = dev_get_plat(dev);
debug("'%s': using legacy data\n", dev->name);
if (pdata->name)
@@ -210,8 +210,7 @@ UCLASS_DRIVER(rproc) = {
.flags = DM_UC_FLAG_SEQ_ALIAS,
.pre_probe = rproc_pre_probe,
.post_probe = rproc_post_probe,
- .per_device_platdata_auto_alloc_size =
- sizeof(struct dm_rproc_uclass_pdata),
+ .per_device_plat_auto = sizeof(struct dm_rproc_uclass_pdata),
};
/* Remoteproc subsystem access functions */
@@ -248,7 +247,7 @@ static int _rproc_dev_is_probed(struct udevice *dev,
struct dm_rproc_uclass_pdata *uc_pdata,
const void *data)
{
- if (dev->flags & DM_FLAG_ACTIVATED)
+ if (dev_get_flags(dev) & DM_FLAG_ACTIVATED)
return 0;
return -EAGAIN;
@@ -306,7 +305,7 @@ int rproc_load(int id, ulong addr, ulong size)
return ret;
}
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ops = rproc_get_ops(dev);
if (!ops) {
@@ -366,7 +365,7 @@ static int _rproc_ops_wrapper(int id, enum rproc_ops op)
return ret;
}
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ops = rproc_get_ops(dev);
if (!ops) {
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index 2b58b27947..6836eca4c5 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -128,7 +128,7 @@ static int sandbox_testproc_probe(struct udevice *dev)
struct sandbox_test_devdata *ddata;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ddata = dev_get_priv(dev);
if (!ddata) {
debug("%s: platform private data missing\n", uc_pdata->name);
@@ -151,7 +151,7 @@ static int sandbox_testproc_init(struct udevice *dev)
struct dm_rproc_uclass_pdata *uc_pdata;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ret = sandbox_dev_move_to_state(dev, sb_init);
@@ -173,7 +173,7 @@ static int sandbox_testproc_reset(struct udevice *dev)
struct dm_rproc_uclass_pdata *uc_pdata;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ret = sandbox_dev_move_to_state(dev, sb_reset);
@@ -197,7 +197,7 @@ static int sandbox_testproc_load(struct udevice *dev, ulong addr, ulong size)
struct dm_rproc_uclass_pdata *uc_pdata;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ret = sandbox_dev_move_to_state(dev, sb_loaded);
@@ -220,7 +220,7 @@ static int sandbox_testproc_start(struct udevice *dev)
struct dm_rproc_uclass_pdata *uc_pdata;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ret = sandbox_dev_move_to_state(dev, sb_running);
@@ -242,7 +242,7 @@ static int sandbox_testproc_stop(struct udevice *dev)
struct dm_rproc_uclass_pdata *uc_pdata;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ret = sandbox_dev_move_to_state(dev, sb_init);
@@ -265,7 +265,7 @@ static int sandbox_testproc_is_running(struct udevice *dev)
struct sandbox_test_devdata *ddata;
int ret = 1;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ddata = dev_get_priv(dev);
if (ddata->current_state == sb_running)
@@ -287,7 +287,7 @@ static int sandbox_testproc_ping(struct udevice *dev)
struct sandbox_test_devdata *ddata;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
ddata = dev_get_priv(dev);
if (ddata->current_state == sb_running)
@@ -343,7 +343,7 @@ U_BOOT_DRIVER(sandbox_testproc) = {
.id = UCLASS_REMOTEPROC,
.ops = &sandbox_testproc_ops,
.probe = sandbox_testproc_probe,
- .priv_auto_alloc_size = sizeof(struct sandbox_test_devdata),
+ .priv_auto = sizeof(struct sandbox_test_devdata),
};
/* TODO(nm@ti.com): Remove this along with non-DT support */
@@ -352,7 +352,7 @@ static struct dm_rproc_uclass_pdata proc_3_test = {
.mem_type = RPROC_INTERNAL_MEMORY_MAPPED,
};
-U_BOOT_DEVICE(proc_3_demo) = {
+U_BOOT_DRVINFO(proc_3_demo) = {
.name = "sandbox_test_proc",
- .platdata = &proc_3_test,
+ .plat = &proc_3_test,
};
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index dc87cb794e..ec7694dda9 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -222,5 +222,5 @@ U_BOOT_DRIVER(stm32_copro) = {
.id = UCLASS_REMOTEPROC,
.ops = &stm32_copro_ops,
.probe = stm32_copro_probe,
- .priv_auto_alloc_size = sizeof(struct stm32_copro_privdata),
+ .priv_auto = sizeof(struct stm32_copro_privdata),
};
diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c
index 28c6ddb691..1041f3805f 100644
--- a/drivers/remoteproc/ti_k3_arm64_rproc.c
+++ b/drivers/remoteproc/ti_k3_arm64_rproc.c
@@ -226,6 +226,6 @@ U_BOOT_DRIVER(k3_arm64) = {
.id = UCLASS_REMOTEPROC,
.ops = &k3_arm64_ops,
.probe = k3_arm64_probe,
- .priv_auto_alloc_size = sizeof(struct k3_arm64_privdata),
+ .priv_auto = sizeof(struct k3_arm64_privdata),
.flags = DM_FLAG_DEFAULT_PD_CTRL_OFF,
};
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index 3361555c53..1a2e9dd1f5 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -456,5 +456,5 @@ U_BOOT_DRIVER(k3_dsp) = {
.ops = &k3_dsp_ops,
.probe = k3_dsp_probe,
.remove = k3_dsp_remove,
- .priv_auto_alloc_size = sizeof(struct k3_dsp_privdata),
+ .priv_auto = sizeof(struct k3_dsp_privdata),
};
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index 9332a63d21..10bc4e99f0 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -866,7 +866,7 @@ U_BOOT_DRIVER(k3_r5f_rproc) = {
.ops = &k3_r5f_rproc_ops,
.probe = k3_r5f_probe,
.remove = k3_r5f_remove,
- .priv_auto_alloc_size = sizeof(struct k3_r5f_core),
+ .priv_auto = sizeof(struct k3_r5f_core),
};
static int k3_r5f_cluster_probe(struct udevice *dev)
@@ -901,6 +901,6 @@ U_BOOT_DRIVER(k3_r5fss) = {
.of_match = k3_r5fss_ids,
.id = UCLASS_MISC,
.probe = k3_r5f_cluster_probe,
- .priv_auto_alloc_size = sizeof(struct k3_r5f_cluster),
+ .priv_auto = sizeof(struct k3_r5f_cluster),
.flags = DM_FLAG_DEFAULT_PD_CTRL_OFF,
};
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 350450d1fb..9dbbb44e95 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -71,7 +71,7 @@ static int ti_powerproc_probe(struct udevice *dev)
struct ti_powerproc_privdata *priv;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
priv = dev_get_priv(dev);
ret = ti_of_to_priv(dev, priv);
@@ -96,7 +96,7 @@ static int ti_powerproc_load(struct udevice *dev, ulong addr, ulong size)
struct ti_powerproc_privdata *priv;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
if (!uc_pdata) {
debug("%s: no uc pdata!\n", dev->name);
return -EINVAL;
@@ -131,7 +131,7 @@ static int ti_powerproc_start(struct udevice *dev)
struct ti_powerproc_privdata *priv;
int ret;
- uc_pdata = dev_get_uclass_platdata(dev);
+ uc_pdata = dev_get_uclass_plat(dev);
if (!uc_pdata) {
debug("%s: no uc pdata!\n", dev->name);
return -EINVAL;
@@ -177,5 +177,5 @@ U_BOOT_DRIVER(ti_powerproc) = {
.id = UCLASS_REMOTEPROC,
.ops = &ti_powerproc_ops,
.probe = ti_powerproc_probe,
- .priv_auto_alloc_size = sizeof(struct ti_powerproc_privdata),
+ .priv_auto = sizeof(struct ti_powerproc_privdata),
};