Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org
Cc:     Terry Bowman <terry.bowman@amd.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Andy Shevchenko <andy.shevchenko@gmail.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        UNGLinuxDriver@microchip.com,
        Steen Hegelund <Steen.Hegelund@microchip.com>,
        Lars Povlsen <lars.povlsen@microchip.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Russell King <linux@armlinux.org.uk>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>, Lee Jones <lee@kernel.org>,
        katie.morris@in-advantage.com
Subject: [RESEND PATCH v16 mfd 1/8] mfd: ocelot: add helper to get regmap from a resource
Date:   Mon,  5 Sep 2022 09:21:25 -0700
Message-Id: <20220905162132.2943088-2-colin.foster@in-advantage.com>
In-Reply-To: <20220905162132.2943088-1-colin.foster@in-advantage.com>
References: <20220905162132.2943088-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?iRWo1mt8S3mQX/n4phuit9rm68ESZwi7QM1eoI9Oct5e9Xx8lvETK4/UpEXY?=
 =?us-ascii?Q?/7AbuBZVcqtVqv5uvHxVaJyF80E4EXD3DZnkPsb6GEFV0IfvsuT8yj2zByoL?=
 =?us-ascii?Q?G//jGogUrPfCaPIMC/cqWKGPo0mOVdw4HxJE+TgLayPTzMfsWfLTtxjPmYxl?=
 =?us-ascii?Q?bmRK+ceikTU2VBivj8ydEk0eolH/GUJx+CDOeRyFOYbXTdYyXtSd0Fg87Oxz?=
 =?us-ascii?Q?j/uF1cRr24P4yHJk4voe4h8iYxxRYltm+c7U4eGD7ym5F8xbo07lZM9sY5rf?=
 =?us-ascii?Q?oTYCGW0a5+Y85RdvEBu7ux6VELMPXsiJIAcw4rw1VkAlPp/xEniGHxRJO5Tv?=
 =?us-ascii?Q?E3ZbCvNitfs6bLJK0bmgWH8MBqK6IboBsE+rWNtrQCHQKJbaK4u9+hTXED+o?=
 =?us-ascii?Q?Od1W+qAOD3yJpvcvBzcjUyaiisK8kKpqWn8jMMqhmGYlaCoCsolIrXK0Mqmt?=
 =?us-ascii?Q?KwM9Pa5QEbkCbqAQrj+EUMdkQziOPfaDM/tk8ncS5nUAjxGkSLmsKlbTFILC?=
 =?us-ascii?Q?eJ4nsFWtsj/VEhHcveB/K5Xx9Rm964aMlBnc/4BHj/+o19XVe/6/l7GPDwGv?=
 =?us-ascii?Q?Vrk8jBx3Q1Uw52iExi5fkIZlMsMgFNwGYKduZV+KNTUty/J2CPi+zlxcT7gz?=
 =?us-ascii?Q?nnEhlnF9g4aLT6mSOiMy7nfQ9YoYYFA2v6nn94+EhoWjhZazOMQCPoV5P5W4?=
 =?us-ascii?Q?8Rlp4tGb6i9Q11N6cYPJqtBvGVZJJvuZ7vGTVaTws4AxqL3fYlg4t0xYbQnb?=
 =?us-ascii?Q?SVe8GPc4mFkihGEtrfFNNL+hzGr7+oX/9iNxz3EnjhgmtqvZIGlkMlxfuNPW?=
 =?us-ascii?Q?Tem8yn100DLZ4kVk1n7jt0V6IHtLyk7By2GwP3UP1gPLmgTjPM5amWZz66y0?=
 =?us-ascii?Q?nEAgaM3WygKhqqi5B2W8/IkTFktCVCRYN3s41CO8vMUEiSlefJZ8hxrsdQGk?=
 =?us-ascii?Q?68IbNrC9bJ6iCGLPACNJY5f9N51gg24dtem1dbRBtxsiSh4zxZPhg9exoBfu?=
 =?us-ascii?Q?4yByr5y+bqbLYVsadC8jpb07kZTFZ9qZU2NTzxUsu/ACTwXZoSAh93KU4fQq?=
 =?us-ascii?Q?2y3twZm16BsiUxfEaMOHZwvkwsJPKXhq8ZD9/jCaoSEMxXS0CA8PV+ALQH8g?=
 =?us-ascii?Q?r2yBKMgWv4Zt72WQc3gAZ1kyo6yH/0W3swBgbFu0m2InUXoA2y9xPhUhw2+I?=
 =?us-ascii?Q?+YbFehRJZkQ3xqkPUc3rj99ZKsQgTy30dOS87sz4wHA+v/qeyjfHeUwkNFJK?=
 =?us-ascii?Q?ysGtS8vbqLw9QrmjupuShMk9WeV0Mji13E3iyGKckCl+rXWHFkE8psthzFKi?=
 =?us-ascii?Q?nNtyqCyX7MfVgju3HVldRR0zw9RO3BavhHZj3P4KPowhMWTLzoyk1gS7LcgY?=
 =?us-ascii?Q?bAQFIEJgYGP1ZKzXnreIofmQjIvHzPC6WENg52xedhasKG7D5XrvIAjggu7+?=
 =?us-ascii?Q?i70NTphTq41Omh73+6hOagvOZdjnC08MW53xHvUPLb3xtEnky5TuEbt+Vu/Z?=
 =?us-ascii?Q?gI9vwDdGYBwtCG+BgnJLL/Oyc1cCIg6sRHH47ANiTn7dLuC6wEFpgwMwZVYh?=
 =?us-ascii?Q?H8YxwAvlyXq1N2k4HxBJlxPjTBj5TTj/Ptw6W+GLSLPjeX5TlaX/OeurQBqn?=
 =?us-ascii?Q?TA=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 17508503-d35e-4aad-94b2-08da8f5abd13
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2022 16:21:50.9914
 (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: 9K1ao+pKdEVFG3ToghZeyJ5jvIDrbg4o/zQlsnPpfPQvcXyQ/tag5144BVysp6HVO+wMKvibLvop15HbK767H4EF16ntVOq8uN0cj1H96Oc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Several ocelot-related modules are designed for MMIO / regmaps. As such,
they often use a combination of devm_platform_get_and_ioremap_resource()
and devm_regmap_init_mmio().

Operating in an MFD might be different, in that it could be memory mapped,
or it could be SPI, I2C... In these cases a fallback to use IORESOURCE_REG
instead of IORESOURCE_MEM becomes necessary.

When this happens, there's redundant logic that needs to be implemented in
every driver. In order to avoid this redundancy, utilize a single function
that, if the MFD scenario is enabled, will perform this fallback logic.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
v16
    * Add Andy Reviewed-by tag

v15
    * Add missed errno.h and ioport.h includes
    * Add () to function references in both the commit log and comments

v14
    * Add header guard
    * Change regs type from u32* to void*
    * Add Reviewed-by tag

---
 MAINTAINERS                |  5 +++
 include/linux/mfd/ocelot.h | 62 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 include/linux/mfd/ocelot.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a5012ba6ff9..e0732e9f9090 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14741,6 +14741,11 @@ F:	net/dsa/tag_ocelot.c
 F:	net/dsa/tag_ocelot_8021q.c
 F:	tools/testing/selftests/drivers/net/ocelot/*
 
+OCELOT EXTERNAL SWITCH CONTROL
+M:	Colin Foster <colin.foster@in-advantage.com>
+S:	Supported
+F:	include/linux/mfd/ocelot.h
+
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
 M:	Frederic Barrat <fbarrat@linux.ibm.com>
 M:	Andrew Donnellan <ajd@linux.ibm.com>
diff --git a/include/linux/mfd/ocelot.h b/include/linux/mfd/ocelot.h
new file mode 100644
index 000000000000..dd72073d2d4f
--- /dev/null
+++ b/include/linux/mfd/ocelot.h
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2022 Innovative Advantage Inc. */
+
+#ifndef _LINUX_MFD_OCELOT_H
+#define _LINUX_MFD_OCELOT_H
+
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/types.h>
+
+struct resource;
+
+static inline struct regmap *
+ocelot_regmap_from_resource_optional(struct platform_device *pdev,
+				     unsigned int index,
+				     const struct regmap_config *config)
+{
+	struct device *dev = &pdev->dev;
+	struct resource *res;
+	void __iomem *regs;
+
+	/*
+	 * Don't use _get_and_ioremap_resource() here, since that will invoke
+	 * prints of "invalid resource" which will simply add confusion.
+	 */
+	res = platform_get_resource(pdev, IORESOURCE_MEM, index);
+	if (res) {
+		regs = devm_ioremap_resource(dev, res);
+		if (IS_ERR(regs))
+			return ERR_CAST(regs);
+		return devm_regmap_init_mmio(dev, regs, config);
+	}
+
+	/*
+	 * Fall back to using REG and getting the resource from the parent
+	 * device, which is possible in an MFD configuration
+	 */
+	if (dev->parent) {
+		res = platform_get_resource(pdev, IORESOURCE_REG, index);
+		if (!res)
+			return NULL;
+
+		return dev_get_regmap(dev->parent, res->name);
+	}
+
+	return NULL;
+}
+
+static inline struct regmap *
+ocelot_regmap_from_resource(struct platform_device *pdev, unsigned int index,
+			    const struct regmap_config *config)
+{
+	struct regmap *map;
+
+	map = ocelot_regmap_from_resource_optional(pdev, index, config);
+	return map ?: ERR_PTR(-ENOENT);
+}
+
+#endif
-- 
2.25.1