summaryrefslogtreecommitdiff
path: root/drivers/video/tegra124/sor.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-05-31 17:57:20 -0600
committerSimon Glass <sjg@chromium.org>2017-06-09 13:39:33 -0600
commit505907a4677786dc179d7edd3d71bb5f273425cf (patch)
tree54996d6002e9727cb2582322b26bd7888dbd6a6d /drivers/video/tegra124/sor.c
parentdab4728b3daa67a9995deb03512d548c54939dcf (diff)
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>
Diffstat (limited to 'drivers/video/tegra124/sor.c')
-rw-r--r--drivers/video/tegra124/sor.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 5e4140ff53..4324071cdc 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 :