diff options
author | Tom Rini <trini@konsulko.com> | 2020-08-04 18:11:02 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-08-04 18:11:02 +0300 |
commit | f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1 (patch) | |
tree | 694f503767f8511bffc8c5e6360f542e50428a0d /drivers/video/imx | |
parent | 993b59f0451cb102f23714478a64361b44694fc6 (diff) | |
parent | 3e980a2d8bd13d0d1c2d5cec9e57a47b6cff8b92 (diff) | |
download | u-boot-f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1.tar.xz |
Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- fixes for Toradex board
- fix warnings from previous PR
- HAB: reset instead of panic after failure
- new board: MYiR Tech MYS-6ULX
- mx6cuboxi: use OF_PLATDATA
- further changes for DM
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/714513163
Diffstat (limited to 'drivers/video/imx')
-rw-r--r-- | drivers/video/imx/mxc_ipuv3_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 4c20ec5e66..eb93a4f1fa 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -665,8 +665,8 @@ static const struct udevice_id ipuv3_video_ids[] = { { } }; -U_BOOT_DRIVER(ipuv3_video) = { - .name = "ipuv3_video", +U_BOOT_DRIVER(fsl_imx6q_ipu) = { + .name = "fsl_imx6q_ipu", .id = UCLASS_VIDEO, .of_match = ipuv3_video_ids, .bind = ipuv3_video_bind, |