From patchwork Fri Mar 24 14:36:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chester Lin X-Patchwork-Id: 666744 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C3DFC76196 for ; Fri, 24 Mar 2023 14:38:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231903AbjCXOiO (ORCPT ); Fri, 24 Mar 2023 10:38:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231960AbjCXOiN (ORCPT ); Fri, 24 Mar 2023 10:38:13 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2046.outbound.protection.outlook.com [40.107.21.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0028623116; Fri, 24 Mar 2023 07:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CPIm3kP34qvliYnAPjgi2IKSFq1EoI0xO+tt7afHeMut40WEmUPWTJXFwgmpXjUR+SxTd6wd0NSF7lhBJgqMVZofi6LiQaHcqCcUgwA14InduolipVFiyltCPHGMZei07d1bsaVP3BODw43fFxUNmdTxM/HWer1SSff+LitLf+LH5dWHwj7aRQB5zkhVScUwEARsyqY36tqKxnsnQVpLI9/ZqRlx+l4PsHu1x2fcgmgNAAr6SL9N2dvJpMA9WN/KnSzj+c5bf8pLzd7C6j6Ep4ME7OZSp9gIyMbuWU2MuCZLFkC/IoOXqWImbWQyQ2MumMCctUCFllTnLTPbdI8m/w== 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=fN4oSk/fg6PFOW23zvTHHTxM97j8i0UUQgD086d68p0=; b=eKOqjj/NxCf/lVC0cQL35ptJjLDia5pwy5eR1KjjfbAGfixemZYNtWlDxZrM/ROgJmJnjHXkQLDkRg+tQRsEkYzu+Sq6FrZSetorpkSzUe/VgLlI98QPyxHAmtHEnz7NaI+uIuuDcN0Kd394ABeXzPNroqZl8tQ5M0H0aaJD1NHlOG8s0s/J8zADXbxaArsRW4YgTSks1dtn8Cu861yRBYkoSEFGZzsEwMAfIz7acXZlo/CJ+XH57vefHEXfPeH1m3GjSxN68dYZII1+F9Cg+xjJlALICmMmkyYfRPIaRpGQdMu4yiGORYxfqUx507gy2jJsRSCeXu1SDN9UjxPxAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fN4oSk/fg6PFOW23zvTHHTxM97j8i0UUQgD086d68p0=; b=uhY8pVSfxrM8IXC5JnXtJ2/Mjvr9Z/H8F9l8dv3qMH6HqjF4Jek2rDOkdldQEWVJRuzQ24c9zg7q40AvmcQAfvAuI+FHnRDEZTC6Ci5GZILThbQqzpsx1dp42uH7rWKupdMJrhR4p0aPKjjgr9h6d+HHW8If6yOis1SZrDLISKW3CyKNUP1y6f07R8gB88d6hxRuDV6dRm2sPG9SIzps0LpICJ/5rhS14AK0p/KLe6ao77LcJ1mlu32LqFGCa4k0r+yXl5rYS9jY37LdOPgZ4QKrgBk2WEn5iKWAvI8IClkN2EMjmz32qdSDYPzUF11e5zSsopZC6kEQGlJKtNWLMg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) by PAXPR04MB8623.eurprd04.prod.outlook.com (2603:10a6:102:21a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Fri, 24 Mar 2023 14:37:51 +0000 Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f]) by VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f%2]) with mapi id 15.20.6178.038; Fri, 24 Mar 2023 14:37:50 +0000 From: Chester Lin To: Linus Walleij , Andy Shevchenko Cc: Chester Lin , NXP S32 Linux Team , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ghennadi Procopciuc , Andrei Stefanescu , Radu Pirea , =?utf-8?q?Andreas_F=C3=A4rber?= , Matthias Brugger Subject: [PATCH v4 4/5] pinctrl: s32cc: Use generic struct data to describe pin function Date: Fri, 24 Mar 2023 22:36:25 +0800 Message-Id: <20230324143626.16336-5-clin@suse.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230324143626.16336-1-clin@suse.com> References: <20230324143626.16336-1-clin@suse.com> X-ClientProxiedBy: TY2PR0101CA0016.apcprd01.prod.exchangelabs.com (2603:1096:404:92::28) To VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3439:EE_|PAXPR04MB8623:EE_ X-MS-Office365-Filtering-Correlation-Id: bd21aa54-b754-4fad-3f6b-08db2c75580f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oVDi9jb+COb7rjVctMcfAsvZkyUuUdMHCsAmZQMuqIhQS6bQ1gRuUB9r0X3OJVfmgbn4XkKcRqZPDY/7XDjuTXWmdEhethlqPhe+aCZ718rq6mcj06SrMtC/gnTt4XlTEat4W5Z27hIMjdt6nsbKRH9MG8nfwfj5pGtwC2RW2oM7fjxEWM5tjOS1FtWKKyGRyDAk/fS+AovP5ScyZ3rOOd5ukOvcxUVwR2lk+ntGG0DwYGX8raGU7J1yWaq98nNIiJ0cBoUFIkKfVCCjMToUjFM2BUKBt0bbcX7QXgy94nGHhw76oaVeRWPPTc7VHmSjUViOLfyFRuiA23QDgGnacxeW5C8HyOdqe5bfxKMpw8cFe/7tN+QK9hy7H4P67jsoJzZT6htx49zutFVSXQOaSW8QKoT33QPqLe2xyzZJ7y1b32LGQKI5EJ3iuEoyCDVPKySWr6OAYzaxoCF8mEhCJzlM2CHr3sxdS2Vmce2Pn/H2g1LA6vkxoT7XczuVDUzC1SsfQgMcI94gZgYMGksmFdmEH0g/5w3IAHeP93UFTZBURLPEyL6y4WqBAeFPtH3Wg73bwXA6s53PC5M9OEkfu4azU2iYHDniy/H5ZHmrMnRUIR/vuzIMZZwaY0icswn0OcVwPukzC0ftfMkOoKWc92ph9Hc/FrwUzFeaov9OjHwRzCqIhKlkjSavazmydZ+o X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0402MB3439.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199018)(38100700002)(2906002)(83380400001)(6486002)(478600001)(186003)(2616005)(86362001)(36756003)(110136005)(54906003)(66556008)(8676002)(4326008)(5660300002)(1076003)(66946007)(66476007)(8936002)(107886003)(6506007)(26005)(6512007)(6666004)(316002)(41300700001)(7416002)(41533002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9SNJ56bAmeNoheMN/U3dPjzXSPwbU3JKpQ28Euq0FTt9HHV8FB4f/HIuT1ZVxCkEUn+kStym/VumMdav8PiFJUhhEEtFNfjkdtFbjsCK7WZ3Jel1DM4veuklOFz/46HBSSqAjimt8wlyPhF93r4IyOIrkCoIef4b3fLrvbqpq1MVxXj3N8kD2uhTyldjk8ZaAigrZWEAwQJRmtXBs7zB+G6shhR/E6MSlDzq2Ac86oEBavOsug39Qqz5OrGJvg4mpS7xC3GK1Lp2/uGxjsYeaqC7mcUZEvcaxjZTIJ4VSOJawV9rWaEi/k3e/p9/8WG4lRdAnmwZacfMJTByUEaayCXxwBsQiaOYgJI4L7s3QHpQBYLZXvWGXb6aVQ68Vb/+OZ71/JaulOe/v5cZV0m9KlajPd3+fIqM1b86/HMurfcXeid6gLsT97UyvXlzeIuf5gwIVLXpIWmhtBFRw0p4FrnXb1TFaHTmuixFKFYMLEYg+uu/jBAGnW6wRXwqf8l/OcovH8j3j7xmW/FYokcs0itAyPwHtvZnFXioc4ntT57bBIKqnvp30H5jMVhucF+LTB9mS281lh9IsEKYQJZvNM07Wy1A1Y4IVRHS1LA0Tb7JSm3n4E6m0U6pL4JcGD2KyiunTT190QCfF8rhMFAkhNW3hfddb55/f4XjWxfx5u92V1ENSsQEoL7y3Bl49EnlcEBqb3qAAEKGIX2BepvC+5e14tTiLtOz0InIF+ShYtEVNPGtyRr08Nvj4tS41Jgs+PIvJafTdIR2FQsTPT5tVH71+T+jY9XLBxlB3cdRn8gyrRxoEC6xsHU52PgciThu5HGyY8Pg9HLmiai1+bw8/P5eO5i1P2OOKh5pCn5XlpvIxp4d1uzN2YGTa/3xWAB/mbLbPyJcW3QvFFbK5s0ytftuOMBIzbGtS6eNyar17gc6P174P420sqwM0HKlnUSfr2iY9iq1sFxC39VslvK+ecwDJNHpqZXKla24i3gzddzGVTUkECmWrNllr8hXU10KHs9vAOjJfnhW+SgN8I8Ds4RmbNuP/cC3n9T+Kg7CX6YuQvLYX/qk4+n2zGGKJ9EZffMq92yAM/i+0gcg+2M+GSnaefuK36ujZLDh4RP3xixhwX+YtRkHIamv+3qhUHQq0FL6wNxHMYvDEsyNGGp769TTByMLuileqrwjg/7C03f6LpEfjqvqPoPxarkfkNHGQPdwppPHocV730ghTAjPbqjndVoWhveApzV4XQHuPgFbLhW74ImGvrx+mrrIpV1sJLTJZL/+rKi6qHwQB4iW3FuK4Xv1/GkprJCloomnFTSB8f/Wc3TwQN21lAOnPpPqP7AE3lG5/kUwIYLMa4YXLBKiDNW7qc353IAOKOe+vqu5c2d64id7JXzpfzSrh5bJLJ0DFjliQgU1a68Ipc/Lax5Prg2pdWzp1olpVEVyBUkeh5/npyxi1IVBFC5M3x+XPCeexa2OA7fN0N4mmFYVMDgkX20gQde/roW8yS8crugEOKOT7+QgopZ6l+zblIjz6Ac734xC3I2htB7a+GuZrAWXckS8oJHq5y/eTw0zOEM= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd21aa54-b754-4fad-3f6b-08db2c75580f X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2023 14:37:50.4653 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 26+vXZZ0nTDy17eiOUXcItIuS0aGlFyHCZPA9lW3ukcvdWDhhutcQzPaCZaew30U X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8623 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Replace struct s32_pmx_func with generic struct pinfunction since they have the same data fields. Suggested-by: Andy Shevchenko Signed-off-by: Chester Lin Reviewed-by: Andy Shevchenko --- (No change since v3) drivers/pinctrl/nxp/pinctrl-s32.h | 14 +------------- drivers/pinctrl/nxp/pinctrl-s32cc.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/pinctrl/nxp/pinctrl-s32.h b/drivers/pinctrl/nxp/pinctrl-s32.h index 850cd668f406..2f7aecd462e4 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32.h +++ b/drivers/pinctrl/nxp/pinctrl-s32.h @@ -24,18 +24,6 @@ struct s32_pin_group { unsigned int *pin_sss; }; -/** - * struct s32_pmx_func - describes S32 pinmux functions - * @name: the name of this specific function - * @groups: corresponding pin groups - * @num_groups: the number of groups - */ -struct s32_pmx_func { - const char *name; - const char **groups; - unsigned int num_groups; -}; - /** * struct s32_pin_range - pin ID range for each memory region. * @start: start pin ID @@ -52,7 +40,7 @@ struct s32_pinctrl_soc_info { unsigned int npins; struct s32_pin_group *groups; unsigned int ngroups; - struct s32_pmx_func *functions; + struct pinfunction *functions; unsigned int nfunctions; unsigned int grp_index; const struct s32_pin_range *mem_pin_ranges; diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinctrl-s32cc.c index e65c88162d7f..8373468719b6 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32cc.c +++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c @@ -364,7 +364,7 @@ static int s32_pmx_get_groups(struct pinctrl_dev *pctldev, const struct s32_pinctrl_soc_info *info = ipctl->info; *groups = info->functions[selector].groups; - *num_groups = info->functions[selector].num_groups; + *num_groups = info->functions[selector].ngroups; return 0; } @@ -785,8 +785,9 @@ static int s32_pinctrl_parse_functions(struct device_node *np, u32 index) { struct device_node *child; - struct s32_pmx_func *func; + struct pinfunction *func; struct s32_pin_group *grp; + const char **groups; u32 i = 0; int ret = 0; @@ -796,18 +797,19 @@ static int s32_pinctrl_parse_functions(struct device_node *np, /* Initialise function */ func->name = np->name; - func->num_groups = of_get_child_count(np); - if (func->num_groups == 0) { + func->ngroups = of_get_child_count(np); + if (func->ngroups == 0) { dev_err(info->dev, "no groups defined in %pOF\n", np); return -EINVAL; } - func->groups = devm_kcalloc(info->dev, func->num_groups, + + groups = devm_kcalloc(info->dev, func->ngroups, sizeof(*func->groups), GFP_KERNEL); - if (!func->groups) + if (!groups) return -ENOMEM; for_each_child_of_node(np, child) { - func->groups[i] = child->name; + groups[i] = child->name; grp = &info->groups[info->grp_index++]; ret = s32_pinctrl_parse_groups(child, grp, info); if (ret) @@ -815,6 +817,8 @@ static int s32_pinctrl_parse_functions(struct device_node *np, i++; } + func->groups = groups; + return 0; }