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 v9 net-next 4/7] pinctrl: microchip-sgpio: add ability to be used in a non-mmio configuration
Date:   Fri, 10 Jun 2022 10:56:52 -0700
Message-Id: <20220610175655.776153-5-colin.foster@in-advantage.com>
In-Reply-To: <20220610175655.776153-1-colin.foster@in-advantage.com>
References: <20220610175655.776153-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?NtKH7vyOR6OjMUT0bRzI9iRDUo7v7SFHSMF91ZapKL836Xn9ui/VHeuf1wQD?=
 =?us-ascii?Q?E/XXcxgEGAu2lzQODVoKBFuE9AG9dfn35NsCf6++bRPMDrFsVz2xeZwjjlRc?=
 =?us-ascii?Q?2a91UXAt7BTqj5zqUUY7vYN5bA7rYkUk5410188Z+d7dWltg1kgo7IKT3pWP?=
 =?us-ascii?Q?lZi/VAkBfDfiSyxpFqa/fdhIsM4g0boiGnplF1YrKXYUjm3gVyG2UhKUgvbo?=
 =?us-ascii?Q?+CL/wSU2SCVWzzRLR25VjJ4/0GsVIw6svKgDylfvQ5f9oWZHpBQiH2KN66On?=
 =?us-ascii?Q?l7CsMcK0yHMjM6qw/QI79K1JPQzTFo7XivBZo0tdtN3CXlNr3LP9iiMhkvTX?=
 =?us-ascii?Q?xmu6Ki7Rf/YTT6srhx2Xqp9Jh3dfosNNYrGZbVTRnQ+xkpXUIu+Y4kSs1WIc?=
 =?us-ascii?Q?kvjrRqBnpst17fASOJmxPPgKirbZsxdsteya8tXcafxbQ8eF/tSJ9rgPi3IG?=
 =?us-ascii?Q?EApbpjX4W703C09TTT8+ZSQjDMrBnN5wRvH0RJTtYYFdQWgIvLsxv8wPBD/U?=
 =?us-ascii?Q?JnuyG3/prDE7wlNjKeN3jJBn74PP6aQwdyZRi6I2nEvYmCCWg37WhUsudVqo?=
 =?us-ascii?Q?FzaxabV59WoeAvkSrxBHKoYHFVyNoKkCt3isLHazzwTA7E3d3jDOAAX2cwCJ?=
 =?us-ascii?Q?ELlUdOXEeUa0QftJjWVJ8Ce7wLFYwX5o5rU9Q+OLs+3Xdv5xr8mYW+J9WpR3?=
 =?us-ascii?Q?U+0TJnKU+bQutbj/SE/Xyy6cD5JUjxwqG3d/FGewjsDTTh/XeiWNtOIO9oHI?=
 =?us-ascii?Q?vN1zuPnh4+09xR+0hhVZfbFaHoOckPN0jW9hFHorZqPxQKsFib1HeHETzf8l?=
 =?us-ascii?Q?w8QtxGDvU5dseR4Krb0bdiq+nrWUYCbzNSUxF0Rbij/Y0YcUOrRdnExB9R4k?=
 =?us-ascii?Q?Dfaa07Nl9XFYex86JqoeRVPVhKdMUTOM1prMpTZVsh6sGfMf678mYpFZ3uRd?=
 =?us-ascii?Q?qHJzYoPWikNdjqmn8t4IUabWLtJxHYJKiFdMAqxS0hhUfq/xSTTtsxhm9Vmi?=
 =?us-ascii?Q?F+9HLDOe1ZVDNX/mn1btQ4ufewNyDXG0rW5EUU81aexweh3D8rqGqcjMEo38?=
 =?us-ascii?Q?VujhSYptz5iGAGF+WBfYoE/e65YrK3CD4oMASubKAjSlVtoyI+/1clLSgPqe?=
 =?us-ascii?Q?iRaatVWczFJv+ccppTD1eiwo/EIaiHecIRCKDOkTQlQr6X6kEAzvgWr4zKix?=
 =?us-ascii?Q?/Y49ysoOOHw7jbdxPF7Sen0q7uHC7tsmwZLHY3fheoHWt/eP7sCssaFYKhMw?=
 =?us-ascii?Q?vZTNJJEI3o9UpVE++3l6XjdE7JJKhcQ+Lq08ukLFPvaoL6W0qO1bw+KVcJRB?=
 =?us-ascii?Q?dwZIlQpEB9H2sq3Kyf/vI3HTDELKsC5awZ2di0yjBGtBe/zdY8SHsXOahYpQ?=
 =?us-ascii?Q?4wejBOgQv4nKQwmzD3HIP5zIrR4YxFm/S9rGSvuLawRBP9o6WVukoYxZkQR5?=
 =?us-ascii?Q?jR/cYJVG1KeKK1+Vr7UiHtOA7YXDglnAUmBpfmbBgOdU/+ciss8l65zrbm+O?=
 =?us-ascii?Q?an283oVtUiDiWCIF9wxPhqLn0ZF7VTfask7OT1NYlVdCAjzLYr9vdjfRhUeY?=
 =?us-ascii?Q?+Cu6GaEpgGF/79bmkeVMGpxgp6ju/YF/jwhvelOZ/yKUBcGoLwolvTBODe0/?=
 =?us-ascii?Q?+VvMJ9GyLRe8XYRzU2hRhVdHRsVaHkKhmgtmgB+kuo3somRgcncaJl8ue3dh?=
 =?us-ascii?Q?wL8AkNWs8sMO42J5sHz3yB/6Gv+gUzX6DS0rgukLGf4yQ/uvAKFPpfywTowA?=
 =?us-ascii?Q?X8LaJeFKOFWctoptW3hO6uiTDs9Krx0q0ggkWe9nz6eUw2rcy2VC?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 33cd7c9f-960e-471c-5336-08da4b0aa2f6
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 17:57:08.4967
 (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: 7yAc734C0BsIgdymLflxeJkCSHV2Q+mGNYpZYJ24fHIpIN/wwf9ukqqPaj8ODKbFK932l9YgG5jeIGft0OaHp63VwRYpt2WLSMcJErXItKk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3356
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 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c
index 6f55bf7d5e05..25fe57a0c26e 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);
+	ocelot_platform_init_regmap_from_resource(pdev, 0, &priv->regs, NULL,
+						  &regmap_config);
 	if (IS_ERR(priv->regs))
 		return PTR_ERR(priv->regs);
 
-- 
2.25.1