diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-16 10:50:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-16 10:50:32 -0500 |
| commit | 530dcdd07c9870bcb22e40a72d9ffe2afc513117 (patch) | |
| tree | 8bd83da4fa8d9a43d5d217f9f931256f43985634 /drivers/video | |
| parent | e1fdb2045ad02c9d8bc5972db8f0536518c7330e (diff) | |
| parent | c87eab81616d671a6004ffc95847bad21b7eb005 (diff) | |
| download | u-boot-530dcdd07c9870bcb22e40a72d9ffe2afc513117.zip u-boot-530dcdd07c9870bcb22e40a72d9ffe2afc513117.tar.gz u-boot-530dcdd07c9870bcb22e40a72d9ffe2afc513117.tar.bz2 | |
Merge tag 'u-boot-amlogic-20201116' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- Clock fix MMC driver for SM1 based platforms
- sync SOC Ids from Linux 5.10-rc1
- fix potential build warning on meson_dw_hdmi and meson-g12a-usb2 phy
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/meson/meson_dw_hdmi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c index 7b2ff94..5d74f7f 100644 --- a/drivers/video/meson/meson_dw_hdmi.c +++ b/drivers/video/meson/meson_dw_hdmi.c @@ -379,7 +379,9 @@ static int meson_dw_hdmi_probe(struct udevice *dev) struct meson_dw_hdmi *priv = dev_get_priv(dev); struct reset_ctl_bulk resets; struct clk_bulk clocks; +#if CONFIG_IS_ENABLED(DM_REGULATOR) struct udevice *supply; +#endif int ret; priv->dev = dev; |