On 10/31/2016 03:39 PM, Simon Glass wrote: > 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 <s...@chromium.org> > --- > > drivers/video/rockchip/rk_hdmi.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/video/rockchip/rk_hdmi.c > b/drivers/video/rockchip/rk_hdmi.c > index 7976c5e..72142dc 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);
Magic numbers, could this get fixed to: #define CON6_SOMETHING bit(4) same for other bits if anyone knows what they do. > > ret = hdmi_wait_for_hpd(priv->regs); > if (ret < 0) { > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot