1 files changed, 40 insertions, 31 deletions

diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index 29ff77f90fcb..f78b416d7984 100644
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -32,30 +32,32 @@ struct pin_config_item {
         const enum pin_config_param param;
         const char * const display;
         const char * const format;
+        bool has_arg;
 };
 
-#define PCONFDUMP(a, b, c) { .param = a, .display = b, .format = c }
+#define PCONFDUMP(a, b, c, d) { .param = a, .display = b, .format = c, \
+                                .has_arg = d }
 
-static struct pin_config_item conf_items[] = {
-        PCONFDUMP(PIN_CONFIG_BIAS_DISABLE, "input bias disabled", NULL),
-        PCONFDUMP(PIN_CONFIG_BIAS_HIGH_IMPEDANCE, "input bias high impedance", NULL),
-        PCONFDUMP(PIN_CONFIG_BIAS_BUS_HOLD, "input bias bus hold", NULL),
-        PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", NULL),
-        PCONFDUMP(PIN_CONFIG_BIAS_PULL_DOWN, "input bias pull down", NULL),
+static const struct pin_config_item conf_items[] = {
+        PCONFDUMP(PIN_CONFIG_BIAS_DISABLE, "input bias disabled", NULL, false),
+        PCONFDUMP(PIN_CONFIG_BIAS_HIGH_IMPEDANCE, "input bias high impedance", NULL, false),
+        PCONFDUMP(PIN_CONFIG_BIAS_BUS_HOLD, "input bias bus hold", NULL, false),
+        PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", NULL, false),
+        PCONFDUMP(PIN_CONFIG_BIAS_PULL_DOWN, "input bias pull down", NULL, false),
         PCONFDUMP(PIN_CONFIG_BIAS_PULL_PIN_DEFAULT,
-                                "input bias pull to pin specific state", NULL),
-        PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL),
-        PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL),
-        PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL),
-        PCONFDUMP(PIN_CONFIG_DRIVE_STRENGTH, "output drive strength", "mA"),
-        PCONFDUMP(PIN_CONFIG_INPUT_ENABLE, "input enabled", NULL),
-        PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT_ENABLE, "input schmitt enabled", NULL),
-        PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL),
-        PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "usec"),
-        PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"),
-        PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL),
-        PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"),
-        PCONFDUMP(PIN_CONFIG_OUTPUT, "pin output", "level"),
+                                "input bias pull to pin specific state", NULL, false),
+        PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL, false),
+        PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL, false),
+        PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL, false),
+        PCONFDUMP(PIN_CONFIG_DRIVE_STRENGTH, "output drive strength", "mA", true),
+        PCONFDUMP(PIN_CONFIG_INPUT_ENABLE, "input enabled", NULL, false),
+        PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT_ENABLE, "input schmitt enabled", NULL, false),
+        PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL, false),
+        PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "usec", true),
+        PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector", true),
+        PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL, true),
+        PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode", true),
+        PCONFDUMP(PIN_CONFIG_OUTPUT, "pin output", "level", true),
 };
 
 void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev,
@@ -85,11 +87,14 @@ void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev,
                 seq_puts(s, " ");
                 seq_puts(s, conf_items[i].display);
                 /* Print unit if available */
-                if (conf_items[i].format &&
-                    pinconf_to_config_argument(config) != 0)
-                        seq_printf(s, " (%u %s)",
-                                   pinconf_to_config_argument(config),
-                                   conf_items[i].format);
+                if (conf_items[i].has_arg) {
+                        seq_printf(s, " (%u",
+                                   pinconf_to_config_argument(config));
+                        if (conf_items[i].format)
+                                seq_printf(s, " %s)", conf_items[i].format);
+                        else
+                                seq_puts(s, ")");
+                }
         }
 }
 
@@ -121,10 +126,14 @@ void pinconf_generic_dump_group(struct pinctrl_dev *pctldev,
                 seq_puts(s, " ");
                 seq_puts(s, conf_items[i].display);
                 /* Print unit if available */
-                if (conf_items[i].format && config != 0)
-                        seq_printf(s, " (%u %s)",
-                                   pinconf_to_config_argument(config),
-                                   conf_items[i].format);
+                if (conf_items[i].has_arg) {
+                        seq_printf(s, " (%u",
+                                   pinconf_to_config_argument(config));
+                        if (conf_items[i].format)
+                                seq_printf(s, " %s)", conf_items[i].format);
+                        else
+                                seq_puts(s, ")");
+                }
         }
 }
 
@@ -150,7 +159,7 @@ struct pinconf_generic_dt_params {
         u32 default_value;
 };
 
-static struct pinconf_generic_dt_params dt_params[] = {
+static const struct pinconf_generic_dt_params dt_params[] = {
         { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
         { "bias-high-impedance", PIN_CONFIG_BIAS_HIGH_IMPEDANCE, 0 },
         { "bias-bus-hold", PIN_CONFIG_BIAS_BUS_HOLD, 0 },
@@ -200,7 +209,7 @@ int pinconf_generic_parse_dt_config(struct device_node *np,
                 return -ENOMEM;
 
         for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
-                struct pinconf_generic_dt_params *par = &dt_params[i];
+                const struct pinconf_generic_dt_params *par = &dt_params[i];
                 ret = of_property_read_u32(np, par->property, &val);
 
                 /* property not found */