summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorDario Binacchi <dariobin@libero.it>2021-01-15 09:10:26 +0100
committerTom Rini <trini@konsulko.com>2021-01-15 13:12:38 -0500
commitb0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b (patch)
tree9cd2774a53249733c571b51b60bc40da662d201c /drivers/video
parent83e13c3469c710af03bf43f53aede0f9b7ba2dd0 (diff)
downloadu-boot-b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b.tar.gz
u-boot-b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b.tar.xz
u-boot-b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b.zip
dm: fix build errors generated by last merges
Something was wrong in the merge process into the mainline. Some added patches access driver structure fields and functions that have been modified by previous patches. The patch renames: - dev_get_platdata to dev_get_plat - dev_get_uclass_platdata to dev_get_uclass_plat - ofdata_to_platdata to of_to_plat - plat_data_alloc_size to plat_auto - priv_auto_alloc_size to priv_auto - video_uc_platdata to video_uc_plat Signed-off-by: Dario Binacchi <dariobin@libero.it>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/seps525.c6
-rw-r--r--drivers/video/tdo-tl070wsh30.c12
-rw-r--r--drivers/video/ti/tilcdc-panel.c2
-rw-r--r--drivers/video/ti/tilcdc.c8
4 files changed, 14 insertions, 14 deletions
diff --git a/drivers/video/seps525.c b/drivers/video/seps525.c
index 369e5e6afc..74c8721e1e 100644
--- a/drivers/video/seps525.c
+++ b/drivers/video/seps525.c
@@ -299,7 +299,7 @@ static int seps525_probe(struct udevice *dev)
static int seps525_bind(struct udevice *dev)
{
- struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+ struct video_uc_plat *plat = dev_get_uclass_plat(dev);
plat->size = WIDTH * HEIGHT * 16;
@@ -320,8 +320,8 @@ U_BOOT_DRIVER(seps525_video) = {
.id = UCLASS_VIDEO,
.of_match = seps525_ids,
.ops = &seps525_ops,
- .platdata_auto_alloc_size = sizeof(struct video_uc_platdata),
+ .plat_auto = sizeof(struct video_uc_plat),
.bind = seps525_bind,
.probe = seps525_probe,
- .priv_auto_alloc_size = sizeof(struct seps525_priv),
+ .priv_auto = sizeof(struct seps525_priv),
};
diff --git a/drivers/video/tdo-tl070wsh30.c b/drivers/video/tdo-tl070wsh30.c
index ae9d11f475..813b87a681 100644
--- a/drivers/video/tdo-tl070wsh30.c
+++ b/drivers/video/tdo-tl070wsh30.c
@@ -34,7 +34,7 @@ static const struct display_timing default_timing = {
static int tl070wsh30_panel_enable_backlight(struct udevice *dev)
{
- struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev);
+ struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
struct mipi_dsi_device *device = plat->device;
struct tl070wsh30_panel_priv *priv = dev_get_priv(dev);
int ret;
@@ -70,7 +70,7 @@ static int tl070wsh30_panel_get_display_timing(struct udevice *dev,
return 0;
}
-static int tl070wsh30_panel_ofdata_to_platdata(struct udevice *dev)
+static int tl070wsh30_panel_of_to_plat(struct udevice *dev)
{
struct tl070wsh30_panel_priv *priv = dev_get_priv(dev);
int ret;
@@ -105,7 +105,7 @@ static int tl070wsh30_panel_ofdata_to_platdata(struct udevice *dev)
static int tl070wsh30_panel_probe(struct udevice *dev)
{
struct tl070wsh30_panel_priv *priv = dev_get_priv(dev);
- struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev);
+ struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
int ret;
if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) {
@@ -148,8 +148,8 @@ U_BOOT_DRIVER(tl070wsh30_panel) = {
.id = UCLASS_PANEL,
.of_match = tl070wsh30_panel_ids,
.ops = &tl070wsh30_panel_ops,
- .ofdata_to_platdata = tl070wsh30_panel_ofdata_to_platdata,
+ .of_to_plat = tl070wsh30_panel_of_to_plat,
.probe = tl070wsh30_panel_probe,
- .platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat),
- .priv_auto_alloc_size = sizeof(struct tl070wsh30_panel_priv),
+ .plat_auto = sizeof(struct mipi_dsi_panel_plat),
+ .priv_auto = sizeof(struct tl070wsh30_panel_priv),
};
diff --git a/drivers/video/ti/tilcdc-panel.c b/drivers/video/ti/tilcdc-panel.c
index b90dfae4ae..df95086a51 100644
--- a/drivers/video/ti/tilcdc-panel.c
+++ b/drivers/video/ti/tilcdc-panel.c
@@ -165,7 +165,7 @@ U_BOOT_DRIVER(tilcdc_panel) = {
.id = UCLASS_PANEL,
.of_match = tilcdc_panel_ids,
.ops = &tilcdc_panel_ops,
- .ofdata_to_platdata = tilcdc_panel_of_to_plat,
+ .of_to_plat = tilcdc_panel_of_to_plat,
.probe = tilcdc_panel_probe,
.remove = tilcdc_panel_remove,
.priv_auto = sizeof(struct tilcdc_panel_priv),
diff --git a/drivers/video/ti/tilcdc.c b/drivers/video/ti/tilcdc.c
index d13cc11801..814126af66 100644
--- a/drivers/video/ti/tilcdc.c
+++ b/drivers/video/ti/tilcdc.c
@@ -155,7 +155,7 @@ static ulong tilcdc_set_pixel_clk_rate(struct udevice *dev, ulong rate)
static int tilcdc_remove(struct udevice *dev)
{
- struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
+ struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
struct tilcdc_priv *priv = dev_get_priv(dev);
uc_plat->base -= 0x20;
@@ -167,7 +167,7 @@ static int tilcdc_remove(struct udevice *dev)
static int tilcdc_probe(struct udevice *dev)
{
- struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
+ struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
struct video_priv *uc_priv = dev_get_uclass_priv(dev);
struct tilcdc_priv *priv = dev_get_priv(dev);
struct tilcdc_regs *regs = priv->regs;
@@ -399,7 +399,7 @@ static int tilcdc_of_to_plat(struct udevice *dev)
static int tilcdc_bind(struct udevice *dev)
{
- struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
+ struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
uc_plat->size = ((LCDC_MAX_WIDTH * LCDC_MAX_HEIGHT *
(1 << LCDC_MAX_LOG2_BPP)) >> 3) + 0x20;
@@ -418,7 +418,7 @@ U_BOOT_DRIVER(tilcdc) = {
.id = UCLASS_VIDEO,
.of_match = tilcdc_ids,
.bind = tilcdc_bind,
- .ofdata_to_platdata = tilcdc_of_to_plat,
+ .of_to_plat = tilcdc_of_to_plat,
.probe = tilcdc_probe,
.remove = tilcdc_remove,
.priv_auto = sizeof(struct tilcdc_priv)