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 v2 net-next 3/5] net: dsa: ocelot: felix: add interface for custom regmaps
Date:   Fri,  3 Dec 2021 17:00:48 -0800
Message-Id: <20211204010050.1013718-4-colin.foster@in-advantage.com>
In-Reply-To: <20211204010050.1013718-1-colin.foster@in-advantage.com>
References: <20211204010050.1013718-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?Jt8WM5xgApEeRyyznjblzrVUvcW8s591xmhN2hMnQ+OGA6CHaE5B0Shx3aLQ?=
 =?us-ascii?Q?4Y3UCsPEB+LvTwu1phM+/PaHU2s1fiJEt9Hgk8qQIzXY7/u+y7voVe+CdViZ?=
 =?us-ascii?Q?Gv8YW0HypJ0dgiXd0lMN/m8cJO5V4K0fnN2GROjiN7RDmzgfOKCSEEsw89Wi?=
 =?us-ascii?Q?OOnOPoWNxTsdMK1bjbW+SF5qKU7BnSyuaVRkphZoqm2x7yVtMJ16hNc4EqOF?=
 =?us-ascii?Q?otJ3pDV5nrmSmrh0M7pL9b2c6Tkuc0iXx4iq6Pzg+rwVTb6OKzwo0IT0pxaP?=
 =?us-ascii?Q?WDoVtMwutt07nFjUZHAZHNKjLVcn7UI72P1u0y7IU3FAjzyQwIx1s6Wx+Evr?=
 =?us-ascii?Q?jBjhn2FtgUs4xKbyZ5dZ9MGS7VfHATXEcRUXsX21I7u0kmWAYPFWprviYPq5?=
 =?us-ascii?Q?K3X2M5EUBDsjFuYejRPF9fx4sMtcWoyLzf1auXSMYDwOFVxpuOxWz9nRVgfh?=
 =?us-ascii?Q?ibX5/g/Sqk7imzSwPf4253TjgO+3EB0p1KDgRGSA4Lqg1yIY8dCazYSQc0TM?=
 =?us-ascii?Q?0am7nQhf594sCpu40K8WJVKSFgckEU5wpG18LVrA/YVSN0RlHWcJu7muneXB?=
 =?us-ascii?Q?aXS8rW32Rb1zjqbMr041JadAun/mk5VCl1Hvr6uD48Zmta/PNSJI7Yd+SMxf?=
 =?us-ascii?Q?emr1Stg00YvzgfRnHLg+nvaXMSWqJ7vkpvD/4zFgrE7j9mKYF44Bgklh0NJx?=
 =?us-ascii?Q?KQG25kYfUT/lW1p4Ca8f688SwvWfax8k1EVo0/mInUy4Bs90lNNBZU9O4vsx?=
 =?us-ascii?Q?nRWXzbdMhlR149CeOLnEdTjTR9N4sOWpYsKyFM/gMg3FoppvspWH8wtgKXX1?=
 =?us-ascii?Q?soaClHDVVVGNdcfBu7SYqUD9BZKApQP3CFIF97o6H6VKu0JSMEtq3wURb1Ea?=
 =?us-ascii?Q?DVb4Vi90o3KqJUfBmuHwD1gppcbKqoZRqJbzSOC41P5ykZ7MOUXjLkVbuTmS?=
 =?us-ascii?Q?CDzNcgGg9OGrJu7UhYmszXmkfQkooOffgpscfMcshYTNliKs2zhtvaepDzKO?=
 =?us-ascii?Q?7OZdMekF496LZrJHn5hQeVEoWrnbhVTam28J01u+XYyx43qyrcC6rqgc/C23?=
 =?us-ascii?Q?KsZepg+Kh+GQCtPMHF1o96/x9YiMCKyuQM3eaayIEzEs1u4gecauM4i6RHZP?=
 =?us-ascii?Q?++Zi7iFjVZM6967xzvNMTkjZBsn5oqlMRlIM/bJZcACyxTSg7d9F0isYwBEQ?=
 =?us-ascii?Q?w2FW9OBxpTKPWrPSQXCXKf1uKP/1F4fCQ2euJdJib9Qad2d3dOPhSMLGE3da?=
 =?us-ascii?Q?Hv3PEF3u43/FkovJIaUCdQXKOOeW1bbZ73r2FGuGhTaKpf8t9O6z8ZPNeePJ?=
 =?us-ascii?Q?TjWtsJcwTKR2cwpFKeJpKM4FLAXOUWlRCMSl80yl5gjYZFxPUiF5G2daeLYV?=
 =?us-ascii?Q?HNDpB6eVtBpOkJwYxLgxAV4BWNob7Qfk8OlWgGoihxmYmTjTn1l7xmmTWBuB?=
 =?us-ascii?Q?y/CC3GZPxR1fXHfr6q8cLw+SbzqTqgEFuxGCWUH5rWhqXfDQ7nqnRWI8Oxz6?=
 =?us-ascii?Q?rDEqzY6dyMqHUiwoe+uMsvT8clMdr/Lsx79n7/GyjT6ciTc+leC4gSd2BlqZ?=
 =?us-ascii?Q?mjcb1waExhnYMfCj1uqSOOcDakd7t5HrqT7oMhuY3ARPwM77b8BlPiswaFHu?=
 =?us-ascii?Q?xCI1omZgIiisVX85ufKJ7WHBwiHXFKjjMCih0tmNpE3JU9keokn0yNLZw4/S?=
 =?us-ascii?Q?bZjNag=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e6dbbc48-9085-46e8-da72-08d9b6c18bec
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 01:01:04.3613
 (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: iJ29AmWi5rFK1CxO8JCYGMGngj6ipr80vLa+5W6mP0mBzS4I7oBzw2+vAJMNWgnfAAtKX1jvkpIqmOZxjSXYrgIQ6794AZuQSUxXvFojiio=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
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