diff options
Diffstat (limited to 'drivers/video')
40 files changed, 83 insertions, 83 deletions
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c index 6620c793a1..26c6a46d5b 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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_ofdata_to_platdata(struct udevice *dev) static int am335x_fb_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *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 3eb80c1394..0930d195d0 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_platdata(dev); + struct video_uc_platdata *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_ofdata_to_platdata(struct udevice *dev) static int atmel_hlcdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *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 b129309d34..3af3ea4da2 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_platdata(dev); + struct video_uc_platdata *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; @@ -285,7 +285,7 @@ static int atmel_fb_ofdata_to_platdata(struct udevice *dev) static int atmel_fb_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *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, .ofdata_to_platdata = atmel_fb_ofdata_to_platdata, .probe = atmel_fb_lcd_probe, - .platdata_auto = sizeof(struct atmel_lcd_platdata), + .plat_auto = sizeof(struct atmel_lcd_platdata), .priv_auto = sizeof(struct atmel_fb_priv), }; #endif diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 0888cb0019..95662f14b8 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_platdata(dev); + struct video_uc_platdata *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/bridge/anx6345.c b/drivers/video/bridge/anx6345.c index 147cdcc6d5..93fa25f16e 100644 --- a/drivers/video/bridge/anx6345.c +++ b/drivers/video/bridge/anx6345.c @@ -74,7 +74,7 @@ static int anx6345_read(struct udevice *dev, unsigned int addr_off, static int anx6345_write_r0(struct udevice *dev, unsigned char reg_addr, unsigned char value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); return anx6345_write(dev, chip->chip_addr, reg_addr, value); } @@ -82,7 +82,7 @@ static int anx6345_write_r0(struct udevice *dev, unsigned char reg_addr, static int anx6345_read_r0(struct udevice *dev, unsigned char reg_addr, unsigned char *value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); return anx6345_read(dev, chip->chip_addr, reg_addr, value); } @@ -90,7 +90,7 @@ static int anx6345_read_r0(struct udevice *dev, unsigned char reg_addr, static int anx6345_write_r1(struct udevice *dev, unsigned char reg_addr, unsigned char value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); return anx6345_write(dev, chip->chip_addr + 1, reg_addr, value); } @@ -98,7 +98,7 @@ static int anx6345_write_r1(struct udevice *dev, unsigned char reg_addr, static int anx6345_read_r1(struct udevice *dev, unsigned char reg_addr, unsigned char *value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); return anx6345_read(dev, chip->chip_addr + 1, reg_addr, value); } diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c index 8399c6f74c..76115b7bc5 100644 --- a/drivers/video/bridge/ps862x.c +++ b/drivers/video/bridge/ps862x.c @@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR; static int ps8622_write(struct udevice *dev, unsigned addr_off, unsigned char reg_addr, unsigned char value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); uint8_t buf[2]; struct i2c_msg msg; int ret; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index bc91e7bda5..94d9470751 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_platdata(dev); + struct video_uc_platdata *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_ofdata_to_platdata(struct udevice *dev) static int broadwell_igd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); /* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; @@ -782,5 +782,5 @@ U_BOOT_DRIVER(broadwell_igd) = { .bind = broadwell_igd_bind, .probe = broadwell_igd_probe, .priv_auto = sizeof(struct broadwell_igd_priv), - .platdata_auto = sizeof(struct broadwell_igd_plat), + .plat_auto = sizeof(struct broadwell_igd_plat), }; diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c index c8797a0d9c..043cc627a7 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_platdata(dev); + struct video_uc_platdata *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/display-uclass.c b/drivers/video/display-uclass.c index 5d6f0c1731..068108e915 100644 --- a/drivers/video/display-uclass.c +++ b/drivers/video/display-uclass.c @@ -31,7 +31,7 @@ int display_enable(struct udevice *dev, int panel_bpp, if (ret) return ret; - disp_uc_plat = dev_get_uclass_platdata(dev); + disp_uc_plat = dev_get_uclass_plat(dev); disp_uc_plat->in_use = true; return 0; @@ -71,7 +71,7 @@ int display_read_timing(struct udevice *dev, struct display_timing *timing) bool display_in_use(struct udevice *dev) { - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev); return disp_uc_plat->in_use; } @@ -79,5 +79,5 @@ bool display_in_use(struct udevice *dev) UCLASS_DRIVER(display) = { .id = UCLASS_DISPLAY, .name = "display", - .per_device_platdata_auto = sizeof(struct display_plat), + .per_device_plat_auto = sizeof(struct display_plat), }; diff --git a/drivers/video/efi.c b/drivers/video/efi.c index 47441a35a6..ceb6f85d25 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_platdata(dev); + struct video_uc_platdata *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 7022eec4b7..64bc847884 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 e9d05c9394..9224347ab1 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 dc8f2cfd80..0bbd974c2a 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_platdata(mxc_fbi->udev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 2587f53ac1..9f10689ce3 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 0ffdd7b98f..6c73bd2d62 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 b367276f23..313c013a7d 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_platdata(dev); + struct video_uc_platdata *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 23b5ec6ef1..b5614fafe8 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 af97c71156..bc789ecc7b 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 6589a2a09d..5b770a7a0b 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 d0b8943312..b1f8134ca4 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -404,9 +404,9 @@ static struct nx_display_dev *nx_display_setup(void) __func__); return NULL; } - plat = dev_get_uclass_platdata(dev); + plat = dev_get_uclass_plat(dev); if (!dev) { - debug("%s(): dev_get_uclass_platdata(dev) == NULL --> return NULL\n", + debug("%s(): dev_get_uclass_plat(dev) == NULL --> return NULL\n", __func__); return NULL; } @@ -534,7 +534,7 @@ __weak void lcd_enable(void) static int nx_display_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct nx_display_platdata *plat = dev_get_platdata(dev); static GraphicDevice *graphic_device; @@ -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_platdata(dev); + struct video_uc_platdata *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, - .platdata_auto = + .plat_auto = sizeof(struct nx_display_platdata), .bind = nx_display_bind, .probe = nx_display_probe, diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c index bb8c33bfc7..190bb55164 100644 --- a/drivers/video/orisetech_otm8009a.c +++ b/drivers/video/orisetech_otm8009a.c @@ -366,6 +366,6 @@ U_BOOT_DRIVER(otm8009a_panel) = { .ops = &otm8009a_panel_ops, .ofdata_to_platdata = otm8009a_panel_ofdata_to_platdata, .probe = otm8009a_panel_probe, - .platdata_auto = sizeof(struct mipi_dsi_panel_plat), + .plat_auto = sizeof(struct mipi_dsi_panel_plat), .priv_auto = sizeof(struct otm8009a_panel_priv), }; diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index 49a3c7a58e..d1407977aa 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -84,10 +84,10 @@ static int enable_sequence(struct udevice *dev, int seq) switch (seq) { case 0: if (priv->reg) { - __maybe_unused struct dm_regulator_uclass_platdata + __maybe_unused struct dm_regulator_uclass_plat *plat; - plat = dev_get_uclass_platdata(priv->reg); + plat = dev_get_uclass_plat(priv->reg); log_debug("Enable '%s', regulator '%s'/'%s'\n", dev->name, priv->reg->name, plat->name); ret = regulator_set_enable(priv->reg, true); diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c index 9d103f1f17..82e8f04d8f 100644 --- a/drivers/video/raydium-rm68200.c +++ b/drivers/video/raydium-rm68200.c @@ -338,6 +338,6 @@ U_BOOT_DRIVER(rm68200_panel) = { .ops = &rm68200_panel_ops, .ofdata_to_platdata = rm68200_panel_ofdata_to_platdata, .probe = rm68200_panel_probe, - .platdata_auto = sizeof(struct mipi_dsi_panel_plat), + .plat_auto = sizeof(struct mipi_dsi_panel_plat), .priv_auto = sizeof(struct rm68200_panel_priv), }; diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c index 41f05b7ec6..a25b40c37f 100644 --- a/drivers/video/rockchip/rk3288_hdmi.c +++ b/drivers/video/rockchip/rk3288_hdmi.c @@ -25,7 +25,7 @@ static int rk3288_hdmi_enable(struct udevice *dev, int panel_bpp, const struct display_timing *edid) { struct rk_hdmi_priv *priv = dev_get_priv(dev); - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); int vop_id = uc_plat->source_id; struct rk3288_grf *grf = priv->grf; @@ -58,7 +58,7 @@ static int rk3288_hdmi_ofdata_to_platdata(struct udevice *dev) static int rk3288_clk_config(struct udevice *dev) { - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); struct clk clk; int ret; diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c index ff6f132bab..f8b83a99dc 100644 --- a/drivers/video/rockchip/rk3288_mipi.c +++ b/drivers/video/rockchip/rk3288_mipi.c @@ -31,7 +31,7 @@ static int rk_mipi_dsi_source_select(struct udevice *dev) { struct rk_mipi_priv *priv = dev_get_priv(dev); struct rk3288_grf *grf = priv->grf; - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev); /* Select the video source */ switch (disp_uc_plat->source_id) { diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c index d9f15adc5c..39f0c323f3 100644 --- a/drivers/video/rockchip/rk3399_hdmi.c +++ b/drivers/video/rockchip/rk3399_hdmi.c @@ -23,7 +23,7 @@ static int rk3399_hdmi_enable(struct udevice *dev, int panel_bpp, const struct display_timing *edid) { struct rk_hdmi_priv *priv = dev_get_priv(dev); - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); int vop_id = uc_plat->source_id; struct rk3399_grf_regs *grf = priv->grf; diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c index 873f7fdae0..3b8ac3f730 100644 --- a/drivers/video/rockchip/rk3399_mipi.c +++ b/drivers/video/rockchip/rk3399_mipi.c @@ -29,7 +29,7 @@ static int rk_mipi_dsi_source_select(struct udevice *dev) { struct rk_mipi_priv *priv = dev_get_priv(dev); struct rk3399_grf_regs *grf = priv->grf; - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev); /* Select the video source */ switch (disp_uc_plat->source_id) { diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 282fe09fdf..30fe8cee3c 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1026,7 +1026,7 @@ static int rk_edp_remove(struct udevice *dev) static int rk_edp_probe(struct udevice *dev) { - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); struct rk_edp_priv *priv = dev_get_priv(dev); struct rk3288_edp *regs = priv->regs; struct clk clk; diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c index c93b5dfeed..74a1d3071d 100644 --- a/drivers/video/rockchip/rk_lvds.c +++ b/drivers/video/rockchip/rk_lvds.c @@ -53,7 +53,7 @@ int rk_lvds_enable(struct udevice *dev, int panel_bpp, const struct display_timing *edid) { struct rk_lvds_priv *priv = dev_get_priv(dev); - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); int ret = 0; unsigned int val = 0; diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c index 6475b3e2af..c20d158c9f 100644 --- a/drivers/video/rockchip/rk_vop.c +++ b/drivers/video/rockchip/rk_vop.c @@ -283,7 +283,7 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node) break; }; - disp_uc_plat = dev_get_uclass_platdata(disp); + disp_uc_plat = dev_get_uclass_plat(disp); debug("Found device '%s', disp_uc_priv=%p\n", disp->name, disp_uc_plat); if (display_in_use(disp)) { debug(" - device in use\n"); @@ -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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 c989510640..cf1446e2e7 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_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_platdata(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_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_platdata(dev); int ret = 0; @@ -78,5 +78,5 @@ U_BOOT_DRIVER(sandbox_lcd_sdl) = { .of_match = sandbox_sdl_ids, .bind = sandbox_sdl_bind, .probe = sandbox_sdl_probe, - .platdata_auto = sizeof(struct sandbox_sdl_plat), + .plat_auto = sizeof(struct sandbox_sdl_plat), }; diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c index 0c5b40c30b..7f94018787 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_platdata(dev); + struct video_uc_platdata *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 07a9acbb8e..ff28bdba57 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 b657e163f0..5540e70fa0 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -189,7 +189,7 @@ static int sunxi_de2_init(struct udevice *dev, ulong fbbase, struct display_plat *disp_uc_plat; int ret; - disp_uc_plat = dev_get_uclass_platdata(disp); + disp_uc_plat = dev_get_uclass_plat(disp); debug("Using device '%s', disp_uc_priv=%p\n", disp->name, disp_uc_plat); if (display_in_use(disp)) { debug(" - device in use\n"); @@ -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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; @@ -383,7 +383,7 @@ int sunxi_simplefb_setup(void *blob) } de2_priv = dev_get_uclass_priv(de2); - de2_plat = dev_get_uclass_platdata(de2); + de2_plat = dev_get_uclass_plat(de2); offset = sunxi_simplefb_fdt_match(blob, pipeline); if (offset < 0) { diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c index 6b6792a3dd..3e8d71538f 100644 --- a/drivers/video/sunxi/sunxi_dw_hdmi.c +++ b/drivers/video/sunxi/sunxi_dw_hdmi.c @@ -340,7 +340,7 @@ static int sunxi_dw_hdmi_enable(struct udevice *dev, int panel_bpp, static int sunxi_dw_hdmi_probe(struct udevice *dev) { - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); struct sunxi_dw_hdmi_priv *priv = dev_get_priv(dev); struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index 2519933374..10b834ca76 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_platdata(dev); + struct video_uc_platdata *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_ofdata_to_platdata(struct udevice *dev) static int tegra_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *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 6c27932263..f834bd9f59 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -351,7 +351,7 @@ static int display_init(struct udevice *dev, void *lcdbase, return ret; } - disp_uc_plat = dev_get_uclass_platdata(dp_dev); + disp_uc_plat = dev_get_uclass_plat(dp_dev); debug("Found device '%s', disp_uc_priv=%p\n", dp_dev->name, disp_uc_plat); disp_uc_plat->src_dev = dev; @@ -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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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/tegra124/dp.c b/drivers/video/tegra124/dp.c index 881923f229..8519b534a2 100644 --- a/drivers/video/tegra124/dp.c +++ b/drivers/video/tegra124/dp.c @@ -1596,7 +1596,7 @@ static int dp_tegra_probe(struct udevice *dev) { struct tegra_dp_plat *plat = dev_get_platdata(dev); struct tegra_dp_priv *priv = dev_get_priv(dev); - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev); priv->regs = (struct dpaux_ctlr *)plat->base; priv->enabled = false; @@ -1620,5 +1620,5 @@ U_BOOT_DRIVER(dp_tegra) = { .probe = dp_tegra_probe, .ops = &dp_tegra_ops, .priv_auto = sizeof(struct tegra_dp_priv), - .platdata_auto = sizeof(struct tegra_dp_plat), + .plat_auto = sizeof(struct tegra_dp_plat), }; diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c index 9656326bdb..e370cddda9 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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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 925731341c..2cd0d947f0 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -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_platdata(dev); + struct video_uc_platdata *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_platdata(dev); + struct video_uc_platdata *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_platdata_auto = sizeof(struct video_uc_platdata), + .per_device_plat_auto = sizeof(struct video_uc_platdata), }; |