2 files changed, 11 insertions, 8 deletions

diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index 342409f7f3ec..fe65962b264f 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -162,7 +162,7 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param
 struct pinctrl_dev;
 struct pinctrl_map;
 
-struct pinconf_generic_dt_params {
+struct pinconf_generic_params {
         const char * const property;
         enum pin_config_param param;
         u32 default_value;
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index c58b3e11ba8e..66e4697516de 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -118,9 +118,12 @@ struct pinctrl_ops {
  * @confops: pin config operations vtable, if you support pin configuration in
  *      your driver
  * @owner: module providing the pin controller, used for refcounting
- * @num_dt_params: Number of driver-specific DT parameters
- * @params: List of DT parameters
- * @conf_items: Information how to print @params in debugfs
+ * @num_custom_params: Number of driver-specific custom parameters to be parsed
+ *      from the hardware description
+ * @custom_params: List of driver_specific custom parameters to be parsed from
+ *      the hardware description
+ * @custom_conf_items: Information how to print @params in debugfs, must be
+ *      the same size as the @custom_params, i.e. @num_custom_params
  */
 struct pinctrl_desc {
         const char *name;
@@ -130,10 +133,10 @@ struct pinctrl_desc {
         const struct pinmux_ops *pmxops;
         const struct pinconf_ops *confops;
         struct module *owner;
-#if defined(CONFIG_GENERIC_PINCONF) && defined(CONFIG_OF)
-        unsigned int num_dt_params;
-        const struct pinconf_generic_dt_params *params;
-        const struct pin_config_item *conf_items;
+#ifdef CONFIG_GENERIC_PINCONF
+        unsigned int num_custom_params;
+        const struct pinconf_generic_params *custom_params;
+        const struct pin_config_item *custom_conf_items;
 #endif
 };