This moves the per-devices struct pinctrl handles and device map over from the pinmux part of the subsystem to the core pinctrl part. This makes the device handles core infrastructure with the goal of using these handles also for pin configuration, so that device drivers (or boards etc) will need one and only one handle to the pin control core.
Showing the changes to include/linux/pinctrl (1 of 5 files). Show all
Unified · Split
| @@ -19,9 +19,9 @@ · 18 unmodified lines | ||
| 19 | 19 | /* This struct is private to the core and should be regarded as a cookie */ |
| 20 | 20 | struct pinctrl; |
| 21 | 21 | |
| 22 | −#ifdef CONFIG_PINMUX | |
| 22 | +#ifdef CONFIG_PINCTRL | |
| 23 | 23 | |
| 24 | −/* External interface to pinmux */ | |
| 24 | +/* External interface to pin control */ | |
| 25 | 25 | extern int pinctrl_request_gpio(unsigned gpio); |
| 26 | 26 | extern void pinctrl_free_gpio(unsigned gpio); |
| 27 | 27 | extern int pinctrl_gpio_direction_input(unsigned gpio); |
| @@ -31,7 +31,7 @@ extern void pinctrl_put(struct pinctrl *p); · 3 unmodified lines | ||
| 31 | 31 | extern int pinctrl_enable(struct pinctrl *p); |
| 32 | 32 | extern void pinctrl_disable(struct pinctrl *p); |
| 33 | 33 | |
| 34 | −#else /* !CONFIG_PINMUX */ | |
| 34 | +#else /* !CONFIG_PINCTRL */ | |
| 35 | 35 | |
| 36 | 36 | static inline int pinctrl_request_gpio(unsigned gpio) |
| 37 | 37 | { |
| @@ -70,7 +70,7 @@ static inline void pinctrl_disable(struct pinctrl *p) · 32 unmodified lines | ||
| 70 | 70 | { |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | −#endif /* CONFIG_PINMUX */ | |
| 73 | +#endif /* CONFIG_PINCTRL */ | |
| 74 | 74 | |
| 75 | 75 | #ifdef CONFIG_PINCONF |
| 76 | 76 | |