Merge "drm/msm/dp: assert phy reset before phy mode switch on trinket" into dev/msm-4.14-display (e998bba9) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/dp/dp_catalog_v200.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -121,13 +121,15 @@ static void dp_catalog_aux_setup_v200(struct dp_catalog_aux *aux,

		dp_write(catalog->exe_mode, io_data, DP_PHY_CTRL, 0x4); /* bit 2 */
		udelay(1000);
		dp_write(catalog->exe_mode, io_data, DP_PHY_CTRL, 0x0); /* bit 2 */
		wmb(); /* make sure programming happened */

		io_data = catalog->io->dp_tcsr;
		dp_write(catalog->exe_mode, io_data, 0x0, 0x1);
		wmb(); /* make sure programming happened */

		io_data = catalog->io->dp_ahb;
		dp_write(catalog->exe_mode, io_data, DP_PHY_CTRL, 0x0); /* bit 2 */
		wmb(); /* make sure programming happened */

		io_data = catalog->io->dp_phy;
		dp_write(catalog->exe_mode, io_data, DP_PHY_PD_CTL, 0x3c);
		wmb(); /* make sure PD programming happened */