All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 12/13] phy: qcom-qmp-usb: clean up power-down handling
Date: Wed, 28 Sep 2022 17:28:21 +0200	[thread overview]
Message-ID: <20220928152822.30687-13-johan+linaro@kernel.org> (raw)
In-Reply-To: <20220928152822.30687-1-johan+linaro@kernel.org>

Always define the POWER_DOWN_CONTROL register instead of falling back to
the v2 (and v3) offset during power on and power off.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index f8685eddbf80..8acb5a3aeb95 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -126,6 +126,7 @@ static const unsigned int usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= 0x0d4,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR]  = 0x0d8,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x178,
+	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,
 };
 
 static const unsigned int qmp_v3_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
@@ -135,6 +136,7 @@ static const unsigned int qmp_v3_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= 0x0d8,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR]  = 0x0dc,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170,
+	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,
 };
 
 static const unsigned int qmp_v4_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
@@ -2164,13 +2166,8 @@ static int qmp_usb_init(struct phy *phy)
 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 	}
 
-	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;
 
@@ -2277,13 +2274,8 @@ static int qmp_usb_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


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

WARNING: multiple messages have this Message-ID (diff)
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>,
	linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 12/13] phy: qcom-qmp-usb: clean up power-down handling
Date: Wed, 28 Sep 2022 17:28:21 +0200	[thread overview]
Message-ID: <20220928152822.30687-13-johan+linaro@kernel.org> (raw)
In-Reply-To: <20220928152822.30687-1-johan+linaro@kernel.org>

Always define the POWER_DOWN_CONTROL register instead of falling back to
the v2 (and v3) offset during power on and power off.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index f8685eddbf80..8acb5a3aeb95 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -126,6 +126,7 @@ static const unsigned int usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= 0x0d4,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR]  = 0x0d8,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x178,
+	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,
 };
 
 static const unsigned int qmp_v3_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
@@ -135,6 +136,7 @@ static const unsigned int qmp_v3_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= 0x0d8,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR]  = 0x0dc,
 	[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170,
+	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,
 };
 
 static const unsigned int qmp_v4_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
@@ -2164,13 +2166,8 @@ static int qmp_usb_init(struct phy *phy)
 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
 	}
 
-	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;
 
@@ -2277,13 +2274,8 @@ static int qmp_usb_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


  parent reply	other threads:[~2022-09-28 15:28 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-28 15:28 [PATCH 00/13] phy: qcom-qmp: more fixes and cleanups Johan Hovold
2022-09-28 15:28 ` Johan Hovold
2022-09-28 15:28 ` [PATCH 01/13] phy: qcom-qmp: fix obsolete lane comments Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 15:56   ` Neil Armstrong
2022-09-28 15:56     ` Neil Armstrong
2022-09-28 17:26   ` Dmitry Baryshkov
2022-09-28 17:26     ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 02/13] phy: qcom-qmp-combo: drop unused UFS reset Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 16:04   ` Neil Armstrong
2022-09-28 16:04     ` Neil Armstrong
2022-09-28 17:25   ` Dmitry Baryshkov
2022-09-28 17:25     ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 03/13] phy: qcom-qmp-pcie: drop unused common-block registers Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 16:03   ` Neil Armstrong
2022-09-28 16:03     ` Neil Armstrong
2022-09-28 17:23   ` Dmitry Baryshkov
2022-09-28 17:23     ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 04/13] phy: qcom-qmp-pcie: unify ipq registers Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 15:57   ` Neil Armstrong
2022-09-28 15:57     ` Neil Armstrong
2022-09-28 17:34   ` Dmitry Baryshkov
2022-09-28 17:34     ` Dmitry Baryshkov
2022-09-29  6:53     ` Johan Hovold
2022-09-29  6:53       ` Johan Hovold
2022-09-28 15:28 ` [PATCH 05/13] phy: qcom-qmp-pcie: unify sdm845 registers Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 16:01   ` Neil Armstrong
2022-09-28 16:01     ` Neil Armstrong
2022-09-28 16:03     ` Neil Armstrong
2022-09-28 16:03       ` Neil Armstrong
2022-09-28 19:11   ` Dmitry Baryshkov
2022-09-28 19:11     ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 06/13] phy: qcom-qmp-pcie: drop bogus register update Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 19:10   ` Dmitry Baryshkov
2022-09-28 19:10     ` Dmitry Baryshkov
2022-09-28 19:48     ` Dmitry Baryshkov
2022-09-28 19:48       ` Dmitry Baryshkov
2022-09-29  7:12       ` Johan Hovold
2022-09-29  7:12         ` Johan Hovold
2022-09-29  7:56         ` Dmitry Baryshkov
2022-09-29  7:56           ` Dmitry Baryshkov
2022-09-29  8:18           ` Johan Hovold
2022-09-29  8:18             ` Johan Hovold
2022-09-29  6:56     ` Johan Hovold
2022-09-29  6:56       ` Johan Hovold
2022-09-28 15:28 ` [PATCH 07/13] phy: qcom-qmp-pcie: clean up power-down handling Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 19:15   ` Dmitry Baryshkov
2022-09-28 19:15     ` Dmitry Baryshkov
2022-09-29  7:25     ` Johan Hovold
2022-09-29  7:25       ` Johan Hovold
2022-09-29  7:30       ` Dmitry Baryshkov
2022-09-29  7:30         ` Dmitry Baryshkov
2022-09-29  9:04         ` Johan Hovold
2022-09-29  9:04           ` Johan Hovold
2022-09-29  9:07           ` Dmitry Baryshkov
2022-09-29  9:07             ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 08/13] phy: qcom-qmp-pcie: move power-down update Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 15:28 ` [PATCH 09/13] phy: qcom-qmp-pcie-msm8996: clean up power-down handling Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 19:52   ` Dmitry Baryshkov
2022-09-28 19:52     ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 10/13] phy: qcom-qmp-combo: " Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 19:53   ` Dmitry Baryshkov
2022-09-28 19:53     ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 11/13] phy: qcom-qmp-ufs: " Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 19:53   ` Dmitry Baryshkov
2022-09-28 19:53     ` Dmitry Baryshkov
2022-09-28 15:28 ` Johan Hovold [this message]
2022-09-28 15:28   ` [PATCH 12/13] phy: qcom-qmp-usb: " Johan Hovold
2022-09-28 19:53   ` Dmitry Baryshkov
2022-09-28 19:53     ` Dmitry Baryshkov
2022-09-28 15:28 ` [PATCH 13/13] phy: qcom-qmp-pcie: clean up clock lists Johan Hovold
2022-09-28 15:28   ` Johan Hovold
2022-09-28 19:54   ` Dmitry Baryshkov
2022-09-28 19:54     ` Dmitry Baryshkov

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=20220928152822.30687-13-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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.