diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-10 22:01:22 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-10 22:01:22 (GMT) |
| commit | 8cb3ce64f936f5dedbcfc1935c5caf31bb682474 (patch) | |
| tree | bc6cbbacd344ccdac327b4bb7337aa316ad000e0 /drivers/video/tegra124 | |
| parent | 4bdb49a7487d1c46c04e3da3f1f370cde1566aea (diff) | |
| parent | 9620d87259572ef21f0df60988d9a932ca673779 (diff) | |
| download | u-boot-8cb3ce64f936f5dedbcfc1935c5caf31bb682474.tar.xz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/video/tegra124')
| -rw-r--r-- | drivers/video/tegra124/sor.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c index 5e4140f..4324071 100644 --- a/drivers/video/tegra124/sor.c +++ b/drivers/video/tegra124/sor.c @@ -466,11 +466,20 @@ void tegra_dc_sor_set_lane_count(struct udevice *dev, u8 lane_count) static int tegra_dc_sor_power_up(struct udevice *dev, int is_lvds) { struct tegra_dc_sor_data *sor = dev_get_priv(dev); + u32 reg; int ret; if (sor->power_is_up) return 0; + /* + * If for some reason it is already powered up, don't do it again. + * This can happen if U-Boot is the secondary boot loader. + */ + reg = tegra_sor_readl(sor, DP_PADCTL(sor->portnum)); + if (reg & DP_PADCTL_PD_TXD_0_NO) + return 0; + /* Set link bw */ tegra_dc_sor_set_link_bandwidth(dev, is_lvds ? CLK_CNTRL_DP_LINK_SPEED_LVDS : |