erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: rockchip/rk3399: fix rk_mipi_dsi_phy_init err

Browse source 
This patch fix rk_mipi_dsi_phy_init error return.

BUG=none
BRANCH=none
TEST=none

Change-Id: I731277cde56270bcf18f97dc5c9a0eacbaa12121
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 5be0b2e03d
Original-Change-Id: Ie260975ad6ed26c37aa8bb65dfcef4db2407a2da
Original-Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Original-Reviewed-on: https://review.coreboot.org/19903
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/517928
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
This commit is contained in:
Nickey Yang 2017-05-25 11:23:23 +08:00 • committed by chrome-bot
commit 3a488fb5e4
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/soc/rockchip/rk3399/mipi.c
View file

@ -95,7 +95,7 @@ static void rk_mipi_dsi_phy_write(struct rk_mipi_dsi *dsi,
static int rk_mipi_dsi_phy_init(struct rk_mipi_dsi *dsi)
{
int ret, testdin, vco;
int testdin, vco;
int lane_mbps = div_round_up(dsi->lane_bps, USECS_PER_SEC);
vco = (lane_mbps < 200) ? 0 : (lane_mbps + 100) / 200;
@ -156,7 +156,7 @@ static int rk_mipi_dsi_phy_init(struct rk_mipi_dsi *dsi)
write32(&mipi_regs->dsi_phy_rstz, PHY_ENFORCEPLL | PHY_ENABLECLK |
PHY_UNRSTZ | PHY_UNSHUTDOWNZ);
return ret;
return 0;
}
static inline int mipi_dsi_pixel_format_to_bpp(enum mipi_dsi_pixel_format fmt)
@ -421,7 +421,8 @@ void rk_mipi_prepare(const struct edid *edid, u32 display_on_mdelay, u32 video_m
rk_mipi_dsi_dphy_timing_config(&rk_mipi);
rk_mipi_dsi_dphy_interface_config(&rk_mipi);
rk_mipi_dsi_clear_err(&rk_mipi);
rk_mipi_dsi_phy_init(&rk_mipi);
if (rk_mipi_dsi_phy_init(&rk_mipi) < 0)
return;
rk_mipi_dsi_wait_for_two_frames(&rk_mipi, edid);
rk_mipi_dsi_set_mode(&rk_mipi, MIPI_DSI_CMD_MODE);