From patchwork Fri Apr 27 19:01:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 905931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="D+RjIzpa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40XjxJ2p9cz9s08 for ; Sat, 28 Apr 2018 05:02:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758062AbeD0TCn (ORCPT ); Fri, 27 Apr 2018 15:02:43 -0400 Received: from mail-eopbgr40060.outbound.protection.outlook.com ([40.107.4.60]:63670 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758043AbeD0TCm (ORCPT ); Fri, 27 Apr 2018 15:02:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=fKcXaOvOxaGOhqd3sET3JaAzjCGVEy1+eKxE/2fowfA=; b=D+RjIzpaaLh3b9eVSPUkfAahZE/UXcVVE6B91bhCHwMigR+AraWQkvY6sUKP4Hx/gi6c8VR4NXYahi8xzdNTyn1x6PkLaFgDLMb09T39iNXpA5qm3fq9USD/dLwfFBh6KwSlOLu7tqW1uzAn2365YgTsAFdlMuoli2TMgDPOLno= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aisheng.dong@nxp.com; Received: from b29396-OptiPlex-7040.ap.freescale.net (119.31.174.66) by DB7PR04MB4217.eurprd04.prod.outlook.com (2603:10a6:5:27::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Fri, 27 Apr 2018 19:02:36 +0000 From: Dong Aisheng To: linux-gpio@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, shawnguo@kernel.org, stefan@agner.ch, aisheng.dong@nxp.com, dongas86@gmail.com, linux-imx@nxp.com, kernel@pengutronix.de, fabio.estevam@nxp.com, Fabio Estevam Subject: [PATCH 2/6] pinctrl: pinctrl-imx: improve the code comments of PIN_FUNC_ID Date: Sat, 28 Apr 2018 03:01:49 +0800 Message-Id: <1524855713-15527-3-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524855713-15527-1-git-send-email-aisheng.dong@nxp.com> References: <1524855713-15527-1-git-send-email-aisheng.dong@nxp.com> MIME-Version: 1.0 X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: OS2PR01CA0118.jpnprd01.prod.outlook.com (2603:1096:602::12) To DB7PR04MB4217.eurprd04.prod.outlook.com (2603:10a6:5:27::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB4217; X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4217; 3:ULcZMjwrsLO6wYDLmGKuvnY2kl1lEj2Kw7wgONKDrxQ/oL/WG0fxyYNxRIivk0X7mm3e9lq/rnU2dWw1YvQshj7aV7n40UNcQ6stFjUk7F38mQm4FKdSkyDSK2fy+3rFK86efCfJyberdMTKxhJlSDsOvRYNNW+EgavRu0cA+GBRuH3kNW2xUQfpmMAMwxlBrftfmNQjpMghcMxqJ1SMG+wIyuQ3qge1G4vDxagtfCQJhkOY/cowCq6M2/hAhndd; 25:mz3ICWXlTfRfOtdJTtv5TkplLxBru0PMDTRFipG93m43v+DBGvpV9yO5lJNElCplSqKCDHk0fsp1PP5JdrsP3SoA2d7+QOjjiNmC7A3vBrBPaQ1E3+GrFAQ9qW+QbYI8AZn59MWoUldQCL5wdzh+0K59KKJrpzuNJw2+i4XdsR+iUZu7YTHes2zW9n9eljjfXjdoscO4q6V6WGk0xab5wat9R2HWsUpRXe4s7+wVmRarIrai0KYaNuPZf2t77/eoxf5f2kNd9oUWGXtWT3cHz/9bR8kciXfGrrdhp2323R5/H9Me/ytbLBG2XqeTEKUywCiG8RPfGlwT4RkRsS3cKQ==; 31:ZXDtO6POizj2pg++gL/dd/tgbzt/3LRg788wDth/wiQkYPBTLOaxoUWq+4QOOBG4UUNcE+AzDhYUyxLWP1637azd4WJ01JEKjRltnQfRmK3ZSPOl8nhIGiByR3R98isbXqXhIosw2xG3AJrCI742296QFdhQr5zGpDmW4C4cW3HjtAtu9nzfv0wse8J8tiXGTZv6JBV7lbg1PPZUpbfO9apEssci5feZMRkc2XnMFMM= X-MS-TrafficTypeDiagnostic: DB7PR04MB4217: X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4217; 20:yRPJTCp/oVYBhelv90GCFDDQAKApfOd3mPTF6JW7CL86NiipTZ89RNluS+5S1Oqz4LKi1WGAjlxCalMZYlVGDJRHNBJ/OdviAD4dOmi6UUHqb7OB1qGgEz90ywjsT4MtvnP2vtct6o26RZFG1SoBZfyeYoZ5KERfbiaOpv1Lv8/8F5yT/dbXAGg85GV3RRvELmN8O+os0Mn3EY46Mtic0TWRakKj+kgPBjRud0VR4JqZhzbdXhUZ+Mkh/W/W5jmXyW+xQYzPy7J325pvCSVOkPAvuIMuiugWIPcDrgfgETz8kQzOOOYtiJeb8XuCsA04NATN+d0jiNn1j+HDTMlVOUUTmiLomTMXWQZlVE3qKUsGDUBIdVBYV/wA0rGfnC1V9yeKXWIP3j8VTg5XYTNihPIV36GtgWOs45JiSyd2OMts94TZVykwA55ddrhL8vG4VDKdp60Bykuca5On3XQc4Hl4oiYDSSouzBZVlCtRwJw4KwecI2uNYBAstAOtOlcm; 4:bR2urj6IVmjSqYGTMgF/XFc/uixNh1c6e/tXRRxeSK7ze665H69ThuTeCS4jnrrudhUuEtt3ly1Nxei4iMi2sOCfTzR20YNrlchyHY22yxa1giPHZCxBTyyIkEr7eN3QHTyXpSNf3VhhrFa1EBd05plTVbSI0tsLOsJsyxQj0vH5X2T+WtphCkCERnogz+KxK8yTINW1ShT3IjrMbvs+cAw8cmX+SCFCAlglhIPq7NlquNdE3uNlMckdTxBHICYLTM4jXvCB4kaUHyJB8p7bhiPKVB5caZWjkmny5yeetuBvE9NUbiK6Ua7XpVIn+JXSQxe46YD4KnivQRUBhjkkuGvFyqSLaffJq9BuUo/sGG0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(85827821059158); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231232)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:DB7PR04MB4217; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4217; X-Forefront-PRVS: 0655F9F006 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(346002)(366004)(376002)(396003)(189003)(199004)(5660300001)(16586007)(68736007)(956004)(53936002)(76176011)(86362001)(4326008)(39060400002)(36756003)(11346002)(2361001)(2616005)(8936002)(186003)(8676002)(16526019)(305945005)(2351001)(26005)(25786009)(2906002)(52116002)(97736004)(48376002)(50466002)(6916009)(486006)(7736002)(446003)(50226002)(81156014)(6512007)(6666003)(105586002)(47776003)(316002)(478600001)(66066001)(476003)(386003)(3846002)(81166006)(6486002)(6116002)(51416003)(6506007)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4217; H:b29396-OptiPlex-7040.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4217; 23:4ae+hO6mLdJmOcX5Y1VABGUVUaTjYO/nBOLtA5siztPhZovTVT3lI/Ey4aqB+NmlhUhG5IykQL1j6uuYGspIdl5LfatimaWsLy9wLCgo1jXvQgwGMdvGMtb7fVFZexRFCc610thPsIPJqkdw9/wA9urheLV4bIKCgqn9XwM5c8m3NdB/s9GutXoXrjpQkzhW5WuRcCHJwY7F+HUEB0eWrl9ac0so5hvT2ilcYXLgS20Af86Bb4r6W5r/UggXEbIZQRfsBeQC5euq3q5EtG72QBBUj56jiK5IQW2o/3fa8IGiu/+Nxq8PbvA6qv4GvHVbFYVg9IrNWhJE70orYL7GBW8Hpc6wjyV320iSm0M1qx2d4yVCW/AI6tYP3H5NOQJKuD0lcqR8dpxi16RSE9YXh1G3YMAP4mB1puAj9L8eFsQXvIh49Va6ruPb7ltnoTUiPDjwGwgmsMGFyjU+ZNNbvuyenvKFR9Mu4TZ0ix5zlz6nyPmkT6FfoGCpJxeYgbK60cq6skZjylQgRGEdvzGpm6oYu45rYtsmTWlqfgUcCGk0ZNHC3k2XY3ogcoW2YXbCnr5gdlqF4Kh2i+jPfETk+lM13F+gAysgKOgX9KwpnJVXMg7TUv2rvGCYorlYhmR8uAaIj3ZMP3UXAPNeMBXRt1Wa390S6aNDXiAoYXRGUF440qH68z7fqrv2cRMUFOkrliHlVfYE8bIiW2JIkuaEKK3Pi+huwxyzQr9ZBtt1RRKBOddjQEOHXTVhroAh+k2VxWT8JwL61NMnXFEia3agJFrXU6WDp9IzQ9BT3WW5BauLUWBmW70ec8JZLbXESL4iRgH9pLHUHwh0GT4Q6LtLQKtvoanDxBp9fuzcu6cOvATbQdvKisMdDWja275M+y68O30l0hWhvxs7io7WQ67/4LbPlmCP8tTck6HY6nbf7wJ8ABxDJo2VDSB9pWaSBanOpxgu74jifMgMyRRv7X3gXgahA/ERezpJlnKhMwr+8aeDhAoYA2pmiE475hrdcWvvtGJ0HNh3LaisbzTtpsS3cSK4QUy5HxlqHiM0mF6Vga8qYMXeGCuCwN2hwBeS/NDIWu5czCfVuHJpQXk1nD/jKx2/OFvijrGjtyXg9XaUqmrWSLDhfAdWotu8MwyRMK+fMUwT6bFR2BiyJ5ALrdMaC7AK/EkkyA8/Z0oMKEikSEBjPVYeI+TZCgXgHwXoFx2xi+BqB5kDyttiQEoq0DlX38loTm6epBgPSUsFdnFJ4Dk= X-Microsoft-Antispam-Message-Info: ZYLcM2BqRaD1lUpKNLMW9Iai5o8hlg25fFYf6rnWTr5ee+t8LcyFtBSkaGSQZWVVq1LcTLfZXYmNLppJCnvbbsQ+y5CzUXUY9rbx/p9JBfz7f15jMDjWX7uvS+UuF4+4kijQzWugpizOnDV2yDSdkq2YdQNiqsgu6pQpVR4OAQap5KnTpFCHEbIxhLDcGiaA X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4217; 6:mMYO7YBuSqkl0Ktn/248Kie1lhyWd3NWHpdzofHBxHcZcVZgeorHwp7KJg3iCCMPWtgRG9KJtxLF+H69WetHfSw9rTZTouzaSX8Dp3ODLvFgza+pzqxLH8SxVN47q3mn+DeDULwOkFfJhidRF913I7LfS8W/yaCDksO/kduZLoeo9XAQ64zSRCjCG1xzvCWBM7E1uWgttCsnn7dX15jqxTdPHRAh+yzHJtzQZENECEJbdKdIbvQ6+sSVv2vPis0T7W5L2CCommuoJbdRexwMjW+txIJCxROHq5aXzk/vl/sGvOCnsIsOUvGoj28XAnLfPniy/S38xmxL6+zsNRl8J/WfD/5Ak8hXL3o7Br+Cd60g9k9zl/au7BmiuyTO2Ve/578sQo3tTLFwHGj9R3FOPE35Lv+tJfbdWmZmrGeASv+HSAsmME481aWMoyE36T5Ao8ywfyfNrgYNjAPNDUcw9A==; 5:uaeopC3dXDtJ8jirtaDsgK1mwlSLNEHTWhdl5LjjBh1ciPOtIJKxqla15fWERRttNnqCXOsrYf7HPnpPnw+BfgcDIJIlB5+TidddG9j4l7p3qWWbMA3Spc12prX2Yi16EPRlFfqnK5XBct8i8cULzUgKOiINbGLPyvmU+aTyH4Q=; 24:LPNO1VPkbldNC41H3HhDmG32jVLyi9Sljt8+JPoG5ILih+pQTZCp6xnMBXqk8zM+PtpnhCSH9+vOBrTck2Mw56xrSlnarNnCvPZF6QrahOM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4217; 7:2AL56Ss+FfiGOPQUOOcEFvla6uSZjM+49GkCJ9yf1XA6WDdU+QofR1zbzA53tnL80e2VkQ/UUN5LolWi7mxDj6JTPCUV6ozWyfbpJuV3vImJhc1gYg4VFpPi3ht86qP/IQQ7kCLtaQa3hSFHIJgKrpPbSMPDO9uhJ3LG11tY1Pm3gFwbo9llO6cgPxjbaIss5CqL9/eQ51yU+1Xdo4GQisbHVEYqP7K4M6xBriUKsWuU9DyLeBey2lo5XYPvsyY0 X-MS-Office365-Filtering-Correlation-Id: 4e99487f-4d00-4542-4877-08d5ac7172fe X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2018 19:02:36.1154 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e99487f-4d00-4542-4877-08d5ac7172fe X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4217 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The current code comments of PIN_FUNC_ID actually is not true for SHARE_MUX_CONF_REG case which should be a 4 u32 PIN_FUNC_ID. Fix the comments and re-org it a bit for better extendibility as we may add a different size for SCU based PIN_FUNC_ID later. Cc: Linus Walleij Cc: Shawn Guo Cc: Fabio Estevam Cc: Stefan Agner Cc: Pengutronix Kernel Team Signed-off-by: Dong Aisheng --- drivers/pinctrl/freescale/pinctrl-imx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 77cd364..ff6ca6a4 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -414,11 +414,18 @@ static const struct pinconf_ops imx_pinconf_ops = { }; /* - * Each pin represented in fsl,pins consists of 5 u32 PIN_FUNC_ID and - * 1 u32 CONFIG, so 24 types in total for each pin. + * Each pin represented in fsl,pins consists of a number of u32 PIN_FUNC_ID + * and 1 u32 CONFIG, the total size is PIN_FUNC_ID + CONFIG for each pin. + * For generic_pinconf case, there's no extra u32 CONFIG. + * + * PIN_FUNC_ID format: + * Default: + * + * SHARE_MUX_CONF_REG: + * */ #define FSL_PIN_SIZE 24 -#define SHARE_FSL_PIN_SIZE 20 +#define FSL_PIN_SHARE_SIZE 20 static int imx_pinctrl_parse_groups(struct device_node *np, struct group_desc *grp, @@ -434,7 +441,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np, dev_dbg(ipctl->dev, "group(%d): %s\n", index, np->name); if (info->flags & SHARE_MUX_CONF_REG) - pin_size = SHARE_FSL_PIN_SIZE; + pin_size = FSL_PIN_SHARE_SIZE; else pin_size = FSL_PIN_SIZE;