Skip to content

stm32_gpio: move to pinctrl framework - #6050

Closed
etienne-lms wants to merge 26 commits into
OP-TEE:masterfrom
etienne-lms:stm32-pinctrl
Closed

stm32_gpio: move to pinctrl framework#6050
etienne-lms wants to merge 26 commits into
OP-TEE:masterfrom
etienne-lms:stm32-pinctrl

Conversation

@etienne-lms

@etienne-lms etienne-lms commented May 25, 2023

Copy link
Copy Markdown
Contributor

This P-R ports stm32_gpio driver to the recently merged pinctrl framework.

The series includes 2 changes already under review in specific P-Rs: #6041 and #6049.

Checkpatch complains on false positive warnings on several commits of this series because of a structure field names od, for example:

30243dba7 drivers: stm32_gpio: consider DT output data configuration
WARNING: 'od' may be misspelled - perhaps 'of'?
#52: FILE: core/drivers/stm32_gpio.c:306:
+			ref->active_cfg.od = odata;
 			                ^^

total: 0 errors, 1 warnings, 0 checks, 35 lines checked

@etienne-lms
etienne-lms marked this pull request as draft May 26, 2023 07:54
@etienne-lms

etienne-lms commented May 26, 2023

Copy link
Copy Markdown
Contributor Author

I convert this P-R into DRAF mode as the series is a bit long and I fear it will take time to land. I also wanted to push another P-R for intergrating CFG_DRVIERS_GPIO in stm32_gpio driver, but I see it's hard to decorrelate both as there are common newly introduce functions.

There fore I plan is rather to keep this P-R for the big picture and create samller P-Rs for step by step integration of these 2 features.

etienne-lms and others added 26 commits May 30, 2023 09:44
@etienne-lms
[P-R#6052] drivers: stm32_gpio: helper function to register GPIO banks
7295a14 
NOTE: change under review at OP-TEE#6052

Adds an helper function (dt_stm32_gpio_bank()) to register GPIO banks
in stm32_gpio driver based on DT pinctrl nodes. GPIO banks are
registered in a local list from which will be later used to find a
bank based on its ID number. The function is expected to be called
from the driver probe sequence. The function ensures a bank is not
registered twice.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
[P-R#6052] drivers: stm32_gpio: probe pinctrl nodes
a64c352 
NOTE: change under review at OP-TEE#6052

This change makes stm32_gpio driver to register GPIO bank when the
driver of probed on compatible pin control instances found in the
device tree. This change however does not yet register pinctrl
providers to DT_DRIVER framework.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
[P-R#6052] drivers: stm32_gpio: fix driver header file guards
eb8db6f 
NOTE: change under review at OP-TEE#6052

Fixes the names of the macro used as stm32_gpio.h header file guard.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
[P-R#6041] core: rename dt_driver_phandle_args to dt_pargs
9e1ea28 
NOTE: under review at OP-TEE#6041

Renames struct dt_driver_phandle_args to struct dt_pargs to
shorten the label and prevent ugly line breaks in function
signatures.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
@etienne-lms
[P-R#6049] drivers: pinctrl: fix stubbed pinctrl_free_state()
a1f9e45 
NOTE: under review at OP-TEE#6049

Fixes pinctrl_free_state() when CFG_DRIVERS_PINCTRL is disabled
as the API function has no return value.

The issue is reported by GCC with an error trace like the below:

core/include/drivers/pinctrl.h: In function ‘pinctrl_free_state’:
lib/libutee/include/tee_api_defines.h:117:43: error: ‘return’ with a value, in function returning void [-Werror=return-type]
  117 | #define TEE_ERROR_NOT_SUPPORTED           0xFFFF000A
      |                                           ^~~~~~~~~~
core/include/drivers/pinctrl.h:158:16: note: in expansion of macro ‘TEE_ERROR_NOT_SUPPORTED’
  158 |         return TEE_ERROR_NOT_SUPPORTED;
      |                ^~~~~~~~~~~~~~~~~~~~~~~
In file included from core/include/drivers/stm32_uart.h:10,
                 from core/arch/arm/plat-stm32mp1/main.c:14:
core/include/drivers/pinctrl.h:156:6: note: declared here
  156 | void pinctrl_free_state(struct pinctrl_state *state __unused)
      |      ^~~~~~~~~~~~~~~~~~

Fixes: 9aec039 ("drivers: pinctrl: add pinctrl support")
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
@etienne-lms
[P-R#6053] drivers: stm32_gpio: consider DT output data configuration
814d467 
NOTE: under review at OP-TEE#6053

Get output data pin configuration from DT node property "output-high"
and "output-low".

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
[P-R#6056] drivers: gpio: add put operation handle
89990cc 
NOTE: under review at OP-TEE#6056

Adds a put operation handler for a GPIO consumer driver to be able
to release the GPIO resources it has allocated when getting its
GPIO. This is needed for example, when such a consumer driver must defer
its probe sequence and will get again its GPIO making gpio_dt_alloc_pin()
to be called again.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
@etienne-lms
drivers: stm32_gpio: support CFG_DRIVERS_GPIO
b8e966b 
Changes stm32_gpio driver to register GPIO provider resources for each
GPIO bank registered when CFG_DRIVERS_GPIO is enabled.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
plat-stm32mp1: enable CFG_DRIVERS_GPIO
2ce07b4 
Enables CFG_DRIVERS_GPIO for platform stm32mp1.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: remove GPIO access specific API functions
5f89ae3 
Removes stm32_gpio API functions to access GPIOs as the driver has
moved to the generic GPIO framework and consumer driver should use the
generic API to access GPIOs. The driver now expects CFG_DRIVERS_GPIO
is enabled.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: support CFG_DRIVERS_PINCTRL
87cbd91 
Changes stm32_gpio driver to support generic pin control framework
(CFG_DRIVERS_PINCTRL=y).

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: add helper function stm32_gpio_pinctrl_bank_pin()
2af6403 
Adds helper function stm32_gpio_pinctrl_bank_pin() to get an array
of bank and pin IDs related to a pin control state.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: add helper function stm32_pinctrl_set_secure_cfg()
8668845 
Adds helper function stm32_pinctrl_set_secure_cfg() to set the
GPIO pin secure state (secure or non-secure) for each pin referenced
by a pin control state.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
plat-stm32mp1: shared_resources: support CFG_DRIVERS_PINCTRL
882e488 
Adds shared resources helper functions stm32mp_register_secure_pinctrl()
and stm32mp_register_non_secure_pinctrl() for when a platform driver
registers pins from a pin control state with secure or non-secure
attribute. These function are required when CFG_DRIVERS_PINCTRL is
enabled.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_uart: support CFG_DRIVERS_PINCTRL
fb8ebc4 
Updates stm32_uart driver for when CFG_DRIVERS_PINCTRL is enabled making
UART driver to get pin control configuration using the generic pin
control framework.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_i2c: support CFG_DRIVERS_PINCTRL
bb91a0e 
Updates stm32_i2c driver for when CFG_DRIVERS_PINCTRL is enabled making
I2C driver to get pin control configuration using the generic pin
control framework. When enabled, stm32_i2c driver get the active and
standby pin control configuration from the device tree.

SE050 and STM32MP1 PMIC drivers that use the stm32_i2c bus are both
updated accordingly.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
plat-stm32mp1: conf: enable CFG_DRIVERS_PINCTRL
46ef2d8 
Changes platform stm32mp1 configuration to always enable
CFG_DRIVERS_PINCTRL. The platform requires pinctrl_apply_state() to
be unpaged has it can be used during PM suspend and resume sequences.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: add help function stm32_gpio_get_bank()
3bfb991 
Adds helper function stm32_gpio_get_bank() in stm32_gpio to retrieve
a GPIO bank instance from the bank ID. This change will allow a later
change to remove now useless platform helper functions
stm32_get_gpio_bank_base() and stm32_get_gpio_bank_clk().

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: use SHIFT_U32() where applicable
be10e9a 
Replaces 32bit operand raw left shift with use of SHIFT_U32() macro.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
plat-stm32mp1: remove unused gpio bank clock helper functions
c2b28ac 
Removes stm32mp1 platform helper functions stm32_get_gpio_bank_clock()
and stm32_get_gpio_bank_clk().

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
plat-stm32mp1: remove unused gpio bank base address helper function
9525edd 
Removes stm32mp1 platform helper function stm32_get_gpio_bank_base().

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
plat-stm32mp1: remove unused stm32mp_gpio_bank_is_shared()
2a59bfc 
Removes platform function stm32mp_gpio_bank_is_shared() that is not
used.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: remove cases when CFG_DRIVERS_PINCTRL is disabled
4867659 
Removes implementation when CFG_DRIVERS_PINCTRL is disables as stm32mp1
platform configuration enforces the switch is enabled.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_uart: remove cases when CFG_DRIVERS_PINCTRL is disabled
a7797e9 
Removes implementation when CFG_DRIVERS_PINCTRL is disables as stm32mp1
platform configuration enforces the switch is enabled.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_i2c: remove cases when CFG_DRIVERS_PINCTRL is disabled
d860bbb 
Removes implementation when CFG_DRIVERS_PINCTRL is disables as stm32mp1
platform configuration enforces the switch is enabled.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms
drivers: stm32_gpio: move definitions to source file
0a0c12c 
Moves macros and structures definitions from stm32_gpio.h header file
to the driver source file as these definition do not need to be
visible from other drivers thank to pin control abstraction.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
@etienne-lms etienne-lms mentioned this pull request Jun 7, 2023
Merged
@etienne-lms

etienne-lms commented Jun 15, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Series reviewed throug #6052, #6053, #6053, #6054, #6065, #6067, #6090, #6091 and #6082 (which is finalizing the series).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@etienne-lms