From mboxrd@z Thu Jan 1 00:00:00 1970 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 9613CC433F5 for ; Tue, 31 May 2022 01:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243353AbiEaBXw (ORCPT ); Mon, 30 May 2022 21:23:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243343AbiEaBXt (ORCPT ); Mon, 30 May 2022 21:23:49 -0400 Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE79940A08 for ; Mon, 30 May 2022 18:23:47 -0700 (PDT) Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20220531012345epoutp02cbe599118aefb35b3e2d59be4960e7a0~0DA-67x6J2272322723epoutp02L for ; Tue, 31 May 2022 01:23:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20220531012345epoutp02cbe599118aefb35b3e2d59be4960e7a0~0DA-67x6J2272322723epoutp02L DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1653960225; bh=MefAl/5CSsIqUvfBRB4GKDe7Rqk1CpPiQz9ZkrZGXIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPleZt5TQAtsKtiZuXchv6tZdo5NFykncyLLE3qbcgiV60bvVqmo8P9uoXKOTTfmp TGAuPwQCYBzvtaVq54GVJFd4zF0bHaTULHsAnoiVOBVjCWkzXYixj/QNpBKFeP+mq+ 1KIYn8BEA3G/ROxMJUkwwyX9XT664I+xoaoKJUx0= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas5p2.samsung.com (KnoxPortal) with ESMTP id 20220531012344epcas5p26f0aad0fa8e75fb16f6524ec14d2a028~0DA-BX9pa0088200882epcas5p2T; Tue, 31 May 2022 01:23:44 +0000 (GMT) Received: from epsmges5p3new.samsung.com (unknown [182.195.38.180]) by epsnrtp2.localdomain (Postfix) with ESMTP id 4LBvgK4WbLz4x9QN; Tue, 31 May 2022 01:23:41 +0000 (GMT) Received: from epcas5p3.samsung.com ( [182.195.41.41]) by epsmges5p3new.samsung.com (Symantec Messaging Gateway) with SMTP id FD.F5.09762.D1E65926; Tue, 31 May 2022 10:23:41 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas5p1.samsung.com (KnoxPortal) with ESMTPA id 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273~0DA7aWj0v1064310643epcas5p1Q; Tue, 31 May 2022 01:23:41 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220531012341epsmtrp286fa393e34f482da8f4be33283dc110c~0DA7ZJrS72336523365epsmtrp2p; Tue, 31 May 2022 01:23:41 +0000 (GMT) X-AuditID: b6c32a4b-1fdff70000002622-ad-62956e1db12a Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 80.6F.11276.C1E65926; Tue, 31 May 2022 10:23:40 +0900 (KST) Received: from Jaguar.sa.corp.samsungelectronics.net (unknown [107.108.73.139]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220531012338epsmtip259f4afa19e18dfb4ce36a71e6ba5fe0c~0DA49MtAU1203612036epsmtip20; Tue, 31 May 2022 01:23:38 +0000 (GMT) From: Alim Akhtar To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, vkoul@kernel.org, avri.altman@wdc.com, bvanassche@acm.org, martin.petersen@oracle.com, chanho61.park@samsung.com, pankaj.dubey@samsung.com, Alim Akhtar , linux-fsd@tesla.com, Bharat Uppal Subject: [PATCH 2/6] phy: samsung-ufs: move cdr offset to drvdata Date: Tue, 31 May 2022 06:52:16 +0530 Message-Id: <20220531012220.80563-3-alim.akhtar@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220531012220.80563-1-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIJsWRmVeSWpSXmKPExsWy7bCmpq5s3tQkg/9PFCwezNvGZvHy51U2 i2svL7BbTPvwk9ni8n5ti/lHzrFa9L14yGyx6fE1VouHr8ItLu+aw2YxYdU3Fovu6zvYLJYf /8dksWjrF3aL1r1H2C123jnB7CDgcfmKt8emVZ1sHneu7WHz2Lyk3uPj01ssHn1bVjF6/Gua y+7xeZOcR/uBbqYAzqhsm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRb JRefAF23zBygH5QUyhJzSoFCAYnFxUr6djZF+aUlqQoZ+cUltkqpBSk5BSYFesWJucWleel6 eaklVoYGBkamQIUJ2Rnfny1lLXgsWfHr1hy2BsZJYl2MnBwSAiYSdx68ZO5i5OIQEtjNKDGh r58VwvnEKHHr91wo5xujxJ3+X8wwLV9+rGaESOxllJi78wk7hNPCJHHz0GU2kCo2AW2Ju9O3 MIEkRASaGSUOduwCc5gFzjFJPNu7gQmkSljAUWL5+Q5GEJtFQFXixoUmsG5eARuJhtUH2SH2 yUus3nAAbDengK1E98bTYIMkBOZySNy5coAFoshF4vvljVANwhKvjm+BsqUkPr/bCzSUA8j2 kFj0RwoinCHxdvl6RgjbXuLAlTksICXMApoS63fpg4SZBfgken8/YYLo5JXoaBOCqFaVaH53 FWqptMTE7m5WmOG3/otBwmECo8SvM1+YJzDKzkIYuoCRcRWjZGpBcW56arFpgXFeajk8ppLz czcxgtOmlvcOxkcPPugdYmTiYDzEKMHBrCTCaxUxNUmINyWxsiq1KD++qDQntfgQoykwxCYy S4km5wMTd15JvKGJpYGJmZmZiaWxmaGSOK/A/8YkIYH0xJLU7NTUgtQimD4mDk6pBqaCQ/mM svf3n9AySjeOjDjx96T1jqM1HfN2GEXPWO3feC7T4XSj0TUvvr6zEw4Z/Gx22sFjlDrvy5/A GRqme19rr7/O9t5mUayQ1KPeZWxbqtTX26hLJhjuEuyvd0h8fm5tzAmJBkHFd1XSv64UBTzp zhPYu4zH/ZataseEO3Uv7nE/CBKZd3hj0PL9k0Sv3Xzpy7ff79Cucx+S3I96fnuuO6Vir0DZ sQk8u2faxQr2/M2R2/c2IOHlxphA4VjZx6tkvS9293stK2S5vXES94Tsxu+LzlfLSk7v5VAx bb0crdVn8zn29t61GzjFJ3p51MnM9SphMvrMZvvuy0W+W/xsczdqvZVsWXqo58P1RyZKLMUZ iYZazEXFiQBf9qPcJAQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsWy7bCSvK5M3tQkgxePrS0ezNvGZvHy51U2 i2svL7BbTPvwk9ni8n5ti/lHzrFa9L14yGyx6fE1VouHr8ItLu+aw2YxYdU3Fovu6zvYLJYf /8dksWjrF3aL1r1H2C123jnB7CDgcfmKt8emVZ1sHneu7WHz2Lyk3uPj01ssHn1bVjF6/Gua y+7xeZOcR/uBbqYAzigum5TUnMyy1CJ9uwSujO/PlrIWPJas+HVrDlsD4ySxLkZODgkBE4kv P1YzdjFycQgJ7GaU+PjqExNEQlri+sYJ7BC2sMTKf8/ZIYqamCTWf1jCDJJgE9CWuDt9C1iD iEA7o8T97WwgNrPAHSaJVT0iILawgKPE8vMdjCA2i4CqxI0LTWA1vAI2Eg2rD0ItkJdYveEA 2ExOAVuJ7o2nwWYKAdU8vv+aZQIj3wJGhlWMkqkFxbnpucWGBYZ5qeV6xYm5xaV56XrJ+bmb GMEBr6W5g3H7qg96hxiZOBgPMUpwMCuJ8FpFTE0S4k1JrKxKLcqPLyrNSS0+xCjNwaIkznuh 62S8kEB6YklqdmpqQWoRTJaJg1OqgWm290sG0+PSq5foPZcQXrR00ZJgD1s/1SSHGX/mPhbm Xtfxt1kljVX1oc0miSqrNXvWnw7YsatGPcuQW0lt2xNGx68VH/svG89QvGJ4bq9YV/Mx4ZcH 3I4rqMlcreE/wPYw+ks2z++3s//W+T1pVgsUXNxy3Cb2fomYtoIii4J36X/j/0/Y/1w9Zrjp fN2lD61NtsUV7ZzfH66N0K6TsGucrtA2KarqOvupxjjbqPCnm5K6XEP3C07kdOvY+3Hf9Nem b5bFpR896zC1KFqr8/NVzQc13Y4thxVXFuTemxz0QqyseeeaGHPPM2JPJc9viQ7rXtg9ibFm Ar/fp7nBc61KGYIlUqNFVb04LA2DlFiKMxINtZiLihMBI3njxucCAAA= X-CMS-MailID: 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273 References: <20220531012220.80563-1-alim.akhtar@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move CDR lock offset to drv data so that it can be extended for other SoCs which are having CDR lock at different register offset. Cc: linux-fsd@tesla.com Signed-off-by: Bharat Uppal Signed-off-by: Alim Akhtar --- drivers/phy/samsung/phy-exynos7-ufs.c | 3 +++ drivers/phy/samsung/phy-exynosautov9-ufs.c | 2 ++ drivers/phy/samsung/phy-samsung-ufs.c | 3 ++- drivers/phy/samsung/phy-samsung-ufs.h | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/phy/samsung/phy-exynos7-ufs.c b/drivers/phy/samsung/phy-exynos7-ufs.c index 7c9008e163db..d1a37273cb1f 100644 --- a/drivers/phy/samsung/phy-exynos7-ufs.c +++ b/drivers/phy/samsung/phy-exynos7-ufs.c @@ -11,6 +11,8 @@ #define EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_MASK 0x1 #define EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_EN BIT(0) +#define PHY_CDR_LOCK_STATUS 0x5e + /* Calibration for phy initialization */ static const struct samsung_ufs_phy_cfg exynos7_pre_init_cfg[] = { PHY_COMN_REG_CFG(0x00f, 0xfa, PWR_MODE_ANY), @@ -74,4 +76,5 @@ const struct samsung_ufs_phy_drvdata exynos7_ufs_phy = { .en = EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_EN, }, .has_symbol_clk = 1, + .cdr_lock_status_offset = PHY_CDR_LOCK_STATUS, }; diff --git a/drivers/phy/samsung/phy-exynosautov9-ufs.c b/drivers/phy/samsung/phy-exynosautov9-ufs.c index 36398a15c2db..1572b985c70d 100644 --- a/drivers/phy/samsung/phy-exynosautov9-ufs.c +++ b/drivers/phy/samsung/phy-exynosautov9-ufs.c @@ -10,6 +10,7 @@ #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL 0x728 #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_MASK 0x1 #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_EN BIT(0) +#define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CDR_LOCK_STATUS 0x5e #define PHY_TRSV_REG_CFG_AUTOV9(o, v, d) \ PHY_TRSV_REG_CFG_OFFSET(o, v, d, 0x50) @@ -64,4 +65,5 @@ const struct samsung_ufs_phy_drvdata exynosautov9_ufs_phy = { .en = EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_EN, }, .has_symbol_clk = 0, + .cdr_lock_status_offset = EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CDR_LOCK_STATUS, }; diff --git a/drivers/phy/samsung/phy-samsung-ufs.c b/drivers/phy/samsung/phy-samsung-ufs.c index 602ddef259eb..8e5ae228daa7 100644 --- a/drivers/phy/samsung/phy-samsung-ufs.c +++ b/drivers/phy/samsung/phy-samsung-ufs.c @@ -63,7 +63,8 @@ static int samsung_ufs_phy_wait_for_lock_acq(struct phy *phy) } err = readl_poll_timeout( - ufs_phy->reg_pma + PHY_APB_ADDR(PHY_CDR_LOCK_STATUS), + ufs_phy->reg_pma + + PHY_APB_ADDR(ufs_phy->drvdata->cdr_lock_status_offset), val, (val & PHY_CDR_LOCK_BIT), sleep_us, timeout_us); if (err) dev_err(ufs_phy->dev, diff --git a/drivers/phy/samsung/phy-samsung-ufs.h b/drivers/phy/samsung/phy-samsung-ufs.h index 91a0e9f94f98..965c79bbc278 100644 --- a/drivers/phy/samsung/phy-samsung-ufs.h +++ b/drivers/phy/samsung/phy-samsung-ufs.h @@ -40,7 +40,6 @@ /* UFS PHY registers */ #define PHY_PLL_LOCK_STATUS 0x1e -#define PHY_CDR_LOCK_STATUS 0x5e #define PHY_PLL_LOCK_BIT BIT(5) #define PHY_CDR_LOCK_BIT BIT(4) @@ -109,6 +108,7 @@ struct samsung_ufs_phy_drvdata { u32 en; } isol; bool has_symbol_clk; + u32 cdr_lock_status_offset; }; struct samsung_ufs_phy { -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD7ADC433F5 for ; Tue, 31 May 2022 01:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cxZLymwwhpCKXH6EtQz1bDgUJh3CLphSB+jlLLZlBeI=; b=q3qwS+DbvMhDsa U4xtZLEQfpHjyEr9oGRXjBunW57pSM+SSR8OhPSOjN2TdMrKF0uMTo3JSlcsLVLCz2AGr2Z2c1V0a aKLzEhFa5IEyEINWD/8qHCvAru796k6Bqe/oFmcrFRKDMXwsnESSqN5pyWuKGHPKrSm9ZXVUo02uu bu4P/eNZWd/HelZQKMbutVeD6Dp8JHaz6QiUdCXjpboluiVCPM9ojqKW4eB/eQW6/Us3tZ8+Av0cg +m1oj9OyJ09qizPYIDpDntIa8dk7TbidjKdTv1h4oiGHiFYblE7H6ycfXd1KJiJ7AGfjwHPW+XO6/ YE3b9cTEf5fXw9bGZVaw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvqcF-008oAD-5p; Tue, 31 May 2022 01:24:11 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvqbu-008nz7-4F for linux-phy@lists.infradead.org; Tue, 31 May 2022 01:23:52 +0000 Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20220531012345epoutp01bd029d9c62a56884addc9b8bd2618f2c~0DA-6G9vJ0686006860epoutp01D for ; Tue, 31 May 2022 01:23:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20220531012345epoutp01bd029d9c62a56884addc9b8bd2618f2c~0DA-6G9vJ0686006860epoutp01D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1653960225; bh=MefAl/5CSsIqUvfBRB4GKDe7Rqk1CpPiQz9ZkrZGXIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPleZt5TQAtsKtiZuXchv6tZdo5NFykncyLLE3qbcgiV60bvVqmo8P9uoXKOTTfmp TGAuPwQCYBzvtaVq54GVJFd4zF0bHaTULHsAnoiVOBVjCWkzXYixj/QNpBKFeP+mq+ 1KIYn8BEA3G/ROxMJUkwwyX9XT664I+xoaoKJUx0= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas5p2.samsung.com (KnoxPortal) with ESMTP id 20220531012344epcas5p26f0aad0fa8e75fb16f6524ec14d2a028~0DA-BX9pa0088200882epcas5p2T; Tue, 31 May 2022 01:23:44 +0000 (GMT) Received: from epsmges5p3new.samsung.com (unknown [182.195.38.180]) by epsnrtp2.localdomain (Postfix) with ESMTP id 4LBvgK4WbLz4x9QN; Tue, 31 May 2022 01:23:41 +0000 (GMT) Received: from epcas5p3.samsung.com ( [182.195.41.41]) by epsmges5p3new.samsung.com (Symantec Messaging Gateway) with SMTP id FD.F5.09762.D1E65926; Tue, 31 May 2022 10:23:41 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas5p1.samsung.com (KnoxPortal) with ESMTPA id 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273~0DA7aWj0v1064310643epcas5p1Q; Tue, 31 May 2022 01:23:41 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220531012341epsmtrp286fa393e34f482da8f4be33283dc110c~0DA7ZJrS72336523365epsmtrp2p; Tue, 31 May 2022 01:23:41 +0000 (GMT) X-AuditID: b6c32a4b-1fdff70000002622-ad-62956e1db12a Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 80.6F.11276.C1E65926; Tue, 31 May 2022 10:23:40 +0900 (KST) Received: from Jaguar.sa.corp.samsungelectronics.net (unknown [107.108.73.139]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220531012338epsmtip259f4afa19e18dfb4ce36a71e6ba5fe0c~0DA49MtAU1203612036epsmtip20; Tue, 31 May 2022 01:23:38 +0000 (GMT) From: Alim Akhtar To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, vkoul@kernel.org, avri.altman@wdc.com, bvanassche@acm.org, martin.petersen@oracle.com, chanho61.park@samsung.com, pankaj.dubey@samsung.com, Alim Akhtar , linux-fsd@tesla.com, Bharat Uppal Subject: [PATCH 2/6] phy: samsung-ufs: move cdr offset to drvdata Date: Tue, 31 May 2022 06:52:16 +0530 Message-Id: <20220531012220.80563-3-alim.akhtar@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220531012220.80563-1-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIJsWRmVeSWpSXmKPExsWy7bCmpq5s3tQkg/9PFCwezNvGZvHy51U2 i2svL7BbTPvwk9ni8n5ti/lHzrFa9L14yGyx6fE1VouHr8ItLu+aw2YxYdU3Fovu6zvYLJYf /8dksWjrF3aL1r1H2C123jnB7CDgcfmKt8emVZ1sHneu7WHz2Lyk3uPj01ssHn1bVjF6/Gua y+7xeZOcR/uBbqYAzqhsm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRb JRefAF23zBygH5QUyhJzSoFCAYnFxUr6djZF+aUlqQoZ+cUltkqpBSk5BSYFesWJucWleel6 eaklVoYGBkamQIUJ2Rnfny1lLXgsWfHr1hy2BsZJYl2MnBwSAiYSdx68ZO5i5OIQEtjNKDGh r58VwvnEKHHr91wo5xujxJ3+X8wwLV9+rGaESOxllJi78wk7hNPCJHHz0GU2kCo2AW2Ju9O3 MIEkRASaGSUOduwCc5gFzjFJPNu7gQmkSljAUWL5+Q5GEJtFQFXixoUmsG5eARuJhtUH2SH2 yUus3nAAbDengK1E98bTYIMkBOZySNy5coAFoshF4vvljVANwhKvjm+BsqUkPr/bCzSUA8j2 kFj0RwoinCHxdvl6RgjbXuLAlTksICXMApoS63fpg4SZBfgken8/YYLo5JXoaBOCqFaVaH53 FWqptMTE7m5WmOG3/otBwmECo8SvM1+YJzDKzkIYuoCRcRWjZGpBcW56arFpgXFeajk8ppLz czcxgtOmlvcOxkcPPugdYmTiYDzEKMHBrCTCaxUxNUmINyWxsiq1KD++qDQntfgQoykwxCYy S4km5wMTd15JvKGJpYGJmZmZiaWxmaGSOK/A/8YkIYH0xJLU7NTUgtQimD4mDk6pBqaCQ/mM svf3n9AySjeOjDjx96T1jqM1HfN2GEXPWO3feC7T4XSj0TUvvr6zEw4Z/Gx22sFjlDrvy5/A GRqme19rr7/O9t5mUayQ1KPeZWxbqtTX26hLJhjuEuyvd0h8fm5tzAmJBkHFd1XSv64UBTzp zhPYu4zH/ZataseEO3Uv7nE/CBKZd3hj0PL9k0Sv3Xzpy7ff79Cucx+S3I96fnuuO6Vir0DZ sQk8u2faxQr2/M2R2/c2IOHlxphA4VjZx6tkvS9293stK2S5vXES94Tsxu+LzlfLSk7v5VAx bb0crdVn8zn29t61GzjFJ3p51MnM9SphMvrMZvvuy0W+W/xsczdqvZVsWXqo58P1RyZKLMUZ iYZazEXFiQBf9qPcJAQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsWy7bCSvK5M3tQkgxePrS0ezNvGZvHy51U2 i2svL7BbTPvwk9ni8n5ti/lHzrFa9L14yGyx6fE1VouHr8ItLu+aw2YxYdU3Fovu6zvYLJYf /8dksWjrF3aL1r1H2C123jnB7CDgcfmKt8emVZ1sHneu7WHz2Lyk3uPj01ssHn1bVjF6/Gua y+7xeZOcR/uBbqYAzigum5TUnMyy1CJ9uwSujO/PlrIWPJas+HVrDlsD4ySxLkZODgkBE4kv P1YzdjFycQgJ7GaU+PjqExNEQlri+sYJ7BC2sMTKf8/ZIYqamCTWf1jCDJJgE9CWuDt9C1iD iEA7o8T97WwgNrPAHSaJVT0iILawgKPE8vMdjCA2i4CqxI0LTWA1vAI2Eg2rD0ItkJdYveEA 2ExOAVuJ7o2nwWYKAdU8vv+aZQIj3wJGhlWMkqkFxbnpucWGBYZ5qeV6xYm5xaV56XrJ+bmb GMEBr6W5g3H7qg96hxiZOBgPMUpwMCuJ8FpFTE0S4k1JrKxKLcqPLyrNSS0+xCjNwaIkznuh 62S8kEB6YklqdmpqQWoRTJaJg1OqgWm290sG0+PSq5foPZcQXrR00ZJgD1s/1SSHGX/mPhbm Xtfxt1kljVX1oc0miSqrNXvWnw7YsatGPcuQW0lt2xNGx68VH/svG89QvGJ4bq9YV/Mx4ZcH 3I4rqMlcreE/wPYw+ks2z++3s//W+T1pVgsUXNxy3Cb2fomYtoIii4J36X/j/0/Y/1w9Zrjp fN2lD61NtsUV7ZzfH66N0K6TsGucrtA2KarqOvupxjjbqPCnm5K6XEP3C07kdOvY+3Hf9Nem b5bFpR896zC1KFqr8/NVzQc13Y4thxVXFuTemxz0QqyseeeaGHPPM2JPJc9viQ7rXtg9ibFm Ar/fp7nBc61KGYIlUqNFVb04LA2DlFiKMxINtZiLihMBI3njxucCAAA= X-CMS-MailID: 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273 X-Msg-Generator: CA CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273 References: <20220531012220.80563-1-alim.akhtar@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220530_182350_638154_549EA130 X-CRM114-Status: GOOD ( 19.91 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Move CDR lock offset to drv data so that it can be extended for other SoCs which are having CDR lock at different register offset. Cc: linux-fsd@tesla.com Signed-off-by: Bharat Uppal Signed-off-by: Alim Akhtar --- drivers/phy/samsung/phy-exynos7-ufs.c | 3 +++ drivers/phy/samsung/phy-exynosautov9-ufs.c | 2 ++ drivers/phy/samsung/phy-samsung-ufs.c | 3 ++- drivers/phy/samsung/phy-samsung-ufs.h | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/phy/samsung/phy-exynos7-ufs.c b/drivers/phy/samsung/phy-exynos7-ufs.c index 7c9008e163db..d1a37273cb1f 100644 --- a/drivers/phy/samsung/phy-exynos7-ufs.c +++ b/drivers/phy/samsung/phy-exynos7-ufs.c @@ -11,6 +11,8 @@ #define EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_MASK 0x1 #define EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_EN BIT(0) +#define PHY_CDR_LOCK_STATUS 0x5e + /* Calibration for phy initialization */ static const struct samsung_ufs_phy_cfg exynos7_pre_init_cfg[] = { PHY_COMN_REG_CFG(0x00f, 0xfa, PWR_MODE_ANY), @@ -74,4 +76,5 @@ const struct samsung_ufs_phy_drvdata exynos7_ufs_phy = { .en = EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_EN, }, .has_symbol_clk = 1, + .cdr_lock_status_offset = PHY_CDR_LOCK_STATUS, }; diff --git a/drivers/phy/samsung/phy-exynosautov9-ufs.c b/drivers/phy/samsung/phy-exynosautov9-ufs.c index 36398a15c2db..1572b985c70d 100644 --- a/drivers/phy/samsung/phy-exynosautov9-ufs.c +++ b/drivers/phy/samsung/phy-exynosautov9-ufs.c @@ -10,6 +10,7 @@ #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL 0x728 #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_MASK 0x1 #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_EN BIT(0) +#define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CDR_LOCK_STATUS 0x5e #define PHY_TRSV_REG_CFG_AUTOV9(o, v, d) \ PHY_TRSV_REG_CFG_OFFSET(o, v, d, 0x50) @@ -64,4 +65,5 @@ const struct samsung_ufs_phy_drvdata exynosautov9_ufs_phy = { .en = EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_EN, }, .has_symbol_clk = 0, + .cdr_lock_status_offset = EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CDR_LOCK_STATUS, }; diff --git a/drivers/phy/samsung/phy-samsung-ufs.c b/drivers/phy/samsung/phy-samsung-ufs.c index 602ddef259eb..8e5ae228daa7 100644 --- a/drivers/phy/samsung/phy-samsung-ufs.c +++ b/drivers/phy/samsung/phy-samsung-ufs.c @@ -63,7 +63,8 @@ static int samsung_ufs_phy_wait_for_lock_acq(struct phy *phy) } err = readl_poll_timeout( - ufs_phy->reg_pma + PHY_APB_ADDR(PHY_CDR_LOCK_STATUS), + ufs_phy->reg_pma + + PHY_APB_ADDR(ufs_phy->drvdata->cdr_lock_status_offset), val, (val & PHY_CDR_LOCK_BIT), sleep_us, timeout_us); if (err) dev_err(ufs_phy->dev, diff --git a/drivers/phy/samsung/phy-samsung-ufs.h b/drivers/phy/samsung/phy-samsung-ufs.h index 91a0e9f94f98..965c79bbc278 100644 --- a/drivers/phy/samsung/phy-samsung-ufs.h +++ b/drivers/phy/samsung/phy-samsung-ufs.h @@ -40,7 +40,6 @@ /* UFS PHY registers */ #define PHY_PLL_LOCK_STATUS 0x1e -#define PHY_CDR_LOCK_STATUS 0x5e #define PHY_PLL_LOCK_BIT BIT(5) #define PHY_CDR_LOCK_BIT BIT(4) @@ -109,6 +108,7 @@ struct samsung_ufs_phy_drvdata { u32 en; } isol; bool has_symbol_clk; + u32 cdr_lock_status_offset; }; struct samsung_ufs_phy { -- 2.25.1 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A267C433F5 for ; Tue, 31 May 2022 01:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ft2p737leQUwK3z0/QEbYVVJk3AjIl1W4z6KsFIeaDA=; b=OGqvP8s/oyJAwN B03cFVaIltsw3oy/dnfKYxpuuhWWeS3N3Z0v1HqC8p2aTaM3c1GbfgOCrQSdG4o2DUjknwcJET1Lu 2Zn8A9HQVSHvjFN+Y0n+M8W8tp5Xo3v1UgEfzsWugwVblX2bXRHTwzNgihfdBTSEC/Oc84+N24Wvr VPvmeL8mDEs4uBGyxkfYjUjy3XCkU30bmAdTBIT2TuBzeMYi35vvzb7CJwFJw6DH1iYMZeK0BQHk6 fKjSpq4Ei42ZAa2aBzT7F+AAaC21U1gdrKulsTidLBpct/+J3RboGVJ9j+8wgb1MXIUwn4alK0wgO 8N0F270f8AdsmjApfNbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvqcG-008oAV-21; Tue, 31 May 2022 01:24:12 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvqbu-008nzV-ED for linux-arm-kernel@lists.infradead.org; Tue, 31 May 2022 01:23:53 +0000 Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20220531012345epoutp04c2d9c2911514a634104c138a63426f07~0DA-uP8873056930569epoutp04e for ; Tue, 31 May 2022 01:23:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20220531012345epoutp04c2d9c2911514a634104c138a63426f07~0DA-uP8873056930569epoutp04e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1653960225; bh=MefAl/5CSsIqUvfBRB4GKDe7Rqk1CpPiQz9ZkrZGXIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPleZt5TQAtsKtiZuXchv6tZdo5NFykncyLLE3qbcgiV60bvVqmo8P9uoXKOTTfmp TGAuPwQCYBzvtaVq54GVJFd4zF0bHaTULHsAnoiVOBVjCWkzXYixj/QNpBKFeP+mq+ 1KIYn8BEA3G/ROxMJUkwwyX9XT664I+xoaoKJUx0= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas5p2.samsung.com (KnoxPortal) with ESMTP id 20220531012344epcas5p26f0aad0fa8e75fb16f6524ec14d2a028~0DA-BX9pa0088200882epcas5p2T; Tue, 31 May 2022 01:23:44 +0000 (GMT) Received: from epsmges5p3new.samsung.com (unknown [182.195.38.180]) by epsnrtp2.localdomain (Postfix) with ESMTP id 4LBvgK4WbLz4x9QN; Tue, 31 May 2022 01:23:41 +0000 (GMT) Received: from epcas5p3.samsung.com ( [182.195.41.41]) by epsmges5p3new.samsung.com (Symantec Messaging Gateway) with SMTP id FD.F5.09762.D1E65926; Tue, 31 May 2022 10:23:41 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas5p1.samsung.com (KnoxPortal) with ESMTPA id 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273~0DA7aWj0v1064310643epcas5p1Q; Tue, 31 May 2022 01:23:41 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220531012341epsmtrp286fa393e34f482da8f4be33283dc110c~0DA7ZJrS72336523365epsmtrp2p; Tue, 31 May 2022 01:23:41 +0000 (GMT) X-AuditID: b6c32a4b-1fdff70000002622-ad-62956e1db12a Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 80.6F.11276.C1E65926; Tue, 31 May 2022 10:23:40 +0900 (KST) Received: from Jaguar.sa.corp.samsungelectronics.net (unknown [107.108.73.139]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220531012338epsmtip259f4afa19e18dfb4ce36a71e6ba5fe0c~0DA49MtAU1203612036epsmtip20; Tue, 31 May 2022 01:23:38 +0000 (GMT) From: Alim Akhtar To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, vkoul@kernel.org, avri.altman@wdc.com, bvanassche@acm.org, martin.petersen@oracle.com, chanho61.park@samsung.com, pankaj.dubey@samsung.com, Alim Akhtar , linux-fsd@tesla.com, Bharat Uppal Subject: [PATCH 2/6] phy: samsung-ufs: move cdr offset to drvdata Date: Tue, 31 May 2022 06:52:16 +0530 Message-Id: <20220531012220.80563-3-alim.akhtar@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220531012220.80563-1-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIJsWRmVeSWpSXmKPExsWy7bCmpq5s3tQkg/9PFCwezNvGZvHy51U2 i2svL7BbTPvwk9ni8n5ti/lHzrFa9L14yGyx6fE1VouHr8ItLu+aw2YxYdU3Fovu6zvYLJYf /8dksWjrF3aL1r1H2C123jnB7CDgcfmKt8emVZ1sHneu7WHz2Lyk3uPj01ssHn1bVjF6/Gua y+7xeZOcR/uBbqYAzqhsm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRb JRefAF23zBygH5QUyhJzSoFCAYnFxUr6djZF+aUlqQoZ+cUltkqpBSk5BSYFesWJucWleel6 eaklVoYGBkamQIUJ2Rnfny1lLXgsWfHr1hy2BsZJYl2MnBwSAiYSdx68ZO5i5OIQEtjNKDGh r58VwvnEKHHr91wo5xujxJ3+X8wwLV9+rGaESOxllJi78wk7hNPCJHHz0GU2kCo2AW2Ju9O3 MIEkRASaGSUOduwCc5gFzjFJPNu7gQmkSljAUWL5+Q5GEJtFQFXixoUmsG5eARuJhtUH2SH2 yUus3nAAbDengK1E98bTYIMkBOZySNy5coAFoshF4vvljVANwhKvjm+BsqUkPr/bCzSUA8j2 kFj0RwoinCHxdvl6RgjbXuLAlTksICXMApoS63fpg4SZBfgken8/YYLo5JXoaBOCqFaVaH53 FWqptMTE7m5WmOG3/otBwmECo8SvM1+YJzDKzkIYuoCRcRWjZGpBcW56arFpgXFeajk8ppLz czcxgtOmlvcOxkcPPugdYmTiYDzEKMHBrCTCaxUxNUmINyWxsiq1KD++qDQntfgQoykwxCYy S4km5wMTd15JvKGJpYGJmZmZiaWxmaGSOK/A/8YkIYH0xJLU7NTUgtQimD4mDk6pBqaCQ/mM svf3n9AySjeOjDjx96T1jqM1HfN2GEXPWO3feC7T4XSj0TUvvr6zEw4Z/Gx22sFjlDrvy5/A GRqme19rr7/O9t5mUayQ1KPeZWxbqtTX26hLJhjuEuyvd0h8fm5tzAmJBkHFd1XSv64UBTzp zhPYu4zH/ZataseEO3Uv7nE/CBKZd3hj0PL9k0Sv3Xzpy7ff79Cucx+S3I96fnuuO6Vir0DZ sQk8u2faxQr2/M2R2/c2IOHlxphA4VjZx6tkvS9293stK2S5vXES94Tsxu+LzlfLSk7v5VAx bb0crdVn8zn29t61GzjFJ3p51MnM9SphMvrMZvvuy0W+W/xsczdqvZVsWXqo58P1RyZKLMUZ iYZazEXFiQBf9qPcJAQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsWy7bCSvK5M3tQkgxePrS0ezNvGZvHy51U2 i2svL7BbTPvwk9ni8n5ti/lHzrFa9L14yGyx6fE1VouHr8ItLu+aw2YxYdU3Fovu6zvYLJYf /8dksWjrF3aL1r1H2C123jnB7CDgcfmKt8emVZ1sHneu7WHz2Lyk3uPj01ssHn1bVjF6/Gua y+7xeZOcR/uBbqYAzigum5TUnMyy1CJ9uwSujO/PlrIWPJas+HVrDlsD4ySxLkZODgkBE4kv P1YzdjFycQgJ7GaU+PjqExNEQlri+sYJ7BC2sMTKf8/ZIYqamCTWf1jCDJJgE9CWuDt9C1iD iEA7o8T97WwgNrPAHSaJVT0iILawgKPE8vMdjCA2i4CqxI0LTWA1vAI2Eg2rD0ItkJdYveEA 2ExOAVuJ7o2nwWYKAdU8vv+aZQIj3wJGhlWMkqkFxbnpucWGBYZ5qeV6xYm5xaV56XrJ+bmb GMEBr6W5g3H7qg96hxiZOBgPMUpwMCuJ8FpFTE0S4k1JrKxKLcqPLyrNSS0+xCjNwaIkznuh 62S8kEB6YklqdmpqQWoRTJaJg1OqgWm290sG0+PSq5foPZcQXrR00ZJgD1s/1SSHGX/mPhbm Xtfxt1kljVX1oc0miSqrNXvWnw7YsatGPcuQW0lt2xNGx68VH/svG89QvGJ4bq9YV/Mx4ZcH 3I4rqMlcreE/wPYw+ks2z++3s//W+T1pVgsUXNxy3Cb2fomYtoIii4J36X/j/0/Y/1w9Zrjp fN2lD61NtsUV7ZzfH66N0K6TsGucrtA2KarqOvupxjjbqPCnm5K6XEP3C07kdOvY+3Hf9Nem b5bFpR896zC1KFqr8/NVzQc13Y4thxVXFuTemxz0QqyseeeaGHPPM2JPJc9viQ7rXtg9ibFm Ar/fp7nBc61KGYIlUqNFVb04LA2DlFiKMxINtZiLihMBI3njxucCAAA= X-CMS-MailID: 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273 X-Msg-Generator: CA CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20220531012341epcas5p19b15b4916b210687ab6b46d6da0b2273 References: <20220531012220.80563-1-alim.akhtar@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220530_182350_961946_5B09780E X-CRM114-Status: GOOD ( 19.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move CDR lock offset to drv data so that it can be extended for other SoCs which are having CDR lock at different register offset. Cc: linux-fsd@tesla.com Signed-off-by: Bharat Uppal Signed-off-by: Alim Akhtar --- drivers/phy/samsung/phy-exynos7-ufs.c | 3 +++ drivers/phy/samsung/phy-exynosautov9-ufs.c | 2 ++ drivers/phy/samsung/phy-samsung-ufs.c | 3 ++- drivers/phy/samsung/phy-samsung-ufs.h | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/phy/samsung/phy-exynos7-ufs.c b/drivers/phy/samsung/phy-exynos7-ufs.c index 7c9008e163db..d1a37273cb1f 100644 --- a/drivers/phy/samsung/phy-exynos7-ufs.c +++ b/drivers/phy/samsung/phy-exynos7-ufs.c @@ -11,6 +11,8 @@ #define EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_MASK 0x1 #define EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_EN BIT(0) +#define PHY_CDR_LOCK_STATUS 0x5e + /* Calibration for phy initialization */ static const struct samsung_ufs_phy_cfg exynos7_pre_init_cfg[] = { PHY_COMN_REG_CFG(0x00f, 0xfa, PWR_MODE_ANY), @@ -74,4 +76,5 @@ const struct samsung_ufs_phy_drvdata exynos7_ufs_phy = { .en = EXYNOS7_EMBEDDED_COMBO_PHY_CTRL_EN, }, .has_symbol_clk = 1, + .cdr_lock_status_offset = PHY_CDR_LOCK_STATUS, }; diff --git a/drivers/phy/samsung/phy-exynosautov9-ufs.c b/drivers/phy/samsung/phy-exynosautov9-ufs.c index 36398a15c2db..1572b985c70d 100644 --- a/drivers/phy/samsung/phy-exynosautov9-ufs.c +++ b/drivers/phy/samsung/phy-exynosautov9-ufs.c @@ -10,6 +10,7 @@ #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL 0x728 #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_MASK 0x1 #define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_EN BIT(0) +#define EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CDR_LOCK_STATUS 0x5e #define PHY_TRSV_REG_CFG_AUTOV9(o, v, d) \ PHY_TRSV_REG_CFG_OFFSET(o, v, d, 0x50) @@ -64,4 +65,5 @@ const struct samsung_ufs_phy_drvdata exynosautov9_ufs_phy = { .en = EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CTRL_EN, }, .has_symbol_clk = 0, + .cdr_lock_status_offset = EXYNOSAUTOV9_EMBEDDED_COMBO_PHY_CDR_LOCK_STATUS, }; diff --git a/drivers/phy/samsung/phy-samsung-ufs.c b/drivers/phy/samsung/phy-samsung-ufs.c index 602ddef259eb..8e5ae228daa7 100644 --- a/drivers/phy/samsung/phy-samsung-ufs.c +++ b/drivers/phy/samsung/phy-samsung-ufs.c @@ -63,7 +63,8 @@ static int samsung_ufs_phy_wait_for_lock_acq(struct phy *phy) } err = readl_poll_timeout( - ufs_phy->reg_pma + PHY_APB_ADDR(PHY_CDR_LOCK_STATUS), + ufs_phy->reg_pma + + PHY_APB_ADDR(ufs_phy->drvdata->cdr_lock_status_offset), val, (val & PHY_CDR_LOCK_BIT), sleep_us, timeout_us); if (err) dev_err(ufs_phy->dev, diff --git a/drivers/phy/samsung/phy-samsung-ufs.h b/drivers/phy/samsung/phy-samsung-ufs.h index 91a0e9f94f98..965c79bbc278 100644 --- a/drivers/phy/samsung/phy-samsung-ufs.h +++ b/drivers/phy/samsung/phy-samsung-ufs.h @@ -40,7 +40,6 @@ /* UFS PHY registers */ #define PHY_PLL_LOCK_STATUS 0x1e -#define PHY_CDR_LOCK_STATUS 0x5e #define PHY_PLL_LOCK_BIT BIT(5) #define PHY_CDR_LOCK_BIT BIT(4) @@ -109,6 +108,7 @@ struct samsung_ufs_phy_drvdata { u32 en; } isol; bool has_symbol_clk; + u32 cdr_lock_status_offset; }; struct samsung_ufs_phy { -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel