diff options
| author | Tom Rini <[email protected]> | 2017-11-09 08:11:40 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-11-09 08:11:40 -0500 |
| commit | 1c4043e53236d94f217e98625ea201690e85f56d (patch) | |
| tree | 0436cc07afe319cf42a4a26622c0e28508bd6863 /drivers | |
| parent | 3c674b7e871f49737749c76cccffb9f2ada01586 (diff) | |
| parent | 6270a3f035d0bdb5d2283dff4bb568d36ab4c0e3 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/video/sunxi/sunxi_de2.c | 16 |
3 files changed, 13 insertions, 6 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c1ce54ecbbe..52555da4b32 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -247,6 +247,7 @@ config SUN7I_GMAC config SUN4I_EMAC bool "Allwinner Sun4i Ethernet MAC support" depends on DM_ETH + select PHYLIB help This driver supports the Allwinner based SUN4I Ethernet MAC. diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 94a4fd87016..ac5443c752c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -21,7 +21,7 @@ obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_E1000) += e1000.o obj-$(CONFIG_E1000_SPI) += e1000_spi.o obj-$(CONFIG_EEPRO100) += eepro100.o -obj-$(CONFIG_SUNXI_EMAC) += sunxi_emac.o +obj-$(CONFIG_SUN4I_EMAC) += sunxi_emac.o obj-$(CONFIG_SUN8I_EMAC) += sun8i_emac.o obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_EP93XX) += ep93xx_eth.o diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index e8903400ec7..6d6bb2e0c32 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -346,13 +346,19 @@ int sunxi_simplefb_setup(void *blob) "sunxi_dw_hdmi", &hdmi); if (ret) { debug("HDMI not present\n"); - return 0; + } else if (device_active(hdmi)) { + if (mux == 0) + pipeline = "mixer0-lcd0-hdmi"; + else + pipeline = "mixer1-lcd1-hdmi"; + } else { + debug("HDMI present but not probed\n"); } - if (mux == 0) - pipeline = "mixer0-lcd0-hdmi"; - else - pipeline = "mixer1-lcd1-hdmi"; + if (!pipeline) { + debug("No active display present\n"); + return 0; + } de2_priv = dev_get_uclass_priv(de2); de2_plat = dev_get_uclass_platdata(de2); |