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 3/7] pinctrl: ocelot: add ability to be used in a non-mmio configuration
Date:   Fri, 10 Jun 2022 10:56:51 -0700
Message-Id: <20220610175655.776153-4-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?SIMMwBvqdT9q+4RXMCAoemBNTqZwOKl21yKNqCZoZAgNVK0A83ihwaUy/Rjb?=
 =?us-ascii?Q?lO03ERVZ38tvBL/5CjJEtIwwGcNCzSRJL9S0B/cC4gDQZVdURs6XqoqOS68e?=
 =?us-ascii?Q?PL30gnP0Ao9HILB44Y1uLNRzBnaSWPA5Ld2FK3sR0PjD3EcDsM33dkimZfJY?=
 =?us-ascii?Q?v3l/ZU4baiyq00+4anIJQcATjJf7y5s8D10wSHAjjRt0nUPjg8CvpCG2nxsk?=
 =?us-ascii?Q?G8KIPTJDLAe6F05NwwbuobX2XyadjB9tsXEuVH9pxH6i8rycpGuLBZZ2tEGS?=
 =?us-ascii?Q?PskyuiHiyYkZZphoRaD77hzclpw6oreMvRJ4RG20FyR9GiAnPBXM6RKf7SFt?=
 =?us-ascii?Q?oPAx94U0JojFO4ykdW3+t16E3WNbySMfeOoiYPWUn1nMltVwslF+3rE66brH?=
 =?us-ascii?Q?SdF7c6dX7gZ0l93hXMKoP3WdR7iViMYDDfaop5zdz/ROx0jhZKxn3syT5xYN?=
 =?us-ascii?Q?a75Zw5DOrLP3l0h2kkjdHgUNag9YnsT/HEccYvk67RREYht+H/anHp/gCeg+?=
 =?us-ascii?Q?w0qRViyIxE4/p+/K86LQED3pIlo1S44XI7IEVhb/i/L39eEenISAgjXG0SaL?=
 =?us-ascii?Q?Qzhfre4GcoQv/bqzJvKJEERZOYtUvwuJptCGafOJEpP1ajqd4gVh1kXRCiMB?=
 =?us-ascii?Q?6Ov40u1HahavA6GBwIFvPEUiqj5JB7UdNUsV0ja+DJ+kGfy7WgCFMQnEztZm?=
 =?us-ascii?Q?Q4HB+evgVLfYOCW+OkrF1RFBgwIFjtlsfH89YFbDxfHqbPGWOjm4mTv8R7U4?=
 =?us-ascii?Q?XFVkMntxaOQ2V7WVisWXtopd+Mxh9EzZFGlO9VXNgn2AiyLrAvL8KiORBtQ3?=
 =?us-ascii?Q?0vyNOzYdargdK5nQ61mZljBzq+308KU/L6xbwMOoLji/IqOIDhpT7KgFCrtA?=
 =?us-ascii?Q?qBHbZsi7eRY/FRPy6F+bttviVsm8Mbhmmx0jBMIXMALxIG9whdenh7H4Gnwx?=
 =?us-ascii?Q?4Bz8Pl3OEWx4qBC5UQKPjC6LODjIthztWxQE8zmS4v7dajesoVFJU3ceD4Q8?=
 =?us-ascii?Q?cWIWcx/1VTOpf2ZMjoj/tzb9UnfO02ewLki/QMr+8qKnMsVOnRDeM2C3KWVb?=
 =?us-ascii?Q?0I4M9qIdxS/zjucwrWAMESkMl4XZLwA3j8CIC8aEe2Lrhja+g2+HRNmKt9YG?=
 =?us-ascii?Q?rk942GRrfhBW0/L4UFvAS9Y334aga9nb/LZyBdDuZGDT4FUX78Kdp3lAYTRb?=
 =?us-ascii?Q?TREBLd1CUdlfKVreeR40CSd4eJDoJTEmY4wyHYpUDTVpJ5Ut+OCBAlfJgoEL?=
 =?us-ascii?Q?NpUxjRdM7NcOckX9lrGA4oVAZENeJCS+nj0OM2md0M58cwbBIp5K80fMwXko?=
 =?us-ascii?Q?qhx74tWh82UPEL5jsXgkXuy7Lygo3sdthsKVNjAIjbCapU64mtBQXGV8vkLj?=
 =?us-ascii?Q?jnPPW8yO5kvBum6CYRNVflvHJpMyGYWk2udFrvilGBsVEW/yuwl05YZGhd1m?=
 =?us-ascii?Q?PeFwbeERxvAEmo5QfkYOzUlKA2rBskv7QJw8GeRxL7RtB4Dq64Tsn6MPSAA+?=
 =?us-ascii?Q?0CRAiRvLXLF4hXt9Q2YNYddDULty2n9lBhy78wme/Hw0ZxtVtmf6HJf7OQqs?=
 =?us-ascii?Q?lhdBflZYvaNipJW28v2DJMLEZ4Aq2Kuh4cORrJmK2NH4Xh8Cn6jCjKS7upVv?=
 =?us-ascii?Q?VVK6L4fB6Io2pH0w9jGZzMqX0MRIUf0rEbRBNg6CxRcTSVLASHn2AzedwF0D?=
 =?us-ascii?Q?qYp32HZx5FGnJ+S147hB7R+ioo0cnCvhrMb1fMyADRt1ZO0zEvVdBy5d5aon?=
 =?us-ascii?Q?Ckr8VBR6iA6+bKFaVYXb28nBTgytkPUPmp6qdb5fmkzFq8tn+zw6?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f595aa6d-b18b-4409-3252-08da4b0aa292
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:07.7623
 (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: iVgGDqPGZVUEWxU91TUKSbHJOKp8LbdQ9j04AniN1tEVX+vrDEVfl3Q+u3OXlAh0NRzttzC0xOC3twHwVpwWCeZel2gNU6y0nrHMOKdsTJA=
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 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 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
index 5f4a8c5c6650..7ac12102120f 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>
@@ -1917,7 +1918,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,
@@ -1937,16 +1937,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);
+	ocelot_platform_init_regmap_from_resource(pdev, 0, &info->map, NULL,
+						  &regmap_config);
 	if (IS_ERR(info->map)) {
 		dev_err(dev, "Failed to create regmap\n");
 		return PTR_ERR(info->map);
-- 
2.25.1