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

Commit 44136971 authored by John Keeping's avatar John Keeping Committed by Sean Paul
Browse files

drm/rockchip: dw-mipi-dsi: use specific poll helper 



As the documentation for readx_poll_timeout says, we want to use the
specialized macro for readl rather than using the generic version
directly.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Reviewed-by: default avatarChris Zhong <zyw@rock-chips.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170224125506.21533-19-john@metanate.com
parent b0a45fec

drivers/gpu/drm/rockchip/dw-mipi-dsi.c

+5 −5
Original line number Diff line number Diff line
@@ -470,14 +470,14 @@ static int dw_mipi_dsi_phy_init(struct dw_mipi_dsi *dsi) 
				     PHY_UNRSTZ | PHY_UNSHUTDOWNZ);





	ret = readx_poll_timeout(readl, dsi->base + DSI_PHY_STATUS,

	ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS,

				 val, val & LOCK, 1000, PHY_STATUS_TIMEOUT_US);

	if (ret < 0) {

		dev_err(dsi->dev, "failed to wait for phy lock state\n");

		return ret;

	}



	ret = readx_poll_timeout(readl, dsi->base + DSI_PHY_STATUS,

	ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS,

				 val, val & STOP_STATE_CLK_LANE, 1000,

				 PHY_STATUS_TIMEOUT_US);

	if (ret < 0) {
@@ -604,7 +604,7 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) 
	int ret;

	u32 val, mask;



	ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS,

	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS,

				 val, !(val & GEN_CMD_FULL), 1000,

				 CMD_PKT_STATUS_TIMEOUT_US);

	if (ret < 0) {
@@ -615,7 +615,7 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) 
	dsi_write(dsi, DSI_GEN_HDR, hdr_val);



	mask = GEN_CMD_EMPTY | GEN_PLD_W_EMPTY;

	ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS,

	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS,

				 val, (val & mask) == mask,

				 1000, CMD_PKT_STATUS_TIMEOUT_US);

	if (ret < 0) {
@@ -676,7 +676,7 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, 
			len -= pld_data_bytes;

		}



		ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS,

		ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS,

					 val, !(val & GEN_PLD_W_FULL), 1000,

					 CMD_PKT_STATUS_TIMEOUT_US);

		if (ret < 0) {