From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751130AbdAUQd3 (ORCPT ); Sat, 21 Jan 2017 11:33:29 -0500 Received: from dougal.metanate.com ([90.155.101.14]:54256 "EHLO metanate.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750965AbdAUQcH (ORCPT ); Sat, 21 Jan 2017 11:32:07 -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, John Keeping Subject: [PATCH v2 20/26] drm/rockchip: dw-mipi-dsi: use specific poll helper Date: Sat, 21 Jan 2017 16:31:22 +0000 Message-Id: <20170121163128.22240-21-john@metanate.com> X-Mailer: git-send-email 2.11.0.197.gb556de5.dirty In-Reply-To: <20170121163128.22240-1-john@metanate.com> References: <20170121163128.22240-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 --- 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 f2320cf1366c..3e19693ae59b 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -471,14 +471,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) { @@ -594,7 +594,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) { @@ -605,7 +605,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) { @@ -664,7 +664,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.11.0.197.gb556de5.dirty From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: [PATCH v2 20/26] drm/rockchip: dw-mipi-dsi: use specific poll helper Date: Sat, 21 Jan 2017 16:31:22 +0000 Message-ID: <20170121163128.22240-21-john@metanate.com> References: <20170121163128.22240-1-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170121163128.22240-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 bmcgPGpvaG5AbWV0YW5hdGUuY29tPgotLS0KVW5jaGFuZ2VkIGluIHYyCi0tLQogZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgfCAxMCArKysrKy0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL2R3LW1pcGktZHNpLmMKaW5kZXggZjIzMjBjZjEzNjZjLi4zZTE5NjkzYWU1OWIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jCkBAIC00NzEsMTQgKzQ3MSwxNCBAQCBz dGF0aWMgaW50IGR3X21pcGlfZHNpX3BoeV9pbml0KHN0cnVjdCBkd19taXBpX2RzaSAqZHNpKQog CQkJCSAgICAgUEhZX1VOUlNUWiB8IFBIWV9VTlNIVVRET1dOWik7CiAKIAotCXJldCA9IHJlYWR4 X3BvbGxfdGltZW91dChyZWFkbCwgZHNpLT5iYXNlICsgRFNJX1BIWV9TVEFUVVMsCisJcmV0ID0g cmVhZGxfcG9sbF90aW1lb3V0KGRzaS0+YmFzZSArIERTSV9QSFlfU1RBVFVTLAogCQkJCSB2YWws IHZhbCAmIExPQ0ssIDEwMDAsIFBIWV9TVEFUVVNfVElNRU9VVF9VUyk7CiAJaWYgKHJldCA8IDAp IHsKIAkJZGV2X2Vycihkc2ktPmRldiwgImZhaWxlZCB0byB3YWl0IGZvciBwaHkgbG9jayBzdGF0 ZVxuIik7CiAJCXJldHVybiByZXQ7CiAJfQogCi0JcmV0ID0gcmVhZHhfcG9sbF90aW1lb3V0KHJl YWRsLCBkc2ktPmJhc2UgKyBEU0lfUEhZX1NUQVRVUywKKwlyZXQgPSByZWFkbF9wb2xsX3RpbWVv dXQoZHNpLT5iYXNlICsgRFNJX1BIWV9TVEFUVVMsCiAJCQkJIHZhbCwgdmFsICYgU1RPUF9TVEFU RV9DTEtfTEFORSwgMTAwMCwKIAkJCQkgUEhZX1NUQVRVU19USU1FT1VUX1VTKTsKIAlpZiAocmV0 IDwgMCkgewpAQCAtNTk0LDcgKzU5NCw3IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZ2VuX3Br dF9oZHJfd3JpdGUoc3RydWN0IGR3X21pcGlfZHNpICpkc2ksIHUzMiBoZHJfdmFsKQogCWludCBy ZXQ7CiAJdTMyIHZhbCwgbWFzazsKIAotCXJldCA9IHJlYWR4X3BvbGxfdGltZW91dChyZWFkbCwg ZHNpLT5iYXNlICsgRFNJX0NNRF9QS1RfU1RBVFVTLAorCXJldCA9IHJlYWRsX3BvbGxfdGltZW91 dChkc2ktPmJhc2UgKyBEU0lfQ01EX1BLVF9TVEFUVVMsCiAJCQkJIHZhbCwgISh2YWwgJiBHRU5f Q01EX0ZVTEwpLCAxMDAwLAogCQkJCSBDTURfUEtUX1NUQVRVU19USU1FT1VUX1VTKTsKIAlpZiAo cmV0IDwgMCkgewpAQCAtNjA1LDcgKzYwNSw3IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZ2Vu X3BrdF9oZHJfd3JpdGUoc3RydWN0IGR3X21pcGlfZHNpICpkc2ksIHUzMiBoZHJfdmFsKQogCWRz aV93cml0ZShkc2ksIERTSV9HRU5fSERSLCBoZHJfdmFsKTsKIAogCW1hc2sgPSBHRU5fQ01EX0VN UFRZIHwgR0VOX1BMRF9XX0VNUFRZOwotCXJldCA9IHJlYWR4X3BvbGxfdGltZW91dChyZWFkbCwg ZHNpLT5iYXNlICsgRFNJX0NNRF9QS1RfU1RBVFVTLAorCXJldCA9IHJlYWRsX3BvbGxfdGltZW91 dChkc2ktPmJhc2UgKyBEU0lfQ01EX1BLVF9TVEFUVVMsCiAJCQkJIHZhbCwgKHZhbCAmIG1hc2sp ID09IG1hc2ssCiAJCQkJIDEwMDAsIENNRF9QS1RfU1RBVFVTX1RJTUVPVVRfVVMpOwogCWlmIChy ZXQgPCAwKSB7CkBAIC02NjQsNyArNjY0LDcgQEAgc3RhdGljIGludCBkd19taXBpX2RzaV9kY3Nf bG9uZ193cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwKIAkJCWxlbiAtPSBwbGRfZGF0YV9i eXRlczsKIAkJfQogCi0JCXJldCA9IHJlYWR4X3BvbGxfdGltZW91dChyZWFkbCwgZHNpLT5iYXNl ICsgRFNJX0NNRF9QS1RfU1RBVFVTLAorCQlyZXQgPSByZWFkbF9wb2xsX3RpbWVvdXQoZHNpLT5i YXNlICsgRFNJX0NNRF9QS1RfU1RBVFVTLAogCQkJCQkgdmFsLCAhKHZhbCAmIEdFTl9QTERfV19G VUxMKSwgMTAwMCwKIAkJCQkJIENNRF9QS1RfU1RBVFVTX1RJTUVPVVRfVVMpOwogCQlpZiAocmV0 IDwgMCkgewotLSAKMi4xMS4wLjE5Ny5nYjU1NmRlNS5kaXJ0eQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: john@metanate.com (John Keeping) Date: Sat, 21 Jan 2017 16:31:22 +0000 Subject: [PATCH v2 20/26] drm/rockchip: dw-mipi-dsi: use specific poll helper In-Reply-To: <20170121163128.22240-1-john@metanate.com> References: <20170121163128.22240-1-john@metanate.com> Message-ID: <20170121163128.22240-21-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 --- 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 f2320cf1366c..3e19693ae59b 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -471,14 +471,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) { @@ -594,7 +594,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) { @@ -605,7 +605,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) { @@ -664,7 +664,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.11.0.197.gb556de5.dirty