From d92c3432594085fd46d8c1a4317c8b10429ebc25 Mon Sep 17 00:00:00 2001 From: Jerry Xu Date: Mon, 31 Jul 2017 18:10:51 +0800 Subject: [PATCH] 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. Change-Id: I864b350f0e1b0e24bd3a7e2b0b1c4c231e9acc18 Signed-off-by: Jerry Xu --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index e6519cee2513..b4628df73270 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -409,7 +409,7 @@ static int rockchip_wait_w_pld_fifo_not_full(struct dw_mipi_dsi *dsi) u32 sts; int ret; - ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, + ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, sts, !(sts & GEN_PLD_W_FULL), 10, CMD_PKT_STATUS_TIMEOUT_US); if (ret < 0) { @@ -425,7 +425,7 @@ static int rockchip_wait_cmd_fifo_not_full(struct dw_mipi_dsi *dsi) u32 sts; int ret; - ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, + ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, sts, !(sts & GEN_CMD_FULL), 10, CMD_PKT_STATUS_TIMEOUT_US); if (ret < 0) { @@ -443,7 +443,7 @@ static int rockchip_wait_write_fifo_empty(struct dw_mipi_dsi *dsi) int ret; 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, sts, (sts & mask) == mask, 10, CMD_PKT_STATUS_TIMEOUT_US); if (ret < 0) { @@ -538,14 +538,14 @@ static int dw_mipi_dsi_phy_init(struct dw_mipi_dsi *dsi) dsi_write(dsi, DSI_PHY_RSTZ, PHY_ENFORCEPLL | PHY_ENABLECLK | 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"); goto phy_init_end; } - 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) -- 2.34.1