diff options
| author | Simon Glass <sjg@chromium.org> | 2016-11-13 14:21:55 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-11-25 17:59:30 -0700 |
| commit | e4ab3d712a52e69d154ed9a1fb15e56e9f9c94d3 (patch) | |
| tree | 80f73ef1bb343b668aa07524db4fcd156081856f /drivers/video/rockchip/rk_hdmi.c | |
| parent | ae804cf4af6dbe544e6412207d38850e4647ca1e (diff) | |
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 <sjg@chromium.org>
Diffstat (limited to 'drivers/video/rockchip/rk_hdmi.c')
| -rw-r--r-- | drivers/video/rockchip/rk_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |