From patchwork Fri Nov 19 19:59:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 517138 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6A7FC433F5 for ; Fri, 19 Nov 2021 19:59:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CD9461B27 for ; Fri, 19 Nov 2021 19:59:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236059AbhKSUCs (ORCPT ); Fri, 19 Nov 2021 15:02:48 -0500 Received: from mail-dm6nam10on2137.outbound.protection.outlook.com ([40.107.93.137]:31457 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S236230AbhKSUCn (ORCPT ); Fri, 19 Nov 2021 15:02:43 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iMDIdjQHO9x/R8vi3LaZDvjHn0RkGuuWiwij/0RJaXlP8XwdJMGRQd++n+Ote7/Z3lp7W671U+BkKgmSDblZZuUpurtHFPZLNxe64LKNkWATrRqS5jQoj5kBsq3sgiqdUi2fmBTDmEPmvQ1aQpB4STvWzxQdbnM63uYIEdkyUgHHKdsS4jbnd0GxIyQnzS90+gJITBd/m5uP1gkFvhUZC+I0cBoUO+eIA0II61FG2biH1wPO75I1h2ct0GojJ8hAqe09ZFjIlKqdZngR/zV7i0q1ISzuRiULTtj7jGZHRBRn5PHsDpSbukvwRVZufAIOF+RMxPwpQlbqqdYRBao3hg== 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=5j8Xxs3rlAchO4GZw1TCeHrd4wZkrgjHFAmPbYqkgkk=; b=Dr9FgPdLgbMhI0GrOnnTopXOnZSG0hehY7Z4iFj50/Vqcc+6CJ7LLQyxsNT/QIo9Q8xM45h7j7pdaKREwMGStVekPyb6PklVUPCC49i1yLNCFrcnrMezXBxX3v4y8BnvM/vMZEzMaoj+HsgpHJmBdH1VurTtBdwvg+/PHKcpEG18tC+kFnWtWSuHyKiNEKkbK/pDx+n4y/j1DB+93T9cEbSoPr9up8GUMxzv4vp95dpmJi5br2jQJRhyEO2o1exC2ddF0gVMlNl2OUasCBD6CWrluK1OIi5W5hBnHTJPRNvFIGGLQ53wERrp7tMUmSVd9/391bo3rElbfOcZrsyAWQ== 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=5j8Xxs3rlAchO4GZw1TCeHrd4wZkrgjHFAmPbYqkgkk=; b=apcUj+0NrThBWz8h9mrGixbDaobyPLe1B5oZwHaWQGBn6DINsbiZjLZdtLsDSde4b8Jiu7aLaAxoblqbNbpK4D81+Sf7FOxKNiwhu1T2TvtV54Kn92pC9+TNzs3c9u9TPQx26AP/6udKqXNC7X7gIWPlwBmrOGSAwmWSf1vyTQY= 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 CO6PR10MB5651.namprd10.prod.outlook.com (2603:10b6:303:14e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Fri, 19 Nov 2021 19:59:39 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f%5]) with mapi id 15.20.4713.019; Fri, 19 Nov 2021 19:59:39 +0000 From: Colin Foster To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lars Povlsen , Steen Hegelund , UNGLinuxDriver@microchip.com, Linus Walleij , Alexandre Belloni , =?utf-8?b?Q2zDqW1lbnQg?= =?utf-8?b?TMOpZ2Vy?= , Vladimir Oltean Subject: [PATCH v1 net-next 1/4] pinctrl: ocelot: combine get resource and ioremap into single call Date: Fri, 19 Nov 2021 11:59:25 -0800 Message-Id: <20211119195928.2498441-2-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211119195928.2498441-1-colin.foster@in-advantage.com> References: <20211119195928.2498441-1-colin.foster@in-advantage.com> X-ClientProxiedBy: CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 Received: from localhost.localdomain (67.185.175.147) by CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Fri, 19 Nov 2021 19:59:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9d3e0d93-cd74-4a4b-7abf-08d9ab971ec7 X-MS-TrafficTypeDiagnostic: CO6PR10MB5651: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:935; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NQmKQptJ8jZa1F7YzJbLSBTcUDmjyBDSYxpD8IqDJ1Kom3TBxnKNPkguoDvX8Q4eDaWz6Qxadt6NF51R5wlha4yIdT3nOdDV6oPQAEZaOb3uUWDb8gwrcvRXQqU7IRjqthCNOcC0pIEz/z+Li35eWpKy0gFfWGPO/O4n2SFw+0fTdBn3ZmoLfHiRfmF35ycUgyOIMMBiVV5b/FoAH2yxJvaP5t72/uC5eAtD2w6vGXn1fFPjffKHeE7jHgBRPw2RI8heNSflq0LWOszr9yxrivovLfol1IGuDCYHUNUPZO0hRG/evW/fec1hEPxyzdYu2Y+EuwYqrmAg2calKckDUFw51V4bI1tJYJsTSECYmyoIxGBv2h+V2ivrQ3DOuE6QLpLg1DZxtSIJpI4IFMtRIW0ycQ7WTP5OP4hg4fdY1p9P7lMIcomOzmLnNB3OmD2/JpPh8WkWlcaOuEQIFdWQ0C7yNcCTK8CWG3oRJlFVs3NZXerV268UBgPAF2b3aPAIlpPHuZA4e0hNL0NZ+PkrAOwvt7UyplMEo+cimHWMPmRuHyx0dAHmUvIS4scVh0MBvWu47ijg4dIYlkBljrTMlvx06K1piTbOIoNPKNC95q0YlYoc5N544uO6ikGMBgeAKrJn4WDi1OHSrJ8jsP1uGaXACmt01texkltM+mSHkUMDMtSgF1INOwe06XdhsFwANMj0+GnClB4lJV3sjDdAyA== 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:(346002)(366004)(39830400003)(396003)(136003)(376002)(8676002)(26005)(54906003)(86362001)(36756003)(6666004)(6486002)(5660300002)(6512007)(66556008)(66476007)(186003)(66946007)(2906002)(956004)(38350700002)(52116002)(38100700002)(316002)(4326008)(8936002)(6506007)(2616005)(1076003)(83380400001)(7416002)(508600001)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q24DraNAlYKl7KO5tbYxF+hP2jzz7OXJVRHGkYYlXbxtyWZi0wiXOyrGVFtWLPHi0yOe5d8KkmP0ATyHRTFZupRwybGgWFtFchgwVpCkbUT1NJ8hHZoft5NYVOVNyKr11f1H4LsASwdzrbNIZa4QGoGBKB4GzXUGpRbUhUYfhkBdVaLTCJhPd0QUQq03LYFWxakt5hI8eXSKyPJzdJyG6g9ZYCModSlNsDT9pnAmm+HtoLyUgqMXbFVzQgHbqFk52BJsHWtYZlXpXA2pARlLldiOsL1yn3549pv5mXNozsCXJqj3UrRU7oETuiIAXtloiUmMPBimQXc9r/PZ5gNc44BGWII6SPwwqiH9DzZO+YM3bMmAezimxiQUOBacLWt9bqnLXxV+FzhWEZep7rwd9fSp5VpMLMAIWL4ZDbBrwnTvpwgXU9HOYsIQnp2hMgnfp+UbhGjlzfrNg1D5MvQgIzBk0tSmymrujhL8fyKhke317YPNhhXnRCVBFrMJrLuVRvAayT74PT1+Pt1TNJEc4tOil84iZGn37YfTATaaNGYNXk53KrWQbIEp38bM+8TkZkSIspc72sR/I/6thZp5puOJTLUkKCyshgeyb9ZrspJajcR6KeZpcHZxPWfohdywsZ7LGCo5pY7I8cwGclXvs8Rpb5yh9sqOhxNpQCMmozuw8xfYefvlbV6dDC4eUfp/NvaoSrPKgQmvH8KLFiGmVi3XH3jYjrHrYxpG5FvwqosEKAJe6hDG+pxSW/2sUqa7GR6oWkUwpOZB41JkxonvOpZkc49JqwK/Kq8JxsusTJ5YoLnfHI8Xyz+C4PMtBBHIKspngdnwCdLmQCwMQlMbK3pGOngIvlVUSDEdg4g7s3MAYOOIujOGaHVyCW36cU43JpBGqWsBW7SW6sIL8Bj+zO9218rmOQyJV5YFay4ziR5ZCm9//3qDNOUzqXfLpSlcJlvxC/l3SlovIui3doMMqN1JQoks/nJywIOrJVMqfPf896MSEK2NmBgsnL4dl5DoN1EddnvwU1CA+pyfyTCmregYdFs+MzDfF/6cHcxQ979XR/FhTiX+NXghkOB4+kK309YFlMIyZhvUBjHa3qL2AH3Uut0PNr3cTqnEmqAgJTIxBIGRIRHvZmlyZJASf3e75xuxyNf0jtbqJH3Dly2QRQheMEPJ0DYzB2zyNvaSCG7p1uKzDeHG4jtZ2G5RbLgV2MgpRIFbF1AnhU54uaDkG1+qvQk8XMw5WiFBzD+s8/4i7SSv7VhJte6KTbokc77hXrb7B20vM14zeV4LiTnzHl1oYPwunSoFlE/92GWlCYuZeULKqvn6IYzbm2K2obSTVaglKxGTL1YIMCwtccxE6A3eVLkk719Pej2EapgHOEVhwMmVJ229HeA4CMjLpvisOn+iNy7CmQ7/8DktyK4I2U28zxiosC6bJvyoAGhlefdlUMhLmcdRWvvKaBiS4CnaznmD4nBwXilHUQc/zwU2cfAH3/aMHgibvDPZM8DE5BdSmP7+I8CPk/ELk/eYwWPYjq9HRwG5AHq9AZqmxbtAV7jBo3K/DEN0+h+WuN9DNU9W+3XgfUMrLKuXbgtcRjMwtZHPivkDbLeMDGLOVZdEpM/RAzmQ3DEOQJ+QqzE9bpQJ/LeGMaSYaaeXW++FQiJHK0l3YRQXFiGjKh07JcI9MQ== X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d3e0d93-cd74-4a4b-7abf-08d9ab971ec7 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 19:59:39.6285 (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: MofasaV69iT1+esWwmUZa8eJx/PInPLeFryGFSpyEpNU9yfWry53HXSVfff5K0/a6emN49L7c3/5hQreoR3S/sbOiIhv5pBuAKjfBMjc3rk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5651 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Simple cleanup to make two function calls only one. Signed-off-by: Colin Foster --- drivers/pinctrl/pinctrl-ocelot.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index 0a36ec8775a3..306293314069 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1345,7 +1345,6 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct ocelot_pinctrl *info; void __iomem *base; - struct resource *res; int ret; struct regmap_config regmap_config = { .reg_bits = 32, @@ -1378,8 +1377,7 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev) /* Pinconf registers */ if (info->desc->confops) { - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - base = devm_ioremap_resource(dev, res); + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) dev_dbg(dev, "Failed to ioremap config registers (no extended pinconf)\n"); else From patchwork Fri Nov 19 19:59:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 517137 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96D86C433F5 for ; Fri, 19 Nov 2021 19:59:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 821C661B43 for ; Fri, 19 Nov 2021 19:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236556AbhKSUCu (ORCPT ); Fri, 19 Nov 2021 15:02:50 -0500 Received: from mail-dm6nam10on2137.outbound.protection.outlook.com ([40.107.93.137]:31457 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S236129AbhKSUCs (ORCPT ); Fri, 19 Nov 2021 15:02:48 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZD/tamrEfii7lsn90WvNUk64T0FJmuemEIZKgAsmRuOsywkz/YQwmX+OvuiEXK0QIcjIbj6jUB8aacgcu1vcukLu4xOv6Qaa8qSGZMganTswLtlS6xTVlKENwWuvGxhPL5qfqiuBk2j0d1h8WedfAXQDwLFKyAbki8xCS243Fm46jPchXB4pn3HD3qdxW0KHxvmvsVmXy9kcxonPn76L3ulXtrx6y1pZ3b2x7vePHHVkEp512Tcb90ON12OWNT+j12/pPuQ9QrJGjY3y4BqZJ635PYZ44uv1zxsCVMf9H7RMHolrZDNLtDFKHK3mYW9fZrs/KrZxi+3Thf4fUE0u6w== 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=x8FZkDfqZ1W3J7NA1JEWfHLVBL2fJYpMPFMFDYHx/uM=; b=iC68Qds5XqFQJFC3Nmh5wpYlrcbctKEalZJU3N8x4LgYw1spSni1xvOGFBNoy8T8ObtwlAtxzuZDmhEIYvW+467J40Tw6xytuZ6hvR1WDzgGYTuz6yL/7zhxSJPHJpPyOgcF63v+XKZSvB+ZC58FTjbHz1HBXwAZ9ep5SONCi/MBqB7xSl4bGkykq7DtqYCMSGDiQ2vfKRn12hXNJj/qNyl2+X+xhRB182b+7owbjSQh1tkQrzLdtTkfp41QuOdrWzSufztRZ0BUn3IuxEhcBlqkYk9u/SVXtVbXjZj4hppruf7aJ0PpXAM4XcHfIq/ziqZtT4B5KSkpUUghyTHajw== 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=x8FZkDfqZ1W3J7NA1JEWfHLVBL2fJYpMPFMFDYHx/uM=; b=V8iS7nNcixxNdqyzo/rrPXXOaaYhLHLcON1cn7bXtwa/E++q80CS//jXeVfYhbkoHijoM4wrCcdTVGmlMKDT7+Ypjroum+C1NP/chea57wn14cgkcMH0PYJQL8AUSbqYedMBfGR2KwRGKN9wJI1O6D9eqvV8IXOO3SSmJKTzJL4= 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 CO6PR10MB5651.namprd10.prod.outlook.com (2603:10b6:303:14e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Fri, 19 Nov 2021 19:59:40 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f%5]) with mapi id 15.20.4713.019; Fri, 19 Nov 2021 19:59:40 +0000 From: Colin Foster To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lars Povlsen , Steen Hegelund , UNGLinuxDriver@microchip.com, Linus Walleij , Alexandre Belloni , =?utf-8?b?Q2zDqW1lbnQg?= =?utf-8?b?TMOpZ2Vy?= , Vladimir Oltean Subject: [PATCH v1 net-next 2/4] pinctrl: ocelot: update pinctrl to automatic base address Date: Fri, 19 Nov 2021 11:59:26 -0800 Message-Id: <20211119195928.2498441-3-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211119195928.2498441-1-colin.foster@in-advantage.com> References: <20211119195928.2498441-1-colin.foster@in-advantage.com> X-ClientProxiedBy: CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 Received: from localhost.localdomain (67.185.175.147) by CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Fri, 19 Nov 2021 19:59:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b462b8d-3ea6-442c-751b-08d9ab971f18 X-MS-TrafficTypeDiagnostic: CO6PR10MB5651: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EvmPG/GafFiyRTs2dyoQyRz/RhYfUDEx8muPBOmuIKZ7QWXQi0gRYSLa1ijtPNV4GOFhafduW94YTr3LUBf5WfT7/ntXgJ2ryVorv0C95MyLsR+9dcpyyPZJKRrnjXVXKFfqex1buuqRZwshNSRc2A0tgiFKTrprNUGa39K85iF2QG0FcIt9K63f69yMrn77NDBTQP7F9IHb7yygByDSm2IqVryPIhCQZq2ahXZvoI2G53Zd2YzRvHPNg9SVuOpJwMsPb1YloOKZrZypEYeGWSpsLr0XbKsaS2ASONFFzYRT1IzZx3KFp2vJUrm/edYQhUuG43kSnKVIKOwwD/N4rbwKQjjvRt/J43rTHR4ExIyMCsaN3CUktMC9ZmdiOnK99R7P6sCuMsTpXcjhlha6yn70keFZTT5l2d7iHowhm1VuuO3dTyJR1V2ZqD080avILPQb6vMX87uuHZQ890zfMHGJaiqAu6+K5mfSJtSmX+YuqRmSAe1l2Jg9DNbzZyY4UB9JZDpCS/cKNZgi7cKA6c8D4blvSZtt+2H6aMkLcsm15fjk4jAAwaQyzUXmgyDLumE67d98ZtOsowUIgsvj7ZEPJOMJfHH3awiVwdw/ABOgvU5j7z7bePQZjG7XzB2+4ORdbqaRi1wshXgIYe2lLdU/bApuxsYh9goUOZJGhOraA27cgTr2453SM7WaIJQsk0QYa+RmTGKzSQH9go0J+w== 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:(346002)(366004)(39830400003)(396003)(136003)(376002)(8676002)(4744005)(26005)(54906003)(86362001)(36756003)(6666004)(6486002)(5660300002)(6512007)(66556008)(66476007)(186003)(66946007)(2906002)(956004)(38350700002)(52116002)(38100700002)(316002)(4326008)(8936002)(6506007)(66574015)(2616005)(1076003)(83380400001)(7416002)(508600001)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?s+oQmSYUnCe3ssAZTkNcd/Lc4456?= =?utf-8?q?ZQk7r+SvZ5h6jTpVmSe7RVYKzeucXtPwZ8YQKOQkQSXph39OD2KyAEapYOYL4pJPN?= =?utf-8?q?6SNLbYzRQDrkPpp+AxHgufJDQYcpRB/Wk2KanJ1T0KBNsb5qDeIjacmRhW63A0i59?= =?utf-8?q?vhcnspl9BEW5S+rUup9WJPsr/cO8pf+ug5HcSF2GCGPitf6ZpvOFA4AF0rL3LIDEx?= =?utf-8?q?nZSfELMSQvJQ1yN75K/sqtsM4eLLRtGmA2F+fzYEKpoelvMACKpgqgdasa8aOnr64?= =?utf-8?q?AFZ1AxXC6I44auJ+wfLf8JN/QzcxPZNg5dow6Y9hyhCa0FwP4WYK5/DoqnMVS3t1n?= =?utf-8?q?U96xVyfN/l/g9SP7F3taU6f2I89u2PzLC+FWskBdcdtABtq5FBtj4UDUW359Pl+pQ?= =?utf-8?q?5iCqeXS2y8ZeZLBiZ3K5Xg+gxghVEnRuERx6/vHxHPuIMTG7oHnHjRUuRo1A2XMS+?= =?utf-8?q?nCkP1asTY9ULJdoQo1z034GDaNCAQE/0yXLO5ExZQFj3T7oNOIcbOyO1BbdU4xs3l?= =?utf-8?q?A3SNNBmGfQDMb4Kgaq5+xJaxzQOym/bAYPA8gqUcJ8xbtGvvm6A4SzX9VX/AB9TVI?= =?utf-8?q?5ag9/1mnyfJhUAvph0GY8rFZJvb8b0T3nvErM94/ogemESfLmhdvZgHYx8MHGSulK?= =?utf-8?q?N6A5h0b6tezPxWxIAVYaszI8DOvWYkqrkhbyYjR6hDlXXYEMlvD4TLZFjNcO/m8gy?= =?utf-8?q?OQBVGtBAd4iRsyDAOkmwDHMr+GY7oOxLdW+CBr4CorkjG6UA4pL+X6/Js+FiHokM9?= =?utf-8?q?Mgl5gY5KSDnY2PEzAwCm4eRs0CthkDL/PQFmasXbSVXrfOGLp6pcYVWBOQkhKbw/D?= =?utf-8?q?Shq0jyUDzsWEm7iY5/t6N4bHf+PBNHvyRQIcY83ezin7VOcQrvsX4zgznLwlC1yI8?= =?utf-8?q?bsswkY/MIr33U826K0GIoKtj1xZDSBfcobHPwzlbNLu5JL9duScTGNHCdi2wIGXeD?= =?utf-8?q?PWp2BVSgzkwSm33fkC9swB1MZVFEgmU74TI+A7zHf1erbZehzC982Y1MtL9l4Q2yn?= =?utf-8?q?xKrL8EqvZm/yBUrBV6EMKyFb5/zVhjSlcDTREF65ss9VBiYPCzW8HRYPA7rZ5K7CD?= =?utf-8?q?Fe3U13OJdrjAsZX4oawzU7z/RJaqOU4mgZip/abAZagkvJbXJuMhN7r0d/u4vGSqD?= =?utf-8?q?CiYrnspDIHnfeh6pTs/Drh6VidPTKIXyyHqcoEX9nGiBlD8hVmI13H8GTGkhXh6su?= =?utf-8?q?8dtxAEiWJrz51wRBfL3VOX6ZTMp42PFoklla/ELUBGq54C4Im36A6CiBRs4+Cc5TM?= =?utf-8?q?xqnDdyA4qOJqZ/lMrpq9RTnxgUemJHi3f48IeEGv1czH5J/DMDTdR0jv+OSAL4it1?= =?utf-8?q?iWXA5W9/+9/DRYfwWRerXnlv0V1ecKfBMVpTi9SAxt+Y+YJIXFZLeQom8UR5Q49/Y?= =?utf-8?q?c8mlh3onVjv8C0Xxu6ct00Q7JXfXFz/ZAVwbseld90CGeannk7l69zBv25vb3+W2B?= =?utf-8?q?1wvtKzuSyiASZDQaNQMlaCLQLmajr7gX9NylSAH42NrVbHlhCiFmRvezNngSe6uSO?= =?utf-8?q?Rxz4NbjkUr+q8ClRVJYhM5C2MeatGKwTOV+fxrCTO6I0Te3iDidBTvzodeVjf+cma?= =?utf-8?q?i49cn6JUVXW68jiOTy1RLjOwUCDb29aOg=3D=3D?= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b462b8d-3ea6-442c-751b-08d9ab971f18 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 19:59:40.1682 (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: U/N/MdwmArpI8bWxynBszLXut/UcUiYE1u5Z1snXnN3cuEzWqs1P+e1ezwsTPKSKPCiqPBeRKjwD7A1diWJnymPD4lCt2ySiDzb+moo3FTo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5651 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org struct gpio_chip recommends passing -1 as base to gpiolib. Doing so avoids conflicts when the chip is external and gpiochip0 already exists. Signed-off-by: Colin Foster Tested-by: Clément Léger --- drivers/pinctrl/pinctrl-ocelot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index 306293314069..6941c1b45b00 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1308,7 +1308,7 @@ static int ocelot_gpiochip_register(struct platform_device *pdev, gc = &info->gpio_chip; gc->ngpio = info->desc->npins; gc->parent = &pdev->dev; - gc->base = 0; + gc->base = -1; gc->of_node = info->dev->of_node; gc->label = "ocelot-gpio"; From patchwork Fri Nov 19 19:59:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 517136 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DDE6C433FE for ; Fri, 19 Nov 2021 19:59:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 481B661B27 for ; Fri, 19 Nov 2021 19:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236701AbhKSUCy (ORCPT ); Fri, 19 Nov 2021 15:02:54 -0500 Received: from mail-dm6nam10on2137.outbound.protection.outlook.com ([40.107.93.137]:31457 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S236581AbhKSUCt (ORCPT ); Fri, 19 Nov 2021 15:02:49 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KmPFZi5tTtf2aZbYxkMPaORPyR/0CE7gNuf7cnqIZRTrawYwgml/ElBovpBczS4S2Kma9T94FQ5v/fejm8eau9vlZbYDPFNIPozZxSfNO4nSLadc0tbIf4SfoHNQk3u3bKJKhCkWCMdz4Ou35+1KwxgYuTpZpie49zvopQ3j8PcEDqPUwh7VYhkwXsH82ootgVMW2ccPtAMvMnN+wLeEvklY6B6xbif5WIbbNXeeBo97WsAoS1UnP64IZQSC3h3A2nOkPSbr5UPurKmNlrHKs0faipZjeIE6LA5t7mWxZ/cjLwtZ421D5AgTZL3lf/D6D49+ZAXXIX4yx5yI+dO7+Q== 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=0uYE0zfIxidrPed7qb/vmZ9e5KY/riR7DJ4fft48pms=; b=D0RL1odrqPZsMIjgKyV1UrRqzYgFnKaeYHSmi53bjjseUXpRv6a4vwqS2kTssgiWOnHyfSmOkOytUAJX8LUR/u4/qQ8o1X1nFNmHMjTRztonH4EyLTY8F5J50qkaY5JJJNhRwWsQR59EwMbpM8iDMo6yJuGabw/DClu4Abb/gi1ajy4kpUg73aXWikmDqL2mW6VprkEJl8Jw9uJjdjxZj8tnzjBSzvL4Umt8EqxPYvWPZa2KpxjiAiudN5hU4O8XfJrj8/XrPjW0hbEIAY4OB4mauWtsEHgap5TkFzU1IwD0D91Aj+Lce+ZAWdxaiGKn1AW1UwWclzxaygBkAYCkoQ== 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=0uYE0zfIxidrPed7qb/vmZ9e5KY/riR7DJ4fft48pms=; b=LzRNUl6DRBY7C+7kJwWffu8TE8yBkUlRpxQfEnYotTH0Wp5e5Gmvx9XCCjtEFgHPr+LrDA/uUYeCtzeVYzGSTlaemSwLLfEDTsO7B23JyVl0AvVZWLa0B3E6ziyFKSnpj0R7pR4g6QUToGQ9w217YBo9v3/5WZYvLwrUqbZJcQk= 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 CO6PR10MB5651.namprd10.prod.outlook.com (2603:10b6:303:14e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Fri, 19 Nov 2021 19:59:40 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f%5]) with mapi id 15.20.4713.019; Fri, 19 Nov 2021 19:59:40 +0000 From: Colin Foster To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lars Povlsen , Steen Hegelund , UNGLinuxDriver@microchip.com, Linus Walleij , Alexandre Belloni , =?utf-8?b?Q2zDqW1lbnQg?= =?utf-8?b?TMOpZ2Vy?= , Vladimir Oltean Subject: [PATCH v1 net-next 3/4] pinctrl: ocelot: convert pinctrl to regmap Date: Fri, 19 Nov 2021 11:59:27 -0800 Message-Id: <20211119195928.2498441-4-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211119195928.2498441-1-colin.foster@in-advantage.com> References: <20211119195928.2498441-1-colin.foster@in-advantage.com> X-ClientProxiedBy: CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 Received: from localhost.localdomain (67.185.175.147) by CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Fri, 19 Nov 2021 19:59:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8a8fc00-f489-41be-61fe-08d9ab971f6f X-MS-TrafficTypeDiagnostic: CO6PR10MB5651: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EpgBvuiJRl8OwxYybZdmXGuDgHHfN3f5XftpjMVg37J0ymotiAFPY1IeqRWnUm9xypI2sd71mSM0ocTatmXlnA7iTD6u95EHXOO0MvS9TAE0zAvyr/LasNWrrOAmVVGefjnb3ktSLedC3Q1HMMESS7BuHKJo3jSAo/3+M59/GBnUGTHAdTnXnzBVTU9hBLBtyA7R6xIfIUwzvc5Q23+LmuRyeafZUa9Oc7HAbSfqvLHEYMZHtLFzO8IQTriJirwMcIJTsGfbvc1PCKWPz9cztWHXeFi2IO6qna20q802eyTs5ei/2/vRop8wq8vVw0nWI5xbm8umHLepbgnxMbJw6UZxb/upviK8RqNEqsKq3XluMmZOwds9fem6CahETXrs7HLWQncrSJ+9PDY+Yc0v4L3ZRk7OgY/307/p7UOZvkP+lmQTWhTxryCAiq+0+Rl0LRGRC0idI8HGBtSMQtGchXQsKfJWBkYuiFTR70FBv/M/1VE2tkjj40Hlpr/3ctIYrCYb4JFK7MQp1xu/EhJAa/9876huew9GFRLi7vYBSeDoye3Iyv9ZcoiENx8IlTsOxcNtpf2Crj98emSksEDaC6RCys6OANUuTr1oq49Uf2PZA2/V9YFJJsvZStaMqdna06dJxRVg8ttRq1nHdeGalxuTAK/AkOxvMNxJ2g4pNDYHlVvL1GtVN6/VUBZh2i8abABTmTwLF5tDR1YAQxkcFw== 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:(346002)(366004)(39830400003)(396003)(136003)(376002)(8676002)(26005)(54906003)(86362001)(36756003)(6666004)(6486002)(5660300002)(6512007)(66556008)(66476007)(186003)(66946007)(2906002)(956004)(38350700002)(52116002)(38100700002)(316002)(4326008)(8936002)(6506007)(2616005)(1076003)(83380400001)(7416002)(508600001)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xXsWbPvK0aG5Qwt0Gr5FJ07I5VSq+26j8lvk2WFLIuDM9IbyccDfPoo2GxPNtQEwLwwSmF8Dx3r+i0/jgcKjACtSKKQdnjg1XPaqc6saQCl3nECjmdNSH1m48zbh3CCahMMwGk2ETEuQXyFMXVxQ6ZyVCdZTS8Tftn5yZIcccYXqj9sTJidZRrBLkNmuWZPjy50zi8RykWFsBNJQ/u67J6SWyxZeJ5NjHXuDsNc3bp1DKo90hANf/KDBtyJBVtkAFZ2MdhRDG8XejrvfM6Ix016Yqwu+btAj5jTa9s09ieRwEhgJLfOvU72Y/G8Q0swgNoHN++OQlw/3yUxymiJbUDLYHsIrPKYXqwkPy19pC6YgZ44dPq9Vnb+ZgndwPiar6cKiz+DxaL/dQEwAOFlilbcVnLrvP5F4DB5ubH8SN+I/Kv6nQUa9CW3gef54LE7ediQPvO1DMeu4tOBOJPum420RY6xn7KcAXOmsAtHOUtZ+rpgyJMHOHMaqWSRacCKX7ZfroP23vgVfCYLm17BfQVur7nz6ssPF+XskSxnKjaJr1HslQoMC62Tw6EiW1w6W34ZCZnxIbQZhdEjf5hOdapaSdJGyKXjvMisGAjEYytCQuLzXLkBGnbQCZChXqTh3vdf5fXgM+MBl4tj9aTBLlcj8/ioxX1UJiioRrgWNOe1eo4VtVhYxqEU4yHayUQFappegy3J+o2z1lbRfyKS1keM/J1fXKshDocp4kOpbS3v5gAGVlAmfZp/I596wjbEcPi5S2YTtDVNo+cf5E8TWcwCWePZAhHjNGCExAtXug6UtB9LlBKGNcSnkil93nLXXGHBB2F281Xy/65Seipw8Z+3cP4bcjiMMJd2TAymMGa0+7+cz0PbnePLunz7wzG+Cdh9xXuKO+L6Qe8dLzqcyPGSDQ/7aUh3mhupGqBkt7GFjA82NPWXYzGPvAoMxpPX1VIgUVSixT4IZ5AxfFsksIb4l1rOvgCOsMQHWVpP3ilRrmhXjM+sTOpMvVPP7omyx0CW/sYBwzqbrzqqsDgtIm7OAl61Mifpj6wguuRfZmbgqHDeO7/i2gkgBNAdAlQy+C2o8q/7/ktxjApWA/8IvxbPJR7FwAPP3My80RQH9L/bFqy0KVD0EWKxyymBw/V44vL5pV0fvvnEtXxyeW+NEL85wL02buH/7Avt/HhFxufCG9sKGtL+ranBE6oRSnBlDiwHxa5flG1OTo69UIXf9nomcC0DpyGEOK+vN8+hTiGWdhKDE0yUJ+AVid+mvGTa44JinXH3rOctiFUdJwJzU1SJX9CvpyULuc+zptyGDzZlphITKZDkimzF6ZUfQysLUS/k6Rul54ZF0ZGDWCUZtQCJ83/l1Hp3fAwfGti2OCoDoD2SlMP17v+qjb+vzZ0z5I5BZSTLEQikFVNclRiKgvpjTpH+u4E42K87UAr7N/IxAEflUtfE+YzzFUpSgi33HykRVoqtjjG4mNXzCBkXKHfdU2mgIZmxTHHn0A3+Ozl6uUSBoRMiJbx9aOlKHawr6n7AR3nmk9MMFh5tIuELVckVNROOZDcs0SQ8+vA2bKNvfqWLSUerh2HUmQKYfLG4dH3ZqhdU+cuyhe2VKMmH+qBKTdAzF4YQ2U5+IiqMJH2hvFONMXHslI2r++E01eO9UjorEZJhXh/I2LAhvMyw6Rw== X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8a8fc00-f489-41be-61fe-08d9ab971f6f X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 19:59:40.6999 (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: utWmXAPEaDf581JD8u0KcyOmHlYnA9HAwqw+etOqvDgUTqclfF8C/8n04hVbznkt2q2uzIx9KXpxUI1v3k/5/wFvTug7YbdUQP0Dq3w63yY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5651 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org In order to allow external control via SPI, memory-mapped areas must be changed to use the generic regmap interface. This is step 1, and is followed by an implementation that allows a custom regmap. Signed-off-by: Colin Foster --- drivers/pinctrl/pinctrl-ocelot.c | 65 +++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index 6941c1b45b00..b9acb80d6b3f 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -152,7 +152,7 @@ struct ocelot_pinctrl { struct pinctrl_dev *pctl; struct gpio_chip gpio_chip; struct regmap *map; - void __iomem *pincfg; + struct regmap *pincfg; struct pinctrl_desc *desc; struct ocelot_pmx_func func[FUNC_MAX]; u8 stride; @@ -819,7 +819,11 @@ static int ocelot_hw_get_value(struct ocelot_pinctrl *info, int ret = -EOPNOTSUPP; if (info->pincfg) { - u32 regcfg = readl(info->pincfg + (pin * sizeof(u32))); + u32 regcfg; + + ret = regmap_read(info->pincfg, pin, ®cfg); + if (ret) + return ret; ret = 0; switch (reg) { @@ -843,6 +847,24 @@ static int ocelot_hw_get_value(struct ocelot_pinctrl *info, return ret; } +static int ocelot_pincfg_clrsetbits(struct ocelot_pinctrl *info, u32 regaddr, + u32 clrbits, u32 setbits) +{ + u32 val; + int ret; + + ret = regmap_read(info->pincfg, regaddr, &val); + if (ret) + return ret; + + val &= ~clrbits; + val |= setbits; + + ret = regmap_write(info->pincfg, regaddr, val); + + return ret; +} + static int ocelot_hw_set_value(struct ocelot_pinctrl *info, unsigned int pin, unsigned int reg, @@ -851,21 +873,23 @@ static int ocelot_hw_set_value(struct ocelot_pinctrl *info, int ret = -EOPNOTSUPP; if (info->pincfg) { - void __iomem *regaddr = info->pincfg + (pin * sizeof(u32)); ret = 0; switch (reg) { case PINCONF_BIAS: - ocelot_clrsetbits(regaddr, BIAS_BITS, val); + ret = ocelot_pincfg_clrsetbits(info, pin, BIAS_BITS, + val); break; case PINCONF_SCHMITT: - ocelot_clrsetbits(regaddr, SCHMITT_BIT, val); + ret = ocelot_pincfg_clrsetbits(info, pin, SCHMITT_BIT, + val); break; case PINCONF_DRIVE_STRENGTH: if (val <= 3) - ocelot_clrsetbits(regaddr, DRIVE_BITS, val); + ret = ocelot_pincfg_clrsetbits(info, pin, + DRIVE_BITS, val); else ret = -EINVAL; break; @@ -1340,10 +1364,31 @@ static const struct of_device_id ocelot_pinctrl_of_match[] = { {}, }; +static struct regmap *ocelot_pinctrl_create_pincfg(struct platform_device *pdev) +{ + void __iomem *base; + + const struct regmap_config regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .max_register = 32, + }; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) { + dev_dbg(&pdev->dev, "Failed to ioremap config registers (no extended pinconf)\n"); + return NULL; + } + + return devm_regmap_init_mmio(&pdev->dev, base, ®map_config); +} + static int ocelot_pinctrl_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct ocelot_pinctrl *info; + struct regmap *pincfg; void __iomem *base; int ret; struct regmap_config regmap_config = { @@ -1377,11 +1422,11 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev) /* Pinconf registers */ if (info->desc->confops) { - base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(base)) - dev_dbg(dev, "Failed to ioremap config registers (no extended pinconf)\n"); + pincfg = ocelot_pinctrl_create_pincfg(pdev); + if (IS_ERR(pincfg)) + dev_dbg(dev, "Failed to create pincfg regmap\n"); else - info->pincfg = base; + info->pincfg = pincfg; } ret = ocelot_pinctrl_register(pdev, info); From patchwork Fri Nov 19 19:59:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 518428 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 913FBC433EF for ; Fri, 19 Nov 2021 19:59:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B66961B1E for ; Fri, 19 Nov 2021 19:59:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236448AbhKSUCt (ORCPT ); Fri, 19 Nov 2021 15:02:49 -0500 Received: from mail-bn1nam07on2110.outbound.protection.outlook.com ([40.107.212.110]:13381 "EHLO NAM02-BN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S235208AbhKSUCr (ORCPT ); Fri, 19 Nov 2021 15:02:47 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D6RVMzxuPaKTiP9P8tDo/ocfF+yMP1WgdVOCi+Jo5uRRz9lP8a5aII3AZlAGJOYhit8mD8fC35vkQOTNw5t/PFtnMFx88u8iZZUD+wDjAr+lHfxXIKVcmwiQNCUKQSsF7kxp1c/qXOjMLOiZoMLLMIjB6Q4X7NUoWMfHR30XCn8YSAXStvn6Mr12zUxW2WHgqVCPw5D0iXZnOXaXUn2IUQOc+K4SiKedhbV8DF6E0Jfk2QnIGuyPaShE7dbMGWt74vQpjqq3BfBVR19zfC3b6YwOE/QCbhRpPQHNdnnAkYZm7+2qkfvAkZ7IcQ4TYzdxo5klG8V9FUFj2nNpjKcVDg== 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=dfborKht4S6i6bKzP5zQQgPUelK4e7eCGot2VmBn4XE=; b=lORrXcVqvG7WubB73Nc9PtzkA8RtWu1Wr/XpwLbBAaRRlQbCGADmeJouCMlXDrh6OF8S3ojh0UH1LLMTVt+ryVqtj8hU/P29AZ7rMj37CMOvBOzgxtrdg+a7bpb+hBYUnbwLtgREQxE/NVLJW73oW5MVLmMhYHrdLL4LrvvUFR57wRXDESruOHj7/nkwPpaBG2kd34YcHOYYvJWHjHG0CvMa/mOQQdOm0mgViVNLa3gegxIrtBo459yLJ0pHHlRdaf8nVcP6OXxkyB58kSBQQyTwojTvot3eJWaVgjb1PjlirXYtkH0pnWwb9dA4OhyhT9ol9C1la/tKvlPm7zrZXQ== 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=dfborKht4S6i6bKzP5zQQgPUelK4e7eCGot2VmBn4XE=; b=hprmRjuaoNi9bGLGeIwi0sWGhNfRYMe0Hwb+BGLcFtIgH0gpD6CeBlC66s2Ts+5vdMS6lreqan8pgONvoc+gCS9gOe2qfiAchI6ZrzBTXgt4xH9ahpk5wvIQT7dfc1aFhJ1Nox6VIW2m/1t0TiookYN1EDCAN3HzB9qUKW3s4zg= 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 MWHPR10MB1454.namprd10.prod.outlook.com (2603:10b6:300:23::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Fri, 19 Nov 2021 19:59:41 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::6430:b20:8805:cd9f%5]) with mapi id 15.20.4713.019; Fri, 19 Nov 2021 19:59:41 +0000 From: Colin Foster To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lars Povlsen , Steen Hegelund , UNGLinuxDriver@microchip.com, Linus Walleij , Alexandre Belloni , =?utf-8?b?Q2zDqW1lbnQg?= =?utf-8?b?TMOpZ2Vy?= , Vladimir Oltean Subject: [PATCH v1 net-next 4/4] pinctrl: microchip-sgpio: update to support regmap Date: Fri, 19 Nov 2021 11:59:28 -0800 Message-Id: <20211119195928.2498441-5-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211119195928.2498441-1-colin.foster@in-advantage.com> References: <20211119195928.2498441-1-colin.foster@in-advantage.com> X-ClientProxiedBy: CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 Received: from localhost.localdomain (67.185.175.147) by CO2PR07CA0068.namprd07.prod.outlook.com (2603:10b6:100::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Fri, 19 Nov 2021 19:59:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97447887-572f-441b-0179-08d9ab971fbd X-MS-TrafficTypeDiagnostic: MWHPR10MB1454: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1824; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EKk/WZmr7u8RS5aVc8LxlBveNN2xbDU9Nf4NX0DyhWY8l0iZDJo+Ho1Xh6NhW7U1unzgSyTyP3WjAaAxtb7T8ZCFPQqonZq6D+okQzFUZ2Y1KicTkjZttUTxsSvG0xKFtBDoVu7MLaqN597gEPvvBvvV8t/pWjJq4M2uOHxGm7SagItVT3WscqxH0vfTPVZ0Z9WtLuYMte0fPvxDnf1DjYCtOZx09li5ezOWwA0InZb0U4yjMoz9ibqlPIYxyMVyNuuQMmYTFUS0l6bkse2MXF1G3l9y8M+2z5gfN3Ec0YKmOlM/E1V13jD6xPyEEvUSuNkEnDhzuhAfIKyyf2z3AyUbQp4Yjb0H9mUbaswZhlWRp2njDKni7sspb3XfgwD6xXXjdilVi7KaUCrbstjNzthhhK7k7rHj+jVHt6frBiycAZihvI/gtmyu+iEGiLDvJF/Rm/CFExkCCT9m7eHmm/yT79fxikmr5ZqQfU7Z9TmBY+E9stR1uewmxoFwuatldAhE5KYcQC4jDXgWZF6+gMtZZOD+TAR71fD32+Pt/n38nqdM08UED1KAeEY7OTCg2zqCkfDN8xnFc6BKS6M3VCZMs4t2vP/Aagxmh323/j7+gElgJN7xdO0/XRRdoXvNv/hl/NdwmfzrJh7upFEOhE7Ho6y1ful4luJ/sMsvOQ1IAGs17N8n8gXFy+RSqbmnRi7lf7ocJ8tJL4c+djtfYg== 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:(136003)(39840400004)(376002)(366004)(346002)(396003)(38350700002)(38100700002)(956004)(8676002)(26005)(2906002)(66946007)(52116002)(86362001)(36756003)(1076003)(186003)(83380400001)(6512007)(316002)(5660300002)(6486002)(54906003)(66556008)(66476007)(7416002)(508600001)(4326008)(2616005)(6666004)(8936002)(6506007)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AvRyOojq7+e4xyz5lTUVS4FNIqmJcoLkHKxJ383sAamWG0pLUFaqVqhVM2La+lpA5s1OYLXJPgX6wNnwB96Nv7a9lt2Hnmm67pOSHqQ5UJoyUX4ynXDUFaUbl4wrKJavPLZ2c/5W68zhc40PlGPtCvI6DUHEYkhegPjGykCfa1cOpzXJbEwW/frqC+MfqDfAOSVmsZ1Jkv+YwkQpGdK/TM32OFAxGdIeKsHqFwwjsVEQ5MfMh9sDpOoosICsYK5GyrLToKEe1iA+j5ZtA3WE0v1CMybWTQR4h6IxaF+IQceA16bFsZys7+9yyWhB3LEcoluCU1Wu+VysVTJB7Z4a9CtICDhik2udui3KLmQ7BMn6NqRwt5nL23JwOUlDlPEhjhXQrqYelVZLOIJPu2nXzWWFf2ihwFbQGRAImGYgB2dB3FH0ORh6ojDOTdWOgQZps5J31A8tXZxPwFcinOdjzTkRLJTTklCBPOIGmbelm1PEmemTT2occPptxwzIEXqDVLPAiyhDrZYvmw4smRXS2Umi0z+SuoGNpc91/PRpsm9fDXp6j/I6+Tori2+L4UGAbj+DS8Mywe0B1t9fMwcrQVxaFEdlhtm2j+lIghSpMir/PLRb3eq1bCTXEhPLaLrjKLZJ6ZaeOfj+0DLeQky17wIWUp05C19r5dNDDtXQxIs1PB5RGhJ2ECpek5byt3mC1fb0zbrUxLzq0bUqhsPHw+5D8oX9AoeghOqo/yJP8NhxGwgBq4GEfqHJQjXU6uVXePhNXlT6H8aMYDNDDfCme4m0uaUzOWMlsWDA345Ig3irfdCK/85tcZNSspzm26P0lRX3THpWMVn0/WfpBj6xzGNJrtW89wtAdehDPbagJkDlGrVX9df87ZahNA2i3cbBreTaVDLtBN0XWt9fKk2myGo3evXbcZ8oqnzTYGqYGqNHMdgCOwksl7Q5sN+fWpVsM9OzpieFEoH6SPoJfi7pQuyg/IyfREg90M0747+VVmf4z6xfaJvQ1yYXOVAflFr5btHLCn58FAiA42byahehdd8U7h7zopL8/z/tov+m2qbPiBeV4IreCaXoIhrIEo+Bopg83A4mjUq7/j3TXRLQ87oTxPlsSLrXy7o0FBuqtYlzFNxhAc9ZYBYEap1AgGhH2/IP+CNBg3Ci3NG8/9fzMYrZCz0FuhGpI2vuh+wdKgB4e4NG9M6HoDNg7R+LPs0HCmiYY7blGn7F0BbAcw8dxa8VCxzR3nXdwaIahmtpS2WoLy9vWWndV5OxYNMVXLO95cDk2/md+V0KkC18Xty6BLNq2pexcpyPjqFPT5NqMkDAqGi/51YIFMyt20Fgx7KaScyqsF/T7zzbTZ29d3KWD0kJSCTmWmBgvBc3c4xiZfpwR9xyRMwqxbp4oPCJavzZwvd1JJpsh+SqnCU5KlUE5+63i2OdnBdsw4QMJhzEsDbAzhYrO4yHyrS0hEVNbZF0bNee9/TJ/p19SdHKB2Pp0lWcJEiRXmp522ThLqZma1FNJhcKRs1zkj9pfdR7DdMMpsscN4pOKtkPkPmUz2kxEGNTYr+ZqMs3RevWvt+2/Yfs3o+I8tpn74RlvYrcERvZ9xfCJGDDitKFkxEVTuOot/k2egI2gaIh8cFEpg39jR5CCny87ia8YnNawDVlSHszUAxZkDEU5I43Kq+02sr8Lg== X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97447887-572f-441b-0179-08d9ab971fbd X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 19:59:41.5085 (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: WEr46dyohN186SqfN9ogOPiNXGLpj9ASNifKNKBr+vPS4wco74J/OGU67/r46hwC6aHTPJ+uEGDzcLs1qSTfD3zquw3AXqEE9WG0BjD4m8Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1454 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Adopt regmap instead of a direct memory map so that custom regmaps and other interfaces can be supported. Signed-off-by: Colin Foster --- drivers/pinctrl/pinctrl-microchip-sgpio.c | 45 +++++++++++++++++------ 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c index 78765faa245a..8e081c90bdb2 100644 --- a/drivers/pinctrl/pinctrl-microchip-sgpio.c +++ b/drivers/pinctrl/pinctrl-microchip-sgpio.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include "core.h" @@ -113,7 +114,7 @@ struct sgpio_priv { u32 bitcount; u32 ports; u32 clock; - u32 __iomem *regs; + struct regmap *regs; const struct sgpio_properties *properties; }; @@ -134,31 +135,42 @@ static inline int sgpio_addr_to_pin(struct sgpio_priv *priv, int port, int bit) return bit + port * priv->bitcount; } -static inline u32 sgpio_readl(struct sgpio_priv *priv, u32 rno, u32 off) +static inline u32 sgpio_get_addr(struct sgpio_priv *priv, u32 rno, u32 off) +{ + return priv->properties->regoff[rno] + off; +} + +static u32 sgpio_readl(struct sgpio_priv *priv, u32 rno, u32 off) { - u32 __iomem *reg = &priv->regs[priv->properties->regoff[rno] + off]; + u32 addr = sgpio_get_addr(priv, rno, off); + u32 val = 0; + int ret; - return readl(reg); + ret = regmap_read(priv->regs, addr, &val); + WARN_ONCE(ret, "error reading sgpio reg %d\n", ret); + + return val; } -static inline void sgpio_writel(struct sgpio_priv *priv, +static void sgpio_writel(struct sgpio_priv *priv, u32 val, u32 rno, u32 off) { - u32 __iomem *reg = &priv->regs[priv->properties->regoff[rno] + off]; + u32 addr = sgpio_get_addr(priv, rno, off); + int ret; - writel(val, reg); + ret = regmap_write(priv->regs, addr, val); + WARN_ONCE(ret, "error writing sgpio reg %d\n", ret); } static inline void sgpio_clrsetbits(struct sgpio_priv *priv, u32 rno, u32 off, u32 clear, u32 set) { - u32 __iomem *reg = &priv->regs[priv->properties->regoff[rno] + off]; - u32 val = readl(reg); + u32 val = sgpio_readl(priv, rno, off); val &= ~clear; val |= set; - writel(val, reg); + sgpio_writel(priv, val, rno, off); } static inline void sgpio_configure_bitstream(struct sgpio_priv *priv) @@ -807,7 +819,13 @@ 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, + .val_bits = 32, + .reg_stride = 4, + }; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -832,9 +850,14 @@ static int microchip_sgpio_probe(struct platform_device *pdev) return -EINVAL; } - priv->regs = devm_platform_ioremap_resource(pdev, 0); + 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); if (IS_ERR(priv->regs)) return PTR_ERR(priv->regs); + priv->properties = device_get_match_data(dev); priv->in.is_input = true;