From: Thomas Richard <thomas.richard@bootlin.com>
To: "Linus Walleij" <linus.walleij@linaro.org>,
"Bartosz Golaszewski" <brgl@bgdev.pl>,
"Andy Shevchenko" <andy@kernel.org>,
"Tony Lindgren" <tony@atomide.com>,
"Haojian Zhuang" <haojian.zhuang@linaro.org>,
"Vignesh R" <vigneshr@ti.com>,
"Aaro Koskinen" <aaro.koskinen@iki.fi>,
"Janusz Krzysztofik" <jmkrzyszt@gmail.com>,
"Andi Shyti" <andi.shyti@kernel.org>,
"Peter Rosin" <peda@axentia.se>, "Vinod Koul" <vkoul@kernel.org>,
"Kishon Vijay Abraham I" <kishon@kernel.org>,
"Philipp Zabel" <p.zabel@pengutronix.de>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-omap@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-phy@lists.infradead.org, linux-pci@vger.kernel.org,
gregory.clement@bootlin.com, theo.lebrun@bootlin.com,
thomas.petazzoni@bootlin.com, u-kumar1@ti.com,
Thomas Richard <thomas.richard@bootlin.com>
Subject: [PATCH v4 11/18] phy: cadence-torrent: add already_configured to struct cdns_torrent_phy
Date: Mon, 04 Mar 2024 16:35:54 +0100 [thread overview]
Message-ID: <20240102-j7200-pcie-s2r-v4-11-6f1f53390c85@bootlin.com> (raw)
In-Reply-To: <20240102-j7200-pcie-s2r-v4-0-6f1f53390c85@bootlin.com>
Add already_configured to struct cdns_torrent_phy, so it can be used at
differents stages.
Signed-off-by: Thomas Richard <thomas.richard@bootlin.com>
---
drivers/phy/cadence/phy-cadence-torrent.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/phy/cadence/phy-cadence-torrent.c b/drivers/phy/cadence/phy-cadence-torrent.c
index bba10ca0bfdd..b35fbc8a60e5 100644
--- a/drivers/phy/cadence/phy-cadence-torrent.c
+++ b/drivers/phy/cadence/phy-cadence-torrent.c
@@ -358,6 +358,7 @@ struct cdns_torrent_phy {
enum cdns_torrent_ref_clk ref_clk_rate;
struct cdns_torrent_inst phys[MAX_NUM_LANES];
int nsubnodes;
+ int already_configured;
const struct cdns_torrent_data *init_data;
struct regmap *regmap_common_cdb;
struct regmap *regmap_phy_pcs_common_cdb;
@@ -2740,7 +2741,6 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
struct device_node *child;
int ret, subnodes, node = 0, i;
u32 total_num_lanes = 0;
- int already_configured;
u8 init_dp_regmap = 0;
u32 phy_type;
@@ -2787,9 +2787,9 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
if (ret)
goto clk_cleanup;
- regmap_field_read(cdns_phy->phy_pma_cmn_ctrl_1, &already_configured);
+ regmap_field_read(cdns_phy->phy_pma_cmn_ctrl_1, &cdns_phy->already_configured);
- if (!already_configured) {
+ if (!cdns_phy->already_configured) {
ret = cdns_torrent_clk(cdns_phy);
if (ret)
goto clk_cleanup;
@@ -2869,7 +2869,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
of_property_read_u32(child, "cdns,ssc-mode",
&cdns_phy->phys[node].ssc_mode);
- if (!already_configured)
+ if (!cdns_phy->already_configured)
gphy = devm_phy_create(dev, child, &cdns_torrent_phy_ops);
else
gphy = devm_phy_create(dev, child, &noop_ops);
@@ -2955,7 +2955,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
goto put_lnk_rst;
}
- if (cdns_phy->nsubnodes > 1 && !already_configured) {
+ if (cdns_phy->nsubnodes > 1 && !cdns_phy->already_configured) {
ret = cdns_torrent_phy_configure_multilink(cdns_phy);
if (ret)
goto put_lnk_rst;
--
2.39.2
next prev parent reply other threads:[~2024-03-04 15:36 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-04 15:35 [PATCH v4 00/18] Add suspend to ram support for PCIe on J7200 Thomas Richard
2024-03-04 15:35 ` [PATCH v4 01/18] gpio: pca953x: move suspend()/resume() to suspend_noirq()/resume_noirq() Thomas Richard
2024-03-04 15:35 ` [PATCH v4 02/18] pinctrl: pinctrl-single: move suspend()/resume() callbacks to noirq Thomas Richard
2024-03-08 8:39 ` Tony Lindgren
2024-03-20 7:44 ` Dhruva Gole
2024-03-20 8:37 ` Thomas Richard
2024-03-28 21:07 ` Linus Walleij
2024-03-04 15:35 ` [PATCH v4 03/18] i2c: omap: wakeup the controller during suspend() callback Thomas Richard
2024-03-08 8:42 ` Tony Lindgren
2024-03-12 8:03 ` Wolfram Sang
2024-03-13 0:48 ` Andi Shyti
2024-03-13 6:21 ` Wolfram Sang
2024-03-13 0:37 ` Andi Shyti
2024-03-04 15:35 ` [PATCH v4 04/18] mux: add mux_chip_resume() function Thomas Richard
2024-03-04 15:35 ` [PATCH v4 05/18] mux: mmio: add resume support Thomas Richard
2024-03-04 15:35 ` [PATCH v4 06/18] phy: ti: phy-j721e-wiz: use dev_err_probe() instead of dev_err() Thomas Richard
2024-03-04 15:35 ` [PATCH v4 07/18] phy: ti: phy-j721e-wiz: split wiz_clock_init() function Thomas Richard
2024-04-05 16:42 ` Vinod Koul
2024-03-04 15:35 ` [PATCH v4 08/18] phy: ti: phy-j721e-wiz: add resume support Thomas Richard
2024-04-05 16:44 ` Vinod Koul
2024-04-05 17:14 ` Andy Shevchenko
2024-03-04 15:35 ` [PATCH v4 09/18] phy: cadence-torrent: extract calls to clk_get from cdns_torrent_clk Thomas Richard
2024-03-04 15:35 ` [PATCH v4 10/18] phy: cadence-torrent: register resets even if the phy is already configured Thomas Richard
2024-03-04 15:35 ` Thomas Richard [this message]
2024-03-04 15:35 ` [PATCH v4 12/18] phy: cadence-torrent: remove noop_ops phy operations Thomas Richard
2024-03-04 15:35 ` [PATCH v4 13/18] phy: cadence-torrent: add suspend and resume support Thomas Richard
2024-03-04 15:35 ` [PATCH v4 14/18] PCI: cadence: Extract link setup sequence from cdns_pcie_host_setup() Thomas Richard
2024-03-04 15:35 ` [PATCH v4 15/18] PCI: cadence: Set cdns_pcie_host_init() global Thomas Richard
2024-03-04 15:35 ` [PATCH v4 16/18] PCI: j721e: Use dev_err_probe() in the probe() function Thomas Richard
2024-04-10 7:51 ` Francesco Dolcini
2024-03-04 15:36 ` [PATCH v4 17/18] PCI: j721e: Add reset GPIO to struct j721e_pcie Thomas Richard
2024-03-04 15:36 ` [PATCH v4 18/18] PCI: j721e: Add suspend and resume support Thomas Richard
2024-03-13 6:51 ` Siddharth Vadapalli
2024-03-28 22:07 ` Bjorn Helgaas
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=20240102-j7200-pcie-s2r-v4-11-6f1f53390c85@bootlin.com \
--to=thomas.richard@bootlin.com \
--cc=aaro.koskinen@iki.fi \
--cc=andi.shyti@kernel.org \
--cc=andy@kernel.org \
--cc=bhelgaas@google.com \
--cc=brgl@bgdev.pl \
--cc=gregory.clement@bootlin.com \
--cc=haojian.zhuang@linaro.org \
--cc=jmkrzyszt@gmail.com \
--cc=kishon@kernel.org \
--cc=kw@linux.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=lpieralisi@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=peda@axentia.se \
--cc=robh@kernel.org \
--cc=theo.lebrun@bootlin.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tony@atomide.com \
--cc=u-kumar1@ti.com \
--cc=vigneshr@ti.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).