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 v5 net-next 3/4] net: dsa: ocelot: felix: add interface for custom regmaps
Date:   Tue,  7 Dec 2021 09:00:29 -0800
Message-Id: <20211207170030.1406601-4-colin.foster@in-advantage.com>
In-Reply-To: <20211207170030.1406601-1-colin.foster@in-advantage.com>
References: <20211207170030.1406601-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?vsp+XF4KFxQzXaTSdoRUuQZm3ZZ57x03j7kzAo9ibEzHBRXBzVCb5L9hgFTX?=
 =?us-ascii?Q?86blA3e3NxQC59Z47SJ9mad72HMCOz9u1aI6N2Tor57/IIqrH8ncmHFeq+HL?=
 =?us-ascii?Q?tLcc7q495buKpNC4BndkElKX9Lgh1Zk4ScTrLeZFCttpdD1HiiuBEF1BawDq?=
 =?us-ascii?Q?0QGH23/JC+VJk3stWCAnVaQQgN3nboG9GfojfIxQgf0OC+a1vObwshGeewqH?=
 =?us-ascii?Q?P86E0wWWMrS8u1MQU1JwpHuTi4/kUJSF6Hg2rzEymjan/3LT1PyZsHMuzmmn?=
 =?us-ascii?Q?Xs9B12aBoG5N1IqHBolwC3ga5FKXxXP4f1TcKtFkE3MltuUvD5hWOAQNRCXO?=
 =?us-ascii?Q?YM/AzoSVdUS8cq+7PKMFbnaYXVb3syWXFA5Gm6/l0usYag/acTBTUaNbvWep?=
 =?us-ascii?Q?IOsmLkE3B66HYmrYpLa+wRNBBMzvOJkqQeVcZtth4p80kamO06lLgjkgbBBF?=
 =?us-ascii?Q?3WY0g/lzgZvTupBwB08hJVmPxvifQe9J0V2Qh8oXHn8GJXZQG2QD/xAqi6PS?=
 =?us-ascii?Q?vd3yux3WEYU9ch55nnU45SilAODhPheih8/zFD1lZa12nL2+Z/asdrJQj9z3?=
 =?us-ascii?Q?UQsetQZ3Hcsglv7FYcA6WFzQyIpISZoNnQWFXKVsZGUzTcFSqFzgFiIZw27j?=
 =?us-ascii?Q?6zmRL5Xwm0dU6I7sLcGRLSeDlYDBgEYsGzCt43oepNBYZH8JRAouDuBr80ES?=
 =?us-ascii?Q?yRzewAgYqoQqXeZXmAYWb3P07xbBOuU3Yg2k41VePJVlFZJ/WTMhke566T4+?=
 =?us-ascii?Q?zgrFdmmCPVBdw8CjdjrxhaBxYN22nHWOUiX9bcRt//tMBiMVZMGvtUjvmdgB?=
 =?us-ascii?Q?JN88BOz8YNEX8TVsSoVJlxe3QBddpJEFSYdYONfQSfBiwk56BXSvLJ5hTkle?=
 =?us-ascii?Q?nVoGzim3B+4quQhfsH0GRwOxVg2Qm7LZ91+JVsTjPkwePbvieK59hh8wXIG7?=
 =?us-ascii?Q?WmF4ayBsK6N0C+pqMK/DkF8L7rxB+C4RtNef2oyY4GkkpGdXgWmfpC+kp38M?=
 =?us-ascii?Q?cJ2NJ5jsW+KamV8V94t1iwzQf9pdOaCTHFZQPeEJgdKvAM0VfS06aTuw2QYY?=
 =?us-ascii?Q?y9dxZloqZ7XVMnFP8S9qJcgYIhO/edcYPf4z0qkw8/79IHaI0cfw7GCtEx1H?=
 =?us-ascii?Q?fMIzI6uOqNAA0ELEQQlvfIQUpqPmuuZJi6l2DOTwcdVyLdoZDa/9ZEG3Il3X?=
 =?us-ascii?Q?0qZe0UJ4I6FDr6wd48ZEQJa5wGQLdVgoWG+ckUibiL8cjRl/EaqHJZJ4cESj?=
 =?us-ascii?Q?2apt0ZREXaYzcYOreKuk8Cq9rtkNQruyFykksHGzK6BfTaDoKZvUqwxsl+92?=
 =?us-ascii?Q?HkpElKwsDep4EYN6q/ygRSKw6CrWlSoC0YR7A2bDKojHzl68V/mzOmot0aoP?=
 =?us-ascii?Q?jTXz6fO1OFZdroasFXLiS10P9W4c5bWZUcYQusRjJwNYv/V/uodU0a91JCKv?=
 =?us-ascii?Q?1wAK8MiLgtmAbeh7tCRaK1RrvV9PnwEJTTr6z7w83se2pr3Mm74IQGpU3YoL?=
 =?us-ascii?Q?/vYnAn8UZ0zKNdeo0Dl8QnFOKSoFbu2LxK3YNH9FyCD1LB4czuxKIlvVsdkw?=
 =?us-ascii?Q?/gt7dn0NV+dZ/qhrltD03Ie4XySNdK6eK1RHyDLiEEX1Ge51BVP20lHTZWpe?=
 =?us-ascii?Q?CrUIngDCVSIwnYrOB9WQyoryg9j/TNv3NLx9jxbvGIFFPkjiT3YRKlkWrFtq?=
 =?us-ascii?Q?eIxzMg=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3c4d5235-7d82-4b85-6d31-08d9b9a31aa5
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 17:00:43.0001
 (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: 2klX07eMrAVIn5L1zUOWcXAIKjFg1RLYSGpl03HRw871dM9ytG7dZDGYE+9k4g8ocUVefmc1FVJox5sarxRtExTJ/9yzC1+7wtAkVsamJ4g=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5441
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>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.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