From patchwork Mon Jan 17 00:26:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 532688 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ECB4C433EF for ; Mon, 17 Jan 2022 00:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236490AbiAQAoC (ORCPT ); Sun, 16 Jan 2022 19:44:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233846AbiAQAoB (ORCPT ); Sun, 16 Jan 2022 19:44:01 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C24C061574; Sun, 16 Jan 2022 16:44:01 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id u21so58674806edd.5; Sun, 16 Jan 2022 16:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fVBwHqjRiTPngWkNGF9zdvdA//oHQIGX1K8FVBmadoE=; b=ahBnotuLo2MHhRJNsnoJSvsPJeP0nuIPb74JifxhzfTNUva1Vmp1Vq4Zc6ZivaEViv 9nq4+vSH2/FTECHhEJ5ZraYvkWRYoVPACRbUrsTyq04YFJlVjA84kPBFfByykgRgdoMr jLb8Vn6+kUjpFVcV9kzZs3cU9OGrLl8CE/fDn00mAdVmOzsRFFwAO7D0wh0wIp1ELnfW NmGahlbaSFhpcKXd3wSPcTtXW8eEj6PNOWnELVoei3BM6f1mImANOlqsHabqdzcteXxh NV75MnAUb9Mmjx/jNPhOnmIKw6ZiFM97QBQWZ052DWG/yyCkLf8r7UTvLzr+wm0GQX/l joLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fVBwHqjRiTPngWkNGF9zdvdA//oHQIGX1K8FVBmadoE=; b=iS5Irj0tVBABnki8KJlsrxcuTYwJp/aeFHh8Je94zLlKjbOWbOZO9s2i9WzKwKoRqZ kDm7Y/UNoUavej+jOSMnFDZ6pTWqzVFmQQAZyn4V7KqNBUH29jY0+jq39M9TtoD1LF0k 12hGM66dGIvdOlLESEr1UXzjF5rfRO/GBb4uPerIYqZeY6JnfDoQLgUCrO29xgY8FZNK obZxI8nuLBYnR0FFQC21j2qhvlZcqbF/1DnqgFHu2tqTH/+2ylcdmrAcdceiBy8A5Jik 6Imw1NRe3gSFLxlSJqK/h6D70kNyT1LDTCzpVzKgWpDt9kch4YxwlbSK2ojY8X9MzSG5 QYgQ== X-Gm-Message-State: AOAM533x7WhE7Im3JnDMKWkznls0iaKk/gQJgQpEyXNmFV2dSetuLddV 4NbctFxaDXnV6oPctd3x0Zb3ZaKRFlM= X-Google-Smtp-Source: ABdhPJzueh6U+3ebTRaJF4BFO4gi/HSDdXR09qU0X172/JUL/EVbKDFdN4yPWzvoVNgrxesnWeUZ1A== X-Received: by 2002:a05:6402:1bd9:: with SMTP id ch25mr14458702edb.84.1642380239563; Sun, 16 Jan 2022 16:43:59 -0800 (PST) Received: from localhost.localdomain (93-42-71-246.ip85.fastwebnet.it. [93.42.71.246]) by smtp.googlemail.com with ESMTPSA id go41sm3879266ejc.200.2022.01.16.16.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Jan 2022 16:43:59 -0800 (PST) From: Ansuel Smith To: Andy Gross , Bjorn Andersson , Kishon Vijay Abraham I , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ansuel Smith Subject: [PATCH 1/2] drivers: phy: qcom: ipq806x-usb: convert to BITFIELD macro Date: Mon, 17 Jan 2022 01:26:40 +0100 Message-Id: <20220117002641.26773-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Convert some define to BITFIELD macro to tidy things up. Signed-off-by: Ansuel Smith --- drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c index bfff0c8c9130..6788e0e8272a 100644 --- a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c +++ b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c @@ -10,6 +10,7 @@ #include #include #include +#include /* USB QSCRATCH Hardware registers */ #define QSCRATCH_GENERAL_CFG (0x08) @@ -74,20 +75,20 @@ PHY_PARAM_CTRL1_LOS_BIAS_MASK) #define PHY_PARAM_CTRL1_TX_FULL_SWING(x) \ - (((x) << 20) & PHY_PARAM_CTRL1_TX_FULL_SWING_MASK) + FIELD_PREP(PHY_PARAM_CTRL1_TX_FULL_SWING_MASK, (x)) #define PHY_PARAM_CTRL1_TX_DEEMPH_6DB(x) \ - (((x) << 14) & PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK) + FIELD_PREP(PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK, (x)) #define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(x) \ - (((x) << 8) & PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK) + FIELD_PREP(PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK, x) #define PHY_PARAM_CTRL1_LOS_BIAS(x) \ - (((x) << 3) & PHY_PARAM_CTRL1_LOS_BIAS_MASK) + FIELD_PREP(PHY_PARAM_CTRL1_LOS_BIAS_MASK, (x)) /* RX OVRD IN HI bits */ #define RX_OVRD_IN_HI_RX_RESET_OVRD BIT(13) #define RX_OVRD_IN_HI_RX_RX_RESET BIT(12) #define RX_OVRD_IN_HI_RX_EQ_OVRD BIT(11) #define RX_OVRD_IN_HI_RX_EQ_MASK GENMASK(10, 7) -#define RX_OVRD_IN_HI_RX_EQ(x) ((x) << 8) +#define RX_OVRD_IN_HI_RX_EQ(x) FIELD_PREP(RX_OVRD_IN_HI_RX_EQ_MASK, (x)) #define RX_OVRD_IN_HI_RX_EQ_EN_OVRD BIT(7) #define RX_OVRD_IN_HI_RX_EQ_EN BIT(6) #define RX_OVRD_IN_HI_RX_LOS_FILTER_OVRD BIT(5) From patchwork Mon Jan 17 00:26:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 532947 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25E22C433EF for ; Mon, 17 Jan 2022 00:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233846AbiAQAoF (ORCPT ); Sun, 16 Jan 2022 19:44:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236491AbiAQAoC (ORCPT ); Sun, 16 Jan 2022 19:44:02 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02D85C06161C; Sun, 16 Jan 2022 16:44:02 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id k15so58577626edk.13; Sun, 16 Jan 2022 16:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WyTjsYAqJre6WBuJN2gLwpHyZHUA9DXs/0qZoICj1G0=; b=jQuaq0y+O5L6GO4bjUCOQ9A/Mg373V15MBKhEAX0Rvrk8AUTttyNuRg//wLxc/dQXQ W9c5Xrweqcw5rLf/YZ4xbsI+VXMiwauZCA0Bdehno9ZK2tRWkQCdXIslj38ZguicXNzP H9FmrocNbwh09OEt+81WwfhVfTCJcpxFvwHOz/r2UDIGCH30GHQLpObvPGLycQunuQ1u 2NfhuTJaZ5tSj1tR+1kgX5veWd6+bNaObmTDLcO64OA3RiFfCrq+9oOOaaJGAM9NJTvJ p+gzkGsZTw1HWPeHmQvZ9lJ62S58Z/oP1Fz3BhXHITVM2KGcPbs+Y0YohUEQXPIEyCZX y/7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WyTjsYAqJre6WBuJN2gLwpHyZHUA9DXs/0qZoICj1G0=; b=n4tGOnP7gEE4oHFoYyHFy6/knimq05rTEqUKYzyQE3tCmCczkzCA3EVCWUuUgprYht yahn0X0rzQtq3MS1kV+aV6rQGqDkZ9IG18/7Ewmf+ADDoFbFA2SAqTejWIVZQGfE6MuZ JcON3fSvpqH2KvQykhMExeVh/h/nsj5GFx6zr/XZsGQ3HC/rGVhQPwecQ3l7tACUGCQZ lhFMGgi0QFlQbFi//xiGsxkv9W7gvTPG8pTLbRtCNjFZwW1oQTFqhK32le+lo8SD/WtP 4gOJvfx/Sdn61evdlmI1O0SYcV3idUykqyARicjQuwShmXKgAiBlKE2tC8sylZE1euAJ 66Hw== X-Gm-Message-State: AOAM532Wv07+Ip0rsfs2sM+0IWwIbcJOGEQVKOakF9dq4kjogcfS/P2s /i5QWF1r4NOMb4wFIseuLmw= X-Google-Smtp-Source: ABdhPJycHDJDK2wIcZ9MrKh20kbDlM+LzNtCQKuPryr8jJpJPvyJUwDwk9l2Zpc42McZ1yARtziNUg== X-Received: by 2002:a17:907:961d:: with SMTP id gb29mr14852565ejc.123.1642380240431; Sun, 16 Jan 2022 16:44:00 -0800 (PST) Received: from localhost.localdomain (93-42-71-246.ip85.fastwebnet.it. [93.42.71.246]) by smtp.googlemail.com with ESMTPSA id go41sm3879266ejc.200.2022.01.16.16.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Jan 2022 16:44:00 -0800 (PST) From: Ansuel Smith To: Andy Gross , Bjorn Andersson , Kishon Vijay Abraham I , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ansuel Smith Subject: [PATCH 2/2] drivers: phy: qcom: ipq806x-usb: conver latch function to pool macro Date: Mon, 17 Jan 2022 01:26:41 +0100 Message-Id: <20220117002641.26773-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220117002641.26773-1-ansuelsmth@gmail.com> References: <20220117002641.26773-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Convert latch function to readl pool macro to tidy things up. Signed-off-by: Ansuel Smith --- drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c index 6788e0e8272a..ab2d1431546d 100644 --- a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c +++ b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c @@ -112,6 +112,9 @@ #define SS_CR_READ_REG BIT(0) #define SS_CR_WRITE_REG BIT(0) +#define LATCH_SLEEP 40 +#define LATCH_TIMEOUT 100 + struct usb_phy { void __iomem *base; struct device *dev; @@ -156,19 +159,9 @@ static inline void usb_phy_write_readback(struct usb_phy *phy_dwc3, static int wait_for_latch(void __iomem *addr) { - u32 retry = 10; - - while (true) { - if (!readl(addr)) - break; - - if (--retry == 0) - return -ETIMEDOUT; - - usleep_range(10, 20); - } + u32 val; - return 0; + return readl_poll_timeout(addr, val, !val, LATCH_SLEEP, LATCH_TIMEOUT); } /**