From: Patrick Wildt Date: Sun, 7 Jun 2020 18:36:12 +0000 (+0200) Subject: rockchip: correctly set vop0 or vop1 X-Git-Tag: v2020.10~147^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=673eb44e91bc0c06cb1e3f353f5d07b4f9e5a586;p=platform%2Fkernel%2Fu-boot.git rockchip: correctly set vop0 or vop1 The EDP_LCDC_SEL bit has to be set correctly to select vop0 or vop1, but so far we have set it in both conditions, which is not correct. Can someone verify this is the correct way round? vop1 -> set, vop0 -> clear? Signed-off-by: Patrick Wildt Reviewed-by: Kever Yang --- diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 92188be..000bd48 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1062,7 +1062,8 @@ static int rk_edp_probe(struct udevice *dev) rk_setreg(&priv->grf->soc_con12, 1 << 4); /* select epd signal from vop0 or vop1 */ - rk_setreg(&priv->grf->soc_con6, (vop_id == 1) ? (1 << 5) : (1 << 5)); + rk_clrsetreg(&priv->grf->soc_con6, (1 << 5), + (vop_id == 1) ? (1 << 5) : (0 << 5)); rockchip_edp_wait_hpd(priv);