Skip to content

Commit 96f7d8e

Browse files
committed
ci(stm32variant): use LL GPIO definition
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 7434813 commit 96f7d8e

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

CI/update/stm32variant.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ def adc_pinmap():
702702
"pin": p[0],
703703
"inst": inst,
704704
"mode": mode,
705-
"pull": "GPIO_NOPULL",
705+
"pull": "LL_GPIO_PULL_NO",
706706
"af": "0",
707707
"chan": chan,
708708
"inv": inv,
@@ -740,7 +740,7 @@ def dac_pinmap():
740740
"pin": p[0],
741741
"inst": "DAC" + inst,
742742
"mode": mode,
743-
"pull": "GPIO_NOPULL",
743+
"pull": "LL_GPIO_PULL_NO",
744744
"af": "0",
745745
"chan": chan,
746746
"inv": "0",
@@ -778,7 +778,7 @@ def i2c_pinmap(lst):
778778
"pin": p[0],
779779
"inst": inst,
780780
"mode": mode,
781-
"pull": "GPIO_NOPULL",
781+
"pull": "LL_GPIO_PULL_NO",
782782
"af": p[3],
783783
}
784784
)
@@ -813,7 +813,7 @@ def i3c_pinmap(lst):
813813
"pin": p[0],
814814
"inst": inst,
815815
"mode": mode,
816-
"pull": "GPIO_NOPULL",
816+
"pull": "LL_GPIO_PULL_NO",
817817
"af": p[3],
818818
}
819819
)
@@ -852,7 +852,7 @@ def tim_pinmap():
852852
"pin": p[0],
853853
"inst": inst,
854854
"mode": mode,
855-
"pull": "GPIO_PULLUP",
855+
"pull": "LL_GPIO_PULL_UP",
856856
"af": p[3],
857857
"chan": chan,
858858
"inv": inv,
@@ -897,7 +897,7 @@ def uart_pinmap(lst):
897897
"pin": p[0],
898898
"inst": inst,
899899
"mode": mode,
900-
"pull": "GPIO_PULLUP",
900+
"pull": "LL_GPIO_PULL_UP",
901901
"af": p[3],
902902
}
903903
)
@@ -937,7 +937,7 @@ def spi_pinmap(lst):
937937
"pin": p[0],
938938
"inst": inst,
939939
"mode": "STM_MODE_AF_PP",
940-
"pull": "GPIO_PULLUP" if inst != "SUBGHZSPI" else "GPIO_NOPULL",
940+
"pull": "LL_GPIO_PULL_UP" if inst != "SUBGHZSPI" else "LL_GPIO_PULL_NO",
941941
"af": p[4],
942942
}
943943
)
@@ -980,7 +980,7 @@ def can_pinmap(lst):
980980
"pin": p[0],
981981
"inst": inst,
982982
"mode": mode,
983-
"pull": "GPIO_NOPULL",
983+
"pull": "LL_GPIO_PULL_NO",
984984
"af": p[3],
985985
}
986986
)
@@ -1012,7 +1012,7 @@ def eth_pinmap():
10121012
"pin": p[0],
10131013
"inst": inst,
10141014
"mode": "STM_MODE_AF_PP",
1015-
"pull": "GPIO_PULLUP",
1015+
"pull": "LL_GPIO_PULL_UP",
10161016
"af": p[3],
10171017
"cmt": p[2],
10181018
}
@@ -1080,7 +1080,7 @@ def xspi_pinmap(lst):
10801080
"pin": p[0],
10811081
"inst": inst,
10821082
"mode": "STM_MODE_AF_PP",
1083-
"pull": "GPIO_PULLUP",
1083+
"pull": "LL_GPIO_PULL_UP",
10841084
"af": p[3],
10851085
"cmt": p[2],
10861086
}
@@ -1129,20 +1129,19 @@ def usb_pinmap(lst):
11291129

11301130
# 2nd element is the USB_XXXX signal
11311131
if not p[2].startswith("USB_D") and "VBUS" not in p[2]:
1132+
pull = "LL_GPIO_PULL_UP"
11321133
if "ID" not in p[2]:
11331134
mode = "STM_MODE_AF_PP"
1134-
pull = "GPIO_PULLUP"
11351135
else:
11361136
# ID pin: AF_PP + PULLUP
11371137
mode = "STM_MODE_AF_OD"
1138-
pull = "GPIO_PULLUP"
11391138
else:
11401139
# USB_DM/DP and VBUS: INPUT/AF + NOPULL
11411140
if p[2].startswith("USB_D") and "NONE" not in p[3]:
11421141
mode = "STM_MODE_AF_PP"
11431142
else:
11441143
mode = "STM_MODE_INPUT"
1145-
pull = "GPIO_NOPULL"
1144+
pull = "LL_GPIO_PULL_NO"
11461145
wpin.append(len(p[0]))
11471146
usb_pins_list.append(
11481147
{
@@ -1204,9 +1203,9 @@ def sdx_pinmap(lst):
12041203
a = p[2].split("_")
12051204
inst = a[0]
12061205
if a[1].startswith("C") or a[1].endswith("DIR"):
1207-
pull = "GPIO_NOPULL"
1206+
pull = "LL_GPIO_PULL_NO"
12081207
else:
1209-
pull = "GPIO_PULLUP"
1208+
pull = "LL_GPIO_PULL_UP"
12101209
winst.append(len(inst))
12111210
wpin.append(len(p[0]))
12121211
sdx_pins_list.append(

0 commit comments

Comments
 (0)