netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Colin Foster <colin.foster@in-advantage.com>
To: linux-phy@lists.infradead.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Russell King <linux@armlinux.org.uk>,
	Kishon Vijay Abraham I <kishon@kernel.org>,
	Vinod Koul <vkoul@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Eric Dumazet <edumazet@google.com>,
	"David S. Miller" <davem@davemloft.net>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Andrew Lunn <andrew@lunn.ch>,
	UNGLinuxDriver@microchip.com,
	Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Claudiu Manoil <claudiu.manoil@nxp.com>,
	Vladimir Oltean <vladimir.oltean@nxp.com>,
	Lee Jones <lee@kernel.org>
Subject: [PATCH v2 net-next 1/9] phy: phy-ocelot-serdes: add ability to be used in a non-syscon configuration
Date: Fri, 17 Mar 2023 11:54:07 -0700	[thread overview]
Message-ID: <20230317185415.2000564-2-colin.foster@in-advantage.com> (raw)
In-Reply-To: <20230317185415.2000564-1-colin.foster@in-advantage.com>

The phy-ocelot-serdes module has exclusively been used in a syscon setup,
from an internal CPU. The addition of external control of ocelot switches
via an existing MFD implementation means that syscon is no longer the only
interface that phy-ocelot-serdes will see.

In the MFD configuration, an IORESOURCE_REG resource will exist for the
device. Utilize this resource to be able to function in both syscon and
non-syscon configurations.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---

v1 -> v2
    * No change

---
 drivers/phy/mscc/phy-ocelot-serdes.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/phy/mscc/phy-ocelot-serdes.c b/drivers/phy/mscc/phy-ocelot-serdes.c
index 76f596365176..d9443e865a78 100644
--- a/drivers/phy/mscc/phy-ocelot-serdes.c
+++ b/drivers/phy/mscc/phy-ocelot-serdes.c
@@ -494,6 +494,7 @@ static int serdes_probe(struct platform_device *pdev)
 {
 	struct phy_provider *provider;
 	struct serdes_ctrl *ctrl;
+	struct resource *res;
 	unsigned int i;
 	int ret;
 
@@ -503,6 +504,14 @@ static int serdes_probe(struct platform_device *pdev)
 
 	ctrl->dev = &pdev->dev;
 	ctrl->regs = syscon_node_to_regmap(pdev->dev.parent->of_node);
+	if (IS_ERR(ctrl->regs)) {
+		/* Fall back to using IORESOURCE_REG, if possible */
+		res = platform_get_resource(pdev, IORESOURCE_REG, 0);
+		if (res)
+			ctrl->regs = dev_get_regmap(ctrl->dev->parent,
+						    res->name);
+	}
+
 	if (IS_ERR(ctrl->regs))
 		return PTR_ERR(ctrl->regs);
 
-- 
2.25.1


  reply	other threads:[~2023-03-17 18:54 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-17 18:54 [PATCH v2 net-next 0/9] add support for ocelot external ports Colin Foster
2023-03-17 18:54 ` Colin Foster [this message]
2023-03-20  8:49   ` [PATCH v2 net-next 1/9] phy: phy-ocelot-serdes: add ability to be used in a non-syscon configuration Vinod Koul
2023-03-20  9:24     ` Russell King (Oracle)
2023-03-20 12:43       ` Vinod Koul
2023-03-20 13:34       ` Lee Jones
2023-03-20 14:27         ` Russell King (Oracle)
2023-03-20 16:41           ` Lee Jones
2023-03-20 17:00             ` Russell King (Oracle)
2023-03-21  8:26               ` Lee Jones
2023-03-21 10:16                 ` Russell King (Oracle)
2023-03-21 11:08                   ` Lee Jones
2023-03-21 11:14                     ` Russell King (Oracle)
2023-03-17 18:54 ` [PATCH v2 net-next 2/9] mfd: ocelot: add ocelot-serdes capability Colin Foster
2023-03-17 18:54 ` [PATCH v2 net-next 3/9] net: mscc: ocelot: expose ocelot_pll5_init routine Colin Foster
2023-03-17 18:54 ` [PATCH v2 net-next 4/9] net: mscc: ocelot: expose generic phylink_mac_config routine Colin Foster
2023-03-17 18:54 ` [PATCH v2 net-next 5/9] net: mscc: ocelot: expose serdes configuration function Colin Foster
2023-03-17 18:54 ` [PATCH v2 net-next 6/9] net: dsa: felix: attempt to initialize internal hsio plls Colin Foster
2023-03-17 18:54 ` [PATCH v2 net-next 7/9] net: dsa: felix: allow configurable phylink_mac_config Colin Foster
2023-03-17 18:54 ` [PATCH v2 net-next 8/9] net: dsa: felix: allow serdes configuration for dsa ports Colin Foster
2023-03-17 18:54 ` [PATCH v2 net-next 9/9] net: dsa: ocelot: add support for external phys Colin Foster
2023-03-20  9:20 ` [PATCH v2 net-next 0/9] add support for ocelot external ports patchwork-bot+netdevbpf

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=20230317185415.2000564-2-colin.foster@in-advantage.com \
    --to=colin.foster@in-advantage.com \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=andrew@lunn.ch \
    --cc=claudiu.manoil@nxp.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=f.fainelli@gmail.com \
    --cc=kishon@kernel.org \
    --cc=kuba@kernel.org \
    --cc=lee@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-phy@lists.infradead.org \
    --cc=linux@armlinux.org.uk \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=vkoul@kernel.org \
    --cc=vladimir.oltean@nxp.com \
    /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 NNTP newsgroup(s).