From patchwork Fri Jul 22 04:06:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 12925956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5087C43334 for ; Fri, 22 Jul 2022 04:09:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xeChjZGOy+YUa9SiF76gwbcP+gv9XK5GvzwXgDS2pdc=; b=xEqVWKeu3mYnHn Ru8gQ+4Bo2lZXiy6ZzunbfKsLkx64BOP9YT++W2TUx3qwNBuFau0t7ttxTM04Bq6qeVhE0O+ko73p q3xauJP/er68ER6Tow/gz27C77ZSZTRwaWvUDDsQW20pX7CABfQu0PnIo/LxlsQz0D9izdXsAam9n 8+5ltWEgqjQykYX3Bt5ARffc7kPQQnT6lLSHyvpdZ3ihojWJ681dj6VfyiAGg3fWsYRaLQR0OuyWz 5Kk8S8GUZEgBhUDGGns9h6mjG5L82+U8KcZ88SHC9cJlGk41xRkzZ5AnxFqdNOqgeSaJEb06MI191 22by6fy0oWtHvL002rEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oEjxK-00HOOF-IF; Fri, 22 Jul 2022 04:08:02 +0000 Received: from mail-co1nam11on2096.outbound.protection.outlook.com ([40.107.220.96] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oEjw0-00HNpq-2f for linux-arm-kernel@lists.infradead.org; Fri, 22 Jul 2022 04:06:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D0O+/DRDvEQi50M85QvzHYMgrJ11ItdhxUHQAywTMVW8Zw1s2uMswpxVOw+CnhzL3VgLoU9wEnJ061L4tPj8DX7Zqq6Q3IB5RggQysSHmxPiNlhRC7LOo/hVLKAjd/zTzP6/DxkqWHbNOVIT8UoSI2FTcwfNkERgLk6NN978kxlfWCEabioQno/JP6oLKMJotHRqDn/KgHqHEGDjI/W0wbBqdvYWWXHCbeGB/bk5Dr8HHHPUsmmWRBNe9K9bAKryiYT8qo70YMnhXr4Tny9CVfwJjIlPzvcQP4Qe5Z9Hqi2L/1BG1je8o8elFDumv2QUKaebWdFJv0zDBmxXTuBFfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kK8A1qhc8RxFrx0hyJytdFxYW1S6bsYH2mPTOT+0jtQ=; b=lZDYdaXFyZnk/tGmMO8zLpQMrKQMCZfR39sbK3XakM8oiYQTke0ug+Sfjbc1ld8Ymi8y4r5Q78pwCDmRXhthdHa0TwqHvvytTemO9e8+bGvGqtcE0MAwhGzrTZSZQqoQ57FGzpYZ9XKSEAitNPw4OFLhYgdSLcGtqiMKsUTN4+/uVOf58YMrCIWkwYXxaTyodn2AwWhOyqRT2LOuVuBR867HmJ0pdDCSae+r7sN2ocefuJKirdPZIeOzMFbc1Q1W2NxmU/0U1MCWmjd/3t61UmaBlfGxkoTj7spB7gku6Bi+7Rwsl2DLFMiMcsauXbhMbr/gMj7+E8lUHj4eJ5BUtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=in-advantage.com; dmarc=pass action=none header.from=in-advantage.com; dkim=pass header.d=in-advantage.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inadvantage.onmicrosoft.com; s=selector2-inadvantage-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kK8A1qhc8RxFrx0hyJytdFxYW1S6bsYH2mPTOT+0jtQ=; b=ScbxJ1//sweJdXF/FQOw08rk15xG4WGalrG30CRJWlPQ7vSp6TLGDlKWm/ivWcJkGMqhSU9lyMvfRVGd5r8HN5CKO3fJYTdvSipxQ9YnZ0M/fUgAMls/8BdVd6etGesGESR14jXqNHW+V+rHSAPjFD7NzfMfjze0GTF1wbJVL2M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=in-advantage.com; Received: from MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) by MN2PR10MB3919.namprd10.prod.outlook.com (2603:10b6:208:1be::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Fri, 22 Jul 2022 04:06:30 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::7451:2903:45de:3912]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::7451:2903:45de:3912%7]) with mapi id 15.20.5438.023; Fri, 22 Jul 2022 04:06:30 +0000 From: Colin Foster To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Terry Bowman , Vladimir Oltean , Wolfram Sang , Andy Shevchenko , UNGLinuxDriver@microchip.com, Steen Hegelund , Lars Povlsen , Linus Walleij , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Russell King , Heiner Kallweit , Andrew Lunn , Krzysztof Kozlowski , Rob Herring , Lee Jones , katie.morris@in-advantage.com Subject: [PATCH v14 mfd 6/9] pinctrl: microchip-sgpio: add ability to be used in a non-mmio configuration Date: Thu, 21 Jul 2022 21:06:06 -0700 Message-Id: <20220722040609.91703-7-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220722040609.91703-1-colin.foster@in-advantage.com> References: <20220722040609.91703-1-colin.foster@in-advantage.com> X-ClientProxiedBy: MW4PR03CA0044.namprd03.prod.outlook.com (2603:10b6:303:8e::19) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b228a45c-243f-4d10-72cb-08da6b978e05 X-MS-TrafficTypeDiagnostic: MN2PR10MB3919:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ddl6Yjogfxkg0C8wc/On9U/+/JgGY1rSR0hNsd4q5aZ3D9Kdk1odifKDuCgwDpl665tYQWLpr4Jhzg8MzKdZYKf+0BaSdjlzoZwprUnAcWEoq3ZZE51UDMY7RLrTeFHCEHmhb8DK3Z3WU97OgbcClpx/oitAq2bDl6/RpkeAtUhxeCQRROAqJV4Idw2E/5DS3Kh4Hmyfq4FolbKjg9ASFQvwDEJikNGOlJfHEa+8nBFz1lMl8kLdHGXRb9SlKvpqE3lmTJabTYdr44c36D3ZKkuugjhJk8QkAyBiC0JUQHut7qp01uvfSY4ZIHPmv7aq7EoBMGDcgV7LMRooiVIFMVZZSM8RLRW+ObTtoI2GclUp0/fOhpL7kkYk53FF/5S4csNEVIvDerhOSQMnX3yQXbRCS6aS4HRRidUjDe/+RnhnolOkDcr9URr/Dx5z4ADYTih8hHOJLHu5+t2aVNRadugNR0UPZObZ2FyoAXeFID+Gjp1gJnsVrKcscVYPG1scjl9nJmzrF2UuBdLjnI5tGGXTfZ5oNcYhTWlK4RVkIS8XTtTY038Nuj+E9BSiDezMbJ7XNWiFPn/2Yi7PnFd+6hgaRGz/PcE7V/yCImDXbV+IrBgeomGODArYURw8J8FMY/KGr7/rUexjPdXvOhacp/91trHXuqmnaXbZQIChYoHWGft7deN0z/PBUYfvNPQj09PzEdkcU8cECOz3c8jyItSDecieWo0IJIHxelAcMoPoiLWrUHa9qF3EpJk2St7Mvx6rpTdps4HRJd28aoa1Dt87BizfUkqBH9cQqWgZ/jY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2351.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(346002)(376002)(136003)(396003)(39840400004)(36756003)(6506007)(2906002)(44832011)(41300700001)(52116002)(5660300002)(1076003)(66556008)(8676002)(8936002)(4326008)(66476007)(186003)(6486002)(478600001)(6666004)(6512007)(7416002)(83380400001)(26005)(316002)(86362001)(38100700002)(107886003)(2616005)(38350700002)(54906003)(66946007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 67j/+GtpdNYSdNjHdBrlnw2SjpQbQd4A/812voHoG3tsq3Seb+LM3fTe3yN+VIL62FFxLUAhPL6pvcHxBnajUj9OUQNnI55nsZD167++fh1AQU4tTbi4noKPW8BJl9HI28HWa3KqucqzBJEJV8KOVnrQ6kSN8y4djWwVq1zUpiPJ6H2AtfsNe40qiSW6iTw2eEXxwLc75jgX0pKmNFEm7ZFqdJxZngMPj6fB4TdYVSYjg1iRCHl6H0WgU3C3w8DJYqbhyXnfRenP8Lkc+cBMIc8p/hhTWoOyx4pBreypbeK/wH7PZDlp7mLQvbvMrhTRgKZDPrjfQBz6ynyf0u0a3bnpJxslfhXbGbrAur6KMm+XWa6/vKd8s0ChGt3stmnWtqo5zXm6i3fMTUUWkxkBLeqsfRE/DPiW1pt34zhtitZZ0MoGGkb0ubYy7sxTdQg5deCLVY6NqQ73TOyWdRt1uhsr09YhYW+8tA+4tiFyL7adCyqUJp43PGbz6jC64wGci6zWxFugwO/nMkvqxa7jW9McMgV62hcI9EbT93sVfxlMH3zGBzsjENMEsOJbKogMUoW1dhi7Ly2sMwopPEAD63f0u32bM6nuVyBDU3JmbJVMetFLWKRTveFCkvffE44dpXK4zMW0KvN6qAsC4/ByCfftOPh6N4tl0TLOvDeZ0zFY0XSD5HT0YFc4RHIXLU6RBEEfb8VCIygElS/ivey1+kAxsUfRl6R9+8ojplk93nMGv9e5Yxt9D2Kk7eB5M8wY7chCaWYawtU4kEorMVOu92Px3dBPR0/aj9s437zOMKg9/Pw1U4+o/sM3YlanUq+IhM+Mdtl2Y+hpMER9YauQ0zDuyZHCpRQESP1ovQoG9YQr6G9dsCQWAnTKlcOJuFFBq3JJApmhmyn73RGEVLwicarCtJTtxJppNfWCfET9dgH7vCjQPB/RJgXgttgzdes795FbCNTEANuto9U6Xq34/fX0ktCb27ubDOmLaS013CqOueP8PpWmHagKYMzoQmtZpLic9EHFgKQ2WLDbGAFvVD6Dz979WiHe+HLNuIncEFhofo2q0VKVUpS50qkbjYe31V7LFavFCNEylYXQwNfMPAon/wSnOx8Ep5MW58/7oFxXx623IoF08AVMRlJJjef6cozJaecM/RsSnFnFoyfH4O6SalqT5HXvXVBSVgbmlZCUr38QYQn/E1KcVj5Cghd6UerNaedFuatatVElMqQhz8SO8EJkFhErDfna1vEdYGLuwJANl1s50dNm1Mpit7KXz77iOeDkDaT1gGFfVqToVJDoDUa/beDWpwoTurouW3do247CfoYcOGiTWBcHx9vmmKXFNBCIelp43aRFHdeN7mtm++1voW5LZGPYecxDJIYLn7BpSy2dRFeahRbyrv0+Ao2ahZta+BLXZELhyPc8NHnXZZQNxl35yEZb/fUW/rPL/FoNZMf69ID5GCRE8NgA6F6WQjo3BhOg7ySO1HbPTiLySBdxdYdjlr9fCUVsVUb9zPJwCydn2FDMjjYI3k7arFsHi4WaZzeKLSCxpwP5xSyhiYs6HJr03cj0OzSgXjOIj2S0+ZNGda16cyVe/cbQUpf0UVslhhtZDqnJkreYcQBGDcZPSPISArDf3cwp6os= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: b228a45c-243f-4d10-72cb-08da6b978e05 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2022 04:06:29.5176 (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: 96eVxerX0Ts6ZqRzjKx8GiNUYZTWoJ1VFy6pnbLireqwX+rcDbLDCK1tNk99h/onK6B3ZaGw1cUaXNTSxnup5gT++f/cGgf0oG58DDCIqno= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3919 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220721_210640_146729_F3E8F1BA X-CRM114-Status: GOOD ( 15.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Reviewed-by: Vladimir Oltean Acked-by: Linus Walleij --- v14 * Add Reviewed and Acked tags --- drivers/pinctrl/pinctrl-microchip-sgpio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c index e56074b7e659..2b4167a09b3b 100644 --- a/drivers/pinctrl/pinctrl-microchip-sgpio.c +++ b/drivers/pinctrl/pinctrl-microchip-sgpio.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -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,7 @@ 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, ®map_config); + priv->regs = ocelot_regmap_from_resource(pdev, 0, ®map_config); if (IS_ERR(priv->regs)) return PTR_ERR(priv->regs);