linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Colin Foster <colin.foster@in-advantage.com>
To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
	linux-phy@lists.infradead.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	Marc Zyngier <maz@kernel.org>, Hector Martin <marcan@marcan.st>,
	Angela Czubak <acz@semihalf.com>,
	Steen Hegelund <Steen.Hegelund@microchip.com>,
	Lars Povlsen <lars.povlsen@microchip.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Vinod Koul <vkoul@kernel.org>,
	Kishon Vijay Abraham I <kishon@ti.com>,
	Russell King <linux@armlinux.org.uk>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Jakub Kicinski <kuba@kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Vivien Didelot <vivien.didelot@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.jones@linaro.org>,
	katie.morris@in-advantage.com
Subject: [RFC v7 net-next 08/13] phy: ocelot-serdes: add ability to be used in mfd configuration
Date: Sun,  6 Mar 2022 18:12:03 -0800	[thread overview]
Message-ID: <20220307021208.2406741-9-colin.foster@in-advantage.com> (raw)
In-Reply-To: <20220307021208.2406741-1-colin.foster@in-advantage.com>

When ocelot-serdes is used in an MFD configuration, it might need to get
regmaps from an mfd instead of syscon. Add this ability to be used in
either configuration.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/phy/mscc/phy-ocelot-serdes.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/phy/mscc/phy-ocelot-serdes.c b/drivers/phy/mscc/phy-ocelot-serdes.c
index 76f596365176..ae1284e356e7 100644
--- a/drivers/phy/mscc/phy-ocelot-serdes.c
+++ b/drivers/phy/mscc/phy-ocelot-serdes.c
@@ -15,6 +15,7 @@
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <soc/mscc/ocelot.h>
 #include <soc/mscc/ocelot_hsio.h>
 #include <dt-bindings/phy/phy-ocelot-serdes.h>
 
@@ -492,8 +493,10 @@ static int serdes_phy_create(struct serdes_ctrl *ctrl, u8 idx, struct phy **phy)
 
 static int serdes_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
 	struct phy_provider *provider;
 	struct serdes_ctrl *ctrl;
+	struct resource *res;
 	unsigned int i;
 	int ret;
 
@@ -502,7 +505,15 @@ static int serdes_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	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 = ocelot_get_regmap_from_resource(dev, res);
+	}
+
 	if (IS_ERR(ctrl->regs))
 		return PTR_ERR(ctrl->regs);
 
-- 
2.25.1


  parent reply	other threads:[~2022-03-07  2:13 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-07  2:11 [RFC v7 net-next 00/13] add support for VSC7512 control over SPI Colin Foster
2022-03-07  2:11 ` [RFC v7 net-next 01/13] pinctrl: ocelot: allow pinctrl-ocelot to be loaded as a module Colin Foster
2022-03-07  2:11 ` [RFC v7 net-next 02/13] pinctrl: microchip-sgpio: allow sgpio driver to be used " Colin Foster
2022-03-07  2:11 ` [RFC v7 net-next 03/13] net: mdio: mscc-miim: add local dev variable to cleanup probe function Colin Foster
2022-03-07  2:11 ` [RFC v7 net-next 04/13] net: ocelot: add interface to get regmaps when exernally controlled Colin Foster
2022-03-07  2:12 ` [RFC v7 net-next 05/13] net: mdio: mscc-miim: add ability to be used in a non-mmio configuration Colin Foster
2022-03-07  2:12 ` [RFC v7 net-next 06/13] pinctrl: ocelot: " Colin Foster
2022-03-07  2:12 ` [RFC v7 net-next 07/13] pinctrl: microchip-sgpio: " Colin Foster
2022-03-07  2:12 ` Colin Foster [this message]
2022-03-07  2:12 ` [RFC v7 net-next 09/13] resource: add define macro for register address resources Colin Foster
2022-03-07  2:12 ` [RFC v7 net-next 10/13] mfd: ocelot: add support for the vsc7512 chip via spi Colin Foster
2022-03-08 14:37   ` Vladimir Oltean
2022-04-13  8:32   ` Lee Jones
2022-04-19  9:07     ` Lee Jones
2022-04-20  2:13       ` Colin Foster
2022-03-07  2:12 ` [RFC v7 net-next 11/13] net: mscc: ocelot: expose ocelot wm functions Colin Foster
2022-03-07  2:12 ` [RFC v7 net-next 12/13] net: dsa: felix: add configurable device quirks Colin Foster
2022-03-07  2:12 ` [RFC v7 net-next 13/13] net: dsa: ocelot: add external ocelot switch control Colin Foster
2022-03-08 14:14   ` Vladimir Oltean
2022-03-09  6:13     ` Colin Foster
2022-03-08 14:39 ` [RFC v7 net-next 00/13] add support for VSC7512 control over SPI Vladimir Oltean
2022-03-09  7:34   ` Colin Foster

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=20220307021208.2406741-9-colin.foster@in-advantage.com \
    --to=colin.foster@in-advantage.com \
    --cc=Steen.Hegelund@microchip.com \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=acz@semihalf.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=andrew@lunn.ch \
    --cc=claudiu.manoil@nxp.com \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=katie.morris@in-advantage.com \
    --cc=kishon@ti.com \
    --cc=kuba@kernel.org \
    --cc=lars.povlsen@microchip.com \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-phy@lists.infradead.org \
    --cc=linux@armlinux.org.uk \
    --cc=marcan@marcan.st \
    --cc=maz@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=vivien.didelot@gmail.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).