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 v10 net-next 3/7] pinctrl: ocelot: add ability to be used in a non-mmio configuration
Date:   Fri, 10 Jun 2022 13:23:26 -0700
Message-Id: <20220610202330.799510-4-colin.foster@in-advantage.com>
In-Reply-To: <20220610202330.799510-1-colin.foster@in-advantage.com>
References: <20220610202330.799510-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?xe+czl5JeI7HaHTBkxKh0Wnab8ojXrHGiqAwEIAjkXfG/QrMfc5/tM7Bbnih?=
 =?us-ascii?Q?5k4WYk1H70/C+w/ZQafdgEOS8JaTpVBA3E98KRJxGl4nkm6OnPMXXolmQHTv?=
 =?us-ascii?Q?4gQilY7H1h5qNUx3E806PcVUoOJZs7Hwiz+dMpl0u11d6r9H8QYpQ8oaZHQg?=
 =?us-ascii?Q?1YjUhIrfLWA4jav5YSZn1AgrXN3ic/kAHf1/nN2qH4CeH7siN6ce/plvn/V8?=
 =?us-ascii?Q?rD3k5FcrRZ/zVSONTzrb7rLkJMKzLeoUQOZnhW4ABDzLhgq+nvUPNCAwwV7h?=
 =?us-ascii?Q?1tE8qsdhgW0Z3R6TeaSm9Ky0htOH3uwwW2goBNOLxvCF8AClChj+akuNJu9k?=
 =?us-ascii?Q?Ytd3uaytAotOUty112CHrrntqGgjefRZ2PUBuVDKcw9WVO7oJ1wkDOlurppU?=
 =?us-ascii?Q?4g3CTX2CmieFdXLSWJ3TWPfHDypiRqFQsnhFHGQeppcfAVS9V0h4jXft63bn?=
 =?us-ascii?Q?FQ+X9/feMAdQ/Jl+8F2eGSimmNsSrbb99NXGChrjN08XlZJ3mGkurZNmOqf0?=
 =?us-ascii?Q?xwQsGM+VgxQ+EdBEdPkVU9695ieLj8S2VwKmLjZKiBxkvNkao0xZTdzTdoOD?=
 =?us-ascii?Q?lCFGw6LSpVjb1tLRpR2Wi9oh5QFlnf6gf2sD43dT/lZnkKfsKmbADHEqE//1?=
 =?us-ascii?Q?dNCCDQKwTCHU+D5d6ITeTxRp/PLvVDm1NHeQ7+LsY7GtR0WorfLo5xCW9LsD?=
 =?us-ascii?Q?iEu/PY1nqt8cpidV44Q8ZM+tzBL2jwMbanDyfVgypbAJPo3wn+WXej+qa3wS?=
 =?us-ascii?Q?Yhqfi7mX6LK5c8i/LwOQ4DNkstSnuhvNxQodUC08xEk8fVKrLO/3CCaQySuS?=
 =?us-ascii?Q?k48dKAb9YLAxUS6jSKWLyNDZBcClhLhECN/px6Ek0qwQ9SwDopXZObjJkzIX?=
 =?us-ascii?Q?My0sV+ofj6yAeSUYKeaWfgycwm1WkxEY1bOuCkf+uH6jguDMNSqxQk3HA8up?=
 =?us-ascii?Q?VyKYLcfycZgPhaC6gFoZwtaxfy/7MgyHILKcWNWdal2ipyY0shEDFLesRDtm?=
 =?us-ascii?Q?aEWv9fRBGm5lc3MLJpydIGqYAmWegOR4nS25Jm4t+NdC12CuSMvFfRpRnmzE?=
 =?us-ascii?Q?UR5f5LIoQ+424zKn83HBUkmFhB2KwduceVDDDyTsPLiVXQXyd8dnZV66/ovn?=
 =?us-ascii?Q?tO21lfsaA+SLNrzHmU77YOO4bPjdOMzggs54R6QPpe4LrjMITaoFwkFGWcpP?=
 =?us-ascii?Q?WfDUj2XbgMiwqpTM9KEgPofgbKr9BKszMlGDBYOx6im6ZdXO3n0UgpSrkIZR?=
 =?us-ascii?Q?OroQhKudpDrEPevwr/pH8od7E0N4GkEgBtcXfPlW5yeeY47MNcZqpuHfTx3u?=
 =?us-ascii?Q?MMJKfOrfyYOQmDz52W5Kn7/aMmaxdq5Mc/DWE9Z0/Uo57ObwmgmRGLBcvF20?=
 =?us-ascii?Q?SjauA6ilkNfSgivPG5AfVeh8FoLB4D5brY8u9OzXPiSbd4U/222s3yGCu2bP?=
 =?us-ascii?Q?ehwKRcCakWMHj45iiuiLK8rbx8Pk7+NNNwIc/cZ0B0wgxTHEQiRKnbU4SWY+?=
 =?us-ascii?Q?l8PiLK1RRJgwobMeOOGvYA2MZWBryc+SGgmlPeOKDcNSY95HQpO79vSWUP5k?=
 =?us-ascii?Q?ON/gJtBvxntKELQv3e6sJuciXKaWYJDv3tVrgocEIJVaQ7UBRUYUJAuDttWl?=
 =?us-ascii?Q?HScWXqDl2Z0U9wfzJP8JXuQYayfUVMwNaYimm9XULH8kpURv9GLQnqiX9nmk?=
 =?us-ascii?Q?9ROL5z3wUwacoRXuokLbTC0nf4aECBXFtG46h4argFzLGOqhnxC59dbVwhZj?=
 =?us-ascii?Q?1q3M3Af+Qhe0u96B2c2sJb/oHTVQbclhwIeYEu5cjJnO0u8c5VMq?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 32082673-f455-42c0-9c0e-08da4b1f1fdf
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 20:23:47.9351
 (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: ESkJWWZK4S1/lkg8HZAzlzc0/Z575XBNz61K0ezuqqqqomdRzFSjARQ4JqzIXxmA9B2ESr0nQNlreU1JEQWeaJRzBVokTFX71HhZZ83u7LM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1629
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