Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3ee245c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: update the power down sequence for DSI 12nm PHY"

parents 330013f2 74890d8c

drivers/video/fbdev/msm/mdss_dsi.h

+1 −0
Original line number Diff line number Diff line
@@ -685,6 +685,7 @@ void mdss_dsi_set_reg(struct mdss_dsi_ctrl_pdata *ctrl, int off, 
	u32 mask, u32 val);

int mdss_dsi_phy_pll_reset_status(struct mdss_dsi_ctrl_pdata *ctrl);

int mdss_dsi_panel_power_ctrl(struct mdss_panel_data *pdata, int power_state);

void mdss_dsi_ctrl_phy_reset(struct mdss_dsi_ctrl_pdata *ctrl);



void mdss_dsi_debug_bus_init(struct mdss_dsi_data *sdata);

drivers/video/fbdev/msm/mdss_dsi_phy_12nm.c

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ int mdss_dsi_12nm_phy_shutdown(struct mdss_dsi_ctrl_pdata *ctrl) 
{

	DSI_PHY_W32(ctrl->phy_io.base, SYS_CTRL, BIT(0) | BIT(3));

	wmb(); /* make sure DSI PHY is disabled */

	mdss_dsi_ctrl_phy_reset(ctrl);

	return 0;

}

drivers/video/fbdev/msm/msm_mdss_io_8974.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ void mdss_dsi_dfps_config_8996(struct mdss_dsi_ctrl_pdata *ctrl) 
	wmb(); /* make sure phy timings are updated*/

}



static void mdss_dsi_ctrl_phy_reset(struct mdss_dsi_ctrl_pdata *ctrl)

void mdss_dsi_ctrl_phy_reset(struct mdss_dsi_ctrl_pdata *ctrl)

{

	/* start phy sw reset */

	MIPI_OUTP(ctrl->ctrl_base + 0x12c, 0x0001);