diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-27 09:41:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-27 09:41:51 -0400 |
| commit | d16d37bcd4087b8ea0f66cb76a73edad182d151a (patch) | |
| tree | f1e2fea5fd6dd0b26749e9061ddfcb64a632a5ff | |
| parent | d202f67db0771247de562af5d6a5df778702857b (diff) | |
| parent | ea16637525ad6a49626de3fbf01e29e1af08d29f (diff) | |
Merge tag 'video-for-v2020.07-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- simple panel 'nv140fhmn49' compatible
- rockchip eDP and LVDS drivers build fix
| -rw-r--r-- | drivers/video/rockchip/rk_edp.c | 1 | ||||
| -rw-r--r-- | drivers/video/rockchip/rk_lvds.c | 3 | ||||
| -rw-r--r-- | drivers/video/simple_panel.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 8703df0ec0..cf84b886e7 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -18,6 +18,7 @@ #include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/edp_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/hardware.h> #include <dt-bindings/clock/rk3288-cru.h> #define MAX_CR_LOOP 5 diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c index cf5c0439b1..79e24baf53 100644 --- a/drivers/video/rockchip/rk_lvds.c +++ b/drivers/video/rockchip/rk_lvds.c @@ -13,8 +13,9 @@ #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/lvds_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/lvds_rk3288.h> #include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/video/rk3288.h> diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index c3c0e84732..5722811117 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -105,6 +105,7 @@ static const struct udevice_id simple_panel_ids[] = { { .compatible = "auo,b133xtn01" }, { .compatible = "auo,b116xw03" }, { .compatible = "auo,b133htn01" }, + { .compatible = "boe,nv140fhmn49" }, { .compatible = "lg,lb070wv8" }, { } }; |