Received-SPF: pass (google.com: domain of linux-kernel+bounces-141754-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Fri, 12 Apr 2024 08:29:27 +0800
Subject: [PATCH 3/3] pinctrl: scmi: support i.MX OEM pin configuration type
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240412-pinctrl-scmi-oem-v1-v1-3-704f242544c1@nxp.com>
References: <20240412-pinctrl-scmi-oem-v1-v1-0-704f242544c1@nxp.com>
In-Reply-To: <20240412-pinctrl-scmi-oem-v1-v1-0-704f242544c1@nxp.com>
To: Linus Walleij <linus.walleij@linaro.org>, Rob Herring <robh@kernel.org>, 
 Krzysztof Kozlowski <krzk+dt@kernel.org>, 
 Conor Dooley <conor+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>, 
 Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, Peng Fan <peng.fan@arm.com>, 
 Sudeep Holla <sudeep.holla@arm.com>, 
 Cristian Marussi <cristian.marussi@arm.com>
Cc: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, 
 imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, 
 linux-kernel@vger.kernel.org, Peng Fan <peng.fan@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|AM8PR04MB7970:EE_
X-MS-Office365-Filtering-Correlation-Id: bce5f7d8-d249-466b-1a81-08dc5a868465
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	4kvyoMR6JtEaeCcNw43N4gTq24QTR21nFWNnSwcFR2Bp5WVcHkqO8fv6jk5NyYii3gpcT6OFSc04l7/Z/Gw66Jukw4Owg75Zy7UqS0R67GGcRAwPLfm5/K4r+/Uygp5Es9x72+e7J66dfob6OFC4XEAJhCNQriEHlpg1hxBq4LtXXA/ykQfQYLj8IVXys8UDECGjIfVSl3VTyfyvTB8e6sBWAdJvkXarqZT9oR3NXBLRg08kisY+qcUWn1GPaigHBuzU/IZDDwwRzUEwfjVi/LEEffDbf1NQ1n4rY5DEuqNQsv7LJkpViwcuiWvmxkGXPst2PfvlxERiYObyUJ72JfmtzXLqVBxHtpPKSwFuPT/ZQd5PsOW8LJYb5fGAVMj0rSmvdQc+Ae2TJZ10gxHQNcX/YurLOeb+/uXd+TtzfeSOhNMH9Lz27JUUHmpqxF4kamoE98ENQqwOdcM1Q1rm2cKg19oULi7HednkaNTY5F9GlG8thmaaREgxYeyBG1uPABY60W2uNq40VSRSQvqTJHNwy/Kx4CCXXDVl9MMUIhjgsFJEsqdJetONtLUQDWwFAvOQ9MYIJk6GpHk0Mt3ToJKNaiagxVCMbDj+NcG/5INzjjN53VE5TZZhnCM6Enl7tyx03vlkkbItQyGunahkUrmOuL7JrAt8UWk+IMtVJmK4X+UuvtNM28fsDbp6uqbemhxNbFOqBIflIUGfcBkkkaPW+R85jv4KaTmx+f66qLw=
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(1800799015)(52116005)(7416005)(376005)(38350700005)(921011);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?a2R5ZnFMME5SY1crRHhIcGo5eHFFZ1BkcTFyV1U3a2FlLzg2VmFXTXZVMGV2?=
 =?utf-8?B?LzNXZCtEeDh0amZQM0F0aVJmN0xkREkzMEJ2S2gxVWRpM1NlVnZTOE9qdGJ1?=
 =?utf-8?B?VExyN0JyN0pxbUJsSm1SSXoxeWJBcEN5bTErOW42YVcrUC9FRnluRG55bkQx?=
 =?utf-8?B?Mzl1Z0tMTlBuQy96dlRpb2Rvamp3a254bjlvSnZVeDYzQkErOHVmYmxlenNC?=
 =?utf-8?B?MFJXbk51M3pwR29IQVhSTHgyYlJCcXk1TVA0Z3A3WTJsRmVEVy9xcnpra3hx?=
 =?utf-8?B?WWlnN2sxVXB6TUJFM3JGeC9Qa0lWcmQ5Y25LSU1sWXMyRkFpZEcvdHBHdm4x?=
 =?utf-8?B?Y2dYZzNXbGZzVDlOS2p6OUk1SkZDNVVkZThzT1k1dzF4VXM1cFd6U0FUalRQ?=
 =?utf-8?B?V05GS2JtTC9GRHBFblhBSXJxQ2hyTW11WGpPdDZFRU9IeVVUcmVhRnFNcUVC?=
 =?utf-8?B?RENPSlN4K3dsSU00N1dBcTNmNWlXdTJMV2tLTG42YUh3dWFFNHRuajc3aXUr?=
 =?utf-8?B?bXhNWHdGSzJDbHNnZ2wxRG45dEF1QkVwOXBBVXpMRTV1QndsYU8vVEhQKzVL?=
 =?utf-8?B?NUJBUGF1K1JwTVpXdEpISjEwZ0syaE9TaWxQWGcrZllBN21GcnV6dnFXREsy?=
 =?utf-8?B?M3dCTlVVQnZ3TjAra1R4TXE1R3kvcUtBZFkwZVUzdUQ3aTVWUWc0VWxjaHpk?=
 =?utf-8?B?K1lvVWVxL0dpc2grbTlmYmFrODJla3Zrdy9henlPZHpIaFppQVNhOWR3RXNv?=
 =?utf-8?B?eFc2MGJNNG9uS0hHRVJtS1BJV2doVU1kM2wxcGNPNzN1YjJMZFpBMFJYc1BL?=
 =?utf-8?B?MytNNDU2M3ViMDRVWExWK24vVnVKamptQ0hHMWFjVkxrTlVSRmVzTEw5Ky9Y?=
 =?utf-8?B?VkUxM1g0VWdCZDZIR29KelhDU01GY3FzaXRrMk04YUd2eU9wdmtQTkxRQjFo?=
 =?utf-8?B?SUkxSy82TWcxSERWWHd1SVc5QjFEekg0OUxKSC9DMklsNGxUQVJObldNQlJK?=
 =?utf-8?B?Nlo2QWZkMDdUMno3U0Zma255Z3VHYnhaU2NOQ1crM2xMZm96T0UrOFBxeXVh?=
 =?utf-8?B?OGYrSVVQTEptV3dGRUp5dExUMXpNY1dONm5Cd2dYZ2VDbzVzR1NvQkZHcm9r?=
 =?utf-8?B?Q25ReTg4djRHOFhTTWJGT3hCaUNJaWFHVlRtWWtuZ3g3QUtSQjVjamNGSUht?=
 =?utf-8?B?cTBEMVdOSTB0Y0xabmNzdllJWFBKRmRBajFPRnoxdy9MQ09qclFaMS90Z011?=
 =?utf-8?B?dzV4aEpiZzcxUEtlTXFxYXdTUVlXL25WTEp4N28yeWZJSDBQSlM2M3hYOXNm?=
 =?utf-8?B?RmhPaGcwVzNNdXM1dFNOSXF6bDVUSlRHVS84K0NGeFl5SnI2eEtNL3NjMHNs?=
 =?utf-8?B?UXFDS3QrQXNjMXVBS0VsckNYNVNYS0YwY0Z0OHA1ekVxbmpLOXJ6UGw3TVdU?=
 =?utf-8?B?c2gyWFR1WWwxVXQ3b3UrZ0x4WkxvQlRwbEdLQitZZnJtSlduVW5TODZDbXJY?=
 =?utf-8?B?VzRrTjIvb3BvcTZtTmRObGdnNUV1a0lxbHZyNnVRcEJpZy8yU0V2MGJXQ05y?=
 =?utf-8?B?eWM0SFhoSHNTT3lWOW82a3ExZElML1ROZlBIM1ZUNWlFT1JseFBPS1lIMk0x?=
 =?utf-8?B?R3lCMnRmcG1jMUY1aDVhTXVaUml5L2tKKzNSL1UvVXh2cXNtUjY1WUNqVHlj?=
 =?utf-8?B?Sm5jNDRoWmp2QTJ6NEJRQ253OEZZVytrUmZ6WWJ1R2lwc1BCRXc4bzdtNlJQ?=
 =?utf-8?B?QlIyakVOK1IxN3kzZnp6NVZnMTByNTJKYnhjdjljRDdUalpOWHBYS1AzNW9F?=
 =?utf-8?B?MWdyaDNNNncyZEo3aDBCWWMydkpRRSt4UVVpZjhjc01NZ1BYOGNMa2dQMkxv?=
 =?utf-8?B?NmYva3BQV0prd3lYTW9YUlZXM1RLVGVFazF1Ky81cE9LZERocmFYUEpXOC9Q?=
 =?utf-8?B?NDR4ZFk3N0xPakRUQ3drNitaNTYzZmxHdVdpOVF1bUJvaEZ1WTB3M25QVExJ?=
 =?utf-8?B?aFpBMHpUOFVXNUJvYWFROVZwQUtoS3dYOFFmWlZXOUNKak5JOW11TVdDbWlC?=
 =?utf-8?B?amozMXFValNPZktuUEM0LzJEZTNvaldKbXEwbWVmbDBjQTRjOE5jUzJnZml1?=
 =?utf-8?Q?GgwiixZYbonrUZUIAVcr7Wfhf?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bce5f7d8-d249-466b-1a81-08dc5a868465
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 00:21:37.4007
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: keGm/0zTyPPysGP2SYw5Je4wbwNkoPPi/UNipdYfBBAwlmw0/fellq0R1SV04sH672b704XndmEjMg8iiGRCpg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7970

From: Peng Fan <peng.fan@nxp.com>

i.MX95 System Manager FW supports SCMI PINCTRL protocol, but uses
OEM Pin Configuration type, so extend the driver to support custom
params.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/pinctrl/pinctrl-scmi.c | 23 +++++++++++++++++++++++
 drivers/pinctrl/pinctrl-scmi.h | 15 +++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/drivers/pinctrl/pinctrl-scmi.c b/drivers/pinctrl/pinctrl-scmi.c
index 0f55f000a679..97c3d9d4634b 100644
--- a/drivers/pinctrl/pinctrl-scmi.c
+++ b/drivers/pinctrl/pinctrl-scmi.c
@@ -20,6 +20,7 @@
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 
+#include "pinctrl-scmi.h"
 #include "pinctrl-utils.h"
 #include "core.h"
 #include "pinconf.h"
@@ -462,6 +463,23 @@ static const struct pinconf_ops pinctrl_scmi_pinconf_ops = {
 	.pin_config_config_dbg_show = pinconf_generic_dump_config,
 };
 
+static const struct pinconf_generic_params pinctrl_scmi_oem_dt_params[] = {
+	{"nxp,func-id", IMX_SCMI_PIN_MUX, -1},
+	{"nxp,daisy-id", IMX_SCMI_PIN_DAISY_ID, -1},
+	{"nxp,daisy-conf", IMX_SCMI_PIN_DAISY_CFG, -1},
+	{"nxp,pin-conf", IMX_SCMI_PIN_CONF, -1},
+};
+
+#ifdef CONFIG_DEBUG_FS
+static const
+struct pin_config_item pinctrl_scmi_oem_conf_items[ARRAY_SIZE(pinctrl_scmi_oem_dt_params)] = {
+	PCONFDUMP(IMX_SCMI_PIN_MUX, "FUNC-ID", NULL, true),
+	PCONFDUMP(IMX_SCMI_PIN_DAISY_ID, "DAISY-ID", NULL, true),
+	PCONFDUMP(IMX_SCMI_PIN_DAISY_CFG, "DAISY-CFG", NULL, true),
+	PCONFDUMP(IMX_SCMI_PIN_CONF, "PIN-CONF", NULL, true),
+};
+#endif
+
 static int pinctrl_scmi_get_pins(struct scmi_pinctrl *pmx,
 				 struct pinctrl_desc *desc)
 {
@@ -526,6 +544,11 @@ static int scmi_pinctrl_probe(struct scmi_device *sdev)
 	pmx->pctl_desc.pctlops = &pinctrl_scmi_pinctrl_ops;
 	pmx->pctl_desc.pmxops = &pinctrl_scmi_pinmux_ops;
 	pmx->pctl_desc.confops = &pinctrl_scmi_pinconf_ops;
+	pmx->pctl_desc.custom_params = pinctrl_scmi_oem_dt_params;
+	pmx->pctl_desc.num_custom_params = ARRAY_SIZE(pinctrl_scmi_oem_dt_params);
+#ifdef CONFIG_DEBUG_FS
+	pmx->pctl_desc.custom_conf_items = pinctrl_scmi_oem_conf_items;
+#endif
 
 	ret = pinctrl_scmi_get_pins(pmx, &pmx->pctl_desc);
 	if (ret)
diff --git a/drivers/pinctrl/pinctrl-scmi.h b/drivers/pinctrl/pinctrl-scmi.h
new file mode 100644
index 000000000000..fcc61bc19c98
--- /dev/null
+++ b/drivers/pinctrl/pinctrl-scmi.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright 2024 NXP
+ */
+
+#ifndef __DRIVERS_PINCTRL_SCMI_H
+#define __DRIVERS_PINCTRL_SCMI_H
+
+/* OEM VENDOR Pin Configuration Type */
+#define IMX_SCMI_PIN_MUX	192
+#define IMX_SCMI_PIN_CONF	193
+#define IMX_SCMI_PIN_DAISY_ID	194
+#define IMX_SCMI_PIN_DAISY_CFG	195
+
+#endif /* __DRIVERS_PINCTRL_SCMI_H */

-- 
2.37.1