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

Commit b853134f 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 PHY settings for DSI1 for 8939"

parents 547c1620 6ad78ad2

drivers/video/msm/mdss/mdss_dsi.h

+3 −0
Original line number Diff line number Diff line
@@ -45,10 +45,13 @@ 
#define DSI_PANEL_MAX	8



#define MDSS_DSI_HW_REV_100		0x10000000	/* 8974    */

#define MDSS_DSI_HW_REV_100_1		0x10000001	/* 8x26    */

#define MDSS_DSI_HW_REV_100_2		0x10000002	/* 8x26v2  */

#define MDSS_DSI_HW_REV_101		0x10010000	/* 8974v2  */

#define MDSS_DSI_HW_REV_101_1		0x10010001	/* 8974Pro */

#define MDSS_DSI_HW_REV_102		0x10020000	/* 8084    */

#define MDSS_DSI_HW_REV_103		0x10030000	/* 8994    */

#define MDSS_DSI_HW_REV_103_1		0x10030001	/* 8916/8936 */





enum {		/* mipi dsi panel */

drivers/video/msm/mdss/msm_mdss_io_8974.c

+5 −1
Original line number Diff line number Diff line
@@ -1151,6 +1151,7 @@ void mdss_dsi_phy_init(struct mdss_panel_data *pdata) 
	struct mdss_dsi_phy_ctrl *pd;

	int i, off, ln, offset;

	struct mdss_dsi_ctrl_pdata *ctrl_pdata = NULL, *temp_ctrl = NULL;

	u32 ctrl_rev;



	ctrl_pdata = container_of(pdata, struct mdss_dsi_ctrl_pdata,

				panel_data);
@@ -1237,8 +1238,11 @@ void mdss_dsi_phy_init(struct mdss_panel_data *pdata) 
	MIPI_OUTP((ctrl_pdata->phy_io.base) + 0x0170, 0x5f);

	wmb();



	ctrl_rev = MIPI_INP(ctrl_pdata->ctrl_base);



	/* DSI_0_PHY_DSIPHY_GLBL_TEST_CTRL */

	if ((ctrl_pdata->panel_data).panel_info.pdest == DISPLAY_1)

	if (((ctrl_pdata->panel_data).panel_info.pdest == DISPLAY_1) ||

			(ctrl_rev == MDSS_DSI_HW_REV_103_1))

		MIPI_OUTP((ctrl_pdata->phy_io.base) + 0x01d4, 0x01);

	else

		MIPI_OUTP((ctrl_pdata->phy_io.base) + 0x01d4, 0x00);