dm: treewide: Rename ..._platdata variables to just ..._plat

Try to maintain some consistency between these variables by using _plat as
a suffix for them.

Signed-off-by: Simon Glass <sjg@chromium.org>

26 files changed, 62 insertions, 62 deletions

diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index e0d5f44590..e99a9185a2 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -368,7 +368,7 @@ struct am335x_fb_priv {
 
 static int am335x_fb_remove(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	uc_plat->base -= 0x20;
 	uc_plat->size += 0x20;
@@ -377,7 +377,7 @@ static int am335x_fb_remove(struct udevice *dev)
 
 static int am335x_fb_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct am335x_fb_priv *priv = dev_get_priv(dev);
 	struct am335x_lcdhw *regs = priv->regs;
@@ -592,7 +592,7 @@ static int am335x_fb_of_to_plat(struct udevice *dev)
 
 static int am335x_fb_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	uc_plat->size = ((LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
 			  (1 << LCD_MAX_LOG2_BPP)) >> 3) + 0x20;
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 2d0d0d4f9c..0485ae2436 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -293,7 +293,7 @@ static int at91_hlcdc_enable_clk(struct udevice *dev)
 
 static void atmel_hlcdc_init(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct atmel_hlcdc_priv *priv = dev_get_priv(dev);
 	struct atmel_hlcd_regs *regs = priv->regs;
 	struct display_timing *timing = &priv->timing;
@@ -539,7 +539,7 @@ static int atmel_hlcdc_of_to_plat(struct udevice *dev)
 
 static int atmel_hlcdc_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
 				(1 << LCD_MAX_LOG2_BPP) / 8;
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index f836a9a82f..f87c0224a1 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -245,7 +245,7 @@ ulong calc_fbsize(void)
 #ifdef CONFIG_DM_VIDEO
 static int atmel_fb_lcd_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct atmel_fb_priv *priv = dev_get_priv(dev);
 	struct display_timing *timing = &priv->timing;
@@ -269,7 +269,7 @@ static int atmel_fb_lcd_probe(struct udevice *dev)
 
 static int atmel_fb_of_to_plat(struct udevice *dev)
 {
-	struct atmel_lcd_platdata *plat = dev_get_plat(dev);
+	struct atmel_lcd_plat *plat = dev_get_plat(dev);
 	struct atmel_fb_priv *priv = dev_get_priv(dev);
 	struct display_timing *timing = &priv->timing;
 	const void *blob = gd->fdt_blob;
@@ -285,7 +285,7 @@ static int atmel_fb_of_to_plat(struct udevice *dev)
 
 static int atmel_fb_lcd_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
 			(1 << VIDEO_BPP16) / 8;
@@ -306,7 +306,7 @@ U_BOOT_DRIVER(atmel_fb) = {
 	.bind	= atmel_fb_lcd_bind,
 	.of_to_plat	= atmel_fb_of_to_plat,
 	.probe	= atmel_fb_lcd_probe,
-	.plat_auto	= sizeof(struct atmel_lcd_platdata),
+	.plat_auto	= sizeof(struct atmel_lcd_plat),
 	.priv_auto	= sizeof(struct atmel_fb_priv),
 };
 #endif
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 95662f14b8..9326999cd3 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -13,7 +13,7 @@
 
 static int bcm2835_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	int ret;
 	int w, h, pitch;
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 8e5c6cf866..cba105c19a 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -661,7 +661,7 @@ static int broadwell_igd_int15_handler(void)
 
 static int broadwell_igd_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	bool is_broadwell;
 	ulong fbbase;
@@ -756,7 +756,7 @@ static int broadwell_igd_of_to_plat(struct udevice *dev)
 
 static int broadwell_igd_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	/* Set the maximum supported resolution */
 	uc_plat->size = 2560 * 1600 * 4;
diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index 043cc627a7..0a5fb08dc8 100644
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -38,7 +38,7 @@ static int save_vesa_mode(struct cb_framebuffer *fb,
 
 static int coreboot_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct cb_framebuffer *fb = lib_sysinfo.framebuffer;
 	struct vesa_mode_info *vesa = &mode_info.vesa;
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index ceb6f85d25..c248bd352a 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -110,7 +110,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa)
 
 static int efi_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct vesa_mode_info *vesa = &mode_info.vesa;
 	int ret;
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index cd7767fb6e..7b4459ced8 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -377,7 +377,7 @@ void exynos_fimd_disable_sysmmu(void)
 void exynos_fimd_lcd_init(struct udevice *dev)
 {
 	struct exynos_fb_priv *priv = dev_get_priv(dev);
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct exynos_fb *reg = priv->reg;
 	unsigned int cfg = 0, rgb_mode;
 	unsigned int offset;
@@ -692,7 +692,7 @@ static int exynos_fb_probe(struct udevice *dev)
 
 static int exynos_fb_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	/* This is the maximum panel size we expect to see */
 	plat->size = 1920 * 1080 * 2;
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index 9224347ab1..4ea0f12487 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -484,7 +484,7 @@ void *video_hw_init(void)
 
 static int fsl_dcu_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct fb_info fbinfo = { 0 };
 	unsigned int win_x;
@@ -516,7 +516,7 @@ static int fsl_dcu_video_probe(struct udevice *dev)
 
 static int fsl_dcu_video_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	unsigned int win_x;
 	unsigned int win_y;
 	unsigned int depth = 0, freq = 0;
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index 0bbd974c2a..6cdbbafafb 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -383,7 +383,7 @@ static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 static int mxcfb_map_video_memory(struct fb_info *fbi)
 {
 	struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
-	struct video_uc_platdata *plat = dev_get_uclass_plat(mxc_fbi->udev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(mxc_fbi->udev);
 
 	if (fbi->fix.smem_len < fbi->var.yres_virtual * fbi->fix.line_length) {
 		fbi->fix.smem_len = fbi->var.yres_virtual *
@@ -586,7 +586,7 @@ enum {
 
 static int ipuv3_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 #if defined(CONFIG_DISPLAY)
 	struct udevice *disp_dev;
@@ -647,7 +647,7 @@ struct ipuv3_video_priv {
 
 static int ipuv3_video_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
 		     (1 << VIDEO_BPP32) / 8;
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 9f10689ce3..e7db0cbcef 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -753,7 +753,7 @@ static int gma_func0_init(struct udevice *dev)
 
 static int bd82x6x_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	ulong fbbase;
 	void *gtt_bar;
 	int ret, rev;
@@ -781,7 +781,7 @@ static int bd82x6x_video_probe(struct udevice *dev)
 
 static int bd82x6x_video_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	/* Set the maximum supported resolution */
 	uc_plat->size = 2560 * 1600 * 4;
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 6c73bd2d62..dc4f542256 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -260,7 +260,7 @@ static int malidp_update_timings_from_edid(struct udevice *dev,
 static int malidp_probe(struct udevice *dev)
 {
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	ofnode framebuffer = ofnode_find_subnode(dev_ofnode(dev), "framebuffer");
 	struct malidp_priv *priv = dev_get_priv(dev);
 	struct display_timing timings;
@@ -382,7 +382,7 @@ fail_aclk:
 
 static int malidp_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	/* choose max possible size: 2K x 2K, XRGB888 framebuffer */
 	uc_plat->size = 4 * 2048 * 2048;
diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c
index 313c013a7d..e3f784ecfe 100644
--- a/drivers/video/meson/meson_plane.c
+++ b/drivers/video/meson/meson_plane.c
@@ -100,7 +100,7 @@ meson_vpp_disable_interlace_vscaler_osd1(struct meson_vpu_priv *priv)
 
 void meson_vpu_setup_plane(struct udevice *dev, bool is_interlaced)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct meson_vpu_priv *priv = dev_get_priv(dev);
 	u32 osd1_ctrl_stat;
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index b5614fafe8..ca6933a6c5 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -43,7 +43,7 @@ bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
 
 static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct display_timing timing;
 	bool is_cvbs = false;
@@ -138,7 +138,7 @@ static int meson_vpu_probe(struct udevice *dev)
 
 static int meson_vpu_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	plat->size = VPU_MAX_WIDTH * VPU_MAX_HEIGHT *
 		(1 << VPU_MAX_LOG2_BPP) / 8;
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index bc789ecc7b..d3d07e5f83 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -526,7 +526,7 @@ static void mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info,
 
 static int mvebu_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct mvebu_video_priv *priv = dev_get_priv(dev);
 	struct mvebu_lcd_info lcd_info;
@@ -575,7 +575,7 @@ static int mvebu_video_probe(struct udevice *dev)
 
 static int mvebu_video_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
 		(1 << LCD_MAX_LOG2_BPP) / 8;
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 5b770a7a0b..b43732a77a 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -356,7 +356,7 @@ static int mxs_of_get_timings(struct udevice *dev,
 
 static int mxs_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 
 	struct display_timing timings;
@@ -409,7 +409,7 @@ static int mxs_video_probe(struct udevice *dev)
 
 static int mxs_video_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct display_timing timings;
 	u32 bpp = 0;
 	u32 bytes_pp = 0;
@@ -443,7 +443,7 @@ static int mxs_video_bind(struct udevice *dev)
 
 static int mxs_video_remove(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	mxs_remove_common(plat->base);
 
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index da11e9d2e1..00e2c36f37 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -174,7 +174,7 @@ static void nx_display_parse_dp_layer(ofnode node, struct dp_plane_info *plane)
 
 static void nx_display_parse_dp_planes(ofnode node,
 				       struct nx_display_dev *dp,
-				       struct video_uc_platdata *plat)
+				       struct video_uc_plat *plat)
 {
 	const char *name;
 	ofnode subnode;
@@ -332,7 +332,7 @@ static int nx_display_parse_dp_lcds(ofnode node, const char *type,
 
 static int nx_display_parse_dt(struct udevice *dev,
 			       struct nx_display_dev *dp,
-			       struct video_uc_platdata *plat)
+			       struct video_uc_plat *plat)
 {
 	const char *name, *dtype;
 	int ret = 0;
@@ -391,7 +391,7 @@ static struct nx_display_dev *nx_display_setup(void)
 	struct nx_display_dev *dp;
 	int i, ret;
 	int node = 0;
-	struct video_uc_platdata *plat = NULL;
+	struct video_uc_plat *plat = NULL;
 
 	struct udevice *dev;
 
@@ -534,9 +534,9 @@ __weak void lcd_enable(void)
 
 static int nx_display_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
-	struct nx_display_platdata *plat = dev_get_plat(dev);
+	struct nx_display_plat *plat = dev_get_plat(dev);
 	static GraphicDevice *graphic_device;
 	char addr[64];
 
@@ -546,7 +546,7 @@ static int nx_display_probe(struct udevice *dev)
 		return -EINVAL;
 
 	if (!uc_plat) {
-		debug("%s(): video_uc_platdata *plat == NULL --> return -EINVAL\n",
+		debug("%s(): video_uc_plat *plat == NULL --> return -EINVAL\n",
 		      __func__);
 		return -EINVAL;
 	}
@@ -558,7 +558,7 @@ static int nx_display_probe(struct udevice *dev)
 	}
 
 	if (!plat) {
-		debug("%s(): nx_display_platdata *plat == NULL --> return -EINVAL\n",
+		debug("%s(): nx_display_plat *plat == NULL --> return -EINVAL\n",
 		      __func__);
 		return -EINVAL;
 	}
@@ -619,7 +619,7 @@ static int nx_display_probe(struct udevice *dev)
 
 static int nx_display_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	debug("%s()\n", __func__);
 
@@ -643,7 +643,7 @@ U_BOOT_DRIVER(nexell_display) = {
 	.name = "nexell-display",
 	.id = UCLASS_VIDEO,
 	.of_match = nx_display_ids,
-	.plat_auto	= sizeof(struct nx_display_platdata),
+	.plat_auto	= sizeof(struct nx_display_plat),
 	.bind = nx_display_bind,
 	.probe = nx_display_probe,
 	.priv_auto	= sizeof(struct nx_display_dev),
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index c20d158c9f..fcb393b906 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -364,7 +364,7 @@ void rk_vop_probe_regulators(struct udevice *dev,
 
 int rk_vop_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct rk_vop_priv *priv = dev_get_priv(dev);
 	int ret = 0;
 	ofnode port, node;
@@ -406,7 +406,7 @@ int rk_vop_probe(struct udevice *dev)
 
 int rk_vop_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	plat->size = 4 * (CONFIG_VIDEO_ROCKCHIP_MAX_XRES *
 			  CONFIG_VIDEO_ROCKCHIP_MAX_YRES);
diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c
index 3e231e8c55..12edf9c90c 100644
--- a/drivers/video/sandbox_sdl.c
+++ b/drivers/video/sandbox_sdl.c
@@ -23,7 +23,7 @@ enum {
 
 static int sandbox_sdl_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct sandbox_sdl_plat *plat = dev_get_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct sandbox_state *state = state_get_current();
@@ -49,7 +49,7 @@ static int sandbox_sdl_probe(struct udevice *dev)
 
 static int sandbox_sdl_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct sandbox_sdl_plat *plat = dev_get_plat(dev);
 	int ret = 0;
 
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index 7f94018787..b5fb6f62bb 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -12,7 +12,7 @@
 
 static int simple_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	const void *blob = gd->fdt_blob;
 	const int node = dev_of_offset(dev);
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index ff28bdba57..dc10b8cfc1 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -329,7 +329,7 @@ static void stm32_ltdc_set_layer1(struct stm32_ltdc_priv *priv, ulong fb_addr)
 
 static int stm32_ltdc_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct stm32_ltdc_priv *priv = dev_get_priv(dev);
 	struct udevice *bridge = NULL;
@@ -452,7 +452,7 @@ static int stm32_ltdc_probe(struct udevice *dev)
 
 static int stm32_ltdc_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES *
 			CONFIG_VIDEO_STM32_MAX_YRES *
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index 5540e70fa0..50657a77d3 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -237,7 +237,7 @@ static int sunxi_de2_init(struct udevice *dev, ulong fbbase,
 
 static int sunxi_de2_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct udevice *disp;
 	int ret;
 
@@ -299,7 +299,7 @@ static int sunxi_de2_probe(struct udevice *dev)
 
 static int sunxi_de2_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
 		(1 << LCD_MAX_LOG2_BPP) / 8;
@@ -331,7 +331,7 @@ int sunxi_simplefb_setup(void *blob)
 {
 	struct udevice *de2, *hdmi, *lcd;
 	struct video_priv *de2_priv;
-	struct video_uc_platdata *de2_plat;
+	struct video_uc_plat *de2_plat;
 	int mux;
 	int offset, ret;
 	u64 start, size;
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index d185096db0..08b006b469 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -299,7 +299,7 @@ static int tegra_display_probe(const void *blob, struct tegra_lcd_priv *priv,
 
 static int tegra_lcd_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct tegra_lcd_priv *priv = dev_get_priv(dev);
 	const void *blob = gd->fdt_blob;
@@ -393,7 +393,7 @@ static int tegra_lcd_of_to_plat(struct udevice *dev)
 
 static int tegra_lcd_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	const void *blob = gd->fdt_blob;
 	int node = dev_of_offset(dev);
 	int rgb;
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index f834bd9f59..f642b3b10a 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -465,7 +465,7 @@ static int tegra124_lcd_init(struct udevice *dev, void *lcdbase,
 
 static int tegra124_lcd_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	ulong start;
 	int ret;
 
@@ -482,7 +482,7 @@ static int tegra124_lcd_probe(struct udevice *dev)
 
 static int tegra124_lcd_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
 			(1 << VIDEO_BPP16) / 8;
diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c
index e370cddda9..869e546973 100644
--- a/drivers/video/vesa.c
+++ b/drivers/video/vesa.c
@@ -13,7 +13,7 @@
 
 static int vesa_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	ulong fbbase;
 	int ret;
 
@@ -31,7 +31,7 @@ static int vesa_video_probe(struct udevice *dev)
 
 static int vesa_video_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
 	/* Set the maximum supported resolution */
 	uc_plat->size = 2560 * 1600 * 4;
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 2cd0d947f0..20f6973b4b 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -25,7 +25,7 @@
  * Theory of operation:
  *
  * Before relocation each device is bound. The driver for each device must
- * set the @align and @size values in struct video_uc_platdata. This
+ * set the @align and @size values in struct video_uc_plat. This
  * information represents the requires size and alignment of the frame buffer
  * for the device. The values can be an over-estimate but cannot be too
  * small. The actual values will be suppled (in the same manner) by the bind()
@@ -68,7 +68,7 @@ void video_set_flush_dcache(struct udevice *dev, bool flush)
 
 static ulong alloc_fb(struct udevice *dev, ulong *addrp)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	ulong base, align, size;
 
 	if (!plat->size)
@@ -301,7 +301,7 @@ static int video_pre_remove(struct udevice *dev)
 /* Set up the display ready for use */
 static int video_post_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_plat(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *priv = dev_get_uclass_priv(dev);
 	char name[30], drv[15], *str;
 	const char *drv_name = drv;
@@ -410,5 +410,5 @@ UCLASS_DRIVER(video) = {
 	.pre_remove	= video_pre_remove,
 	.priv_auto	= sizeof(struct video_uc_priv),
 	.per_device_auto	= sizeof(struct video_priv),
-	.per_device_plat_auto	= sizeof(struct video_uc_platdata),
+	.per_device_plat_auto	= sizeof(struct video_uc_plat),
 };