tegra: video: Don't power up the SOR twice

If U-Boot is the secondary boot loader, or has been run from itself, the
SOR may already be powered up. Powering it up again causes a hang, so
detect this situation and skip it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Simon Glass 2017-05-31 17:57:20 -06:00
parent dab4728b3d
commit 505907a467

View file

@ -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) static int tegra_dc_sor_power_up(struct udevice *dev, int is_lvds)
{ {
struct tegra_dc_sor_data *sor = dev_get_priv(dev); struct tegra_dc_sor_data *sor = dev_get_priv(dev);
u32 reg;
int ret; int ret;
if (sor->power_is_up) if (sor->power_is_up)
return 0; 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 */ /* Set link bw */
tegra_dc_sor_set_link_bandwidth(dev, is_lvds ? tegra_dc_sor_set_link_bandwidth(dev, is_lvds ?
CLK_CNTRL_DP_LINK_SPEED_LVDS : CLK_CNTRL_DP_LINK_SPEED_LVDS :