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 4/9] pinctrl: ocelot: add ability to be used in a non-mmio configuration
Date:   Tue, 28 Jun 2022 01:17:04 -0700
Message-Id: <20220628081709.829811-5-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?6TiD9pnTU9Fiv4BVVdWXElLgfcWzUl1v/S1FktuBwtstw7NOtqxtCPZJA6fE?=
 =?us-ascii?Q?nGjZc7lnfICJYPazM04k54kY18p9nfWXdmVOXWMJgdaLhONkXkWS9CXg7skq?=
 =?us-ascii?Q?2evzmXYZQRmCtN61/kX5sjot4cljSt2/QN5/cpDYn7Gaq6jHfFlfZMDqVJoa?=
 =?us-ascii?Q?YL0ChRIAWWVkxLBODgIkGz4Qa6Qg8hpAQuIuB58Wiigapc7ow3k1LHr0cnd7?=
 =?us-ascii?Q?IbZECPDLWGvbSVhA9OMiisAZHsqQg767QdLgm/rpR2AkpS4i5S7df1V6XH58?=
 =?us-ascii?Q?FIuH31CrpC8Bmj/TLfcVSn1M1l6LRAsbk4yBwEifxMldmAw36Rmmroo3yAfR?=
 =?us-ascii?Q?LQEmH+WjwIPhEy5W5pJpKy7kXlZFoqQ4qp0n2+3tN/Hw63o6XkL5FvSR/R1v?=
 =?us-ascii?Q?Va0+GTsaGhYsGn5BO2VpxgjTJRiEp6UqL3c6g9aC69YBEG+kZNpCOuvRhbiB?=
 =?us-ascii?Q?l/lvDRZhsf90HXMc0sOoDQv4xTeJcAHzjnAG6YX79yUVTAcBfn1IwO5qp8+2?=
 =?us-ascii?Q?ZAlMJ1a2hHyXRulL2hw3w1nO61CAbslUIJ2Oicrqy2TV0YcubvQmxTUNHdK8?=
 =?us-ascii?Q?t3TzWSLHC03T6WQVR2DWroAp6ZfbXLq8s62yIjYygwddcSMKeFnzYLzfPU2O?=
 =?us-ascii?Q?+Rai6+NBgW7Ta90k9N3Re3Ye/FPtdR6nHJ8RngLPqIdj+n/KWdmT6x141vSs?=
 =?us-ascii?Q?Mvo0EORXwzpOfavRRJz6/GC+K+p6KQ4e8/h2PJXnvMMYJBCSapSWX5kDgIrP?=
 =?us-ascii?Q?Zj1rH8DHOnovW6QUlKT05j490ACuBCkUlTGkZSYRzNDEb5FE0V7dVEzfzRwy?=
 =?us-ascii?Q?vnRv2eqc5+6lkewGA6ebkrBbTnzkq3cFYjFR8j3rjO68uXt7BGn/BcaHla6j?=
 =?us-ascii?Q?P5oAGmZ+lQxVH/aNHQS5z8rTFv9zyO9A8ML5h2w7+8nYq2+e97RqlwyTCetw?=
 =?us-ascii?Q?nBH0HRRdOm+xLirBwDmkQ71M+35PvWLyfEMwamJGDd9zRRfJfAuRGBLzjyMh?=
 =?us-ascii?Q?0vQe3k+QQyer0wFU/bbJhkS/qCXM1EC/0T9GY6ydwMQf2ghrzlOz78QPXaNh?=
 =?us-ascii?Q?Jb5zhQHor1I9WrrHkUBHGdCXKX+A5oERM/eI/RTBwZsLxhSUzN0nZAJPrlmQ?=
 =?us-ascii?Q?VE6Sa+XEVEnj4DKjn3F/eKO1w0YS7pl86ijT6ipED9iFLeyxoK3dA2//4qrp?=
 =?us-ascii?Q?z2BB2ODa1gmzIdY9imcoNgs+Tv3wztPM7oC4SwkWq3mG/6Dj7qpIUySUaacx?=
 =?us-ascii?Q?CYkzG7x8zHORPYgZ6NIQmjpHkjJHgv+Ba9dXoERXqKmAqMnPPuqEq8PoJhHY?=
 =?us-ascii?Q?wvknnvtbZTNRdSpZzZQHNCVLOFa98/w7buF9XHVWIYicz6R7i4E0a3MUALlo?=
 =?us-ascii?Q?MeFIUtt1TdIeVb7O/X5d+hyy160nZVvOCRkY8NUoDunbDp19P99tuoVfApnn?=
 =?us-ascii?Q?pDyD7RQLpjzSdQ4uU1VKOFrnUF9MJc/8F6IbyL/qVm5F9wmn4Xfb3yM4LF4Q?=
 =?us-ascii?Q?gDsKUZ2rdS4EPz05mdEHHzexLkr2BzTdCflsv+2StmXYKkTSTAhEZgGO8CEx?=
 =?us-ascii?Q?+hupXRlt9VdIe4mp2d1Z1F5J9+0lwN+OIHZMLyrEUrlc/84NJOGMV1sYjQYI?=
 =?us-ascii?Q?Fg=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d04a2e34-2d5d-44b2-89c1-08da58dea3a1
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:27.9634
 (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: A7s22QZou7VCfLBADuw1q3q39H9vlc06Fs939O4ocSy5aBtfF5E1KrJ/sIw8jptm3MpA4v7CXbzopS9jFVRst39C5QmnHNvfC/QpuQiUZx4=
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 contain pinctrl 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-ocelot.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
index 5554c3014448..655bada7cc4b 100644
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -10,6 +10,7 @@
 #include <linux/gpio/driver.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/mfd/ocelot.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
@@ -1918,7 +1919,6 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev)
 	struct ocelot_pinctrl *info;
 	struct reset_control *reset;
 	struct regmap *pincfg;
-	void __iomem *base;
 	int ret;
 	struct regmap_config regmap_config = {
 		.reg_bits = 32,
@@ -1938,16 +1938,12 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev)
 				     "Failed to get reset\n");
 	reset_control_reset(reset);
 
-	base = devm_ioremap_resource(dev,
-			platform_get_resource(pdev, IORESOURCE_MEM, 0));
-	if (IS_ERR(base))
-		return PTR_ERR(base);
-
 	info->stride = 1 + (info->desc->npins - 1) / 32;
 
 	regmap_config.max_register = OCELOT_GPIO_SD_MAP * info->stride + 15 * 4;
 
-	info->map = devm_regmap_init_mmio(dev, base, &regmap_config);
+	info->map = ocelot_platform_init_regmap_from_resource(pdev, 0,
+							      &regmap_config);
 	if (IS_ERR(info->map)) {
 		dev_err(dev, "Failed to create regmap\n");
 		return PTR_ERR(info->map);
@@ -1989,3 +1985,4 @@ builtin_platform_driver(ocelot_pinctrl_driver);
 
 MODULE_DESCRIPTION("Ocelot Chip Pinctrl Driver");
 MODULE_LICENSE("Dual MIT/GPL");
+MODULE_IMPORT_NS(MFD_OCELOT);
-- 
2.25.1