From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751768AbdBXM5b (ORCPT ); Fri, 24 Feb 2017 07:57:31 -0500 Received: from dougal.metanate.com ([90.155.101.14]:54568 "EHLO metanate.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751293AbdBXMz1 (ORCPT ); Fri, 24 Feb 2017 07:55:27 -0500 From: John Keeping To: Mark Yao Cc: Chris Zhong , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Sean Paul , John Keeping Subject: [PATCH v4 18/23] drm/rockchip: dw-mipi-dsi: use specific poll helper Date: Fri, 24 Feb 2017 12:55:01 +0000 Message-Id: <20170224125506.21533-19-john@metanate.com> X-Mailer: git-send-email 2.12.0.rc0.230.gf625d4cdb9.dirty In-Reply-To: <20170224125506.21533-1-john@metanate.com> References: <20170224125506.21533-1-john@metanate.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: John Keeping Reviewed-by: Chris Zhong Reviewed-by: Sean Paul --- v4: - Add Sean's Reviewed-by v3: - Add Chris' Reviewed-by Unchanged in v2 --- 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 e6b52c7cb5e3..ccf818d5c7ac 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -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) { -- 2.12.0.rc0.230.gf625d4cdb9.dirty From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: [PATCH v4 18/23] drm/rockchip: dw-mipi-dsi: use specific poll helper Date: Fri, 24 Feb 2017 12:55:01 +0000 Message-ID: <20170224125506.21533-19-john@metanate.com> References: <20170224125506.21533-1-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170224125506.21533-1-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mark Yao Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org QXMgdGhlIGRvY3VtZW50YXRpb24gZm9yIHJlYWR4X3BvbGxfdGltZW91dCBzYXlzLCB3ZSB3YW50 IHRvIHVzZSB0aGUKc3BlY2lhbGl6ZWQgbWFjcm8gZm9yIHJlYWRsIHJhdGhlciB0aGFuIHVzaW5n IHRoZSBnZW5lcmljIHZlcnNpb24KZGlyZWN0bHkuCgpTaWduZWQtb2ZmLWJ5OiBKb2huIEtlZXBp bmcgPGpvaG5AbWV0YW5hdGUuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgWmhvbmcgPHp5d0Byb2Nr LWNoaXBzLmNvbT4KUmV2aWV3ZWQtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3Jn PgotLS0KdjQ6Ci0gQWRkIFNlYW4ncyBSZXZpZXdlZC1ieQp2MzoKLSBBZGQgQ2hyaXMnIFJldmll d2VkLWJ5ClVuY2hhbmdlZCBpbiB2MgotLS0KIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1t aXBpLWRzaS5jIHwgMTAgKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygr KSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAv ZHctbWlwaS1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jCmlu ZGV4IGU2YjUyYzdjYjVlMy4uY2NmODE4ZDVjN2FjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAv ZHctbWlwaS1kc2kuYwpAQCAtNDcwLDE0ICs0NzAsMTQgQEAgc3RhdGljIGludCBkd19taXBpX2Rz aV9waHlfaW5pdChzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkKIAkJCQkgICAgIFBIWV9VTlJTVFog fCBQSFlfVU5TSFVURE9XTlopOwogCiAKLQlyZXQgPSByZWFkeF9wb2xsX3RpbWVvdXQocmVhZGws IGRzaS0+YmFzZSArIERTSV9QSFlfU1RBVFVTLAorCXJldCA9IHJlYWRsX3BvbGxfdGltZW91dChk c2ktPmJhc2UgKyBEU0lfUEhZX1NUQVRVUywKIAkJCQkgdmFsLCB2YWwgJiBMT0NLLCAxMDAwLCBQ SFlfU1RBVFVTX1RJTUVPVVRfVVMpOwogCWlmIChyZXQgPCAwKSB7CiAJCWRldl9lcnIoZHNpLT5k ZXYsICJmYWlsZWQgdG8gd2FpdCBmb3IgcGh5IGxvY2sgc3RhdGVcbiIpOwogCQlyZXR1cm4gcmV0 OwogCX0KIAotCXJldCA9IHJlYWR4X3BvbGxfdGltZW91dChyZWFkbCwgZHNpLT5iYXNlICsgRFNJ X1BIWV9TVEFUVVMsCisJcmV0ID0gcmVhZGxfcG9sbF90aW1lb3V0KGRzaS0+YmFzZSArIERTSV9Q SFlfU1RBVFVTLAogCQkJCSB2YWwsIHZhbCAmIFNUT1BfU1RBVEVfQ0xLX0xBTkUsIDEwMDAsCiAJ CQkJIFBIWV9TVEFUVVNfVElNRU9VVF9VUyk7CiAJaWYgKHJldCA8IDApIHsKQEAgLTYwNCw3ICs2 MDQsNyBAQCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX2dlbl9wa3RfaGRyX3dyaXRlKHN0cnVjdCBk d19taXBpX2RzaSAqZHNpLCB1MzIgaGRyX3ZhbCkKIAlpbnQgcmV0OwogCXUzMiB2YWwsIG1hc2s7 CiAKLQlyZXQgPSByZWFkeF9wb2xsX3RpbWVvdXQocmVhZGwsIGRzaS0+YmFzZSArIERTSV9DTURf UEtUX1NUQVRVUywKKwlyZXQgPSByZWFkbF9wb2xsX3RpbWVvdXQoZHNpLT5iYXNlICsgRFNJX0NN RF9QS1RfU1RBVFVTLAogCQkJCSB2YWwsICEodmFsICYgR0VOX0NNRF9GVUxMKSwgMTAwMCwKIAkJ CQkgQ01EX1BLVF9TVEFUVVNfVElNRU9VVF9VUyk7CiAJaWYgKHJldCA8IDApIHsKQEAgLTYxNSw3 ICs2MTUsNyBAQCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX2dlbl9wa3RfaGRyX3dyaXRlKHN0cnVj dCBkd19taXBpX2RzaSAqZHNpLCB1MzIgaGRyX3ZhbCkKIAlkc2lfd3JpdGUoZHNpLCBEU0lfR0VO X0hEUiwgaGRyX3ZhbCk7CiAKIAltYXNrID0gR0VOX0NNRF9FTVBUWSB8IEdFTl9QTERfV19FTVBU WTsKLQlyZXQgPSByZWFkeF9wb2xsX3RpbWVvdXQocmVhZGwsIGRzaS0+YmFzZSArIERTSV9DTURf UEtUX1NUQVRVUywKKwlyZXQgPSByZWFkbF9wb2xsX3RpbWVvdXQoZHNpLT5iYXNlICsgRFNJX0NN RF9QS1RfU1RBVFVTLAogCQkJCSB2YWwsICh2YWwgJiBtYXNrKSA9PSBtYXNrLAogCQkJCSAxMDAw LCBDTURfUEtUX1NUQVRVU19USU1FT1VUX1VTKTsKIAlpZiAocmV0IDwgMCkgewpAQCAtNjc2LDcg KzY3Niw3IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZGNzX2xvbmdfd3JpdGUoc3RydWN0IGR3 X21pcGlfZHNpICpkc2ksCiAJCQlsZW4gLT0gcGxkX2RhdGFfYnl0ZXM7CiAJCX0KIAotCQlyZXQg PSByZWFkeF9wb2xsX3RpbWVvdXQocmVhZGwsIGRzaS0+YmFzZSArIERTSV9DTURfUEtUX1NUQVRV UywKKwkJcmV0ID0gcmVhZGxfcG9sbF90aW1lb3V0KGRzaS0+YmFzZSArIERTSV9DTURfUEtUX1NU QVRVUywKIAkJCQkJIHZhbCwgISh2YWwgJiBHRU5fUExEX1dfRlVMTCksIDEwMDAsCiAJCQkJCSBD TURfUEtUX1NUQVRVU19USU1FT1VUX1VTKTsKIAkJaWYgKHJldCA8IDApIHsKLS0gCjIuMTIuMC5y YzAuMjMwLmdmNjI1ZDRjZGI5LmRpcnR5CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: john@metanate.com (John Keeping) Date: Fri, 24 Feb 2017 12:55:01 +0000 Subject: [PATCH v4 18/23] drm/rockchip: dw-mipi-dsi: use specific poll helper In-Reply-To: <20170224125506.21533-1-john@metanate.com> References: <20170224125506.21533-1-john@metanate.com> Message-ID: <20170224125506.21533-19-john@metanate.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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: John Keeping Reviewed-by: Chris Zhong Reviewed-by: Sean Paul --- v4: - Add Sean's Reviewed-by v3: - Add Chris' Reviewed-by Unchanged in v2 --- 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 e6b52c7cb5e3..ccf818d5c7ac 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -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) { -- 2.12.0.rc0.230.gf625d4cdb9.dirty