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:     devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-gpio@vger.kernel.org
Cc:     Vladimir Oltean <vladimir.oltean@nxp.com>,
        Lee Jones <lee.jones@linaro.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Lars Povlsen <lars.povlsen@microchip.com>,
        Steen Hegelund <Steen.Hegelund@microchip.com>,
        UNGLinuxDriver@microchip.com,
        Linus Walleij <linus.walleij@linaro.org>,
        Wolfram Sang <wsa@kernel.org>,
        Terry Bowman <terry.bowman@amd.com>,
        Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: [PATCH v11 net-next 6/9] pinctrl: microchip-sgpio: add ability to be used in a non-mmio configuration
Date:   Tue, 28 Jun 2022 01:17:06 -0700
Message-Id: <20220628081709.829811-7-colin.foster@in-advantage.com>
In-Reply-To: <20220628081709.829811-1-colin.foster@in-advantage.com>
References: <20220628081709.829811-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?YWPC9TAijY7IJjxCgunvFV/qko5w38UfdPk+Pz+yWdXYMWLybxJcrmza1iHT?=
 =?us-ascii?Q?hOtYQn9nSvaBxG5MFu6CXowaJ5LhVA+3oE4gOAU3I6nAjml6X8W0eDZigQjE?=
 =?us-ascii?Q?yBv31x8/RJPELDIgS7UD3RJuMSIkRl5NCouQaWwivb2dxNp7MfxUly6MtrlX?=
 =?us-ascii?Q?GGFOoMPR2DPKcgMBMnSxcGxrNFi2rkT5/ZHUUYBLF9Czgar0grWsUpMbZw4d?=
 =?us-ascii?Q?BRhF6CUq8a3K2a6W/zRmmOpuUJob8yQ7eHFdrEJLzISwCTXZADQSj/0FbtPC?=
 =?us-ascii?Q?j4/w6WSUtho3y/x/PqioBT6zvyKBVWs2BiiodbMD7pDoZ1EVzerAmeBSySmW?=
 =?us-ascii?Q?yOH7lijkqMP4O3uDuP9gflSPyn67mjvuG5KJmmATIqVIK2je44VvhwdJVrMu?=
 =?us-ascii?Q?B3ag3rJ5bN7TX6hGEOo6mdWkIGo2+2LnXP72vNFnvlSRBjqKosJv9ov1MXbX?=
 =?us-ascii?Q?kUYEvX/qRxqYR/JG7hTya2JAyg12WoM6bQ0+11co4+aJahCDADc1uuCgChPe?=
 =?us-ascii?Q?LmnT93iITcxb9Zp8ECeaWfTdhgellKsVROPAJ5fY/n9h26y5EyC4Z7WNEAxH?=
 =?us-ascii?Q?qrfXNGGjXnMGpK4QOV2JtdsKKm2ZquG9YbNNQ5qBEypXs9FJ0WH9lldc3okk?=
 =?us-ascii?Q?KZcjJDDp4X1kOkirOJD8WWp5vPQwaNRmnKB/ouaa6S+GJTwhjCbxspsxDSiw?=
 =?us-ascii?Q?Lm9UHK3Tz4vPNbmNtskMOtTSd0jXa22n/KoN4weuGWJlJla984UIWayK3Khs?=
 =?us-ascii?Q?mxMzzt2qXkC8FQNVwT+4GeL0v/sPdnaSDTajztoQmcC622M1YTYiXca7xMuY?=
 =?us-ascii?Q?AZK0Uq5souc35o8uD99QuCdJNLu5dVpLKs7BcuwWS9xOjpZLIBj22UnvqAbA?=
 =?us-ascii?Q?3QTYJHmklC+lTK/f5m1xt0o/VJV/2Obvgd69obhcqMXmjxpseOSDYQwAe1jZ?=
 =?us-ascii?Q?NaHtHyIcyfwiIKGti5VuohXazkV9vGICL5LCyKYfYPo0z/3NCThVMExlfFXg?=
 =?us-ascii?Q?1fX6Rfw2iYnLI8hOQX7ITCrEdBVSlER9NZ+1+SD3wrF1RSpm4wUXR5CbLr/C?=
 =?us-ascii?Q?saWvr27eyY/7tPM0lGj+XowTthGoFN10CsK/k41mYj2G+xOtLET6IxrVpBSD?=
 =?us-ascii?Q?zjuftpOj3EJnwjPVahcn+pvbYn7uJ9yZF1Xm3eO6xNpHrqKsldaiu4U+mrSk?=
 =?us-ascii?Q?gpDn75xXeqmscHzagukREXXcq+wGFfdQ98f3ivJ1we7IwG4hXiaCllhQUOVt?=
 =?us-ascii?Q?0dN3AHox/on8bTIwIb+9L3e4uDn68CBFuBtQ2d25C2mLR26hTZgYF4sxFGN/?=
 =?us-ascii?Q?2Gax7M94HSWz9Hllqkt+M4eBRgFKEOppSz6hvRNGTZ6ZoAZu+Vt8RhlDT2iL?=
 =?us-ascii?Q?Nfh1VZKZU+A+v1mNRvWOnwRsReBMeSdGpyf7Y7CLJSdIiWdogkEjkgoIiP3i?=
 =?us-ascii?Q?W50SJSQFPotc5OhXov3nwBFZuT49M3DEIQdD+wTCT7TP4Z6c+ruHr28+TjKZ?=
 =?us-ascii?Q?GZg5jzo9UT963oyoWchNUN7pUXITurzJZKcIRolbKT1UQfC6a4kHvV45u3RX?=
 =?us-ascii?Q?5tL2PitiqlS6NHXXj0PpJKBd1cIw3poXar4DWzhVAdNFfWerrR0h01zJM0J/?=
 =?us-ascii?Q?7Q=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c8217e62-8a55-4d6d-0726-08da58dea465
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 08:17:29.2289
 (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: 4DWB10UyAEavLbVlBZh3A7MUHID1TybGlfalNkuNYrZFgDN9pnI6AjN5ZIXawQl4M1s7E94Sm+Mg0y5xlC0CVA/1K5rzAiuhi0krWieL/vM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5891
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

There are a few Ocelot chips that can contain SGPIO logic, but can be
controlled externally. Specifically the VSC7511, 7512, 7513, and 7514. In
the externally controlled configurations these registers are not
memory-mapped.

Add support for these non-memory-mapped configurations.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/pinctrl/pinctrl-microchip-sgpio.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c
index 47b479c1fb7c..c924605f9d03 100644
--- a/drivers/pinctrl/pinctrl-microchip-sgpio.c
+++ b/drivers/pinctrl/pinctrl-microchip-sgpio.c
@@ -12,6 +12,7 @@
 #include <linux/clk.h>
 #include <linux/gpio/driver.h>
 #include <linux/io.h>
+#include <linux/mfd/ocelot.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinmux.h>
@@ -904,7 +905,6 @@ static int microchip_sgpio_probe(struct platform_device *pdev)
 	struct reset_control *reset;
 	struct sgpio_priv *priv;
 	struct clk *clk;
-	u32 __iomem *regs;
 	u32 val;
 	struct regmap_config regmap_config = {
 		.reg_bits = 32,
@@ -937,11 +937,8 @@ 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);
+	priv->regs = ocelot_platform_init_regmap_from_resource(pdev, 0,
+							       &regmap_config);
 	if (IS_ERR(priv->regs))
 		return PTR_ERR(priv->regs);
 
@@ -1013,3 +1010,4 @@ builtin_platform_driver(microchip_sgpio_pinctrl_driver);
 
 MODULE_DESCRIPTION("Microchip SGPIO Pinctrl Driver");
 MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(MFD_OCELOT);
-- 
2.25.1