From patchwork Thu Mar 23 14:48:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chester Lin X-Patchwork-Id: 13185732 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 4CEB2C6FD1C for ; Thu, 23 Mar 2023 14:50:43 +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=tCM+XI9IzsbGPo+LsnwNHP5/xV5N7aSCSZGrX8OWXjU=; b=fTv9zworet3/bb km8qqgrO52BCi9ZfZd4/h5Scj99UnrjjiA8RpopD/n9bOsHiyztsmeRJiWObGxMSUUop8AEeKtfSj u4G1WAwLoJNxQHLwsopqp2bhRZk7wfZaDDRW8qXacB3YtROLGQjOtN9UG0zwVVA4Fh8kFDr+3raRf sA97tZn9i+dYORjNeDSlSJuX/oDgcrNgQcxhVs5Btc8VdiN3jg2fwUfV4CxCwPGNKTRA5IpWkrOt2 w4KYyd7pykIik9P+498CieowOBmliCd2MaQSWWmI9G4n7nt4FssaaEwGQ3dX0uG34G7IAJoFA8M1h gUPslfXw11kfmN3+VPig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pfMGF-002E8Z-2C; Thu, 23 Mar 2023 14:49:51 +0000 Received: from mail-he1eur01on0625.outbound.protection.outlook.com ([2a01:111:f400:fe1e::625] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pfMGC-002E5f-2S for linux-arm-kernel@lists.infradead.org; Thu, 23 Mar 2023 14:49:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K68DjeHnAteFebQ99cU3PVQTs3BcieWZ6dZ7gP8sk3VCkyRPcJvvTGGuMkMqL9GuAjayBKYO8JAlz648ZDVatCxC4R5354xjWS1pxSGPqMHqU9CYKYWhsrsXqnnciZco7DDIQXFcR77b+EX5gXoZmp1MmepyeQbRwMiBODRwmt7BI39Rcb5DckjOTj7VVEestcayoM4OsDkoLTE+GidMlpcuvJ4RJKiXGHzsznT/pCZ4HnfCCWjsujf5uglACCT3gWSVV707JgtRhJeyEToyNVb6dlEZje9aA0mfE53WSCAolj29/vKXoo5+1QtlM1mPrgUrRxIXWeOM8cdsE/QjxA== 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=YPHjBpbyjqpZdYucP8HA6SoZjt7wrYl9ZeRBprvTChA=; b=ionni5yFjUH6rtqC+dSqFRyIXOl6DpiTFH+Rm4bkWNuyJXwy7Kg77XxsAJbuV46HtraBqBZsBoxAh8c75SIR2/NrY4nbz2Q1bFAfcXfsFYR7cLqA9n7KzgK0TAosUBLSvQCnaVPj/3BGDVga6WA3RJ7JgtptN65I9efHzSMWTrRV6cyvtrKFyhHYeD/im6R1+cDi02ttei/6pZrx+5vRiQe4Da+hFIsNXz9jaXLLl4z9V4Uc7X1+9ViEL2Kmc1Sx+5iXx1mPfu5PbQSIxOHJWNovJWQpxWhrBN+4rKM58giYJc5tfd9oL6OBLSYLHWsXGzlcCjdAzHMhnc66IJroZg== 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=YPHjBpbyjqpZdYucP8HA6SoZjt7wrYl9ZeRBprvTChA=; b=UwkqAC7UlSiRLlPM421F30zhzD/OePLC5nLxjtk53HpFgB9qVfuFdVS//eM7RXpOTw/VByTSw1eeQnCT4uYP9CC1IXONM86uNKbcgIUW0XERVW9SAJkqLfdvdr95VLf45IfP3lZNkKWmWCuOySi02o9bnbOIaxlHLeJzTeyX7bCkLvyo92Vve+cdPEtS6xc6miBq8IwVFPGQjJu6scpJQe0PjjO1Cr4sJPWMdysNdgxP/oBoSwDGO31eBu+64aTOcNQhX6PKqG8qkUNZyZxTSgAvI0U8oV/bw4M/LdqvQ1xAhm8X3ufkak0Z28IlhOiWoH3tkfmBxc2JuAJzoII2+Q== 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 PAXPR04MB9254.eurprd04.prod.outlook.com (2603:10a6:102:2bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Thu, 23 Mar 2023 14:49:44 +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.037; Thu, 23 Mar 2023 14:49:44 +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 v3 5/6] pinctrl: s32cc: Use generic struct data to describe pin function Date: Thu, 23 Mar 2023 22:48:32 +0800 Message-Id: <20230323144833.28562-6-clin@suse.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230323144833.28562-1-clin@suse.com> References: <20230323144833.28562-1-clin@suse.com> X-ClientProxiedBy: TYCP286CA0343.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38e::11) To VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3439:EE_|PAXPR04MB9254:EE_ X-MS-Office365-Filtering-Correlation-Id: 82adb6c0-8611-4115-9c9f-08db2badd70a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w8aWPrRQggVFxedVCl6hzOye8r3WnkDQmr41C6fBxFBKDOk5EJHDu82fYC1gPwq8XFyPAA6EPOsPPPIU5OwQoa7eAaufyGDakkcusLRYWcBiPmnA1TOQB2GqzjfGRR/qOnW6u++2/IjvLFP3Q4F9Ze+2YISU3oUBn+JEtggZ0sb5BVZdMIAzen8+qjcZMm2EKyWOvHyipHnwgDNMrELM8ypeN3BO5V810Z7KAhMrCXsleBTOuW6NpRbUDiUY4iEjuRktAJBBdNb640EqCLuO7om3es/tYVPWREQyrYbGsXBVeUWV06/1jaGURYiviOnPe1EnJIImZRoGwgSyQC6yTayaYXZTfNqsmeHe0TDUsMXqvW2Oi7AuI5RE9GUhZI0xKElDD66kBs/NpBtjKspCxlGK9wHO5OOeMNmAtDv/DWgwwi6XmL9WT9lmrtbsV24c4yK3qX1kUzE8e9xdXtFEsjgb/mG0Z1LSNrrA83OEyK3yORbFRGs3kR48kkQwx9JMLZLVZKgX913l0spk+z/jRJa6VYIsTF4Y3rOU3JzpqRwJbjTivMMWe1PvlbDTcNjeuAy0xsJO1kUo905/cN0SWUmhsvTpTuYGP9R1fZx+ZcyV1haqMhm/1yBfj16QbT2SCG8qBsccSsem0gkNL/h4ALBGADgJz//S4OLD3z6/WuzQgJlBJKWylq8KiWtGTtue 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)(396003)(136003)(39860400002)(346002)(376002)(366004)(451199018)(4326008)(66476007)(8676002)(66556008)(66946007)(316002)(110136005)(54906003)(5660300002)(7416002)(41300700001)(8936002)(6512007)(6506007)(1076003)(26005)(107886003)(6666004)(2616005)(186003)(83380400001)(478600001)(6486002)(86362001)(36756003)(38100700002)(2906002)(41533002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8n6QPhWcFA+BtNYB0yJ6iSme1XTr9lrOioRp821tNksTVOhSaYh2uwM+p8wK8YCpjbYB/9+lKAkrYCZb+1xqm2H2Ddx463CFlKNmgAQtnIstynPCx6pmRg1P5FaZK8BX8dasg/aK9eh5EPt/fi7//OR7Nu2ruBZU90uE8Lwc2PhHnuSxl7QSwX94dQ3rtia8MZmjSN+t8iiWU6IuNRGB2HSfBRdWAP+rWFGpkYqgjBlrnS3AlOQ7xys3YBmlBL/sSIOb265jSK6cc1aECAExXZauogdRj7krmM961lBFvkX9sb+/oeab3sZ1DKCBuwoNrSN65nPz6qzkviqOWJdJhfo9d/Kn9OXNH8yIWgS584Fjzw49R6QkazXYbMHHyaJASG39t08GDApUx8E10y16GUzIX80t4Efj8onZcVZse0mjI+4daLHFGaXbgagmwFDClEhx6hnql92TzAFGGZKCCceGxMpY9kJEDynDLpsr27w6s8y/qrrdAtGy/AgXR1mjmTqZeWTxmCVg9PYzRM3+sKIdKCRFg3fdtMYJepXXEO84902U9dPdOAbb35iHfgJhJ2gT1fNe0+kwjncNATLzxmq27ABUtSnUWqoxcIpeEZTiEnYMM/WmWfanYeh8KhgRHbxUUrPjPxJ/DyJjO/e+ropwxXvBy8hHWK3sJuTo/XbcKvzLEYHVLqOup2ljkj5RWXbAkSYNqAdLNTXDrTFtI9xuivJwWIRqKzIrs91d2NWqSVoyOoXSZcPL8C/NiYb5bAZVS7CqTr4wqBwZsRDEQImQ1mVusA5M+sfQZ1OJyCfZQM0LR01SSD1x8khs2i2m21fcB5bsFMpg9E4k1hsDf2me/eR0ngSaZgafO4+N9d+YnwPYGwmiad7x+yvfhzLa7oksLZAouREpPLDr6S98TLzBAntHF1yJclgwyYM2w+HirzavIMQKSz5/rFiCtjzTlnWAj7L0urLrO7apdgShyu0NB7Ak0snYq5KVTWfCKzEjOmg2Rzhrvqf+PRuR76pI0N7TNvLKGFbXVbsoFzjCiNruHJCyr3iTVtQiVCBKZ20/0Vjdw9T4CULe9uMIcVcPo4sGn0M6Ej5nzlFpmaH0VhoWALQ8G8UrNsYvqiS2Us+lIgmQkMoprq+2QwrUhLGgzX2cjViWE4hsYSnbHcnIMFpY8rtgwzZwhqOGfHX0VKmsv7KA+Y0osRhvrtbXClWy5y4k7Qk6Qkwf/4CRcLxgAVmiVqqU9I7d+5ov1YLdulMiNqD6/nYlauyCaIf2WMWbLL5eWaJtj9S1nWYzEIRNGetxnvrsq+egdsB6UHlgN3LkV+03Pc7t1zXnyft3fl6mQAZvMcWcoBY8uw5DdNevriT6vEe2FBNGBgSqWw2fxQR5kpdXdz+3CYiKAPTVk0y6S5G+PYenpDRT9fw++Mv59pOLsD88Wj42l0OGcoUPkXzdCWlkC4TTOBSSJga7/AnN8qrvGHQSu3AjiFbJJKLz9hOvEjPMCJaV08omfoULUk4g/VSA5D/6tzh9/jAVgltpjPC+N/KP7bIUgQ4FLp8ZrAJCqOQR0xsLx3vOr0FKU/o= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82adb6c0-8611-4115-9c9f-08db2badd70a X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2023 14:49:44.4721 (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: mO2GH/Gi+nMJwlPU3+PEWPmH6BjdeBkv1uPx29i+8jXiGar7kJmQFQ0T4tIqmykY X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9254 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230323_074948_801529_564DB6C1 X-CRM114-Status: GOOD ( 15.85 ) 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 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 --- Changes in v3: - Separate the generic pinfunction patch from [PATCH v2 4/4] - Fix the data type declaration and remove unncessary type casting developed in v2. 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; }