Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: introduce generic pin config

This is a split-off from the earlier patch set which adds generic
pin configuration for the pin controllers that want it. Since
we may have a system with mixed generic and custom pin controllers,
we pass a boolean in the pin controller ops vtable to indicate
if it is generic.

ChangeLog v1->v5:
- Follow parent patch versioning number system.
- Document the semantic meaning of return values from pin config
get functions, so we can iterate over pins and check their
properties from debugfs as part of the generic config code.
- Use proper cast functions in the generic debugfs pin config
file.
- Expand generic config to optionally cover groups too.
ChangeLog v5->v6:
- Update to match underlying changes.
ChangeLog v6->v7:
- Drop DRIVE_OFF parameter, use bias high impedance for this
- Delete argument for drive modes push-pull, od and os. These
are now just state transitions.
- Delete slew rate rising/falling due to discussions on on
proper semantics
- Drop config wakeup, struct irq_chip does this for now, add
back if need be.
- Set PIN_CONFIG_END to 0x7fff making room for custom config
parameters from 0x8000 and up.
- Prefix accessor functions with pinconf_

+289 -4
+4
drivers/pinctrl/Kconfig
··· 17 17 config PINCONF 18 18 bool "Support pin configuration controllers" 19 19 20 + config GENERIC_PINCONF 21 + bool 22 + select PINCONF 23 + 20 24 config DEBUG_PINCTRL 21 25 bool "Debug PINCTRL calls" 22 26 depends on DEBUG_KERNEL
+1
drivers/pinctrl/Makefile
··· 5 5 obj-$(CONFIG_PINCTRL) += core.o 6 6 obj-$(CONFIG_PINMUX) += pinmux.o 7 7 obj-$(CONFIG_PINCONF) += pinconf.o 8 + obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o 8 9 obj-$(CONFIG_PINCTRL_PXA3xx) += pinctrl-pxa3xx.o 9 10 obj-$(CONFIG_PINCTRL_MMP2) += pinctrl-mmp2.o 10 11 obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o
+120
drivers/pinctrl/pinconf-generic.c
··· 1 + /* 2 + * Core driver for the generic pin config portions of the pin control subsystem 3 + * 4 + * Copyright (C) 2011 ST-Ericsson SA 5 + * Written on behalf of Linaro for ST-Ericsson 6 + * 7 + * Author: Linus Walleij <linus.walleij@linaro.org> 8 + * 9 + * License terms: GNU General Public License (GPL) version 2 10 + */ 11 + 12 + #define pr_fmt(fmt) "generic pinconfig core: " fmt 13 + 14 + #include <linux/kernel.h> 15 + #include <linux/init.h> 16 + #include <linux/device.h> 17 + #include <linux/slab.h> 18 + #include <linux/debugfs.h> 19 + #include <linux/seq_file.h> 20 + #include <linux/pinctrl/pinctrl.h> 21 + #include <linux/pinctrl/pinconf.h> 22 + #include <linux/pinctrl/pinconf-generic.h> 23 + #include "core.h" 24 + #include "pinconf.h" 25 + 26 + #ifdef CONFIG_DEBUG_FS 27 + 28 + struct pin_config_item { 29 + const enum pin_config_param param; 30 + const char * const display; 31 + const char * const format; 32 + }; 33 + 34 + #define PCONFDUMP(a, b, c) { .param = a, .display = b, .format = c } 35 + 36 + struct pin_config_item conf_items[] = { 37 + PCONFDUMP(PIN_CONFIG_BIAS_DISABLE, "input bias disabled", NULL), 38 + PCONFDUMP(PIN_CONFIG_BIAS_HIGH_IMPEDANCE, "input bias high impedance", NULL), 39 + PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", NULL), 40 + PCONFDUMP(PIN_CONFIG_BIAS_PULL_DOWN, "input bias pull down", NULL), 41 + PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL), 42 + PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL), 43 + PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL), 44 + PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL), 45 + PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "time units"), 46 + PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"), 47 + PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"), 48 + }; 49 + 50 + void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev, 51 + struct seq_file *s, unsigned pin) 52 + { 53 + const struct pinconf_ops *ops = pctldev->desc->confops; 54 + int i; 55 + 56 + if (!ops->is_generic) 57 + return; 58 + 59 + for(i = 0; i < ARRAY_SIZE(conf_items); i++) { 60 + unsigned long config; 61 + int ret; 62 + 63 + /* We want to check out this parameter */ 64 + config = pinconf_to_config_packed(conf_items[i].param, 0); 65 + ret = pin_config_get_for_pin(pctldev, pin, &config); 66 + /* These are legal errors */ 67 + if (ret == -EINVAL || ret == -ENOTSUPP) 68 + continue; 69 + if (ret) { 70 + seq_printf(s, "ERROR READING CONFIG SETTING %d ", i); 71 + continue; 72 + } 73 + /* Space between multiple configs */ 74 + seq_puts(s, " "); 75 + seq_puts(s, conf_items[i].display); 76 + /* Print unit if available */ 77 + if (conf_items[i].format && 78 + pinconf_to_config_argument(config) != 0) 79 + seq_printf(s, " (%u %s)", 80 + pinconf_to_config_argument(config), 81 + conf_items[i].format); 82 + } 83 + } 84 + 85 + void pinconf_generic_dump_group(struct pinctrl_dev *pctldev, 86 + struct seq_file *s, const char *gname) 87 + { 88 + const struct pinconf_ops *ops = pctldev->desc->confops; 89 + int i; 90 + 91 + if (!ops->is_generic) 92 + return; 93 + 94 + for(i = 0; i < ARRAY_SIZE(conf_items); i++) { 95 + unsigned long config; 96 + int ret; 97 + 98 + /* We want to check out this parameter */ 99 + config = pinconf_to_config_packed(conf_items[i].param, 0); 100 + ret = pin_config_group_get(dev_name(pctldev->dev), gname, 101 + &config); 102 + /* These are legal errors */ 103 + if (ret == -EINVAL || ret == -ENOTSUPP) 104 + continue; 105 + if (ret) { 106 + seq_printf(s, "ERROR READING CONFIG SETTING %d ", i); 107 + continue; 108 + } 109 + /* Space between multiple configs */ 110 + seq_puts(s, " "); 111 + seq_puts(s, conf_items[i].display); 112 + /* Print unit if available */ 113 + if (conf_items[i].format && config != 0) 114 + seq_printf(s, " (%u %s)", 115 + pinconf_to_config_argument(config), 116 + conf_items[i].format); 117 + } 118 + } 119 + 120 + #endif
+5 -1
drivers/pinctrl/pinconf.c
··· 54 54 return 0; 55 55 } 56 56 57 - static int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin, 57 + int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin, 58 58 unsigned long *config) 59 59 { 60 60 const struct pinconf_ops *ops = pctldev->desc->confops; ··· 439 439 { 440 440 const struct pinconf_ops *ops = pctldev->desc->confops; 441 441 442 + /* no-op when not using generic pin config */ 443 + pinconf_generic_dump_pin(pctldev, s, pin); 442 444 if (ops && ops->pin_config_dbg_show) 443 445 ops->pin_config_dbg_show(pctldev, s, pin); 444 446 } ··· 484 482 { 485 483 const struct pinconf_ops *ops = pctldev->desc->confops; 486 484 485 + /* no-op when not using generic pin config */ 486 + pinconf_generic_dump_group(pctldev, s, gname); 487 487 if (ops && ops->pin_config_group_dbg_show) 488 488 ops->pin_config_group_dbg_show(pctldev, s, selector); 489 489 }
+40 -3
drivers/pinctrl/pinconf.h
··· 14 14 #ifdef CONFIG_PINCONF 15 15 16 16 int pinconf_check_ops(struct pinctrl_dev *pctldev); 17 - 18 17 int pinconf_validate_map(struct pinctrl_map const *map, int i); 19 - 20 18 int pinconf_map_to_setting(struct pinctrl_map const *map, 21 19 struct pinctrl_setting *setting); 22 20 void pinconf_free_setting(struct pinctrl_setting const *setting); 23 21 int pinconf_apply_setting(struct pinctrl_setting const *setting); 24 - 25 22 void pinconf_show_map(struct seq_file *s, struct pinctrl_map const *map); 26 23 void pinconf_show_setting(struct seq_file *s, 27 24 struct pinctrl_setting const *setting); 28 25 void pinconf_init_device_debugfs(struct dentry *devroot, 29 26 struct pinctrl_dev *pctldev); 27 + 28 + /* 29 + * You will only be interested in these if you're using PINCONF 30 + * so don't supply any stubs for these. 31 + */ 32 + int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin, 33 + unsigned long *config); 34 + int pin_config_group_get(const char *dev_name, const char *pin_group, 35 + unsigned long *config); 30 36 31 37 #else 32 38 ··· 74 68 static inline void pinconf_init_device_debugfs(struct dentry *devroot, 75 69 struct pinctrl_dev *pctldev) 76 70 { 71 + } 72 + 73 + #endif 74 + 75 + /* 76 + * The following functions are available if the driver uses the generic 77 + * pin config. 78 + */ 79 + 80 + #ifdef CONFIG_GENERIC_PINCONF 81 + 82 + void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev, 83 + struct seq_file *s, unsigned pin); 84 + 85 + void pinconf_generic_dump_group(struct pinctrl_dev *pctldev, 86 + struct seq_file *s, const char *gname); 87 + 88 + #else 89 + 90 + static inline void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev, 91 + struct seq_file *s, 92 + unsigned pin) 93 + { 94 + return; 95 + } 96 + 97 + static inline void pinconf_generic_dump_group(struct pinctrl_dev *pctldev, 98 + struct seq_file *s, 99 + const char *gname) 100 + { 101 + return; 77 102 } 78 103 79 104 #endif
+114
include/linux/pinctrl/pinconf-generic.h
··· 1 + /* 2 + * Interface the generic pinconfig portions of the pinctrl subsystem 3 + * 4 + * Copyright (C) 2011 ST-Ericsson SA 5 + * Written on behalf of Linaro for ST-Ericsson 6 + * This interface is used in the core to keep track of pins. 7 + * 8 + * Author: Linus Walleij <linus.walleij@linaro.org> 9 + * 10 + * License terms: GNU General Public License (GPL) version 2 11 + */ 12 + #ifndef __LINUX_PINCTRL_PINCONF_GENERIC_H 13 + #define __LINUX_PINCTRL_PINCONF_GENERIC_H 14 + 15 + /* 16 + * You shouldn't even be able to compile with these enums etc unless you're 17 + * using generic pin config. That is why this is defined out. 18 + */ 19 + #ifdef CONFIG_GENERIC_PINCONF 20 + 21 + /** 22 + * enum pin_config_param - possible pin configuration parameters 23 + * @PIN_CONFIG_BIAS_DISABLE: disable any pin bias on the pin, a 24 + * transition from say pull-up to pull-down implies that you disable 25 + * pull-up in the process, this setting disables all biasing. 26 + * @PIN_CONFIG_BIAS_HIGH_IMPEDANCE: the pin will be set to a high impedance 27 + * mode, also know as "third-state" (tristate) or "high-Z" or "floating". 28 + * On output pins this effectively disconnects the pin, which is useful 29 + * if for example some other pin is going to drive the signal connected 30 + * to it for a while. Pins used for input are usually always high 31 + * impedance. 32 + * @PIN_CONFIG_BIAS_PULL_UP: the pin will be pulled up (usually with high 33 + * impedance to VDD). If the argument is != 0 pull-up is enabled, 34 + * if it is 0, pull-up is disabled. 35 + * @PIN_CONFIG_BIAS_PULL_DOWN: the pin will be pulled down (usually with high 36 + * impedance to GROUND). If the argument is != 0 pull-down is enabled, 37 + * if it is 0, pull-down is disabled. 38 + * @PIN_CONFIG_DRIVE_PUSH_PULL: the pin will be driven actively high and 39 + * low, this is the most typical case and is typically achieved with two 40 + * active transistors on the output. Sending this config will enabale 41 + * push-pull mode, the argument is ignored. 42 + * @PIN_CONFIG_DRIVE_OPEN_DRAIN: the pin will be driven with open drain (open 43 + * collector) which means it is usually wired with other output ports 44 + * which are then pulled up with an external resistor. Sending this 45 + * config will enabale open drain mode, the argument is ignored. 46 + * @PIN_CONFIG_DRIVE_OPEN_SOURCE: the pin will be driven with open source 47 + * (open emitter). Sending this config will enabale open drain mode, the 48 + * argument is ignored. 49 + * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in 50 + * schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis, 51 + * the threshold value is given on a custom format as argument when 52 + * setting pins to this mode. The argument zero turns the schmitt trigger 53 + * off. 54 + * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode, 55 + * which means it will wait for signals to settle when reading inputs. The 56 + * argument gives the debounce time on a custom format. Setting the 57 + * argument to zero turns debouncing off. 58 + * @PIN_CONFIG_POWER_SOURCE: if the pin can select between different power 59 + * supplies, the argument to this parameter (on a custom format) tells 60 + * the driver which alternative power source to use. 61 + * @PIN_CONFIG_LOW_POWER_MODE: this will configure the pin for low power 62 + * operation, if several modes of operation are supported these can be 63 + * passed in the argument on a custom form, else just use argument 1 64 + * to indicate low power mode, argument 0 turns low power mode off. 65 + * @PIN_CONFIG_END: this is the last enumerator for pin configurations, if 66 + * you need to pass in custom configurations to the pin controller, use 67 + * PIN_CONFIG_END+1 as the base offset. 68 + */ 69 + enum pin_config_param { 70 + PIN_CONFIG_BIAS_DISABLE, 71 + PIN_CONFIG_BIAS_HIGH_IMPEDANCE, 72 + PIN_CONFIG_BIAS_PULL_UP, 73 + PIN_CONFIG_BIAS_PULL_DOWN, 74 + PIN_CONFIG_DRIVE_PUSH_PULL, 75 + PIN_CONFIG_DRIVE_OPEN_DRAIN, 76 + PIN_CONFIG_DRIVE_OPEN_SOURCE, 77 + PIN_CONFIG_INPUT_SCHMITT, 78 + PIN_CONFIG_INPUT_DEBOUNCE, 79 + PIN_CONFIG_POWER_SOURCE, 80 + PIN_CONFIG_LOW_POWER_MODE, 81 + PIN_CONFIG_END = 0x7FFF, 82 + }; 83 + 84 + /* 85 + * Helpful configuration macro to be used in tables etc. 86 + */ 87 + #define PIN_CONF_PACKED(p, a) ((a << 16) | ((unsigned long) p & 0xffffUL)) 88 + 89 + /* 90 + * The following inlines stuffs a configuration parameter and data value 91 + * into and out of an unsigned long argument, as used by the generic pin config 92 + * system. We put the parameter in the lower 16 bits and the argument in the 93 + * upper 16 bits. 94 + */ 95 + 96 + static inline enum pin_config_param pinconf_to_config_param(unsigned long config) 97 + { 98 + return (enum pin_config_param) (config & 0xffffUL); 99 + } 100 + 101 + static inline u16 pinconf_to_config_argument(unsigned long config) 102 + { 103 + return (enum pin_config_param) ((config >> 16) & 0xffffUL); 104 + } 105 + 106 + static inline unsigned long pinconf_to_config_packed(enum pin_config_param param, 107 + u16 argument) 108 + { 109 + return PIN_CONF_PACKED(param, argument); 110 + } 111 + 112 + #endif /* CONFIG_GENERIC_PINCONF */ 113 + 114 + #endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */
+5
include/linux/pinctrl/pinconf.h
··· 20 20 /** 21 21 * struct pinconf_ops - pin config operations, to be implemented by 22 22 * pin configuration capable drivers. 23 + * @is_generic: for pin controllers that want to use the generic interface, 24 + * this flag tells the framework that it's generic. 23 25 * @pin_config_get: get the config of a certain pin, if the requested config 24 26 * is not available on this controller this should return -ENOTSUPP 25 27 * and if it is available but disabled it should return -EINVAL ··· 35 33 * per-device info for a certain group in debugfs 36 34 */ 37 35 struct pinconf_ops { 36 + #ifdef CONFIG_GENERIC_PINCONF 37 + bool is_generic; 38 + #endif 38 39 int (*pin_config_get) (struct pinctrl_dev *pctldev, 39 40 unsigned pin, 40 41 unsigned long *config);