From: Simon Glass Date: Sun, 13 Nov 2016 21:21:55 +0000 (-0700) Subject: rockchip: video: Correct HDMI data source selection X-Git-Tag: v2017.01-rc1~210^2~21 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e4ab3d712a52e69d154ed9a1fb15e56e9f9c94d3;p=oweals%2Fu-boot.git rockchip: video: Correct HDMI data source selection This code currently always selects the second source. It only worked because both sources are set up. With the change to only init video devices that are present in the stdout environment variable, this fails. Fix it. Signed-off-by: Simon Glass --- diff --git a/drivers/video/rockchip/rk_hdmi.c b/drivers/video/rockchip/rk_hdmi.c index 7976c5e263..72142dc0f6 100644 --- a/drivers/video/rockchip/rk_hdmi.c +++ b/drivers/video/rockchip/rk_hdmi.c @@ -899,7 +899,8 @@ static int rk_hdmi_probe(struct udevice *dev) rk_setreg(&priv->grf->soc_con6, 1 << 15); /* hdmi data from vop id */ - rk_setreg(&priv->grf->soc_con6, (vop_id == 1) ? (1 << 4) : (1 << 4)); + rk_clrsetreg(&priv->grf->soc_con6, 1 << 4, + (vop_id == 1) ? (1 << 4) : 0); ret = hdmi_wait_for_hpd(priv->regs); if (ret < 0) {