From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     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>,
        Russell King <linux@armlinux.org.uk>
Subject: [PATCH v3 net-next 3/5] net: dsa: ocelot: felix: add interface for custom regmaps
Date:   Sat,  4 Dec 2021 10:21:27 -0800
Message-Id: <20211204182129.1044899-4-colin.foster@in-advantage.com>
In-Reply-To: <20211204182129.1044899-1-colin.foster@in-advantage.com>
References: <20211204182129.1044899-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?UcOE23CypcdaZUJ/1SafIMB+dlmANjWOe+vk5Xiy/7wStX6T0qGAXM6KVkZV?=
 =?us-ascii?Q?TGJ0/ffjEYwGGXtt5WGwRHGSB6vODWFpd6S2pOL4TbLE097nSBzqaRLvO4id?=
 =?us-ascii?Q?oQcj9/f7jcePG6zDcUsbhsRrV7JmmkCGJKp/KxtKFPYilKLpAcZFuAevojdV?=
 =?us-ascii?Q?zBnd57DfUAKtFfH8EptKW75j+Wkkl/B0oS8Y06iO2efX8vrsmG4EFHT5v3Wv?=
 =?us-ascii?Q?yx36Ege3O0HgSFVtIv1rUXKYEs6uk8lLu+yfAcJMoLWRY+0e06yZFjAkc+oB?=
 =?us-ascii?Q?gTiBdyoiAAhbf6rM6ht89HgUxck/40ipS8EFizLI25hq4rXFqKzhPm+JpE9P?=
 =?us-ascii?Q?bylJ6XiiQBjpuAwicO4H0e82K3Ho1j83wuevH4QlmRFrmAZpGyjHTBXppTH5?=
 =?us-ascii?Q?KnxQROL4Xq4kkZRDV3vb17Mqax75DojPHccnueKtwuOgrCavsrwt7BYS4Upk?=
 =?us-ascii?Q?KMWnf+OLFPkXDZhy0wgq2t+1hU/woGb/JLLlwPh+zEVG7pf6kec3D/lI78yx?=
 =?us-ascii?Q?NGBNVeHMbbxuUX9ubzBaeqDvJ17CdjVNZj0exLmqR5ta1q7rH7pux+X4xZSU?=
 =?us-ascii?Q?QMHAj7ff3lflVKJUbxlifTYH6wZ/NS0v+CgBJKp8MC1mw1uG5DumBP/VkLSG?=
 =?us-ascii?Q?1MRN8hZ0bzu1xTpnVwRpVHZ4O+JIiMoodQ+2s+Qpr7cCllrFCrJtm7NMKtFM?=
 =?us-ascii?Q?hQoeClgT+dtPWEzd3cMtK2u4IP4iOEjUdNC5/MP1bdzj8829dnsYztunbh/L?=
 =?us-ascii?Q?uX5UKz2Tw6X5bEAjxvgxobuHtDqSEvThJv2z0h0uqjRqDXMofeJWZSJPxXY2?=
 =?us-ascii?Q?VwDG+I3+VomP1uzMA3SKgEUMD0gU3VkAMvCz/nIWb0QTPETLNddhNSzUa1SI?=
 =?us-ascii?Q?ltBbRMyfVb93FXL0nCQ3Iet681mw2fMpDJIjMoLyFEi7RGFe6NoTKSBbgWTV?=
 =?us-ascii?Q?ZJHWJ2rDNq8eaw1ORmrGQIJX26UPQxBcEIODbIYLto7f43wOxA7yYO5VqlON?=
 =?us-ascii?Q?C1Ci2azArRwAdBTlEhWjNv1EsB9mV11AbRzdEuiIa75QPv86B6u+lSXRlN8A?=
 =?us-ascii?Q?5csVAKZwVL8y4rmwYxtoLBbp7mzuxAlfNmZ4mRl80xv60MOEgpuSIE0f54Ik?=
 =?us-ascii?Q?B+tYN3JuubcFEuUE/FYm04Lka/4AwkvdoGQ9SXlERcELkhtBfLu2RmkZjUTJ?=
 =?us-ascii?Q?RUkXfm8tyXKg/nQ1p2RpAcg6SMvvaNBAKJN3WKriedqkwTpQjDMBQUeb3sem?=
 =?us-ascii?Q?aW+X1DqFPIWjQKAbIQABrlS+fDSpQToTUcICQFip6X1BwrJg0xJ5KXnvBERu?=
 =?us-ascii?Q?jHLeRE3dyNtRAiv1S9qzmjrm2lO2sorku1uSVCvJ+ImM9yQL+4Yx96tFoYL5?=
 =?us-ascii?Q?rRV9lulwhCXpDa6JvUKALy/QFKXhkRmEB8bfRO7jSwFm7o2c/tgI5hf4wSei?=
 =?us-ascii?Q?q62tw0WWL7QLaZEEt9b7TTG+eLAm7z9nJtXB6RFRC73NUDRFUw4NJ5qvPy59?=
 =?us-ascii?Q?5cb1cuCLN/KkNVmlP0jhTErtpwlNdq55rqhVqnNoJCobqSKpVIDUnIu/XP9E?=
 =?us-ascii?Q?phJS6A9ZEWHcNC7CUSOOJjE71AVjD/hZHv1NC+w36jYJ2Ez0iJtVPfIAqEcN?=
 =?us-ascii?Q?2c6dvfgQrvNOjkHTLRzJvUEp9alQPtHYQFvmSOreXE5X1yrWK0O8I8p7FuBg?=
 =?us-ascii?Q?eRDn2Jp9MOs8I0tLhToApr6AA5M=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 13b0c747-4380-4a8f-9a0a-08d9b752ebee
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 18:21:42.4659
 (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: 3UlQ6hqa7xB1SNtb4+dqxevqP814rFyVWAtXiDWHtn3bTvlv3sXMi/qQjCRYKS+T80WM8/YFYy6L7Q9wnL9ocgMjVQulSv6J/Edu226b3oQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2061
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add an interface so that non-mmio regmaps can be used

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/net/dsa/ocelot/felix.c           | 4 ++--
 drivers/net/dsa/ocelot/felix.h           | 2 ++
 drivers/net/dsa/ocelot/felix_vsc9959.c   | 1 +
 drivers/net/dsa/ocelot/seville_vsc9953.c | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 4ead3ebe947b..57beab3d3ff3 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -1028,7 +1028,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)
 		res.start += felix->switch_base;
 		res.end += felix->switch_base;
 
-		target = ocelot_regmap_init(ocelot, &res);
+		target = felix->info->init_regmap(ocelot, &res);
 		if (IS_ERR(target)) {
 			dev_err(ocelot->dev,
 				"Failed to map device memory space\n");
@@ -1065,7 +1065,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)
 		res.start += felix->switch_base;
 		res.end += felix->switch_base;
 
-		target = ocelot_regmap_init(ocelot, &res);
+		target = felix->info->init_regmap(ocelot, &res);
 		if (IS_ERR(target)) {
 			dev_err(ocelot->dev,
 				"Failed to map memory space for port %d\n",
diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index 183dbf832db9..515bddc012c0 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -50,6 +50,8 @@ struct felix_info {
 				 enum tc_setup_type type, void *type_data);
 	void	(*port_sched_speed_set)(struct ocelot *ocelot, int port,
 					u32 speed);
+	struct regmap *(*init_regmap)(struct ocelot *ocelot,
+				      struct resource *res);
 };
 
 extern const struct dsa_switch_ops felix_switch_ops;
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 0676e204c804..74c5c8cd664a 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -2240,6 +2240,7 @@ static const struct felix_info felix_info_vsc9959 = {
 	.prevalidate_phy_mode	= vsc9959_prevalidate_phy_mode,
 	.port_setup_tc		= vsc9959_port_setup_tc,
 	.port_sched_speed_set	= vsc9959_sched_speed_set,
+	.init_regmap		= ocelot_regmap_init,
 };
 
 static irqreturn_t felix_irq_handler(int irq, void *data)
diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index b9be889016ce..e110550e3507 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -1104,6 +1104,7 @@ static const struct felix_info seville_info_vsc9953 = {
 	.mdio_bus_free		= vsc9953_mdio_bus_free,
 	.phylink_validate	= vsc9953_phylink_validate,
 	.prevalidate_phy_mode	= vsc9953_prevalidate_phy_mode,
+	.init_regmap		= ocelot_regmap_init,
 };
 
 static int seville_probe(struct platform_device *pdev)
-- 
2.25.1