From: Johan Hovold <johan+linaro@kernel.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Kishon Vijay Abraham I <kishon@ti.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Neil Armstrong <neil.armstrong@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org,
linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH v2 08/11] phy: qcom-qmp-ufs: clean up power-down handling
Date: Thu, 29 Sep 2022 11:29:13 +0200 [thread overview]
Message-ID: <20220929092916.23068-9-johan+linaro@kernel.org> (raw)
In-Reply-To: <20220929092916.23068-1-johan+linaro@kernel.org>
Always define the POWER_DOWN_CONTROL register instead of falling back to
the v2 (and v4) offset during power on and power off.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
index d7b35b715b95..c8d86aecfe74 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
@@ -89,22 +89,26 @@ enum qphy_reg_layout {
static const unsigned int msm8996_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = 0x00,
[QPHY_PCS_READY_STATUS] = 0x168,
+ [QPHY_PCS_POWER_DOWN_CONTROL] = 0x04,
};
static const unsigned int sdm845_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = 0x00,
[QPHY_PCS_READY_STATUS] = 0x160,
+ [QPHY_PCS_POWER_DOWN_CONTROL] = 0x04,
};
static const unsigned int sm6115_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = 0x00,
[QPHY_PCS_READY_STATUS] = 0x168,
+ [QPHY_PCS_POWER_DOWN_CONTROL] = 0x04,
};
static const unsigned int sm8150_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = QPHY_V4_PCS_UFS_PHY_START,
[QPHY_PCS_READY_STATUS] = QPHY_V4_PCS_UFS_READY_STATUS,
[QPHY_SW_RESET] = QPHY_V4_PCS_UFS_SW_RESET,
+ [QPHY_PCS_POWER_DOWN_CONTROL] = QPHY_V4_PCS_UFS_POWER_DOWN_CONTROL,
};
static const struct qmp_phy_init_tbl msm8996_ufs_serdes_tbl[] = {
@@ -856,13 +860,8 @@ static int qmp_ufs_com_init(struct qmp_phy *qphy)
if (ret)
goto err_disable_regulators;
- if (cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL])
- qphy_setbits(pcs,
- cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],
- cfg->pwrdn_ctrl);
- else
- qphy_setbits(pcs, QPHY_V2_PCS_POWER_DOWN_CONTROL,
- cfg->pwrdn_ctrl);
+ qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],
+ cfg->pwrdn_ctrl);
return 0;
@@ -996,13 +995,8 @@ static int qmp_ufs_power_off(struct phy *phy)
qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
/* Put PHY into POWER DOWN state: active low */
- if (cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL]) {
- qphy_clrbits(qphy->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],
- cfg->pwrdn_ctrl);
- } else {
- qphy_clrbits(qphy->pcs, QPHY_V2_PCS_POWER_DOWN_CONTROL,
- cfg->pwrdn_ctrl);
- }
+ qphy_clrbits(qphy->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],
+ cfg->pwrdn_ctrl);
return 0;
}
--
2.35.1
next prev parent reply other threads:[~2022-09-29 9:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 9:29 [PATCH v2 00/11] phy: qcom-qmp: more fixes and cleanups Johan Hovold
2022-09-29 9:29 ` [PATCH v2 01/11] phy: qcom-qmp: fix obsolete lane comments Johan Hovold
2022-09-29 9:29 ` [PATCH v2 02/11] phy: qcom-qmp-combo: drop unused UFS reset Johan Hovold
2022-09-29 9:29 ` [PATCH v2 03/11] phy: qcom-qmp-pcie: drop unused common-block registers Johan Hovold
2022-09-29 9:29 ` [PATCH v2 04/11] phy: qcom-qmp-pcie: clean up power-down handling Johan Hovold
2022-09-29 10:09 ` Dmitry Baryshkov
2022-09-29 9:29 ` [PATCH v2 05/11] phy: qcom-qmp-pcie: move power-down update Johan Hovold
2022-09-29 19:05 ` Dmitry Baryshkov
2022-09-29 9:29 ` [PATCH v2 06/11] phy: qcom-qmp-pcie-msm8996: clean up power-down handling Johan Hovold
2022-09-29 10:07 ` Dmitry Baryshkov
2022-09-29 9:29 ` [PATCH v2 07/11] phy: qcom-qmp-combo: " Johan Hovold
2022-09-29 10:08 ` Dmitry Baryshkov
2022-09-29 9:29 ` Johan Hovold [this message]
2022-09-29 10:18 ` [PATCH v2 08/11] phy: qcom-qmp-ufs: " Dmitry Baryshkov
2022-09-29 9:29 ` [PATCH v2 09/11] phy: qcom-qmp-usb: " Johan Hovold
2022-09-29 10:09 ` Dmitry Baryshkov
2022-09-29 9:29 ` [PATCH v2 10/11] phy: qcom-qmp-pcie: clean up clock lists Johan Hovold
2022-09-29 10:08 ` Dmitry Baryshkov
2022-09-29 9:29 ` [PATCH v2 11/11] phy: qcom-qmp-pcie: drop bogus register update Johan Hovold
2022-09-29 10:18 ` Dmitry Baryshkov
2022-09-29 12:39 ` Johan Hovold
2022-09-30 10:57 ` Dmitry Baryshkov
2022-09-30 11:25 ` Johan Hovold
2022-09-29 9:47 ` [PATCH v2 00/11] phy: qcom-qmp: more fixes and cleanups Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220929092916.23068-9-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=kishon@ti.com \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=neil.armstrong@linaro.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox