Skip to content

pinmux: stm32: remove pre-DT API #38275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 5, 2021
Merged

pinmux: stm32: remove pre-DT API #38275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97b6bbc
dt-bindings: pinctrl: stm32: remove unused pin macros
gmarull Sep 3, 2021
a381a0e
drivers: pinmux: stm32: remove pre-DT API
gmarull Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions drivers/pinmux/pinmux_stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,42 +390,3 @@ int stm32_dt_pinctrl_remap(const struct soc_gpio_pinctrl *pinctrl,
return 0;
}
#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */


/**
* @brief pin setup
*
* @param pin STM32PIN() encoded pin ID
* @param func SoC specific function assignment
* @param clk optional clock device
*
* @return 0 on success, error otherwise
*/
int z_pinmux_stm32_set(uint32_t pin, uint32_t func)
{
const struct device *port_device = gpio_ports[STM32_PORT(pin)];

/* make sure to enable port clock first */
if (gpio_stm32_clock_request(port_device, true)) {
return -EIO;
}

return stm32_pin_configure(pin, func, func & STM32_AFR_MASK);
}

/**
* @brief setup pins according to their assignments
*
* @param pinconf board pin configuration array
* @param pins array size
*/
void stm32_setup_pins(const struct pin_config *pinconf,
size_t pins)
{
int i;

for (i = 0; i < pins; i++) {
z_pinmux_stm32_set(pinconf[i].pin_num,
pinconf[i].mode);
}
}
30 changes: 0 additions & 30 deletions drivers/pinmux/pinmux_stm32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
extern "C" {
#endif

struct pin_config {
uint8_t pin_num;
uint32_t mode;
};

/**
* @brief structure to convey pinctrl information for stm32 soc
* value
Expand Down Expand Up @@ -120,31 +115,6 @@ struct stm32_pinmux_conf {
*/
clock_control_subsys_t stm32_get_port_clock(int port);

/**
* @brief helper for configuration of IO pin
*
* @param pin IO pin, STM32PIN() encoded
* @param func IO function encoded
* @param clk clock control device, for enabling/disabling clock gate
* for the port
*/
int z_pinmux_stm32_set(uint32_t pin, uint32_t func);

/**
* @brief helper for obtaining pin configuration for the board
*
* @param[out] pins set to the number of pins in the array
*
* Obtain pin assignment/configuration for current board. This call
* needs to be implemented at the board integration level. After
* restart all pins are already configured as GPIO and can be skipped
* in the configuration array. Pin numbers in @pin_num field are
* STM32PIN() encoded.
*
*/
void stm32_setup_pins(const struct pin_config *pinconf,
size_t pins);

/**
* @brief helper for converting dt stm32 pinctrl format to existing pin config
* format
Expand Down
187 changes: 0 additions & 187 deletions include/dt-bindings/pinctrl/stm32-pinctrl-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,191 +36,4 @@
#define STM32PIN(_port, _pin) \
(_port << 4 | _pin)

#define STM32_PIN_PA0 STM32PIN(STM32_PORTA, 0)
#define STM32_PIN_PA1 STM32PIN(STM32_PORTA, 1)
#define STM32_PIN_PA2 STM32PIN(STM32_PORTA, 2)
#define STM32_PIN_PA3 STM32PIN(STM32_PORTA, 3)
#define STM32_PIN_PA4 STM32PIN(STM32_PORTA, 4)
#define STM32_PIN_PA5 STM32PIN(STM32_PORTA, 5)
#define STM32_PIN_PA6 STM32PIN(STM32_PORTA, 6)
#define STM32_PIN_PA7 STM32PIN(STM32_PORTA, 7)
#define STM32_PIN_PA8 STM32PIN(STM32_PORTA, 8)
#define STM32_PIN_PA9 STM32PIN(STM32_PORTA, 9)
#define STM32_PIN_PA10 STM32PIN(STM32_PORTA, 10)
#define STM32_PIN_PA11 STM32PIN(STM32_PORTA, 11)
#define STM32_PIN_PA12 STM32PIN(STM32_PORTA, 12)
#define STM32_PIN_PA13 STM32PIN(STM32_PORTA, 13)
#define STM32_PIN_PA14 STM32PIN(STM32_PORTA, 14)
#define STM32_PIN_PA15 STM32PIN(STM32_PORTA, 15)

#define STM32_PIN_PB0 STM32PIN(STM32_PORTB, 0)
#define STM32_PIN_PB1 STM32PIN(STM32_PORTB, 1)
#define STM32_PIN_PB2 STM32PIN(STM32_PORTB, 2)
#define STM32_PIN_PB3 STM32PIN(STM32_PORTB, 3)
#define STM32_PIN_PB4 STM32PIN(STM32_PORTB, 4)
#define STM32_PIN_PB5 STM32PIN(STM32_PORTB, 5)
#define STM32_PIN_PB6 STM32PIN(STM32_PORTB, 6)
#define STM32_PIN_PB7 STM32PIN(STM32_PORTB, 7)
#define STM32_PIN_PB8 STM32PIN(STM32_PORTB, 8)
#define STM32_PIN_PB9 STM32PIN(STM32_PORTB, 9)
#define STM32_PIN_PB10 STM32PIN(STM32_PORTB, 10)
#define STM32_PIN_PB11 STM32PIN(STM32_PORTB, 11)
#define STM32_PIN_PB12 STM32PIN(STM32_PORTB, 12)
#define STM32_PIN_PB13 STM32PIN(STM32_PORTB, 13)
#define STM32_PIN_PB14 STM32PIN(STM32_PORTB, 14)
#define STM32_PIN_PB15 STM32PIN(STM32_PORTB, 15)

#define STM32_PIN_PC0 STM32PIN(STM32_PORTC, 0)
#define STM32_PIN_PC1 STM32PIN(STM32_PORTC, 1)
#define STM32_PIN_PC2 STM32PIN(STM32_PORTC, 2)
#define STM32_PIN_PC3 STM32PIN(STM32_PORTC, 3)
#define STM32_PIN_PC4 STM32PIN(STM32_PORTC, 4)
#define STM32_PIN_PC5 STM32PIN(STM32_PORTC, 5)
#define STM32_PIN_PC6 STM32PIN(STM32_PORTC, 6)
#define STM32_PIN_PC7 STM32PIN(STM32_PORTC, 7)
#define STM32_PIN_PC8 STM32PIN(STM32_PORTC, 8)
#define STM32_PIN_PC9 STM32PIN(STM32_PORTC, 9)
#define STM32_PIN_PC10 STM32PIN(STM32_PORTC, 10)
#define STM32_PIN_PC11 STM32PIN(STM32_PORTC, 11)
#define STM32_PIN_PC12 STM32PIN(STM32_PORTC, 12)
#define STM32_PIN_PC13 STM32PIN(STM32_PORTC, 13)
#define STM32_PIN_PC14 STM32PIN(STM32_PORTC, 14)
#define STM32_PIN_PC15 STM32PIN(STM32_PORTC, 15)

#define STM32_PIN_PD0 STM32PIN(STM32_PORTD, 0)
#define STM32_PIN_PD1 STM32PIN(STM32_PORTD, 1)
#define STM32_PIN_PD2 STM32PIN(STM32_PORTD, 2)
#define STM32_PIN_PD3 STM32PIN(STM32_PORTD, 3)
#define STM32_PIN_PD4 STM32PIN(STM32_PORTD, 4)
#define STM32_PIN_PD5 STM32PIN(STM32_PORTD, 5)
#define STM32_PIN_PD6 STM32PIN(STM32_PORTD, 6)
#define STM32_PIN_PD7 STM32PIN(STM32_PORTD, 7)
#define STM32_PIN_PD8 STM32PIN(STM32_PORTD, 8)
#define STM32_PIN_PD9 STM32PIN(STM32_PORTD, 9)
#define STM32_PIN_PD10 STM32PIN(STM32_PORTD, 10)
#define STM32_PIN_PD11 STM32PIN(STM32_PORTD, 11)
#define STM32_PIN_PD12 STM32PIN(STM32_PORTD, 12)
#define STM32_PIN_PD13 STM32PIN(STM32_PORTD, 13)
#define STM32_PIN_PD14 STM32PIN(STM32_PORTD, 14)
#define STM32_PIN_PD15 STM32PIN(STM32_PORTD, 15)

#define STM32_PIN_PE0 STM32PIN(STM32_PORTE, 0)
#define STM32_PIN_PE1 STM32PIN(STM32_PORTE, 1)
#define STM32_PIN_PE2 STM32PIN(STM32_PORTE, 2)
#define STM32_PIN_PE3 STM32PIN(STM32_PORTE, 3)
#define STM32_PIN_PE4 STM32PIN(STM32_PORTE, 4)
#define STM32_PIN_PE5 STM32PIN(STM32_PORTE, 5)
#define STM32_PIN_PE6 STM32PIN(STM32_PORTE, 6)
#define STM32_PIN_PE7 STM32PIN(STM32_PORTE, 7)
#define STM32_PIN_PE8 STM32PIN(STM32_PORTE, 8)
#define STM32_PIN_PE9 STM32PIN(STM32_PORTE, 9)
#define STM32_PIN_PE10 STM32PIN(STM32_PORTE, 10)
#define STM32_PIN_PE11 STM32PIN(STM32_PORTE, 11)
#define STM32_PIN_PE12 STM32PIN(STM32_PORTE, 12)
#define STM32_PIN_PE13 STM32PIN(STM32_PORTE, 13)
#define STM32_PIN_PE14 STM32PIN(STM32_PORTE, 14)
#define STM32_PIN_PE15 STM32PIN(STM32_PORTE, 15)

#define STM32_PIN_PF0 STM32PIN(STM32_PORTF, 0)
#define STM32_PIN_PF1 STM32PIN(STM32_PORTF, 1)
#define STM32_PIN_PF2 STM32PIN(STM32_PORTF, 2)
#define STM32_PIN_PF3 STM32PIN(STM32_PORTF, 3)
#define STM32_PIN_PF4 STM32PIN(STM32_PORTF, 4)
#define STM32_PIN_PF5 STM32PIN(STM32_PORTF, 5)
#define STM32_PIN_PF6 STM32PIN(STM32_PORTF, 6)
#define STM32_PIN_PF7 STM32PIN(STM32_PORTF, 7)
#define STM32_PIN_PF8 STM32PIN(STM32_PORTF, 8)
#define STM32_PIN_PF9 STM32PIN(STM32_PORTF, 9)
#define STM32_PIN_PF10 STM32PIN(STM32_PORTF, 10)
#define STM32_PIN_PF11 STM32PIN(STM32_PORTF, 11)
#define STM32_PIN_PF12 STM32PIN(STM32_PORTF, 12)
#define STM32_PIN_PF13 STM32PIN(STM32_PORTF, 13)
#define STM32_PIN_PF14 STM32PIN(STM32_PORTF, 14)
#define STM32_PIN_PF15 STM32PIN(STM32_PORTF, 15)

#define STM32_PIN_PG0 STM32PIN(STM32_PORTG, 0)
#define STM32_PIN_PG1 STM32PIN(STM32_PORTG, 1)
#define STM32_PIN_PG2 STM32PIN(STM32_PORTG, 2)
#define STM32_PIN_PG3 STM32PIN(STM32_PORTG, 3)
#define STM32_PIN_PG4 STM32PIN(STM32_PORTG, 4)
#define STM32_PIN_PG5 STM32PIN(STM32_PORTG, 5)
#define STM32_PIN_PG6 STM32PIN(STM32_PORTG, 6)
#define STM32_PIN_PG7 STM32PIN(STM32_PORTG, 7)
#define STM32_PIN_PG8 STM32PIN(STM32_PORTG, 8)
#define STM32_PIN_PG9 STM32PIN(STM32_PORTG, 9)
#define STM32_PIN_PG10 STM32PIN(STM32_PORTG, 10)
#define STM32_PIN_PG11 STM32PIN(STM32_PORTG, 11)
#define STM32_PIN_PG12 STM32PIN(STM32_PORTG, 12)
#define STM32_PIN_PG13 STM32PIN(STM32_PORTG, 13)
#define STM32_PIN_PG14 STM32PIN(STM32_PORTG, 14)
#define STM32_PIN_PG15 STM32PIN(STM32_PORTG, 15)

#define STM32_PIN_PH0 STM32PIN(STM32_PORTH, 0)
#define STM32_PIN_PH1 STM32PIN(STM32_PORTH, 1)
#define STM32_PIN_PH2 STM32PIN(STM32_PORTH, 2)
#define STM32_PIN_PH3 STM32PIN(STM32_PORTH, 3)
#define STM32_PIN_PH4 STM32PIN(STM32_PORTH, 4)
#define STM32_PIN_PH5 STM32PIN(STM32_PORTH, 5)
#define STM32_PIN_PH6 STM32PIN(STM32_PORTH, 6)
#define STM32_PIN_PH7 STM32PIN(STM32_PORTH, 7)
#define STM32_PIN_PH8 STM32PIN(STM32_PORTH, 8)
#define STM32_PIN_PH9 STM32PIN(STM32_PORTH, 9)
#define STM32_PIN_PH10 STM32PIN(STM32_PORTH, 10)
#define STM32_PIN_PH11 STM32PIN(STM32_PORTH, 11)
#define STM32_PIN_PH12 STM32PIN(STM32_PORTH, 12)
#define STM32_PIN_PH13 STM32PIN(STM32_PORTH, 13)
#define STM32_PIN_PH14 STM32PIN(STM32_PORTH, 14)
#define STM32_PIN_PH15 STM32PIN(STM32_PORTH, 15)

#define STM32_PIN_PI0 STM32PIN(STM32_PORTI, 0)
#define STM32_PIN_PI1 STM32PIN(STM32_PORTI, 1)
#define STM32_PIN_PI2 STM32PIN(STM32_PORTI, 2)
#define STM32_PIN_PI3 STM32PIN(STM32_PORTI, 3)
#define STM32_PIN_PI4 STM32PIN(STM32_PORTI, 4)
#define STM32_PIN_PI5 STM32PIN(STM32_PORTI, 5)
#define STM32_PIN_PI6 STM32PIN(STM32_PORTI, 6)
#define STM32_PIN_PI7 STM32PIN(STM32_PORTI, 7)
#define STM32_PIN_PI8 STM32PIN(STM32_PORTI, 8)
#define STM32_PIN_PI9 STM32PIN(STM32_PORTI, 9)
#define STM32_PIN_PI10 STM32PIN(STM32_PORTI, 10)
#define STM32_PIN_PI11 STM32PIN(STM32_PORTI, 11)
#define STM32_PIN_PI12 STM32PIN(STM32_PORTI, 12)
#define STM32_PIN_PI13 STM32PIN(STM32_PORTI, 13)
#define STM32_PIN_PI14 STM32PIN(STM32_PORTI, 14)
#define STM32_PIN_PI15 STM32PIN(STM32_PORTI, 15)

#define STM32_PIN_PJ0 STM32PIN(STM32_PORTJ, 0)
#define STM32_PIN_PJ1 STM32PIN(STM32_PORTJ, 1)
#define STM32_PIN_PJ2 STM32PIN(STM32_PORTJ, 2)
#define STM32_PIN_PJ3 STM32PIN(STM32_PORTJ, 3)
#define STM32_PIN_PJ4 STM32PIN(STM32_PORTJ, 4)
#define STM32_PIN_PJ5 STM32PIN(STM32_PORTJ, 5)
#define STM32_PIN_PJ6 STM32PIN(STM32_PORTJ, 6)
#define STM32_PIN_PJ7 STM32PIN(STM32_PORTJ, 7)
#define STM32_PIN_PJ8 STM32PIN(STM32_PORTJ, 8)
#define STM32_PIN_PJ9 STM32PIN(STM32_PORTJ, 9)
#define STM32_PIN_PJ10 STM32PIN(STM32_PORTJ, 10)
#define STM32_PIN_PJ11 STM32PIN(STM32_PORTJ, 11)
#define STM32_PIN_PJ12 STM32PIN(STM32_PORTJ, 12)
#define STM32_PIN_PJ13 STM32PIN(STM32_PORTJ, 13)
#define STM32_PIN_PJ14 STM32PIN(STM32_PORTJ, 14)
#define STM32_PIN_PJ15 STM32PIN(STM32_PORTJ, 15)

#define STM32_PIN_PK0 STM32PIN(STM32_PORTK, 0)
#define STM32_PIN_PK1 STM32PIN(STM32_PORTK, 1)
#define STM32_PIN_PK2 STM32PIN(STM32_PORTK, 2)
#define STM32_PIN_PK3 STM32PIN(STM32_PORTK, 3)
#define STM32_PIN_PK4 STM32PIN(STM32_PORTK, 4)
#define STM32_PIN_PK5 STM32PIN(STM32_PORTK, 5)
#define STM32_PIN_PK6 STM32PIN(STM32_PORTK, 6)
#define STM32_PIN_PK7 STM32PIN(STM32_PORTK, 7)
#define STM32_PIN_PK8 STM32PIN(STM32_PORTK, 8)
#define STM32_PIN_PK9 STM32PIN(STM32_PORTK, 9)
#define STM32_PIN_PK10 STM32PIN(STM32_PORTK, 10)
#define STM32_PIN_PK11 STM32PIN(STM32_PORTK, 11)
#define STM32_PIN_PK12 STM32PIN(STM32_PORTK, 12)
#define STM32_PIN_PK13 STM32PIN(STM32_PORTK, 13)
#define STM32_PIN_PK14 STM32PIN(STM32_PORTK, 14)
#define STM32_PIN_PK15 STM32PIN(STM32_PORTK, 15)

#endif /* ZEPHYR_STM32_PINCTRL_COMMON_H_ */