[v2,02/62] pinctrl: provide new GPIO-to-pinctrl glue helpers

Message ID	20231011120830.49324-3-brgl@bgdev.pl
State	Superseded
Headers	show Return-Path: <linux-gpio-owner@vger.kernel.org> From: Bartosz Golaszewski <brgl@bgdev.pl> To: Linus Walleij <linus.walleij@linaro.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Subject: [PATCH v2 02/62] pinctrl: provide new GPIO-to-pinctrl glue helpers Date: Wed, 11 Oct 2023 14:07:30 +0200 Message-Id: <20231011120830.49324-3-brgl@bgdev.pl> In-Reply-To: <20231011120830.49324-1-brgl@bgdev.pl> References: <20231011120830.49324-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	pinctrl: don't use GPIOLIB global numberspace in helpers \| expand [v2,00/62] pinctrl: don't use GPIOLIB global numberspace in helpers [v2,01/62] pinctrl: remove unneeded extern specifiers from consumer.h [v2,02/62] pinctrl: provide new GPIO-to-pinctrl glue helpers [v2,03/62] gpiolib: generic: use new pinctrl GPIO helpers [v2,04/62] gpio: cdev: use pinctrl_gpio_can_use_line_new() [v2,05/62] gpio: rcar: use new pinctrl GPIO helpers [v2,06/62] gpio: tegra: use new pinctrl GPIO helpers [v2,07/62] gpio: em: use new pinctrl GPIO helpers [v2,08/62] gpio: aspeed: use new pinctrl GPIO helpers [v2,09/62] gpio: mvebu: use new pinctrl GPIO helpers [v2,10/62] gpio: pxa: use new pinctrl GPIO helpers [v2,11/62] gpio: rockchip: use new pinctrl GPIO helpers [v2,12/62] gpio: vf610: use new pinctrl GPIO helpers [v2,13/62] pinctrl: nuvoton: use new pinctrl GPIO helpers [v2,14/62] pinctrl: renesas: use new pinctrl GPIO helpers [v2,15/62] pinctrl: bcm: use new pinctrl GPIO helpers [v2,16/62] pinctrl: stm32: use new pinctrl GPIO helpers [v2,17/62] pinctrl: spear: use new pinctrl GPIO helpers [v2,18/62] pinctrl: starfive: use new pinctrl GPIO helpers [v2,19/62] pinctrl: ocelot: use new pinctrl GPIO helpers [v2,20/62] pinctrl: rk805: use new pinctrl GPIO helpers [v2,21/62] pinctrl: cirrus: use new pinctrl GPIO helpers [v2,22/62] pinctrl: mediatek: use new pinctrl GPIO helpers [v2,23/62] pinctrl: axp209: use new pinctrl GPIO helpers [v2,24/62] pinctrl: vt8500: use new pinctrl GPIO helpers [v2,25/62] pinctrl: cy8c95x0: use new pinctrl GPIO helpers [v2,26/62] pinctrl: as3722: use new pinctrl GPIO helpers [v2,27/62] pinctrl: ingenic: use new pinctrl GPIO helpers [v2,28/62] pinctrl: intel: use new pinctrl GPIO helpers [v2,29/62] pinctrl: st: use new pinctrl GPIO helpers [v2,30/62] pinctrl: remove pinctrl_gpio_can_use_line() [v2,31/62] pinctrl: remove pinctrl_gpio_request() [v2,32/62] pinctrl: remove pinctrl_gpio_free() [v2,33/62] pinctrl: remove pinctrl_gpio_direction_input() [v2,34/62] pinctrl: remove pinctrl_gpio_direction_output() [v2,35/62] pinctrl: remove pinctrl_gpio_set_config() [v2,36/62] treewide: rename pinctrl_gpio_can_use_line_new() [v2,37/62] treewide: rename pinctrl_gpio_request_new() [v2,38/62] treewide: rename pinctrl_gpio_free_new() [v2,39/62] treewide: rename pinctrl_gpio_direction_input_new() [v2,40/62] treewide: rename pinctrl_gpio_direction_output_new() [v2,41/62] treewide: rename pinctrl_gpio_set_config_new() [v2,42/62] pinctrl: change the signature of pinctrl_gpio_direction() [v2,43/62] pinctrl: change the signature of pinctrl_get_device_gpio_range() [v2,44/62] pinctrl: change the signature of pinctrl_match_gpio_range() [v2,45/62] pinctrl: change the signature of gpio_to_pin() [v2,46/62] pinctrl: change the signature of pinctrl_ready_for_gpio_range() [v2,47/62] pinctrl: intel: drop the wrappers around pinctrl_gpio_direction_input() [v2,48/62] pinctrl: st: drop the wrapper around pinctrl_gpio_direction_input() [v2,49/62] pinctrl: ingenic: drop the wrapper around pinctrl_gpio_direction_input() [v2,50/62] pinctrl: as3722: drop the wrapper around pinctrl_gpio_direction_input() [v2,51/62] pinctrl: cy8c95x0: drop the wrapper around pinctrl_gpio_direction_input() [v2,52/62] pinctrl: vt8500: drop the wrapper around pinctrl_gpio_direction_input() [v2,53/62] pinctrl: axp209: drop the wrapper around pinctrl_gpio_direction_input() [v2,54/62] pinctrl: rk805: drop the wrapper around pinctrl_gpio_direction_input() [v2,55/62] pinctrl: mediatek: drop the wrappers around pinctrl_gpio_direction_input() [v2,56/62] pinctrl: cirrus: drop the wrapper around pinctrl_gpio_direction_input() [v2,57/62] pinctrl: ocelot: drop the wrapper around pinctrl_gpio_direction_input() [v2,58/62] pinctrl: starfive: drop wrappers around pinctrl_gpio_request/free() [v2,59/62] pinctrl: stm32: drop wrappers around pinctrl_gpio_free/input() [v2,60/62] pinctrl: nuvoton: drop wrappers around pinctrl_gpio_request/free() [v2,61/62] pinctrl: em: drop the wrapper around pinctrl_gpio_request() [v2,62/62] pinctrl: tegra: drop the wrapper around pinctrl_gpio_request()

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 2bf95d8f30cc..13a6fa85c462 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -23,6 +23,8 @@ #include <linux/seq_file.h> #include <linux/slab.h> +#include <linux/gpio/driver.h> + #include <linux/pinctrl/consumer.h> #include <linux/pinctrl/devinfo.h> #include <linux/pinctrl/machine.h> @@ -781,14 +783,13 @@ bool pinctrl_gpio_can_use_line(unsigned gpio) } EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line); -/** - * pinctrl_gpio_request() - request a single pin to be used as GPIO - * @gpio: the GPIO pin number from the GPIO subsystem number space - * - * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_request() semantics, platforms and individual drivers - * shall *NOT* request GPIO pins to be muxed in. - */ +bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_can_use_line(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line_new); + +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_request(unsigned gpio) { struct pinctrl_dev *pctldev; @@ -817,13 +818,21 @@ int pinctrl_gpio_request(unsigned gpio) EXPORT_SYMBOL_GPL(pinctrl_gpio_request); /** - * pinctrl_gpio_free() - free control on a single pin, currently used as GPIO - * @gpio: the GPIO pin number from the GPIO subsystem number space + * pinctrl_gpio_request_new() - request a single pin to be used as GPIO + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_free() semantics, platforms and individual drivers - * shall *NOT* request GPIO pins to be muxed out. + * as part of their gpio_request() semantics, platforms and individual drivers + * shall *NOT* request GPIO pins to be muxed in. */ +int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_request(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_request_new); + +/* This function is deprecated and will be removed. Don't use. */ void pinctrl_gpio_free(unsigned gpio) { struct pinctrl_dev *pctldev; @@ -846,6 +855,21 @@ void pinctrl_gpio_free(unsigned gpio) } EXPORT_SYMBOL_GPL(pinctrl_gpio_free); +/** + * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller + * + * This function should *ONLY* be used from gpiolib-based GPIO drivers, + * as part of their gpio_request() semantics, platforms and individual drivers + * shall *NOT* request GPIO pins to be muxed in. + */ +void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_free(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new); + static int pinctrl_gpio_direction(unsigned gpio, bool input) { struct pinctrl_dev *pctldev; @@ -869,14 +893,7 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input) return ret; } -/** - * pinctrl_gpio_direction_input() - request a GPIO pin to go into input mode - * @gpio: the GPIO pin number from the GPIO subsystem number space - * - * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_direction_input() semantics, platforms and individual - * drivers shall *NOT* touch pin control GPIO calls. - */ +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_direction_input(unsigned gpio) { return pinctrl_gpio_direction(gpio, true); @@ -884,13 +901,21 @@ int pinctrl_gpio_direction_input(unsigned gpio) EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input); /** - * pinctrl_gpio_direction_output() - request a GPIO pin to go into output mode - * @gpio: the GPIO pin number from the GPIO subsystem number space + * pinctrl_gpio_direction_input_new() - request a GPIO pin to go into input mode + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_direction_output() semantics, platforms and individual + * as part of their gpio_direction_input() semantics, platforms and individual * drivers shall *NOT* touch pin control GPIO calls. */ +int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_direction_input(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input_new); + +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_direction_output(unsigned gpio) { return pinctrl_gpio_direction(gpio, false); @@ -898,14 +923,22 @@ int pinctrl_gpio_direction_output(unsigned gpio) EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); /** - * pinctrl_gpio_set_config() - Apply config to given GPIO pin - * @gpio: the GPIO pin number from the GPIO subsystem number space - * @config: the configuration to apply to the GPIO + * pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output + * mode + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * - * This function should *ONLY* be used from gpiolib-based GPIO drivers, if - * they need to call the underlying pin controller to change GPIO config - * (for example set debounce time). + * This function should *ONLY* be used from gpiolib-based GPIO drivers, + * as part of their gpio_direction_output() semantics, platforms and individual + * drivers shall *NOT* touch pin control GPIO calls. */ +int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_direction_output(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output_new); + +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) { unsigned long configs[] = { config }; @@ -926,6 +959,23 @@ int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) } EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config); +/** + * pinctrl_gpio_set_config_new() - Apply config to given GPIO pin + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller + * @config: the configuration to apply to the GPIO + * + * This function should *ONLY* be used from gpiolib-based GPIO drivers, if + * they need to call the underlying pin controller to change GPIO config + * (for example set debounce time). + */ +int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, + unsigned long config) +{ + return pinctrl_gpio_set_config(gc->base + offset, config); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config_new); + static struct pinctrl_state *find_state(struct pinctrl *p, const char *name) { diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 22eef0a513ce..c95c13983376 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -17,6 +17,7 @@ #include <linux/pinctrl/pinctrl-state.h> struct device; +struct gpio_chip; /* This struct is private to the core and should be regarded as a cookie */ struct pinctrl; @@ -26,11 +27,20 @@ struct pinctrl_state; /* External interface to pin control */ bool pinctrl_gpio_can_use_line(unsigned gpio); +bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_request(unsigned gpio); +int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset); void pinctrl_gpio_free(unsigned gpio); +void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_input(unsigned gpio); +int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, + unsigned int offset); int pinctrl_gpio_direction_output(unsigned gpio); +int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, + unsigned int offset); int pinctrl_gpio_set_config(unsigned gpio, unsigned long config); +int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, + unsigned long config); struct pinctrl * __must_check pinctrl_get(struct device *dev); void pinctrl_put(struct pinctrl *p); @@ -68,30 +78,66 @@ static inline bool pinctrl_gpio_can_use_line(unsigned gpio) return true; } +static inline bool +pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) +{ + return true; +} + static inline int pinctrl_gpio_request(unsigned gpio) { return 0; } +static inline int +pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) +{ + return 0; +} + static inline void pinctrl_gpio_free(unsigned gpio) { } +static inline void +pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) +{ +} + static inline int pinctrl_gpio_direction_input(unsigned gpio) { return 0; } +static inline int +pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) +{ + return 0; +} + static inline int pinctrl_gpio_direction_output(unsigned gpio) { return 0; } +static inline int +pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) +{ + return 0; +} + static inline int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) { return 0; } +static inline int +pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, + unsigned long config) +{ + return 0; +} + static inline struct pinctrl * __must_check pinctrl_get(struct device *dev) { return NULL;

[v2,02/62] pinctrl: provide new GPIO-to-pinctrl glue helpers

Commit Message

Patch