From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Ioana Ciornei <ioana.ciornei@nxp.com>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        Lars Povlsen <lars.povlsen@microchip.com>,
        Steen Hegelund <Steen.Hegelund@microchip.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [RFC PATCH v4 net-next 17/23] pinctrl: microchip-sgpio: expose microchip_sgpio_core_probe interface
Date:   Mon, 15 Nov 2021 22:23:22 -0800
Message-Id: <20211116062328.1949151-18-colin.foster@in-advantage.com>
In-Reply-To: <20211116062328.1949151-1-colin.foster@in-advantage.com>
References: <20211116062328.1949151-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eeUgueAHwrs+OgmQjdHZN2UiHb9Hn2fR/Y6MTEkC/bvnNHUUXcPDeuO8FXZF?=
 =?us-ascii?Q?7lIhcYgVjHX3JutrS7hhSCFlSoxEH5aGR8Awwa6VxBE5ORuJUTZR4k7YOJIv?=
 =?us-ascii?Q?1+ja91Mpq0oiTxrAcCMqRraBhXhi1lt/panZ1uz8ZIz/wEVPbfx2j2i4Q5Kk?=
 =?us-ascii?Q?sK+GGtClTyVgHoP/mZuUm2LX5fIDeI4dvSFGooYTbq3HgxOXOZzI/u2YY415?=
 =?us-ascii?Q?O0BZEHvQFR3+IbUiRg3IeosN71c5NXLqFKbE4X4M0c/M47U6jqPWcS3n+7pl?=
 =?us-ascii?Q?ICccugvlqp8nc0/4htYdwn+V1s6ICAS3/66m1ItyKZQ9rUoB75OO3she4PDM?=
 =?us-ascii?Q?2SvqvgMkyZAme0+ECXHPO8QN/oC5uvpYweC4+Xyo4SXa6ciMuFoAHEEnDrsX?=
 =?us-ascii?Q?OjiZJabAMJB9I4EQau6SAvlBK6Jv5hIixrVq7zyhWJUkBdispnDNDj1YaH75?=
 =?us-ascii?Q?qjgzjQte1sljSxu0BBb4d6Cv+/D+rifd9jVxUqGZrdnuc8xb7JiNxeTUP8rs?=
 =?us-ascii?Q?1ppw2mvqog0UAE7fG3Gn5giIi1ZuqulJTdd1B4TZDBfZSLFKE8bxVluVL27i?=
 =?us-ascii?Q?gjKxJhUGpILRVnlv+RolccGehTkXd3pYxUHff23YVPePpUPBRflIrQUvjQSY?=
 =?us-ascii?Q?wyMA+QrXS1nQNBvz0wS50pHJ6OHIZ2bmIHh9E+3CQi6/Sfd11mB9G2RcFX0c?=
 =?us-ascii?Q?p1yEbw0/45VToZ0RIh8T7unaRv20tNE51kN807VA7f4cRoJ823i3TD5IvIIV?=
 =?us-ascii?Q?KN2qNgCtOXDnUvGBeq12HSYf2ns5YBY087I7sUVt3Ln2pHjSNCRL3gnYHZ68?=
 =?us-ascii?Q?6vDI0RsHVRMJbv6ZeOZsH09fyyOAM9NfMFtdWwKXxQCjAa+MLilO1Vq3gydU?=
 =?us-ascii?Q?In0li2OpiMi7O6Leu0QC3lh0yPqiHepx2Ia3YoejaWtIwROsMI3W61e761KZ?=
 =?us-ascii?Q?Fv7wLX1604NpaWKd99flM+RRElc6NNBQChcNtSlEqRcF1hlkaiuahwV/iCCs?=
 =?us-ascii?Q?s+9Otc80ZoWz219PC0o2kAkRp51gGQoQr9VajPYtQviMwkQcONtPXc/lM75R?=
 =?us-ascii?Q?w05DSoqgpwP9CLA807Oq5mQTW5d7qUehXYrWZq+KeGWTBhSoIr0WRxcmbYC2?=
 =?us-ascii?Q?rJDayU/oVqoWx5iI7PLEATW/dzlFtCYgCRHsDUFcowxRg7EvCJT5dvTr2GZi?=
 =?us-ascii?Q?gZOKfYNYSxaGWCOgRqMyqvqAj04buJc/XCdqSWqyV/E3jSbD5LdOmm+Jfd1h?=
 =?us-ascii?Q?VpKiaA3Hb3v/OJqUhUhRFJY7hZUwQn82nMt6J2vxMrowqGXnscbFJIz9uXsI?=
 =?us-ascii?Q?7O+W5P/JdAYsGHcH3bkUDRJDb53OnlNx1xUIXsmkhetrhPonFTZ5nWLoD0qG?=
 =?us-ascii?Q?2LUvja5iStIXKFTxVjSobxy5WwwN6fPEKUgvLezWHibEKxM/ybvXhw73Z7sZ?=
 =?us-ascii?Q?5UcVSmG5t0SBIBEj0lHIfxzWujibD3qEyl/ZgkB/9gjJ8iKEeiTWUqoRbSXD?=
 =?us-ascii?Q?wFpNQBa24QqQ+aAJWQv71R6osPAgbr0bEn5+jUURU4SfRad8CttyHXWP2le4?=
 =?us-ascii?Q?zcSpHFsonNqc1vUb7/c7AF4vt+cRD7or2zGfrI1fUHgXQfx64Kt8KKvDgyrN?=
 =?us-ascii?Q?UlmzqWTKAlAgwUANmTFabsTP13l+waPYUfvA6GkLhxIn4gmKkmW1+0NifKWo?=
 =?us-ascii?Q?BV7kQEwjmf6t+L2Vf575wwzff3w=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1ad762ad-df57-4e9e-b8f0-08d9a8c9aab9
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 06:23:55.7515
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: MxeY9zuyQ1XCkUDoXbK+zm5lWwLpvZxR7jB/BYE0c6m3cZeapaVdbc9SvJJw1lwaKSWeBniOGzu2mjoC/p40hWg6KUilgA0kaMxmVF2aeSs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4722
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Allow external drivers to hook into microchip_sgpio with custom regmaps. In
the case where the sgpio is part of an external chip like a VSC7512
controlled over SPI, a pre-existing SPI regmap can be used.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/pinctrl/pinctrl-microchip-sgpio.c | 46 ++++++++++++++---------
 include/soc/mscc/ocelot.h                 | 11 ++++++
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c
index 10736ef5c6ca..2ddee50707d0 100644
--- a/drivers/pinctrl/pinctrl-microchip-sgpio.c
+++ b/drivers/pinctrl/pinctrl-microchip-sgpio.c
@@ -835,22 +835,15 @@ static struct sgpio_properties
 	return NULL;
 }
 
-static int microchip_sgpio_probe(struct platform_device *pdev)
+int microchip_sgpio_core_probe(struct device *dev, struct device_node *node,
+			       struct regmap *regmap, u32 offset)
 {
 	int div_clock = 0, ret, port, i, nbanks;
-	struct device *dev = &pdev->dev;
-	struct device_node *node = dev_of_node(dev);
 	struct fwnode_handle *child, *fwnode;
 	struct reset_control *reset;
 	struct sgpio_priv *priv;
 	struct clk *clk;
-	u32 __iomem *regs;
 	u32 val;
-	struct regmap_config regmap_config = {
-		.reg_bits = 32,
-		.val_bits = 32,
-		.reg_stride = 4,
-	};
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
@@ -878,18 +871,14 @@ static int microchip_sgpio_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	regs = devm_platform_ioremap_resource(pdev, 0);
-	if (IS_ERR(regs))
-		return PTR_ERR(regs);
-
-	priv->regs = devm_regmap_init_mmio(dev, regs, &regmap_config);
-	if (IS_ERR(priv->regs))
-		return PTR_ERR(priv->regs);
-
+	priv->regs = regmap;
 	priv->regs_offset = 0;
 	priv->properties = microchip_sgpio_match_from_node(node);
 	priv->in.is_input = true;
 
+	if (!priv->properties)
+		return dev_err_probe(dev, -EINVAL, "No property match found\n");
+
 	/* Get rest of device properties */
 	ret = microchip_sgpio_get_ports(priv);
 	if (ret)
@@ -926,6 +915,29 @@ static int microchip_sgpio_probe(struct platform_device *pdev)
 
 	return 0;
 }
+EXPORT_SYMBOL(microchip_sgpio_core_probe);
+
+static int microchip_sgpio_probe(struct platform_device *pdev)
+{
+	struct regmap_config regmap_config = {0};
+	struct device *dev = &pdev->dev;
+	struct regmap *regmap;
+	u32 __iomem *regs;
+
+	regmap_config.reg_bits = 32;
+	regmap_config.val_bits = 32;
+	regmap_config.reg_stride = 4;
+
+	regs = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(regs))
+		return PTR_ERR(regs);
+
+	regmap = devm_regmap_init_mmio(dev, regs, &regmap_config);
+	if (IS_ERR(regmap))
+		return PTR_ERR(regmap);
+
+	return microchip_sgpio_core_probe(dev, dev->of_node, regmap, 0);
+}
 
 static struct platform_driver microchip_sgpio_pinctrl_driver = {
 	.driver = {
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 14acfe82d0a4..8c27f8f79fff 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -930,4 +930,15 @@ int ocelot_pinctrl_core_probe(struct device *dev,
 }
 #endif
 
+#if IS_ENABLED(CONFIG_PINCTRL_MICROCHIP_SGPIO)
+int microchip_sgpio_core_probe(struct device *dev, struct device_node *node,
+			       struct regmap *regmap, u32 offset);
+#else
+int microchip_sgpio_core_probe(struct device *dev, struct device_node *node,
+			       struct regmap *regmap, u32 offset)
+{
+	return -EOPNOTSUPP;
+}
+#endif
+
 #endif
-- 
2.25.1