Skip to content

arch: stm32: gpio: give ability to set open-drain on pins #9834

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

Closed
wants to merge 1 commit into from
Closed

arch: stm32: gpio: give ability to set open-drain on pins #9834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 20 additions & 10 deletions soc/arm/st_stm32/stm32f0/soc_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,34 @@ int stm32_gpio_flags_to_conf(int flags, int *pincfg)
{
int direction = flags & GPIO_DIR_MASK;
int pud = flags & GPIO_PUD_MASK;
int ds_low = flags & GPIO_DS_LOW_MASK;
int ds_high = flags & GPIO_DS_HIGH_MASK;

if (!pincfg) {
return -EINVAL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = STM32_MODER_OUTPUT_MODE;
/* pull-{up,down,float} */
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = STM32_PUPDR_PULL_DOWN;
} else {
/* pull-{up,down} maybe? */
*pincfg = STM32_MODER_INPUT_MODE;
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = *pincfg | STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = *pincfg | STM32_PUPDR_PULL_DOWN;
/* floating */
*pincfg = STM32_PUPDR_NO_PULL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = *pincfg | STM32_MODER_OUTPUT_MODE;

if (ds_low == GPIO_DS_ALT_LOW ||
Copy link
Member

@erwango erwango Oct 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missing something here.
Can you explain why DS_ALT_LOW is equivalent to DS_DISCONNECT_HIGH and not DISCONNECT_LOW here?

ds_high == GPIO_DS_DISCONNECT_HIGH) {
*pincfg = *pincfg | STM32_OTYPER_OPEN_DRAIN;
} else {
/* floating */
*pincfg = *pincfg | STM32_PUPDR_NO_PULL;
*pincfg = *pincfg | STM32_OTYPER_PUSH_PULL;
}
} else {
*pincfg = *pincfg | STM32_MODER_INPUT_MODE;
}

return 0;
Expand Down
30 changes: 20 additions & 10 deletions soc/arm/st_stm32/stm32f2/soc_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,34 @@ int stm32_gpio_flags_to_conf(int flags, int *pincfg)
{
int direction = flags & GPIO_DIR_MASK;
int pud = flags & GPIO_PUD_MASK;
int ds_low = flags & GPIO_DS_LOW_MASK;
int ds_high = flags & GPIO_DS_HIGH_MASK;

if (!pincfg) {
return -EINVAL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = STM32_MODER_OUTPUT_MODE;
/* pull-{up,down,float} */
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = STM32_PUPDR_PULL_DOWN;
} else {
/* pull-{up,down} maybe? */
*pincfg = STM32_MODER_INPUT_MODE;
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = *pincfg | STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = *pincfg | STM32_PUPDR_PULL_DOWN;
/* floating */
*pincfg = STM32_PUPDR_NO_PULL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = *pincfg | STM32_MODER_OUTPUT_MODE;

if (ds_low == GPIO_DS_ALT_LOW ||
ds_high == GPIO_DS_DISCONNECT_HIGH) {
*pincfg = *pincfg | STM32_OTYPER_OPEN_DRAIN;
} else {
/* floating */
*pincfg = *pincfg | STM32_PUPDR_NO_PULL;
*pincfg = *pincfg | STM32_OTYPER_PUSH_PULL;
}
} else {
*pincfg = *pincfg | STM32_MODER_INPUT_MODE;
}

return 0;
Expand Down
29 changes: 19 additions & 10 deletions soc/arm/st_stm32/stm32f3/soc_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,34 @@ int stm32_gpio_flags_to_conf(int flags, int *pincfg)
{
int direction = flags & GPIO_DIR_MASK;
int pud = flags & GPIO_PUD_MASK;
int ds_low = flags & GPIO_DS_LOW_MASK;
int ds_high = flags & GPIO_DS_HIGH_MASK;

if (!pincfg) {
return -EINVAL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = STM32_MODER_OUTPUT_MODE;
/* pull-{up,down,float} */
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = STM32_PUPDR_PULL_DOWN;
} else {
/* pull-{up,down} maybe? */
*pincfg = STM32_MODER_INPUT_MODE;
/* floating */
*pincfg = STM32_PUPDR_NO_PULL;
}

if (pud == GPIO_PUD_PULL_UP) {
*pincfg = *pincfg | STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = *pincfg | STM32_PUPDR_PULL_DOWN;
if (direction == GPIO_DIR_OUT) {
*pincfg = *pincfg | STM32_MODER_OUTPUT_MODE;

if (ds_low == GPIO_DS_ALT_LOW ||
ds_high == GPIO_DS_DISCONNECT_HIGH) {
*pincfg = *pincfg | STM32_OTYPER_OPEN_DRAIN;
} else {
/* floating */
*pincfg = *pincfg | STM32_PUPDR_NO_PULL;
*pincfg = *pincfg | STM32_OTYPER_PUSH_PULL;
}
} else {
*pincfg = *pincfg | STM32_MODER_INPUT_MODE;
}

return 0;
Expand Down
29 changes: 19 additions & 10 deletions soc/arm/st_stm32/stm32f4/soc_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,34 @@ int stm32_gpio_flags_to_conf(int flags, int *pincfg)
{
int direction = flags & GPIO_DIR_MASK;
int pud = flags & GPIO_PUD_MASK;
int ds_low = flags & GPIO_DS_LOW_MASK;
int ds_high = flags & GPIO_DS_HIGH_MASK;

if (!pincfg) {
return -EINVAL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = STM32_MODER_OUTPUT_MODE;
/* pull-{up,down,float} */
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = STM32_PUPDR_PULL_DOWN;
} else {
/* pull-{up,down} maybe? */
*pincfg = STM32_MODER_INPUT_MODE;
/* floating */
*pincfg = STM32_PUPDR_NO_PULL;
}

if (pud == GPIO_PUD_PULL_UP) {
*pincfg = *pincfg | STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = *pincfg | STM32_PUPDR_PULL_DOWN;
if (direction == GPIO_DIR_OUT) {
*pincfg = *pincfg | STM32_MODER_OUTPUT_MODE;

if (ds_low == GPIO_DS_ALT_LOW ||
ds_high == GPIO_DS_DISCONNECT_HIGH) {
*pincfg = *pincfg | STM32_OTYPER_OPEN_DRAIN;
} else {
/* floating */
*pincfg = *pincfg | STM32_PUPDR_NO_PULL;
*pincfg = *pincfg | STM32_OTYPER_PUSH_PULL;
}
} else {
*pincfg = *pincfg | STM32_MODER_INPUT_MODE;
}

return 0;
Expand Down
29 changes: 19 additions & 10 deletions soc/arm/st_stm32/stm32f7/soc_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,34 @@ int stm32_gpio_flags_to_conf(int flags, int *pincfg)
{
int direction = flags & GPIO_DIR_MASK;
int pud = flags & GPIO_PUD_MASK;
int ds_low = flags & GPIO_DS_LOW_MASK;
int ds_high = flags & GPIO_DS_HIGH_MASK;

if (!pincfg) {
return -EINVAL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = STM32_MODER_OUTPUT_MODE;
/* pull-{up,down,float} */
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = STM32_PUPDR_PULL_DOWN;
} else {
/* pull-{up,down} maybe? */
*pincfg = STM32_MODER_INPUT_MODE;
/* floating */
*pincfg = STM32_PUPDR_NO_PULL;
}

if (pud == GPIO_PUD_PULL_UP) {
*pincfg = *pincfg | STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = *pincfg | STM32_PUPDR_PULL_DOWN;
if (direction == GPIO_DIR_OUT) {
*pincfg = *pincfg | STM32_MODER_OUTPUT_MODE;

if (ds_low == GPIO_DS_ALT_LOW ||
ds_high == GPIO_DS_DISCONNECT_HIGH) {
*pincfg = *pincfg | STM32_OTYPER_OPEN_DRAIN;
} else {
/* floating */
*pincfg = *pincfg | STM32_PUPDR_NO_PULL;
*pincfg = *pincfg | STM32_OTYPER_PUSH_PULL;
}
} else {
*pincfg = *pincfg | STM32_MODER_INPUT_MODE;
}

return 0;
Expand Down
30 changes: 20 additions & 10 deletions soc/arm/st_stm32/stm32l0/soc_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,34 @@ int stm32_gpio_flags_to_conf(int flags, int *pincfg)
{
int direction = flags & GPIO_DIR_MASK;
int pud = flags & GPIO_PUD_MASK;
int ds_low = flags & GPIO_DS_LOW_MASK;
int ds_high = flags & GPIO_DS_HIGH_MASK;

if (!pincfg) {
return -EINVAL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = STM32_MODER_OUTPUT_MODE;
/* pull-{up,down,float} */
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = STM32_PUPDR_PULL_DOWN;
} else {
/* pull-{up,down} maybe? */
*pincfg = STM32_MODER_INPUT_MODE;
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = *pincfg | STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = *pincfg | STM32_PUPDR_PULL_DOWN;
/* floating */
*pincfg = STM32_PUPDR_NO_PULL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = *pincfg | STM32_MODER_OUTPUT_MODE;

if (ds_low == GPIO_DS_ALT_LOW ||
ds_high == GPIO_DS_DISCONNECT_HIGH) {
*pincfg = *pincfg | STM32_OTYPER_OPEN_DRAIN;
} else {
/* floating */
*pincfg = *pincfg | STM32_PUPDR_NO_PULL;
*pincfg = *pincfg | STM32_OTYPER_PUSH_PULL;
}
} else {
*pincfg = *pincfg | STM32_MODER_INPUT_MODE;
}

return 0;
Expand Down
29 changes: 19 additions & 10 deletions soc/arm/st_stm32/stm32l4/soc_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,34 @@ int stm32_gpio_flags_to_conf(int flags, int *pincfg)
{
int direction = flags & GPIO_DIR_MASK;
int pud = flags & GPIO_PUD_MASK;
int ds_low = flags & GPIO_DS_LOW_MASK;
int ds_high = flags & GPIO_DS_HIGH_MASK;

if (!pincfg) {
return -EINVAL;
}

if (direction == GPIO_DIR_OUT) {
*pincfg = STM32_MODER_OUTPUT_MODE;
/* pull-{up,down,float} */
if (pud == GPIO_PUD_PULL_UP) {
*pincfg = STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = STM32_PUPDR_PULL_DOWN;
} else {
/* pull-{up,down} maybe? */
*pincfg = STM32_MODER_INPUT_MODE;
/* floating */
*pincfg = STM32_PUPDR_NO_PULL;
}

if (pud == GPIO_PUD_PULL_UP) {
*pincfg = *pincfg | STM32_PUPDR_PULL_UP;
} else if (pud == GPIO_PUD_PULL_DOWN) {
*pincfg = *pincfg | STM32_PUPDR_PULL_DOWN;
if (direction == GPIO_DIR_OUT) {
*pincfg = *pincfg | STM32_MODER_OUTPUT_MODE;

if (ds_low == GPIO_DS_ALT_LOW ||
ds_high == GPIO_DS_DISCONNECT_HIGH) {
*pincfg = *pincfg | STM32_OTYPER_OPEN_DRAIN;
} else {
/* floating */
*pincfg = *pincfg | STM32_PUPDR_NO_PULL;
*pincfg = *pincfg | STM32_OTYPER_PUSH_PULL;
}
} else {
*pincfg = *pincfg | STM32_MODER_INPUT_MODE;
}

return 0;
Expand Down