diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-18 16:36:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-18 16:36:44 -0400 |
| commit | 3b985bdeabd1b05abf28fe7dc6530c203750f9fc (patch) | |
| tree | 7b32aa816256961ee485be87ba0bffdce2d6c969 /drivers/video/meson/meson_vpu.c | |
| parent | cce99479af3f3d0cdb41a4da078000031b16e9e5 (diff) | |
| parent | be2ffa1656509cc974910224a87443868d7037d9 (diff) | |
Merge tag 'u-boot-amlogic-20191018' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- document alternative libretech-cc installation methods, including upstream TF-A and opensource tools
- add HDMI/CVBS display support for Amlogic G12A SoCs and SEI510 board
- add support for Amlogic A311D based Khadas VIM3
- add support for Amlogic S905X3 based SEI610 board, targeting Android support like SEI510
Diffstat (limited to 'drivers/video/meson/meson_vpu.c')
| -rw-r--r-- | drivers/video/meson/meson_vpu.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index 279401d597b..c3af9b013c6 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -7,7 +7,6 @@ */ #include "meson_vpu.h" -#include <power-domain.h> #include <efi_loader.h> #include <dm/device-internal.h> #include <dm/uclass-internal.h> @@ -87,13 +86,13 @@ static const struct udevice_id meson_vpu_ids[] = { { .compatible = "amlogic,meson-gxbb-vpu", .data = VPU_COMPATIBLE_GXBB }, { .compatible = "amlogic,meson-gxl-vpu", .data = VPU_COMPATIBLE_GXL }, { .compatible = "amlogic,meson-gxm-vpu", .data = VPU_COMPATIBLE_GXM }, + { .compatible = "amlogic,meson-g12a-vpu", .data = VPU_COMPATIBLE_G12A }, { } }; static int meson_vpu_probe(struct udevice *dev) { struct meson_vpu_priv *priv = dev_get_priv(dev); - struct power_domain pd; struct udevice *disp; int ret; @@ -115,14 +114,6 @@ static int meson_vpu_probe(struct udevice *dev) if (!priv->dmc_base) return -EINVAL; - ret = power_domain_get(dev, &pd); - if (ret) - return ret; - - ret = power_domain_on(&pd); - if (ret) - return ret; - meson_vpu_init(dev); /* probe the display */ |