| Message ID | 20171101141807.38705-3-icenowy@aosc.io |
|---|---|
| State | Accepted |
| Commit | 0458e8c6fa660c40f52098e32a71aeee31e3aa92 |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | Fix DE2 SimpleFB node creation and support LCD SimpleFB | expand |
On Wed, Nov 1, 2017 at 7:48 PM, Icenowy Zheng <icenowy@aosc.io> wrote: > Add support for setting up SimpleFB for LCD display output in DE2 > SimpleFB setup code. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Reviewed-by: Jagan Teki <jagan@openedev.com> thanks!
On Wed, Nov 01, 2017 at 10:18:07PM +0800, Icenowy Zheng wrote: > Add support for setting up SimpleFB for LCD display output in DE2 > SimpleFB setup code. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Maxime
On Thu, Nov 2, 2017 at 5:54 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Wed, Nov 01, 2017 at 10:18:07PM +0800, Icenowy Zheng wrote: >> Add support for setting up SimpleFB for LCD display output in DE2 >> SimpleFB setup code. >> >> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Applied to u-boot-sunxi/master
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index 6d6bb2e0c3..860187323c 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -319,7 +319,7 @@ U_BOOT_DEVICE(sunxi_de2) = { #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_VIDEO_DT_SIMPLEFB) int sunxi_simplefb_setup(void *blob) { - struct udevice *de2, *hdmi; + struct udevice *de2, *hdmi, *lcd; struct video_priv *de2_priv; struct video_uc_platdata *de2_plat; int mux; @@ -355,6 +355,15 @@ int sunxi_simplefb_setup(void *blob) debug("HDMI present but not probed\n"); } + ret = uclass_find_device_by_name(UCLASS_DISPLAY, + "sunxi_lcd", &lcd); + if (ret) + debug("LCD not present\n"); + else if (device_active(lcd)) + pipeline = "mixer0-lcd0"; + else + debug("LCD present but not probed\n"); + if (!pipeline) { debug("No active display present\n"); return 0;
Add support for setting up SimpleFB for LCD display output in DE2 SimpleFB setup code. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> --- Changes in v2: - Use lcd variable. - Extract the HDMI SimpleFB fix to a dedicated patch. drivers/video/sunxi/sunxi_de2.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)