From: Oliver Brown <oliver.brown@nxp.com>
Date: Wed, 13 Mar 2019 19:15:49 +0000 (-0500)
Subject: MLK-21142-2: phy: mixel-mipi: Assert PHY reset in phy_init
X-Git-Tag: rel_imx_4.19.35_1.1.0~1808
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=9337c185b28341c052ee127328019680d8ea8c17;p=linux.git

MLK-21142-2: phy: mixel-mipi: Assert PHY reset in phy_init

The reset needs to be set in phy_init to handle the warm reset case.

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>
---

diff --git a/drivers/phy/phy-mixel-mipi-dsi.c b/drivers/phy/phy-mixel-mipi-dsi.c
index 2966d4bf03e0..493612649e3d 100644
--- a/drivers/phy/phy-mixel-mipi-dsi.c
+++ b/drivers/phy/phy-mixel-mipi-dsi.c
@@ -333,6 +333,13 @@ static int mixel_mipi_phy_init(struct phy *phy)
 	phy_write(phy, PWR_OFF, DPHY_PD_PLL);
 	phy_write(phy, PWR_OFF, DPHY_PD_DPHY);
 
+	if (priv->plat_data->have_sc) {
+		int ret;
+		ret = mixel_mipi_phy_enable(phy, 0);
+		if (ret)
+			return ret;
+	}
+
 	mixel_phy_set_prg_regs(phy);
 
 	phy_write(phy, 0x00, DPHY_LOCK_BYP);