~hc/RK356X_SDK_RELEASE.git

..	..	@@ -10,77 +10,82 @@
10	10	#include "pinctrl-stm32.h"
11	11
12	12	static const struct stm32_desc_pin stm32mp157_pins[] = {
13		- STM32_PIN(
	13	+ STM32_PIN_PKG(
14	14	PINCTRL_PIN(0, "PA0"),
	15	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
15	16	STM32_FUNCTION(0, "GPIOA0"),
16	17	STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),
17	18	STM32_FUNCTION(3, "TIM5_CH1"),
18	19	STM32_FUNCTION(4, "TIM8_ETR"),
19	20	STM32_FUNCTION(5, "TIM15_BKIN"),
20		- STM32_FUNCTION(8, "USART2_CTS_NSS USART_BOOT2_CTS_NSS"),
	21	+ STM32_FUNCTION(8, "USART2_CTS USART2_NSS"),
21	22	STM32_FUNCTION(9, "UART4_TX"),
22	23	STM32_FUNCTION(10, "SDMMC2_CMD"),
23	24	STM32_FUNCTION(11, "SAI2_SD_B"),
24		- STM32_FUNCTION(12, "ETH_GMII_CRS ETH_MII_CRS"),
	25	+ STM32_FUNCTION(12, "ETH1_GMII_CRS ETH1_MII_CRS"),
25	26	STM32_FUNCTION(16, "EVENTOUT"),
26	27	STM32_FUNCTION(17, "ANALOG")
27	28	),
28		- STM32_PIN(
	29	+ STM32_PIN_PKG(
29	30	PINCTRL_PIN(1, "PA1"),
	31	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
30	32	STM32_FUNCTION(0, "GPIOA1"),
31	33	STM32_FUNCTION(1, "ETH_CLK"),
32	34	STM32_FUNCTION(2, "TIM2_CH2"),
33	35	STM32_FUNCTION(3, "TIM5_CH2"),
34	36	STM32_FUNCTION(4, "LPTIM3_OUT"),
35	37	STM32_FUNCTION(5, "TIM15_CH1N"),
36		- STM32_FUNCTION(8, "USART2_RTS USART_BOOT2_RTS"),
	38	+ STM32_FUNCTION(8, "USART2_RTS USART2_DE"),
37	39	STM32_FUNCTION(9, "UART4_RX"),
38		- STM32_FUNCTION(10, "QUADSPI_BK1_IO3 QUADSPI_BOOTBK1_IO3"),
	40	+ STM32_FUNCTION(10, "QUADSPI_BK1_IO3"),
39	41	STM32_FUNCTION(11, "SAI2_MCLK_B"),
40		- STM32_FUNCTION(12, "ETH_GMII_RX_CLK ETH_MII_RX_CLK ETH_RGMII_RX_CLK ETH_RMII_REF_CLK"),
	42	+ STM32_FUNCTION(12, "ETH1_GMII_RX_CLK ETH1_MII_RX_CLK ETH1_RGMII_RX_CLK ETH1_RMII_REF_CLK"),
41	43	STM32_FUNCTION(15, "LCD_R2"),
42	44	STM32_FUNCTION(16, "EVENTOUT"),
43	45	STM32_FUNCTION(17, "ANALOG")
44	46	),
45		- STM32_PIN(
	47	+ STM32_PIN_PKG(
46	48	PINCTRL_PIN(2, "PA2"),
	49	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
47	50	STM32_FUNCTION(0, "GPIOA2"),
48	51	STM32_FUNCTION(2, "TIM2_CH3"),
49	52	STM32_FUNCTION(3, "TIM5_CH3"),
50	53	STM32_FUNCTION(4, "LPTIM4_OUT"),
51	54	STM32_FUNCTION(5, "TIM15_CH1"),
52		- STM32_FUNCTION(8, "USART2_TX USART_BOOT2_TX"),
	55	+ STM32_FUNCTION(8, "USART2_TX"),
53	56	STM32_FUNCTION(9, "SAI2_SCK_B"),
54		- STM32_FUNCTION(11, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),
55		- STM32_FUNCTION(12, "ETH_MDIO"),
	57	+ STM32_FUNCTION(11, "SDMMC2_D0DIR"),
	58	+ STM32_FUNCTION(12, "ETH1_MDIO"),
56	59	STM32_FUNCTION(13, "MDIOS_MDIO"),
57	60	STM32_FUNCTION(15, "LCD_R1"),
58	61	STM32_FUNCTION(16, "EVENTOUT"),
59	62	STM32_FUNCTION(17, "ANALOG")
60	63	),
61		- STM32_PIN(
	64	+ STM32_PIN_PKG(
62	65	PINCTRL_PIN(3, "PA3"),
	66	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
63	67	STM32_FUNCTION(0, "GPIOA3"),
64	68	STM32_FUNCTION(2, "TIM2_CH4"),
65	69	STM32_FUNCTION(3, "TIM5_CH4"),
66	70	STM32_FUNCTION(4, "LPTIM5_OUT"),
67	71	STM32_FUNCTION(5, "TIM15_CH2"),
68		- STM32_FUNCTION(8, "USART2_RX USART_BOOT2_RX"),
	72	+ STM32_FUNCTION(8, "USART2_RX"),
69	73	STM32_FUNCTION(10, "LCD_B2"),
70		- STM32_FUNCTION(12, "ETH_GMII_COL ETH_MII_COL"),
	74	+ STM32_FUNCTION(12, "ETH1_GMII_COL ETH1_MII_COL"),
71	75	STM32_FUNCTION(15, "LCD_B5"),
72	76	STM32_FUNCTION(16, "EVENTOUT"),
73	77	STM32_FUNCTION(17, "ANALOG")
74	78	),
75		- STM32_PIN(
	79	+ STM32_PIN_PKG(
76	80	PINCTRL_PIN(4, "PA4"),
	81	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
77	82	STM32_FUNCTION(0, "GPIOA4"),
78	83	STM32_FUNCTION(1, "HDP0"),
79	84	STM32_FUNCTION(3, "TIM5_ETR"),
80	85	STM32_FUNCTION(5, "SAI4_D2"),
81	86	STM32_FUNCTION(6, "SPI1_NSS I2S1_WS"),
82	87	STM32_FUNCTION(7, "SPI3_NSS I2S3_WS"),
83		- STM32_FUNCTION(8, "USART2_CK USART_BOOT2_CK"),
	88	+ STM32_FUNCTION(8, "USART2_CK"),
84	89	STM32_FUNCTION(9, "SPI6_NSS"),
85	90	STM32_FUNCTION(13, "SAI4_FS_A"),
86	91	STM32_FUNCTION(14, "DCMI_HSYNC"),
..	..	@@ -88,8 +93,9 @@
88	93	STM32_FUNCTION(16, "EVENTOUT"),
89	94	STM32_FUNCTION(17, "ANALOG")
90	95	),
91		- STM32_PIN(
	96	+ STM32_PIN_PKG(
92	97	PINCTRL_PIN(5, "PA5"),
	98	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
93	99	STM32_FUNCTION(0, "GPIOA5"),
94	100	STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),
95	101	STM32_FUNCTION(4, "TIM8_CH1N"),
..	..	@@ -101,8 +107,9 @@
101	107	STM32_FUNCTION(16, "EVENTOUT"),
102	108	STM32_FUNCTION(17, "ANALOG")
103	109	),
104		- STM32_PIN(
	110	+ STM32_PIN_PKG(
105	111	PINCTRL_PIN(6, "PA6"),
	112	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
106	113	STM32_FUNCTION(0, "GPIOA6"),
107	114	STM32_FUNCTION(2, "TIM1_BKIN"),
108	115	STM32_FUNCTION(3, "TIM3_CH1"),
..	..	@@ -118,8 +125,9 @@
118	125	STM32_FUNCTION(16, "EVENTOUT"),
119	126	STM32_FUNCTION(17, "ANALOG")
120	127	),
121		- STM32_PIN(
	128	+ STM32_PIN_PKG(
122	129	PINCTRL_PIN(7, "PA7"),
	130	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
123	131	STM32_FUNCTION(0, "GPIOA7"),
124	132	STM32_FUNCTION(2, "TIM1_CH1N"),
125	133	STM32_FUNCTION(3, "TIM3_CH2"),
..	..	@@ -129,13 +137,14 @@
129	137	STM32_FUNCTION(9, "SPI6_MOSI"),
130	138	STM32_FUNCTION(10, "TIM14_CH1"),
131	139	STM32_FUNCTION(11, "QUADSPI_CLK"),
132		- STM32_FUNCTION(12, "ETH_GMII_RX_DV ETH_MII_RX_DV ETH_RGMII_RX_CTL ETH_RMII_CRS_DV"),
	140	+ STM32_FUNCTION(12, "ETH1_GMII_RX_DV ETH1_MII_RX_DV ETH1_RGMII_RX_CTL ETH1_RMII_CRS_DV"),
133	141	STM32_FUNCTION(13, "SAI4_SD_A"),
134	142	STM32_FUNCTION(16, "EVENTOUT"),
135	143	STM32_FUNCTION(17, "ANALOG")
136	144	),
137		- STM32_PIN(
	145	+ STM32_PIN_PKG(
138	146	PINCTRL_PIN(8, "PA8"),
	147	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
139	148	STM32_FUNCTION(0, "GPIOA8"),
140	149	STM32_FUNCTION(1, "MCO1"),
141	150	STM32_FUNCTION(2, "TIM1_CH1"),
..	..	@@ -143,37 +152,37 @@
143	152	STM32_FUNCTION(5, "I2C3_SCL"),
144	153	STM32_FUNCTION(6, "SPI3_MOSI I2S3_SDO"),
145	154	STM32_FUNCTION(8, "USART1_CK"),
146		- STM32_FUNCTION(9, "SDMMC2_CKIN SDMMC_BOOT2_CKIN"),
147		- STM32_FUNCTION(10, "SDMMC2_D4 SDMMC_BOOT2_D4"),
148		- STM32_FUNCTION(11, "USBO_SOF"),
	155	+ STM32_FUNCTION(9, "SDMMC2_CKIN"),
	156	+ STM32_FUNCTION(10, "SDMMC2_D4"),
	157	+ STM32_FUNCTION(11, "OTG_FS_SOF OTG_HS_SOF"),
149	158	STM32_FUNCTION(13, "SAI4_SD_B"),
150	159	STM32_FUNCTION(14, "UART7_RX"),
151	160	STM32_FUNCTION(15, "LCD_R6"),
152	161	STM32_FUNCTION(16, "EVENTOUT"),
153	162	STM32_FUNCTION(17, "ANALOG")
154	163	),
155		- STM32_PIN(
	164	+ STM32_PIN_PKG(
156	165	PINCTRL_PIN(9, "PA9"),
	166	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
157	167	STM32_FUNCTION(0, "GPIOA9"),
158	168	STM32_FUNCTION(2, "TIM1_CH2"),
159	169	STM32_FUNCTION(5, "I2C3_SMBA"),
160	170	STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),
161	171	STM32_FUNCTION(8, "USART1_TX"),
162		- STM32_FUNCTION(9, "SDMMC2_CDIR SDMMC_BOOT2_CDIR"),
163		- STM32_FUNCTION(10, "CAN1_RXFD"),
164		- STM32_FUNCTION(11, "SDMMC2_D5 SDMMC_BOOT2_D5"),
	172	+ STM32_FUNCTION(9, "SDMMC2_CDIR"),
	173	+ STM32_FUNCTION(11, "SDMMC2_D5"),
165	174	STM32_FUNCTION(14, "DCMI_D0"),
166	175	STM32_FUNCTION(15, "LCD_R5"),
167	176	STM32_FUNCTION(16, "EVENTOUT"),
168	177	STM32_FUNCTION(17, "ANALOG")
169	178	),
170		- STM32_PIN(
	179	+ STM32_PIN_PKG(
171	180	PINCTRL_PIN(10, "PA10"),
	181	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
172	182	STM32_FUNCTION(0, "GPIOA10"),
173	183	STM32_FUNCTION(2, "TIM1_CH3"),
174	184	STM32_FUNCTION(6, "SPI3_NSS I2S3_WS"),
175	185	STM32_FUNCTION(8, "USART1_RX"),
176		- STM32_FUNCTION(10, "CAN1_TXFD"),
177	186	STM32_FUNCTION(12, "MDIOS_MDIO"),
178	187	STM32_FUNCTION(13, "SAI4_FS_B"),
179	188	STM32_FUNCTION(14, "DCMI_D1"),
..	..	@@ -181,37 +190,39 @@
181	190	STM32_FUNCTION(16, "EVENTOUT"),
182	191	STM32_FUNCTION(17, "ANALOG")
183	192	),
184		- STM32_PIN(
	193	+ STM32_PIN_PKG(
185	194	PINCTRL_PIN(11, "PA11"),
	195	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
186	196	STM32_FUNCTION(0, "GPIOA11"),
187	197	STM32_FUNCTION(2, "TIM1_CH4"),
188	198	STM32_FUNCTION(3, "I2C6_SCL"),
189	199	STM32_FUNCTION(5, "I2C5_SCL"),
190	200	STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),
191	201	STM32_FUNCTION(7, "UART4_RX"),
192		- STM32_FUNCTION(8, "USART1_CTS_NSS"),
193		- STM32_FUNCTION(10, "CAN1_RX"),
	202	+ STM32_FUNCTION(8, "USART1_CTS USART1_NSS"),
	203	+ STM32_FUNCTION(10, "FDCAN1_RX"),
194	204	STM32_FUNCTION(15, "LCD_R4"),
195	205	STM32_FUNCTION(16, "EVENTOUT"),
196	206	STM32_FUNCTION(17, "ANALOG")
197	207	),
198		- STM32_PIN(
	208	+ STM32_PIN_PKG(
199	209	PINCTRL_PIN(12, "PA12"),
	210	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
200	211	STM32_FUNCTION(0, "GPIOA12"),
201	212	STM32_FUNCTION(2, "TIM1_ETR"),
202	213	STM32_FUNCTION(3, "I2C6_SDA"),
203	214	STM32_FUNCTION(5, "I2C5_SDA"),
204		- STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),
205	215	STM32_FUNCTION(7, "UART4_TX"),
206		- STM32_FUNCTION(8, "USART1_RTS"),
	216	+ STM32_FUNCTION(8, "USART1_RTS USART1_DE"),
207	217	STM32_FUNCTION(9, "SAI2_FS_B"),
208		- STM32_FUNCTION(10, "CAN1_TX"),
	218	+ STM32_FUNCTION(10, "FDCAN1_TX"),
209	219	STM32_FUNCTION(15, "LCD_R5"),
210	220	STM32_FUNCTION(16, "EVENTOUT"),
211	221	STM32_FUNCTION(17, "ANALOG")
212	222	),
213		- STM32_PIN(
	223	+ STM32_PIN_PKG(
214	224	PINCTRL_PIN(13, "PA13"),
	225	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
215	226	STM32_FUNCTION(0, "GPIOA13"),
216	227	STM32_FUNCTION(1, "DBTRGO"),
217	228	STM32_FUNCTION(2, "DBTRGI"),
..	..	@@ -220,8 +231,9 @@
220	231	STM32_FUNCTION(16, "EVENTOUT"),
221	232	STM32_FUNCTION(17, "ANALOG")
222	233	),
223		- STM32_PIN(
	234	+ STM32_PIN_PKG(
224	235	PINCTRL_PIN(14, "PA14"),
	236	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
225	237	STM32_FUNCTION(0, "GPIOA14"),
226	238	STM32_FUNCTION(1, "DBTRGO"),
227	239	STM32_FUNCTION(2, "DBTRGI"),
..	..	@@ -229,73 +241,79 @@
229	241	STM32_FUNCTION(16, "EVENTOUT"),
230	242	STM32_FUNCTION(17, "ANALOG")
231	243	),
232		- STM32_PIN(
	244	+ STM32_PIN_PKG(
233	245	PINCTRL_PIN(15, "PA15"),
	246	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
234	247	STM32_FUNCTION(0, "GPIOA15"),
235	248	STM32_FUNCTION(1, "DBTRGI"),
236	249	STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),
237	250	STM32_FUNCTION(3, "SAI4_D2"),
238	251	STM32_FUNCTION(4, "SDMMC1_CDIR"),
239		- STM32_FUNCTION(5, "HDMI_CEC"),
	252	+ STM32_FUNCTION(5, "CEC"),
240	253	STM32_FUNCTION(6, "SPI1_NSS I2S1_WS"),
241	254	STM32_FUNCTION(7, "SPI3_NSS I2S3_WS"),
242	255	STM32_FUNCTION(8, "SPI6_NSS"),
243		- STM32_FUNCTION(9, "UART4_RTS UART_BOOT4_RTS"),
244		- STM32_FUNCTION(10, "SDMMC2_D5 SDMMC_BOOT2_D5"),
245		- STM32_FUNCTION(11, "SDMMC2_CDIR SDMMC_BOOT2_CDIR"),
246		- STM32_FUNCTION(12, "SDMMC1_D5 SDMMC_BOOT1_D5"),
	256	+ STM32_FUNCTION(9, "UART4_RTS UART4_DE"),
	257	+ STM32_FUNCTION(10, "SDMMC2_D5"),
	258	+ STM32_FUNCTION(11, "SDMMC2_CDIR"),
	259	+ STM32_FUNCTION(12, "SDMMC1_D5"),
247	260	STM32_FUNCTION(13, "SAI4_FS_A"),
248	261	STM32_FUNCTION(14, "UART7_TX"),
	262	+ STM32_FUNCTION(15, "LCD_R1"),
249	263	STM32_FUNCTION(16, "EVENTOUT"),
250	264	STM32_FUNCTION(17, "ANALOG")
251	265	),
252		- STM32_PIN(
	266	+ STM32_PIN_PKG(
253	267	PINCTRL_PIN(16, "PB0"),
	268	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
254	269	STM32_FUNCTION(0, "GPIOB0"),
255	270	STM32_FUNCTION(2, "TIM1_CH2N"),
256	271	STM32_FUNCTION(3, "TIM3_CH3"),
257	272	STM32_FUNCTION(4, "TIM8_CH2N"),
258		- STM32_FUNCTION(7, "DFSDM_CKOUT"),
259		- STM32_FUNCTION(9, "UART4_CTS UART_BOOT4_CTS"),
	273	+ STM32_FUNCTION(7, "DFSDM1_CKOUT"),
	274	+ STM32_FUNCTION(9, "UART4_CTS"),
260	275	STM32_FUNCTION(10, "LCD_R3"),
261		- STM32_FUNCTION(12, "ETH_GMII_RXD2 ETH_MII_RXD2 ETH_RGMII_RXD2"),
	276	+ STM32_FUNCTION(12, "ETH1_GMII_RXD2 ETH1_MII_RXD2 ETH1_RGMII_RXD2"),
262	277	STM32_FUNCTION(13, "MDIOS_MDIO"),
263	278	STM32_FUNCTION(15, "LCD_G1"),
264	279	STM32_FUNCTION(16, "EVENTOUT"),
265	280	STM32_FUNCTION(17, "ANALOG")
266	281	),
267		- STM32_PIN(
	282	+ STM32_PIN_PKG(
268	283	PINCTRL_PIN(17, "PB1"),
	284	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
269	285	STM32_FUNCTION(0, "GPIOB1"),
270	286	STM32_FUNCTION(2, "TIM1_CH3N"),
271	287	STM32_FUNCTION(3, "TIM3_CH4"),
272	288	STM32_FUNCTION(4, "TIM8_CH3N"),
273		- STM32_FUNCTION(7, "DFSDM_DATA1"),
	289	+ STM32_FUNCTION(7, "DFSDM1_DATIN1"),
274	290	STM32_FUNCTION(10, "LCD_R6"),
275		- STM32_FUNCTION(12, "ETH_GMII_RXD3 ETH_MII_RXD3 ETH_RGMII_RXD3"),
	291	+ STM32_FUNCTION(12, "ETH1_GMII_RXD3 ETH1_MII_RXD3 ETH1_RGMII_RXD3"),
276	292	STM32_FUNCTION(13, "MDIOS_MDC"),
277	293	STM32_FUNCTION(15, "LCD_G0"),
278	294	STM32_FUNCTION(16, "EVENTOUT"),
279	295	STM32_FUNCTION(17, "ANALOG")
280	296	),
281		- STM32_PIN(
	297	+ STM32_PIN_PKG(
282	298	PINCTRL_PIN(18, "PB2"),
	299	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
283	300	STM32_FUNCTION(0, "GPIOB2"),
284	301	STM32_FUNCTION(1, "TRACED4"),
285	302	STM32_FUNCTION(2, "RTC_OUT2"),
286	303	STM32_FUNCTION(3, "SAI1_D1"),
287		- STM32_FUNCTION(4, "DFSDM_CK1"),
	304	+ STM32_FUNCTION(4, "DFSDM1_CKIN1"),
288	305	STM32_FUNCTION(5, "USART1_RX"),
289	306	STM32_FUNCTION(6, "I2S_CKIN"),
290	307	STM32_FUNCTION(7, "SAI1_SD_A"),
291	308	STM32_FUNCTION(8, "SPI3_MOSI I2S3_SDO"),
292		- STM32_FUNCTION(9, "UART4_RX UART_BOOT4_RX"),
	309	+ STM32_FUNCTION(9, "UART4_RX"),
293	310	STM32_FUNCTION(10, "QUADSPI_CLK"),
294	311	STM32_FUNCTION(16, "EVENTOUT"),
295	312	STM32_FUNCTION(17, "ANALOG")
296	313	),
297		- STM32_PIN(
	314	+ STM32_PIN_PKG(
298	315	PINCTRL_PIN(19, "PB3"),
	316	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
299	317	STM32_FUNCTION(0, "GPIOB3"),
300	318	STM32_FUNCTION(1, "TRACED9"),
301	319	STM32_FUNCTION(2, "TIM2_CH2"),
..	..	@@ -303,14 +321,15 @@
303	321	STM32_FUNCTION(6, "SPI1_SCK I2S1_CK"),
304	322	STM32_FUNCTION(7, "SPI3_SCK I2S3_CK"),
305	323	STM32_FUNCTION(9, "SPI6_SCK"),
306		- STM32_FUNCTION(10, "SDMMC2_D2 SDMMC_BOOT2_D2"),
	324	+ STM32_FUNCTION(10, "SDMMC2_D2"),
307	325	STM32_FUNCTION(13, "SAI4_MCLK_A"),
308	326	STM32_FUNCTION(14, "UART7_RX"),
309	327	STM32_FUNCTION(16, "EVENTOUT"),
310	328	STM32_FUNCTION(17, "ANALOG")
311	329	),
312		- STM32_PIN(
	330	+ STM32_PIN_PKG(
313	331	PINCTRL_PIN(20, "PB4"),
	332	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
314	333	STM32_FUNCTION(0, "GPIOB4"),
315	334	STM32_FUNCTION(1, "TRACED8"),
316	335	STM32_FUNCTION(2, "TIM16_BKIN"),
..	..	@@ -320,14 +339,15 @@
320	339	STM32_FUNCTION(7, "SPI3_MISO I2S3_SDI"),
321	340	STM32_FUNCTION(8, "SPI2_NSS I2S2_WS"),
322	341	STM32_FUNCTION(9, "SPI6_MISO"),
323		- STM32_FUNCTION(10, "SDMMC2_D3 SDMMC_BOOT2_D3"),
	342	+ STM32_FUNCTION(10, "SDMMC2_D3"),
324	343	STM32_FUNCTION(13, "SAI4_SCK_A"),
325	344	STM32_FUNCTION(14, "UART7_TX"),
326	345	STM32_FUNCTION(16, "EVENTOUT"),
327	346	STM32_FUNCTION(17, "ANALOG")
328	347	),
329		- STM32_PIN(
	348	+ STM32_PIN_PKG(
330	349	PINCTRL_PIN(21, "PB5"),
	350	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
331	351	STM32_FUNCTION(0, "GPIOB5"),
332	352	STM32_FUNCTION(1, "ETH_CLK"),
333	353	STM32_FUNCTION(2, "TIM17_BKIN"),
..	..	@@ -338,166 +358,175 @@
338	358	STM32_FUNCTION(7, "I2C4_SMBA"),
339	359	STM32_FUNCTION(8, "SPI3_MOSI I2S3_SDO"),
340	360	STM32_FUNCTION(9, "SPI6_MOSI"),
341		- STM32_FUNCTION(10, "CAN2_RX"),
	361	+ STM32_FUNCTION(10, "FDCAN2_RX"),
342	362	STM32_FUNCTION(11, "SAI4_SD_A"),
343		- STM32_FUNCTION(12, "ETH_PPS_OUT"),
344		- STM32_FUNCTION(13, "UART5_RX UART_BOOT5_RX"),
	363	+ STM32_FUNCTION(12, "ETH1_PPS_OUT"),
	364	+ STM32_FUNCTION(13, "UART5_RX"),
345	365	STM32_FUNCTION(14, "DCMI_D10"),
346	366	STM32_FUNCTION(15, "LCD_G7"),
347	367	STM32_FUNCTION(16, "EVENTOUT"),
348	368	STM32_FUNCTION(17, "ANALOG")
349	369	),
350		- STM32_PIN(
	370	+ STM32_PIN_PKG(
351	371	PINCTRL_PIN(22, "PB6"),
	372	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
352	373	STM32_FUNCTION(0, "GPIOB6"),
353	374	STM32_FUNCTION(2, "TIM16_CH1N"),
354	375	STM32_FUNCTION(3, "TIM4_CH1"),
355	376	STM32_FUNCTION(5, "I2C1_SCL"),
356		- STM32_FUNCTION(6, "HDMI_CEC"),
	377	+ STM32_FUNCTION(6, "CEC"),
357	378	STM32_FUNCTION(7, "I2C4_SCL"),
358	379	STM32_FUNCTION(8, "USART1_TX"),
359		- STM32_FUNCTION(10, "CAN2_TX"),
360		- STM32_FUNCTION(11, "QUADSPI_BK1_NCS QUADSPI_BOOTBK1_NCS"),
361		- STM32_FUNCTION(12, "DFSDM_DATA5"),
	380	+ STM32_FUNCTION(10, "FDCAN2_TX"),
	381	+ STM32_FUNCTION(11, "QUADSPI_BK1_NCS"),
	382	+ STM32_FUNCTION(12, "DFSDM1_DATIN5"),
362	383	STM32_FUNCTION(13, "UART5_TX"),
363	384	STM32_FUNCTION(14, "DCMI_D5"),
364	385	STM32_FUNCTION(16, "EVENTOUT"),
365	386	STM32_FUNCTION(17, "ANALOG")
366	387	),
367		- STM32_PIN(
	388	+ STM32_PIN_PKG(
368	389	PINCTRL_PIN(23, "PB7"),
	390	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
369	391	STM32_FUNCTION(0, "GPIOB7"),
370	392	STM32_FUNCTION(2, "TIM17_CH1N"),
371	393	STM32_FUNCTION(3, "TIM4_CH2"),
372	394	STM32_FUNCTION(5, "I2C1_SDA"),
373	395	STM32_FUNCTION(7, "I2C4_SDA"),
374	396	STM32_FUNCTION(8, "USART1_RX"),
375		- STM32_FUNCTION(10, "CAN2_TXFD"),
376		- STM32_FUNCTION(11, "SDMMC2_D1 SDMMC_BOOT2_D1"),
377		- STM32_FUNCTION(12, "DFSDM_CK5"),
	397	+ STM32_FUNCTION(11, "SDMMC2_D1"),
	398	+ STM32_FUNCTION(12, "DFSDM1_CKIN5"),
378	399	STM32_FUNCTION(13, "FMC_NL"),
379	400	STM32_FUNCTION(14, "DCMI_VSYNC"),
380	401	STM32_FUNCTION(16, "EVENTOUT"),
381	402	STM32_FUNCTION(17, "ANALOG")
382	403	),
383		- STM32_PIN(
	404	+ STM32_PIN_PKG(
384	405	PINCTRL_PIN(24, "PB8"),
	406	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
385	407	STM32_FUNCTION(0, "GPIOB8"),
386	408	STM32_FUNCTION(1, "HDP6"),
387	409	STM32_FUNCTION(2, "TIM16_CH1"),
388	410	STM32_FUNCTION(3, "TIM4_CH3"),
389		- STM32_FUNCTION(4, "DFSDM_CK7"),
	411	+ STM32_FUNCTION(4, "DFSDM1_CKIN7"),
390	412	STM32_FUNCTION(5, "I2C1_SCL"),
391		- STM32_FUNCTION(6, "SDMMC1_CKIN SDMMC_BOOT1_CKIN"),
	413	+ STM32_FUNCTION(6, "SDMMC1_CKIN"),
392	414	STM32_FUNCTION(7, "I2C4_SCL"),
393		- STM32_FUNCTION(8, "SDMMC2_CKIN SDMMC_BOOT2_CKIN"),
	415	+ STM32_FUNCTION(8, "SDMMC2_CKIN"),
394	416	STM32_FUNCTION(9, "UART4_RX"),
395		- STM32_FUNCTION(10, "CAN1_RX"),
396		- STM32_FUNCTION(11, "SDMMC2_D4 SDMMC_BOOT2_D4"),
397		- STM32_FUNCTION(12, "ETH_GMII_TXD3 ETH_MII_TXD3 ETH_RGMII_TXD3"),
398		- STM32_FUNCTION(13, "SDMMC1_D4 SDMMC_BOOT1_D4"),
	417	+ STM32_FUNCTION(10, "FDCAN1_RX"),
	418	+ STM32_FUNCTION(11, "SDMMC2_D4"),
	419	+ STM32_FUNCTION(12, "ETH1_GMII_TXD3 ETH1_MII_TXD3 ETH1_RGMII_TXD3"),
	420	+ STM32_FUNCTION(13, "SDMMC1_D4"),
399	421	STM32_FUNCTION(14, "DCMI_D6"),
400	422	STM32_FUNCTION(15, "LCD_B6"),
401	423	STM32_FUNCTION(16, "EVENTOUT"),
402	424	STM32_FUNCTION(17, "ANALOG")
403	425	),
404		- STM32_PIN(
	426	+ STM32_PIN_PKG(
405	427	PINCTRL_PIN(25, "PB9"),
	428	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
406	429	STM32_FUNCTION(0, "GPIOB9"),
407	430	STM32_FUNCTION(1, "HDP7"),
408	431	STM32_FUNCTION(2, "TIM17_CH1"),
409	432	STM32_FUNCTION(3, "TIM4_CH4"),
410		- STM32_FUNCTION(4, "DFSDM_DATA7"),
	433	+ STM32_FUNCTION(4, "DFSDM1_DATIN7"),
411	434	STM32_FUNCTION(5, "I2C1_SDA"),
412	435	STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),
413	436	STM32_FUNCTION(7, "I2C4_SDA"),
414		- STM32_FUNCTION(8, "SDMMC2_CDIR SDMMC_BOOT2_CDIR"),
	437	+ STM32_FUNCTION(8, "SDMMC2_CDIR"),
415	438	STM32_FUNCTION(9, "UART4_TX"),
416		- STM32_FUNCTION(10, "CAN1_TX"),
417		- STM32_FUNCTION(11, "SDMMC2_D5 SDMMC_BOOT2_D5"),
418		- STM32_FUNCTION(12, "SDMMC1_CDIR SDMMC_BOOT1_CDIR"),
419		- STM32_FUNCTION(13, "SDMMC1_D5 SDMMC_BOOT1_D5"),
	439	+ STM32_FUNCTION(10, "FDCAN1_TX"),
	440	+ STM32_FUNCTION(11, "SDMMC2_D5"),
	441	+ STM32_FUNCTION(12, "SDMMC1_CDIR"),
	442	+ STM32_FUNCTION(13, "SDMMC1_D5"),
420	443	STM32_FUNCTION(14, "DCMI_D7"),
421	444	STM32_FUNCTION(15, "LCD_B7"),
422	445	STM32_FUNCTION(16, "EVENTOUT"),
423	446	STM32_FUNCTION(17, "ANALOG")
424	447	),
425		- STM32_PIN(
	448	+ STM32_PIN_PKG(
426	449	PINCTRL_PIN(26, "PB10"),
	450	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
427	451	STM32_FUNCTION(0, "GPIOB10"),
428	452	STM32_FUNCTION(2, "TIM2_CH3"),
429	453	STM32_FUNCTION(4, "LPTIM2_IN1"),
430	454	STM32_FUNCTION(5, "I2C2_SCL"),
431	455	STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),
432		- STM32_FUNCTION(7, "DFSDM_DATA7"),
433		- STM32_FUNCTION(8, "USART3_TX USART_BOOT3_TX"),
	456	+ STM32_FUNCTION(7, "DFSDM1_DATIN7"),
	457	+ STM32_FUNCTION(8, "USART3_TX"),
434	458	STM32_FUNCTION(10, "QUADSPI_BK1_NCS"),
435		- STM32_FUNCTION(12, "ETH_GMII_RX_ER ETH_MII_RX_ER"),
	459	+ STM32_FUNCTION(12, "ETH1_GMII_RX_ER ETH1_MII_RX_ER"),
436	460	STM32_FUNCTION(15, "LCD_G4"),
437	461	STM32_FUNCTION(16, "EVENTOUT"),
438	462	STM32_FUNCTION(17, "ANALOG")
439	463	),
440		- STM32_PIN(
	464	+ STM32_PIN_PKG(
441	465	PINCTRL_PIN(27, "PB11"),
	466	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
442	467	STM32_FUNCTION(0, "GPIOB11"),
443	468	STM32_FUNCTION(2, "TIM2_CH4"),
444	469	STM32_FUNCTION(4, "LPTIM2_ETR"),
445	470	STM32_FUNCTION(5, "I2C2_SDA"),
446		- STM32_FUNCTION(7, "DFSDM_CK7"),
	471	+ STM32_FUNCTION(7, "DFSDM1_CKIN7"),
447	472	STM32_FUNCTION(8, "USART3_RX"),
448		- STM32_FUNCTION(12, "ETH_GMII_TX_EN ETH_MII_TX_EN ETH_RGMII_TX_CTL ETH_RMII_TX_EN"),
	473	+ STM32_FUNCTION(12, "ETH1_GMII_TX_EN ETH1_MII_TX_EN ETH1_RGMII_TX_CTL ETH1_RMII_TX_EN"),
449	474	STM32_FUNCTION(14, "DSI_TE"),
450	475	STM32_FUNCTION(15, "LCD_G5"),
451	476	STM32_FUNCTION(16, "EVENTOUT"),
452	477	STM32_FUNCTION(17, "ANALOG")
453	478	),
454		- STM32_PIN(
	479	+ STM32_PIN_PKG(
455	480	PINCTRL_PIN(28, "PB12"),
	481	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
456	482	STM32_FUNCTION(0, "GPIOB12"),
457	483	STM32_FUNCTION(2, "TIM1_BKIN"),
458	484	STM32_FUNCTION(3, "I2C6_SMBA"),
459	485	STM32_FUNCTION(5, "I2C2_SMBA"),
460	486	STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),
461		- STM32_FUNCTION(7, "DFSDM_DATA1"),
462		- STM32_FUNCTION(8, "USART3_CK USART_BOOT3_CK"),
463		- STM32_FUNCTION(9, "USART3_RX USART_BOOT3_RX"),
464		- STM32_FUNCTION(10, "CAN2_RX"),
465		- STM32_FUNCTION(12, "ETH_GMII_TXD0 ETH_MII_TXD0 ETH_RGMII_TXD0 ETH_RMII_TXD0"),
	487	+ STM32_FUNCTION(7, "DFSDM1_DATIN1"),
	488	+ STM32_FUNCTION(8, "USART3_CK"),
	489	+ STM32_FUNCTION(9, "USART3_RX"),
	490	+ STM32_FUNCTION(10, "FDCAN2_RX"),
	491	+ STM32_FUNCTION(12, "ETH1_GMII_TXD0 ETH1_MII_TXD0 ETH1_RGMII_TXD0 ETH1_RMII_TXD0"),
466	492	STM32_FUNCTION(15, "UART5_RX"),
467	493	STM32_FUNCTION(16, "EVENTOUT"),
468	494	STM32_FUNCTION(17, "ANALOG")
469	495	),
470		- STM32_PIN(
	496	+ STM32_PIN_PKG(
471	497	PINCTRL_PIN(29, "PB13"),
	498	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
472	499	STM32_FUNCTION(0, "GPIOB13"),
473	500	STM32_FUNCTION(2, "TIM1_CH1N"),
474		- STM32_FUNCTION(4, "DFSDM_CKOUT"),
	501	+ STM32_FUNCTION(4, "DFSDM1_CKOUT"),
475	502	STM32_FUNCTION(5, "LPTIM2_OUT"),
476	503	STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),
477		- STM32_FUNCTION(7, "DFSDM_CK1"),
478		- STM32_FUNCTION(8, "USART3_CTS_NSS USART_BOOT3_CTS_NSS"),
479		- STM32_FUNCTION(10, "CAN2_TX"),
480		- STM32_FUNCTION(12, "ETH_GMII_TXD1 ETH_MII_TXD1 ETH_RGMII_TXD1 ETH_RMII_TXD1"),
481		- STM32_FUNCTION(15, "UART5_TX UART_BOOT5_TX"),
	504	+ STM32_FUNCTION(7, "DFSDM1_CKIN1"),
	505	+ STM32_FUNCTION(8, "USART3_CTS USART3_NSS"),
	506	+ STM32_FUNCTION(10, "FDCAN2_TX"),
	507	+ STM32_FUNCTION(12, "ETH1_GMII_TXD1 ETH1_MII_TXD1 ETH1_RGMII_TXD1 ETH1_RMII_TXD1"),
	508	+ STM32_FUNCTION(15, "UART5_TX"),
482	509	STM32_FUNCTION(16, "EVENTOUT"),
483	510	STM32_FUNCTION(17, "ANALOG")
484	511	),
485		- STM32_PIN(
	512	+ STM32_PIN_PKG(
486	513	PINCTRL_PIN(30, "PB14"),
	514	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
487	515	STM32_FUNCTION(0, "GPIOB14"),
488	516	STM32_FUNCTION(2, "TIM1_CH2N"),
489	517	STM32_FUNCTION(3, "TIM12_CH1"),
490	518	STM32_FUNCTION(4, "TIM8_CH2N"),
491	519	STM32_FUNCTION(5, "USART1_TX"),
492	520	STM32_FUNCTION(6, "SPI2_MISO I2S2_SDI"),
493		- STM32_FUNCTION(7, "DFSDM_DATA2"),
494		- STM32_FUNCTION(8, "USART3_RTS USART_BOOT3_RTS"),
495		- STM32_FUNCTION(10, "SDMMC2_D0 SDMMC_BOOT2_D0"),
	521	+ STM32_FUNCTION(7, "DFSDM1_DATIN2"),
	522	+ STM32_FUNCTION(8, "USART3_RTS USART3_DE"),
	523	+ STM32_FUNCTION(10, "SDMMC2_D0"),
496	524	STM32_FUNCTION(16, "EVENTOUT"),
497	525	STM32_FUNCTION(17, "ANALOG")
498	526	),
499		- STM32_PIN(
	527	+ STM32_PIN_PKG(
500	528	PINCTRL_PIN(31, "PB15"),
	529	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
501	530	STM32_FUNCTION(0, "GPIOB15"),
502	531	STM32_FUNCTION(1, "RTC_REFIN"),
503	532	STM32_FUNCTION(2, "TIM1_CH3N"),
..	..	@@ -505,523 +534,557 @@
505	534	STM32_FUNCTION(4, "TIM8_CH3N"),
506	535	STM32_FUNCTION(5, "USART1_RX"),
507	536	STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),
508		- STM32_FUNCTION(7, "DFSDM_CK2"),
509		- STM32_FUNCTION(10, "SDMMC2_D1 SDMMC_BOOT2_D1"),
	537	+ STM32_FUNCTION(7, "DFSDM1_CKIN2"),
	538	+ STM32_FUNCTION(10, "SDMMC2_D1"),
510	539	STM32_FUNCTION(16, "EVENTOUT"),
511	540	STM32_FUNCTION(17, "ANALOG")
512	541	),
513		- STM32_PIN(
	542	+ STM32_PIN_PKG(
514	543	PINCTRL_PIN(32, "PC0"),
	544	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
515	545	STM32_FUNCTION(0, "GPIOC0"),
516		- STM32_FUNCTION(4, "DFSDM_CK0"),
	546	+ STM32_FUNCTION(4, "DFSDM1_CKIN0"),
517	547	STM32_FUNCTION(5, "LPTIM2_IN2"),
518		- STM32_FUNCTION(7, "DFSDM_DATA4"),
	548	+ STM32_FUNCTION(7, "DFSDM1_DATIN4"),
519	549	STM32_FUNCTION(9, "SAI2_FS_B"),
520		- STM32_FUNCTION(11, "QUADSPI_BK2_NCS QUADSPI_BOOTBK2_NCS"),
	550	+ STM32_FUNCTION(11, "QUADSPI_BK2_NCS"),
521	551	STM32_FUNCTION(15, "LCD_R5"),
522	552	STM32_FUNCTION(16, "EVENTOUT"),
523	553	STM32_FUNCTION(17, "ANALOG")
524	554	),
525		- STM32_PIN(
	555	+ STM32_PIN_PKG(
526	556	PINCTRL_PIN(33, "PC1"),
	557	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
527	558	STM32_FUNCTION(0, "GPIOC1"),
528	559	STM32_FUNCTION(1, "TRACED0"),
529	560	STM32_FUNCTION(3, "SAI1_D1"),
530		- STM32_FUNCTION(4, "DFSDM_DATA0"),
531		- STM32_FUNCTION(5, "DFSDM_CK4"),
	561	+ STM32_FUNCTION(4, "DFSDM1_DATIN0"),
	562	+ STM32_FUNCTION(5, "DFSDM1_CKIN4"),
532	563	STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),
533	564	STM32_FUNCTION(7, "SAI1_SD_A"),
534	565	STM32_FUNCTION(10, "SDMMC2_CK"),
535		- STM32_FUNCTION(12, "ETH_MDC"),
	566	+ STM32_FUNCTION(12, "ETH1_MDC"),
536	567	STM32_FUNCTION(13, "MDIOS_MDC"),
537	568	STM32_FUNCTION(16, "EVENTOUT"),
538	569	STM32_FUNCTION(17, "ANALOG")
539	570	),
540		- STM32_PIN(
	571	+ STM32_PIN_PKG(
541	572	PINCTRL_PIN(34, "PC2"),
	573	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
542	574	STM32_FUNCTION(0, "GPIOC2"),
543		- STM32_FUNCTION(4, "DFSDM_CK1"),
	575	+ STM32_FUNCTION(4, "DFSDM1_CKIN1"),
544	576	STM32_FUNCTION(6, "SPI2_MISO I2S2_SDI"),
545		- STM32_FUNCTION(7, "DFSDM_CKOUT"),
546		- STM32_FUNCTION(12, "ETH_GMII_TXD2 ETH_MII_TXD2 ETH_RGMII_TXD2"),
	577	+ STM32_FUNCTION(7, "DFSDM1_CKOUT"),
	578	+ STM32_FUNCTION(12, "ETH1_GMII_TXD2 ETH1_MII_TXD2 ETH1_RGMII_TXD2"),
	579	+ STM32_FUNCTION(14, "DCMI_PIXCLK"),
547	580	STM32_FUNCTION(16, "EVENTOUT"),
548	581	STM32_FUNCTION(17, "ANALOG")
549	582	),
550		- STM32_PIN(
	583	+ STM32_PIN_PKG(
551	584	PINCTRL_PIN(35, "PC3"),
	585	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
552	586	STM32_FUNCTION(0, "GPIOC3"),
553	587	STM32_FUNCTION(1, "TRACECLK"),
554		- STM32_FUNCTION(4, "DFSDM_DATA1"),
	588	+ STM32_FUNCTION(4, "DFSDM1_DATIN1"),
555	589	STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),
556		- STM32_FUNCTION(12, "ETH_GMII_TX_CLK ETH_MII_TX_CLK"),
	590	+ STM32_FUNCTION(12, "ETH1_GMII_TX_CLK ETH1_MII_TX_CLK"),
557	591	STM32_FUNCTION(16, "EVENTOUT"),
558	592	STM32_FUNCTION(17, "ANALOG")
559	593	),
560		- STM32_PIN(
	594	+ STM32_PIN_PKG(
561	595	PINCTRL_PIN(36, "PC4"),
	596	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
562	597	STM32_FUNCTION(0, "GPIOC4"),
563		- STM32_FUNCTION(4, "DFSDM_CK2"),
	598	+ STM32_FUNCTION(4, "DFSDM1_CKIN2"),
564	599	STM32_FUNCTION(6, "I2S1_MCK"),
565		- STM32_FUNCTION(10, "SPDIF_IN2"),
566		- STM32_FUNCTION(12, "ETH_GMII_RXD0 ETH_MII_RXD0 ETH_RGMII_RXD0 ETH_RMII_RXD0"),
	600	+ STM32_FUNCTION(10, "SPDIFRX_IN2"),
	601	+ STM32_FUNCTION(12, "ETH1_GMII_RXD0 ETH1_MII_RXD0 ETH1_RGMII_RXD0 ETH1_RMII_RXD0"),
567	602	STM32_FUNCTION(16, "EVENTOUT"),
568	603	STM32_FUNCTION(17, "ANALOG")
569	604	),
570		- STM32_PIN(
	605	+ STM32_PIN_PKG(
571	606	PINCTRL_PIN(37, "PC5"),
	607	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
572	608	STM32_FUNCTION(0, "GPIOC5"),
573	609	STM32_FUNCTION(3, "SAI1_D3"),
574		- STM32_FUNCTION(4, "DFSDM_DATA2"),
	610	+ STM32_FUNCTION(4, "DFSDM1_DATIN2"),
575	611	STM32_FUNCTION(5, "SAI4_D4"),
576	612	STM32_FUNCTION(7, "SAI1_D4"),
577		- STM32_FUNCTION(10, "SPDIF_IN3"),
578		- STM32_FUNCTION(12, "ETH_GMII_RXD1 ETH_MII_RXD1 ETH_RGMII_RXD1 ETH_RMII_RXD1"),
	613	+ STM32_FUNCTION(10, "SPDIFRX_IN3"),
	614	+ STM32_FUNCTION(12, "ETH1_GMII_RXD1 ETH1_MII_RXD1 ETH1_RGMII_RXD1 ETH1_RMII_RXD1"),
579	615	STM32_FUNCTION(13, "SAI4_D3"),
580	616	STM32_FUNCTION(16, "EVENTOUT"),
581	617	STM32_FUNCTION(17, "ANALOG")
582	618	),
583		- STM32_PIN(
	619	+ STM32_PIN_PKG(
584	620	PINCTRL_PIN(38, "PC6"),
	621	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
585	622	STM32_FUNCTION(0, "GPIOC6"),
586	623	STM32_FUNCTION(1, "HDP1"),
587	624	STM32_FUNCTION(3, "TIM3_CH1"),
588	625	STM32_FUNCTION(4, "TIM8_CH1"),
589		- STM32_FUNCTION(5, "DFSDM_CK3"),
	626	+ STM32_FUNCTION(5, "DFSDM1_CKIN3"),
590	627	STM32_FUNCTION(6, "I2S2_MCK"),
591		- STM32_FUNCTION(8, "USART6_TX USART_BOOT6_TX"),
592		- STM32_FUNCTION(9, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),
593		- STM32_FUNCTION(10, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),
594		- STM32_FUNCTION(11, "SDMMC2_D6 SDMMC_BOOT2_D6"),
	628	+ STM32_FUNCTION(8, "USART6_TX"),
	629	+ STM32_FUNCTION(9, "SDMMC1_D0DIR"),
	630	+ STM32_FUNCTION(10, "SDMMC2_D0DIR"),
	631	+ STM32_FUNCTION(11, "SDMMC2_D6"),
595	632	STM32_FUNCTION(12, "DSI_TE"),
596		- STM32_FUNCTION(13, "SDMMC1_D6 SDMMC_BOOT1_D6"),
	633	+ STM32_FUNCTION(13, "SDMMC1_D6"),
597	634	STM32_FUNCTION(14, "DCMI_D0"),
598	635	STM32_FUNCTION(15, "LCD_HSYNC"),
599	636	STM32_FUNCTION(16, "EVENTOUT"),
600	637	STM32_FUNCTION(17, "ANALOG")
601	638	),
602		- STM32_PIN(
	639	+ STM32_PIN_PKG(
603	640	PINCTRL_PIN(39, "PC7"),
	641	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
604	642	STM32_FUNCTION(0, "GPIOC7"),
605	643	STM32_FUNCTION(1, "HDP4"),
606	644	STM32_FUNCTION(3, "TIM3_CH2"),
607	645	STM32_FUNCTION(4, "TIM8_CH2"),
608		- STM32_FUNCTION(5, "DFSDM_DATA3"),
	646	+ STM32_FUNCTION(5, "DFSDM1_DATIN3"),
609	647	STM32_FUNCTION(7, "I2S3_MCK"),
610		- STM32_FUNCTION(8, "USART6_RX USART_BOOT6_RX"),
611		- STM32_FUNCTION(9, "SDMMC1_D123DIR SDMMC_BOOT1_D123DIR"),
612		- STM32_FUNCTION(10, "SDMMC2_D123DIR SDMMC_BOOT2_D123DIR"),
613		- STM32_FUNCTION(11, "SDMMC2_D7 SDMMC_BOOT2_D7"),
614		- STM32_FUNCTION(13, "SDMMC1_D7 SDMMC_BOOT1_D7"),
	648	+ STM32_FUNCTION(8, "USART6_RX"),
	649	+ STM32_FUNCTION(9, "SDMMC1_D123DIR"),
	650	+ STM32_FUNCTION(10, "SDMMC2_D123DIR"),
	651	+ STM32_FUNCTION(11, "SDMMC2_D7"),
	652	+ STM32_FUNCTION(13, "SDMMC1_D7"),
615	653	STM32_FUNCTION(14, "DCMI_D1"),
616	654	STM32_FUNCTION(15, "LCD_G6"),
617	655	STM32_FUNCTION(16, "EVENTOUT"),
618	656	STM32_FUNCTION(17, "ANALOG")
619	657	),
620		- STM32_PIN(
	658	+ STM32_PIN_PKG(
621	659	PINCTRL_PIN(40, "PC8"),
	660	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
622	661	STM32_FUNCTION(0, "GPIOC8"),
623	662	STM32_FUNCTION(1, "TRACED0"),
624	663	STM32_FUNCTION(3, "TIM3_CH3"),
625	664	STM32_FUNCTION(4, "TIM8_CH3"),
626	665	STM32_FUNCTION(7, "UART4_TX"),
627		- STM32_FUNCTION(8, "USART6_CK USART_BOOT6_CK"),
628		- STM32_FUNCTION(9, "UART5_RTS UART_BOOT5_RTS"),
629		- STM32_FUNCTION(13, "SDMMC1_D0 SDMMC_BOOT1_D0"),
	666	+ STM32_FUNCTION(8, "USART6_CK"),
	667	+ STM32_FUNCTION(9, "UART5_RTS UART5_DE"),
	668	+ STM32_FUNCTION(13, "SDMMC1_D0"),
630	669	STM32_FUNCTION(14, "DCMI_D2"),
631	670	STM32_FUNCTION(16, "EVENTOUT"),
632	671	STM32_FUNCTION(17, "ANALOG")
633	672	),
634		- STM32_PIN(
	673	+ STM32_PIN_PKG(
635	674	PINCTRL_PIN(41, "PC9"),
	675	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
636	676	STM32_FUNCTION(0, "GPIOC9"),
637	677	STM32_FUNCTION(1, "TRACED1"),
638	678	STM32_FUNCTION(3, "TIM3_CH4"),
639	679	STM32_FUNCTION(4, "TIM8_CH4"),
640	680	STM32_FUNCTION(5, "I2C3_SDA"),
641	681	STM32_FUNCTION(6, "I2S_CKIN"),
642		- STM32_FUNCTION(9, "UART5_CTS UART_BOOT5_CTS"),
	682	+ STM32_FUNCTION(9, "UART5_CTS"),
643	683	STM32_FUNCTION(10, "QUADSPI_BK1_IO0"),
644		- STM32_FUNCTION(13, "SDMMC1_D1 SDMMC_BOOT1_D1"),
	684	+ STM32_FUNCTION(13, "SDMMC1_D1"),
645	685	STM32_FUNCTION(14, "DCMI_D3"),
646	686	STM32_FUNCTION(15, "LCD_B2"),
647	687	STM32_FUNCTION(16, "EVENTOUT"),
648	688	STM32_FUNCTION(17, "ANALOG")
649	689	),
650		- STM32_PIN(
	690	+ STM32_PIN_PKG(
651	691	PINCTRL_PIN(42, "PC10"),
	692	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
652	693	STM32_FUNCTION(0, "GPIOC10"),
653	694	STM32_FUNCTION(1, "TRACED2"),
654		- STM32_FUNCTION(4, "DFSDM_CK5"),
	695	+ STM32_FUNCTION(4, "DFSDM1_CKIN5"),
655	696	STM32_FUNCTION(7, "SPI3_SCK I2S3_CK"),
656	697	STM32_FUNCTION(8, "USART3_TX"),
657	698	STM32_FUNCTION(9, "UART4_TX"),
658	699	STM32_FUNCTION(10, "QUADSPI_BK1_IO1"),
659	700	STM32_FUNCTION(11, "SAI4_MCLK_B"),
660		- STM32_FUNCTION(13, "SDMMC1_D2 SDMMC_BOOT1_D2"),
	701	+ STM32_FUNCTION(13, "SDMMC1_D2"),
661	702	STM32_FUNCTION(14, "DCMI_D8"),
662	703	STM32_FUNCTION(15, "LCD_R2"),
663	704	STM32_FUNCTION(16, "EVENTOUT"),
664	705	STM32_FUNCTION(17, "ANALOG")
665	706	),
666		- STM32_PIN(
	707	+ STM32_PIN_PKG(
667	708	PINCTRL_PIN(43, "PC11"),
	709	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
668	710	STM32_FUNCTION(0, "GPIOC11"),
669	711	STM32_FUNCTION(1, "TRACED3"),
670		- STM32_FUNCTION(4, "DFSDM_DATA5"),
	712	+ STM32_FUNCTION(4, "DFSDM1_DATIN5"),
671	713	STM32_FUNCTION(7, "SPI3_MISO I2S3_SDI"),
672	714	STM32_FUNCTION(8, "USART3_RX"),
673	715	STM32_FUNCTION(9, "UART4_RX"),
674		- STM32_FUNCTION(10, "QUADSPI_BK2_NCS QUADSPI_BOOTBK2_NCS"),
	716	+ STM32_FUNCTION(10, "QUADSPI_BK2_NCS"),
675	717	STM32_FUNCTION(11, "SAI4_SCK_B"),
676		- STM32_FUNCTION(13, "SDMMC1_D3 SDMMC_BOOT1_D3"),
	718	+ STM32_FUNCTION(13, "SDMMC1_D3"),
677	719	STM32_FUNCTION(14, "DCMI_D4"),
678	720	STM32_FUNCTION(16, "EVENTOUT"),
679	721	STM32_FUNCTION(17, "ANALOG")
680	722	),
681		- STM32_PIN(
	723	+ STM32_PIN_PKG(
682	724	PINCTRL_PIN(44, "PC12"),
	725	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
683	726	STM32_FUNCTION(0, "GPIOC12"),
684	727	STM32_FUNCTION(1, "TRACECLK"),
685	728	STM32_FUNCTION(2, "MCO2"),
686	729	STM32_FUNCTION(3, "SAI4_D3"),
687	730	STM32_FUNCTION(7, "SPI3_MOSI I2S3_SDO"),
688		- STM32_FUNCTION(8, "USART3_CK USART_BOOT3_CK"),
	731	+ STM32_FUNCTION(8, "USART3_CK"),
689	732	STM32_FUNCTION(9, "UART5_TX"),
690	733	STM32_FUNCTION(11, "SAI4_SD_B"),
691		- STM32_FUNCTION(13, "SDMMC1_CK SDMMC_BOOT1_CK"),
	734	+ STM32_FUNCTION(13, "SDMMC1_CK"),
692	735	STM32_FUNCTION(14, "DCMI_D9"),
693	736	STM32_FUNCTION(16, "EVENTOUT"),
694	737	STM32_FUNCTION(17, "ANALOG")
695	738	),
696		- STM32_PIN(
	739	+ STM32_PIN_PKG(
697	740	PINCTRL_PIN(45, "PC13"),
	741	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
698	742	STM32_FUNCTION(0, "GPIOC13"),
699	743	STM32_FUNCTION(16, "EVENTOUT"),
700	744	STM32_FUNCTION(17, "ANALOG")
701	745	),
702		- STM32_PIN(
	746	+ STM32_PIN_PKG(
703	747	PINCTRL_PIN(46, "PC14"),
	748	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
704	749	STM32_FUNCTION(0, "GPIOC14"),
705	750	STM32_FUNCTION(16, "EVENTOUT"),
706	751	STM32_FUNCTION(17, "ANALOG")
707	752	),
708		- STM32_PIN(
	753	+ STM32_PIN_PKG(
709	754	PINCTRL_PIN(47, "PC15"),
	755	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
710	756	STM32_FUNCTION(0, "GPIOC15"),
711	757	STM32_FUNCTION(16, "EVENTOUT"),
712	758	STM32_FUNCTION(17, "ANALOG")
713	759	),
714		- STM32_PIN(
	760	+ STM32_PIN_PKG(
715	761	PINCTRL_PIN(48, "PD0"),
	762	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
716	763	STM32_FUNCTION(0, "GPIOD0"),
717	764	STM32_FUNCTION(3, "I2C6_SDA"),
718		- STM32_FUNCTION(4, "DFSDM_CK6"),
	765	+ STM32_FUNCTION(4, "DFSDM1_CKIN6"),
719	766	STM32_FUNCTION(5, "I2C5_SDA"),
720	767	STM32_FUNCTION(7, "SAI3_SCK_A"),
721	768	STM32_FUNCTION(9, "UART4_RX"),
722		- STM32_FUNCTION(10, "CAN1_RX"),
	769	+ STM32_FUNCTION(10, "FDCAN1_RX"),
723	770	STM32_FUNCTION(11, "SDMMC3_CMD"),
724		- STM32_FUNCTION(12, "DFSDM_DATA7"),
725		- STM32_FUNCTION(13, "FMC_D2"),
	771	+ STM32_FUNCTION(12, "DFSDM1_DATIN7"),
	772	+ STM32_FUNCTION(13, "FMC_D2 FMC_DA2"),
726	773	STM32_FUNCTION(16, "EVENTOUT"),
727	774	STM32_FUNCTION(17, "ANALOG")
728	775	),
729		- STM32_PIN(
	776	+ STM32_PIN_PKG(
730	777	PINCTRL_PIN(49, "PD1"),
	778	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
731	779	STM32_FUNCTION(0, "GPIOD1"),
732	780	STM32_FUNCTION(3, "I2C6_SCL"),
733		- STM32_FUNCTION(4, "DFSDM_DATA6"),
	781	+ STM32_FUNCTION(4, "DFSDM1_DATIN6"),
734	782	STM32_FUNCTION(5, "I2C5_SCL"),
735	783	STM32_FUNCTION(7, "SAI3_SD_A"),
736	784	STM32_FUNCTION(9, "UART4_TX"),
737		- STM32_FUNCTION(10, "CAN1_TX"),
	785	+ STM32_FUNCTION(10, "FDCAN1_TX"),
738	786	STM32_FUNCTION(11, "SDMMC3_D0"),
739		- STM32_FUNCTION(12, "DFSDM_CK7"),
740		- STM32_FUNCTION(13, "FMC_D3"),
	787	+ STM32_FUNCTION(12, "DFSDM1_CKIN7"),
	788	+ STM32_FUNCTION(13, "FMC_D3 FMC_DA3"),
741	789	STM32_FUNCTION(16, "EVENTOUT"),
742	790	STM32_FUNCTION(17, "ANALOG")
743	791	),
744		- STM32_PIN(
	792	+ STM32_PIN_PKG(
745	793	PINCTRL_PIN(50, "PD2"),
	794	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
746	795	STM32_FUNCTION(0, "GPIOD2"),
747	796	STM32_FUNCTION(3, "TIM3_ETR"),
748	797	STM32_FUNCTION(5, "I2C5_SMBA"),
749	798	STM32_FUNCTION(7, "UART4_RX"),
750	799	STM32_FUNCTION(9, "UART5_RX"),
751		- STM32_FUNCTION(13, "SDMMC1_CMD SDMMC_BOOT1_CMD"),
	800	+ STM32_FUNCTION(13, "SDMMC1_CMD"),
752	801	STM32_FUNCTION(14, "DCMI_D11"),
753	802	STM32_FUNCTION(16, "EVENTOUT"),
754	803	STM32_FUNCTION(17, "ANALOG")
755	804	),
756		- STM32_PIN(
	805	+ STM32_PIN_PKG(
757	806	PINCTRL_PIN(51, "PD3"),
	807	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
758	808	STM32_FUNCTION(0, "GPIOD3"),
759	809	STM32_FUNCTION(1, "HDP5"),
760		- STM32_FUNCTION(4, "DFSDM_CKOUT"),
	810	+ STM32_FUNCTION(4, "DFSDM1_CKOUT"),
761	811	STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),
762		- STM32_FUNCTION(7, "DFSDM_DATA0"),
763		- STM32_FUNCTION(8, "USART2_CTS_NSS USART_BOOT2_CTS_NSS"),
764		- STM32_FUNCTION(9, "SDMMC1_D123DIR SDMMC_BOOT1_D123DIR"),
765		- STM32_FUNCTION(10, "SDMMC2_D7 SDMMC_BOOT2_D7"),
766		- STM32_FUNCTION(11, "SDMMC2_D123DIR SDMMC_BOOT2_D123DIR"),
767		- STM32_FUNCTION(12, "SDMMC1_D7 SDMMC_BOOT1_D7"),
	812	+ STM32_FUNCTION(7, "DFSDM1_DATIN0"),
	813	+ STM32_FUNCTION(8, "USART2_CTS USART2_NSS"),
	814	+ STM32_FUNCTION(9, "SDMMC1_D123DIR"),
	815	+ STM32_FUNCTION(10, "SDMMC2_D7"),
	816	+ STM32_FUNCTION(11, "SDMMC2_D123DIR"),
	817	+ STM32_FUNCTION(12, "SDMMC1_D7"),
768	818	STM32_FUNCTION(13, "FMC_CLK"),
769	819	STM32_FUNCTION(14, "DCMI_D5"),
770	820	STM32_FUNCTION(15, "LCD_G7"),
771	821	STM32_FUNCTION(16, "EVENTOUT"),
772	822	STM32_FUNCTION(17, "ANALOG")
773	823	),
774		- STM32_PIN(
	824	+ STM32_PIN_PKG(
775	825	PINCTRL_PIN(52, "PD4"),
	826	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
776	827	STM32_FUNCTION(0, "GPIOD4"),
777	828	STM32_FUNCTION(7, "SAI3_FS_A"),
778		- STM32_FUNCTION(8, "USART2_RTS USART_BOOT2_RTS"),
779		- STM32_FUNCTION(10, "CAN1_RXFD"),
	829	+ STM32_FUNCTION(8, "USART2_RTS USART2_DE"),
780	830	STM32_FUNCTION(11, "SDMMC3_D1"),
781		- STM32_FUNCTION(12, "DFSDM_CK0"),
	831	+ STM32_FUNCTION(12, "DFSDM1_CKIN0"),
782	832	STM32_FUNCTION(13, "FMC_NOE"),
783	833	STM32_FUNCTION(16, "EVENTOUT"),
784	834	STM32_FUNCTION(17, "ANALOG")
785	835	),
786		- STM32_PIN(
	836	+ STM32_PIN_PKG(
787	837	PINCTRL_PIN(53, "PD5"),
	838	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
788	839	STM32_FUNCTION(0, "GPIOD5"),
789	840	STM32_FUNCTION(8, "USART2_TX"),
790		- STM32_FUNCTION(10, "CAN1_TXFD"),
791	841	STM32_FUNCTION(11, "SDMMC3_D2"),
792	842	STM32_FUNCTION(13, "FMC_NWE"),
793	843	STM32_FUNCTION(16, "EVENTOUT"),
794	844	STM32_FUNCTION(17, "ANALOG")
795	845	),
796		- STM32_PIN(
	846	+ STM32_PIN_PKG(
797	847	PINCTRL_PIN(54, "PD6"),
	848	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
798	849	STM32_FUNCTION(0, "GPIOD6"),
799	850	STM32_FUNCTION(2, "TIM16_CH1N"),
800	851	STM32_FUNCTION(3, "SAI1_D1"),
801		- STM32_FUNCTION(4, "DFSDM_CK4"),
802		- STM32_FUNCTION(5, "DFSDM_DATA1"),
	852	+ STM32_FUNCTION(4, "DFSDM1_CKIN4"),
	853	+ STM32_FUNCTION(5, "DFSDM1_DATIN1"),
803	854	STM32_FUNCTION(6, "SPI3_MOSI I2S3_SDO"),
804	855	STM32_FUNCTION(7, "SAI1_SD_A"),
805	856	STM32_FUNCTION(8, "USART2_RX"),
806		- STM32_FUNCTION(10, "CAN2_RXFD"),
807		- STM32_FUNCTION(11, "FMC_INT"),
808	857	STM32_FUNCTION(13, "FMC_NWAIT"),
809	858	STM32_FUNCTION(14, "DCMI_D10"),
810	859	STM32_FUNCTION(15, "LCD_B2"),
811	860	STM32_FUNCTION(16, "EVENTOUT"),
812	861	STM32_FUNCTION(17, "ANALOG")
813	862	),
814		- STM32_PIN(
	863	+ STM32_PIN_PKG(
815	864	PINCTRL_PIN(55, "PD7"),
	865	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
816	866	STM32_FUNCTION(0, "GPIOD7"),
817	867	STM32_FUNCTION(1, "TRACED6"),
818		- STM32_FUNCTION(4, "DFSDM_DATA4"),
	868	+ STM32_FUNCTION(4, "DFSDM1_DATIN4"),
819	869	STM32_FUNCTION(5, "I2C2_SCL"),
820		- STM32_FUNCTION(7, "DFSDM_CK1"),
821		- STM32_FUNCTION(8, "USART2_CK USART_BOOT2_CK"),
822		- STM32_FUNCTION(10, "SPDIF_IN0"),
	870	+ STM32_FUNCTION(7, "DFSDM1_CKIN1"),
	871	+ STM32_FUNCTION(8, "USART2_CK"),
	872	+ STM32_FUNCTION(10, "SPDIFRX_IN0"),
823	873	STM32_FUNCTION(11, "SDMMC3_D3"),
824	874	STM32_FUNCTION(13, "FMC_NE1"),
825	875	STM32_FUNCTION(16, "EVENTOUT"),
826	876	STM32_FUNCTION(17, "ANALOG")
827	877	),
828		- STM32_PIN(
	878	+ STM32_PIN_PKG(
829	879	PINCTRL_PIN(56, "PD8"),
	880	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
830	881	STM32_FUNCTION(0, "GPIOD8"),
831		- STM32_FUNCTION(4, "DFSDM_CK3"),
	882	+ STM32_FUNCTION(4, "DFSDM1_CKIN3"),
832	883	STM32_FUNCTION(7, "SAI3_SCK_B"),
833	884	STM32_FUNCTION(8, "USART3_TX"),
834		- STM32_FUNCTION(10, "SPDIF_IN1"),
835		- STM32_FUNCTION(13, "FMC_D13"),
	885	+ STM32_FUNCTION(10, "SPDIFRX_IN1"),
	886	+ STM32_FUNCTION(13, "FMC_D13 FMC_DA13"),
836	887	STM32_FUNCTION(15, "LCD_B7"),
837	888	STM32_FUNCTION(16, "EVENTOUT"),
838	889	STM32_FUNCTION(17, "ANALOG")
839	890	),
840		- STM32_PIN(
	891	+ STM32_PIN_PKG(
841	892	PINCTRL_PIN(57, "PD9"),
	893	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
842	894	STM32_FUNCTION(0, "GPIOD9"),
843		- STM32_FUNCTION(4, "DFSDM_DATA3"),
	895	+ STM32_FUNCTION(4, "DFSDM1_DATIN3"),
844	896	STM32_FUNCTION(7, "SAI3_SD_B"),
845	897	STM32_FUNCTION(8, "USART3_RX"),
846		- STM32_FUNCTION(10, "CAN2_RXFD"),
847		- STM32_FUNCTION(13, "FMC_D14"),
	898	+ STM32_FUNCTION(13, "FMC_D14 FMC_DA14"),
	899	+ STM32_FUNCTION(14, "DCMI_HSYNC"),
848	900	STM32_FUNCTION(15, "LCD_B0"),
849	901	STM32_FUNCTION(16, "EVENTOUT"),
850	902	STM32_FUNCTION(17, "ANALOG")
851	903	),
852		- STM32_PIN(
	904	+ STM32_PIN_PKG(
853	905	PINCTRL_PIN(58, "PD10"),
	906	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
854	907	STM32_FUNCTION(0, "GPIOD10"),
855	908	STM32_FUNCTION(1, "RTC_REFIN"),
856	909	STM32_FUNCTION(2, "TIM16_BKIN"),
857		- STM32_FUNCTION(4, "DFSDM_CKOUT"),
	910	+ STM32_FUNCTION(4, "DFSDM1_CKOUT"),
858	911	STM32_FUNCTION(5, "I2C5_SMBA"),
859	912	STM32_FUNCTION(6, "SPI3_MISO I2S3_SDI"),
860	913	STM32_FUNCTION(7, "SAI3_FS_B"),
861		- STM32_FUNCTION(8, "USART3_CK USART_BOOT3_CK"),
862		- STM32_FUNCTION(10, "CAN2_TXFD"),
863		- STM32_FUNCTION(13, "FMC_D15"),
	914	+ STM32_FUNCTION(8, "USART3_CK"),
	915	+ STM32_FUNCTION(13, "FMC_D15 FMC_DA15"),
864	916	STM32_FUNCTION(15, "LCD_B3"),
865	917	STM32_FUNCTION(16, "EVENTOUT"),
866	918	STM32_FUNCTION(17, "ANALOG")
867	919	),
868		- STM32_PIN(
	920	+ STM32_PIN_PKG(
869	921	PINCTRL_PIN(59, "PD11"),
	922	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
870	923	STM32_FUNCTION(0, "GPIOD11"),
871	924	STM32_FUNCTION(4, "LPTIM2_IN2"),
872	925	STM32_FUNCTION(5, "I2C4_SMBA"),
873	926	STM32_FUNCTION(6, "I2C1_SMBA"),
874		- STM32_FUNCTION(8, "USART3_CTS_NSS USART_BOOT3_CTS_NSS"),
	927	+ STM32_FUNCTION(8, "USART3_CTS USART3_NSS"),
875	928	STM32_FUNCTION(10, "QUADSPI_BK1_IO0"),
876	929	STM32_FUNCTION(11, "SAI2_SD_A"),
877		- STM32_FUNCTION(13, "FMC_A16 FMC_CLE"),
	930	+ STM32_FUNCTION(13, "FMC_CLE FMC_A16"),
878	931	STM32_FUNCTION(16, "EVENTOUT"),
879	932	STM32_FUNCTION(17, "ANALOG")
880	933	),
881		- STM32_PIN(
	934	+ STM32_PIN_PKG(
882	935	PINCTRL_PIN(60, "PD12"),
	936	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
883	937	STM32_FUNCTION(0, "GPIOD12"),
884	938	STM32_FUNCTION(2, "LPTIM1_IN1"),
885	939	STM32_FUNCTION(3, "TIM4_CH1"),
886	940	STM32_FUNCTION(4, "LPTIM2_IN1"),
887	941	STM32_FUNCTION(5, "I2C4_SCL"),
888	942	STM32_FUNCTION(6, "I2C1_SCL"),
889		- STM32_FUNCTION(8, "USART3_RTS USART_BOOT3_RTS"),
	943	+ STM32_FUNCTION(8, "USART3_RTS USART3_DE"),
890	944	STM32_FUNCTION(10, "QUADSPI_BK1_IO1"),
891	945	STM32_FUNCTION(11, "SAI2_FS_A"),
892		- STM32_FUNCTION(13, "FMC_A17 FMC_ALE"),
	946	+ STM32_FUNCTION(13, "FMC_ALE FMC_A17"),
893	947	STM32_FUNCTION(16, "EVENTOUT"),
894	948	STM32_FUNCTION(17, "ANALOG")
895	949	),
896		- STM32_PIN(
	950	+ STM32_PIN_PKG(
897	951	PINCTRL_PIN(61, "PD13"),
	952	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
898	953	STM32_FUNCTION(0, "GPIOD13"),
899	954	STM32_FUNCTION(2, "LPTIM1_OUT"),
900	955	STM32_FUNCTION(3, "TIM4_CH2"),
901	956	STM32_FUNCTION(5, "I2C4_SDA"),
902	957	STM32_FUNCTION(6, "I2C1_SDA"),
903	958	STM32_FUNCTION(7, "I2S3_MCK"),
904		- STM32_FUNCTION(10, "QUADSPI_BK1_IO3 QUADSPI_BOOTBK1_IO3"),
	959	+ STM32_FUNCTION(10, "QUADSPI_BK1_IO3"),
905	960	STM32_FUNCTION(11, "SAI2_SCK_A"),
906	961	STM32_FUNCTION(13, "FMC_A18"),
907	962	STM32_FUNCTION(14, "DSI_TE"),
908	963	STM32_FUNCTION(16, "EVENTOUT"),
909	964	STM32_FUNCTION(17, "ANALOG")
910	965	),
911		- STM32_PIN(
	966	+ STM32_PIN_PKG(
912	967	PINCTRL_PIN(62, "PD14"),
	968	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
913	969	STM32_FUNCTION(0, "GPIOD14"),
914	970	STM32_FUNCTION(3, "TIM4_CH3"),
915	971	STM32_FUNCTION(7, "SAI3_MCLK_B"),
916		- STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),
917		- STM32_FUNCTION(13, "FMC_D0"),
	972	+ STM32_FUNCTION(9, "UART8_CTS"),
	973	+ STM32_FUNCTION(13, "FMC_D0 FMC_DA0"),
918	974	STM32_FUNCTION(16, "EVENTOUT"),
919	975	STM32_FUNCTION(17, "ANALOG")
920	976	),
921		- STM32_PIN(
	977	+ STM32_PIN_PKG(
922	978	PINCTRL_PIN(63, "PD15"),
	979	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
923	980	STM32_FUNCTION(0, "GPIOD15"),
924	981	STM32_FUNCTION(3, "TIM4_CH4"),
925	982	STM32_FUNCTION(7, "SAI3_MCLK_A"),
926		- STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),
927		- STM32_FUNCTION(13, "FMC_D1"),
	983	+ STM32_FUNCTION(9, "UART8_CTS"),
	984	+ STM32_FUNCTION(13, "FMC_D1 FMC_DA1"),
	985	+ STM32_FUNCTION(15, "LCD_R1"),
928	986	STM32_FUNCTION(16, "EVENTOUT"),
929	987	STM32_FUNCTION(17, "ANALOG")
930	988	),
931		- STM32_PIN(
	989	+ STM32_PIN_PKG(
932	990	PINCTRL_PIN(64, "PE0"),
	991	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
933	992	STM32_FUNCTION(0, "GPIOE0"),
934	993	STM32_FUNCTION(2, "LPTIM1_ETR"),
935	994	STM32_FUNCTION(3, "TIM4_ETR"),
936	995	STM32_FUNCTION(5, "LPTIM2_ETR"),
937	996	STM32_FUNCTION(6, "SPI3_SCK I2S3_CK"),
938	997	STM32_FUNCTION(7, "SAI4_MCLK_B"),
939		- STM32_FUNCTION(9, "UART8_RX UART_BOOT8_RX"),
940		- STM32_FUNCTION(10, "CAN1_RXFD"),
	998	+ STM32_FUNCTION(9, "UART8_RX"),
941	999	STM32_FUNCTION(11, "SAI2_MCLK_A"),
942	1000	STM32_FUNCTION(13, "FMC_NBL0"),
943	1001	STM32_FUNCTION(14, "DCMI_D2"),
944	1002	STM32_FUNCTION(16, "EVENTOUT"),
945	1003	STM32_FUNCTION(17, "ANALOG")
946	1004	),
947		- STM32_PIN(
	1005	+ STM32_PIN_PKG(
948	1006	PINCTRL_PIN(65, "PE1"),
	1007	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
949	1008	STM32_FUNCTION(0, "GPIOE1"),
950	1009	STM32_FUNCTION(2, "LPTIM1_IN2"),
951	1010	STM32_FUNCTION(6, "I2S2_MCK"),
952	1011	STM32_FUNCTION(7, "SAI3_SD_B"),
953		- STM32_FUNCTION(9, "UART8_TX UART_BOOT8_TX"),
954		- STM32_FUNCTION(10, "CAN1_TXFD"),
	1012	+ STM32_FUNCTION(9, "UART8_TX"),
955	1013	STM32_FUNCTION(13, "FMC_NBL1"),
956	1014	STM32_FUNCTION(14, "DCMI_D3"),
957	1015	STM32_FUNCTION(16, "EVENTOUT"),
958	1016	STM32_FUNCTION(17, "ANALOG")
959	1017	),
960		- STM32_PIN(
	1018	+ STM32_PIN_PKG(
961	1019	PINCTRL_PIN(66, "PE2"),
	1020	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
962	1021	STM32_FUNCTION(0, "GPIOE2"),
963	1022	STM32_FUNCTION(1, "TRACECLK"),
964	1023	STM32_FUNCTION(3, "SAI1_CK1"),
965	1024	STM32_FUNCTION(5, "I2C4_SCL"),
966	1025	STM32_FUNCTION(6, "SPI4_SCK"),
967	1026	STM32_FUNCTION(7, "SAI1_MCLK_A"),
968		- STM32_FUNCTION(10, "QUADSPI_BK1_IO2 QUADSPI_BOOTBK1_IO2"),
969		- STM32_FUNCTION(12, "ETH_GMII_TXD3 ETH_MII_TXD3 ETH_RGMII_TXD3"),
	1027	+ STM32_FUNCTION(10, "QUADSPI_BK1_IO2"),
	1028	+ STM32_FUNCTION(12, "ETH1_GMII_TXD3 ETH1_MII_TXD3 ETH1_RGMII_TXD3"),
970	1029	STM32_FUNCTION(13, "FMC_A23"),
971	1030	STM32_FUNCTION(16, "EVENTOUT"),
972	1031	STM32_FUNCTION(17, "ANALOG")
973	1032	),
974		- STM32_PIN(
	1033	+ STM32_PIN_PKG(
975	1034	PINCTRL_PIN(67, "PE3"),
	1035	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
976	1036	STM32_FUNCTION(0, "GPIOE3"),
977	1037	STM32_FUNCTION(1, "TRACED0"),
978	1038	STM32_FUNCTION(5, "TIM15_BKIN"),
979	1039	STM32_FUNCTION(7, "SAI1_SD_B"),
980		- STM32_FUNCTION(10, "SDMMC2_CK SDMMC_BOOT2_CK"),
	1040	+ STM32_FUNCTION(10, "SDMMC2_CK"),
981	1041	STM32_FUNCTION(13, "FMC_A19"),
982	1042	STM32_FUNCTION(16, "EVENTOUT"),
983	1043	STM32_FUNCTION(17, "ANALOG")
984	1044	),
985		- STM32_PIN(
	1045	+ STM32_PIN_PKG(
986	1046	PINCTRL_PIN(68, "PE4"),
	1047	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
987	1048	STM32_FUNCTION(0, "GPIOE4"),
988	1049	STM32_FUNCTION(1, "TRACED1"),
989	1050	STM32_FUNCTION(3, "SAI1_D2"),
990		- STM32_FUNCTION(4, "DFSDM_DATA3"),
	1051	+ STM32_FUNCTION(4, "DFSDM1_DATIN3"),
991	1052	STM32_FUNCTION(5, "TIM15_CH1N"),
992	1053	STM32_FUNCTION(6, "SPI4_NSS"),
993	1054	STM32_FUNCTION(7, "SAI1_FS_A"),
994		- STM32_FUNCTION(8, "SDMMC2_CKIN SDMMC_BOOT2_CKIN"),
995		- STM32_FUNCTION(9, "SDMMC1_CKIN SDMMC_BOOT1_CKIN"),
996		- STM32_FUNCTION(10, "SDMMC2_D4 SDMMC_BOOT2_D4"),
997		- STM32_FUNCTION(12, "SDMMC1_D4 SDMMC_BOOT1_D4"),
	1055	+ STM32_FUNCTION(8, "SDMMC2_CKIN"),
	1056	+ STM32_FUNCTION(9, "SDMMC1_CKIN"),
	1057	+ STM32_FUNCTION(10, "SDMMC2_D4"),
	1058	+ STM32_FUNCTION(12, "SDMMC1_D4"),
998	1059	STM32_FUNCTION(13, "FMC_A20"),
999	1060	STM32_FUNCTION(14, "DCMI_D4"),
1000	1061	STM32_FUNCTION(15, "LCD_B0"),
1001	1062	STM32_FUNCTION(16, "EVENTOUT"),
1002	1063	STM32_FUNCTION(17, "ANALOG")
1003	1064	),
1004		- STM32_PIN(
	1065	+ STM32_PIN_PKG(
1005	1066	PINCTRL_PIN(69, "PE5"),
	1067	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1006	1068	STM32_FUNCTION(0, "GPIOE5"),
1007	1069	STM32_FUNCTION(1, "TRACED3"),
1008	1070	STM32_FUNCTION(3, "SAI1_CK2"),
1009		- STM32_FUNCTION(4, "DFSDM_CK3"),
	1071	+ STM32_FUNCTION(4, "DFSDM1_CKIN3"),
1010	1072	STM32_FUNCTION(5, "TIM15_CH1"),
1011	1073	STM32_FUNCTION(6, "SPI4_MISO"),
1012	1074	STM32_FUNCTION(7, "SAI1_SCK_A"),
1013		- STM32_FUNCTION(8, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),
1014		- STM32_FUNCTION(9, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),
1015		- STM32_FUNCTION(10, "SDMMC2_D6 SDMMC_BOOT2_D6"),
1016		- STM32_FUNCTION(12, "SDMMC1_D6 SDMMC_BOOT1_D6"),
	1075	+ STM32_FUNCTION(8, "SDMMC2_D0DIR"),
	1076	+ STM32_FUNCTION(9, "SDMMC1_D0DIR"),
	1077	+ STM32_FUNCTION(10, "SDMMC2_D6"),
	1078	+ STM32_FUNCTION(12, "SDMMC1_D6"),
1017	1079	STM32_FUNCTION(13, "FMC_A21"),
1018	1080	STM32_FUNCTION(14, "DCMI_D6"),
1019	1081	STM32_FUNCTION(15, "LCD_G0"),
1020	1082	STM32_FUNCTION(16, "EVENTOUT"),
1021	1083	STM32_FUNCTION(17, "ANALOG")
1022	1084	),
1023		- STM32_PIN(
	1085	+ STM32_PIN_PKG(
1024	1086	PINCTRL_PIN(70, "PE6"),
	1087	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1025	1088	STM32_FUNCTION(0, "GPIOE6"),
1026	1089	STM32_FUNCTION(1, "TRACED2"),
1027	1090	STM32_FUNCTION(2, "TIM1_BKIN2"),
..	..	@@ -1030,7 +1093,7 @@
1030	1093	STM32_FUNCTION(6, "SPI4_MOSI"),
1031	1094	STM32_FUNCTION(7, "SAI1_SD_A"),
1032	1095	STM32_FUNCTION(8, "SDMMC2_D0"),
1033		- STM32_FUNCTION(9, "SDMMC1_D2 SDMMC_BOOT1_D2"),
	1096	+ STM32_FUNCTION(9, "SDMMC1_D2"),
1034	1097	STM32_FUNCTION(11, "SAI2_MCLK_B"),
1035	1098	STM32_FUNCTION(13, "FMC_A22"),
1036	1099	STM32_FUNCTION(14, "DCMI_D7"),
..	..	@@ -1038,119 +1101,132 @@
1038	1101	STM32_FUNCTION(16, "EVENTOUT"),
1039	1102	STM32_FUNCTION(17, "ANALOG")
1040	1103	),
1041		- STM32_PIN(
	1104	+ STM32_PIN_PKG(
1042	1105	PINCTRL_PIN(71, "PE7"),
	1106	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1043	1107	STM32_FUNCTION(0, "GPIOE7"),
1044	1108	STM32_FUNCTION(2, "TIM1_ETR"),
1045	1109	STM32_FUNCTION(3, "TIM3_ETR"),
1046		- STM32_FUNCTION(4, "DFSDM_DATA2"),
	1110	+ STM32_FUNCTION(4, "DFSDM1_DATIN2"),
1047	1111	STM32_FUNCTION(8, "UART7_RX"),
1048		- STM32_FUNCTION(11, "QUADSPI_BK2_IO0 QUADSPI_BOOTBK2_IO0"),
1049		- STM32_FUNCTION(13, "FMC_D4"),
	1112	+ STM32_FUNCTION(11, "QUADSPI_BK2_IO0"),
	1113	+ STM32_FUNCTION(13, "FMC_D4 FMC_DA4"),
1050	1114	STM32_FUNCTION(16, "EVENTOUT"),
1051	1115	STM32_FUNCTION(17, "ANALOG")
1052	1116	),
1053		- STM32_PIN(
	1117	+ STM32_PIN_PKG(
1054	1118	PINCTRL_PIN(72, "PE8"),
	1119	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1055	1120	STM32_FUNCTION(0, "GPIOE8"),
1056	1121	STM32_FUNCTION(2, "TIM1_CH1N"),
1057		- STM32_FUNCTION(4, "DFSDM_CK2"),
	1122	+ STM32_FUNCTION(4, "DFSDM1_CKIN2"),
1058	1123	STM32_FUNCTION(8, "UART7_TX"),
1059		- STM32_FUNCTION(11, "QUADSPI_BK2_IO1 QUADSPI_BOOTBK2_IO1"),
1060		- STM32_FUNCTION(13, "FMC_D5"),
	1124	+ STM32_FUNCTION(11, "QUADSPI_BK2_IO1"),
	1125	+ STM32_FUNCTION(13, "FMC_D5 FMC_DA5"),
1061	1126	STM32_FUNCTION(16, "EVENTOUT"),
1062	1127	STM32_FUNCTION(17, "ANALOG")
1063	1128	),
1064		- STM32_PIN(
	1129	+ STM32_PIN_PKG(
1065	1130	PINCTRL_PIN(73, "PE9"),
	1131	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1066	1132	STM32_FUNCTION(0, "GPIOE9"),
1067	1133	STM32_FUNCTION(2, "TIM1_CH1"),
1068		- STM32_FUNCTION(4, "DFSDM_CKOUT"),
1069		- STM32_FUNCTION(8, "UART7_RTS UART_BOOT7_RTS"),
1070		- STM32_FUNCTION(11, "QUADSPI_BK2_IO2 QUADSPI_BOOTBK2_IO2"),
1071		- STM32_FUNCTION(13, "FMC_D6"),
	1134	+ STM32_FUNCTION(4, "DFSDM1_CKOUT"),
	1135	+ STM32_FUNCTION(8, "UART7_RTS UART7_DE"),
	1136	+ STM32_FUNCTION(11, "QUADSPI_BK2_IO2"),
	1137	+ STM32_FUNCTION(13, "FMC_D6 FMC_DA6"),
1072	1138	STM32_FUNCTION(16, "EVENTOUT"),
1073	1139	STM32_FUNCTION(17, "ANALOG")
1074	1140	),
1075		- STM32_PIN(
	1141	+ STM32_PIN_PKG(
1076	1142	PINCTRL_PIN(74, "PE10"),
	1143	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1077	1144	STM32_FUNCTION(0, "GPIOE10"),
1078	1145	STM32_FUNCTION(2, "TIM1_CH2N"),
1079		- STM32_FUNCTION(4, "DFSDM_DATA4"),
1080		- STM32_FUNCTION(8, "UART7_CTS UART_BOOT7_CTS"),
1081		- STM32_FUNCTION(11, "QUADSPI_BK2_IO3 QUADSPI_BOOTBK2_IO3"),
1082		- STM32_FUNCTION(13, "FMC_D7"),
	1146	+ STM32_FUNCTION(4, "DFSDM1_DATIN4"),
	1147	+ STM32_FUNCTION(8, "UART7_CTS"),
	1148	+ STM32_FUNCTION(11, "QUADSPI_BK2_IO3"),
	1149	+ STM32_FUNCTION(13, "FMC_D7 FMC_DA7"),
1083	1150	STM32_FUNCTION(16, "EVENTOUT"),
1084	1151	STM32_FUNCTION(17, "ANALOG")
1085	1152	),
1086		- STM32_PIN(
	1153	+ STM32_PIN_PKG(
1087	1154	PINCTRL_PIN(75, "PE11"),
	1155	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1088	1156	STM32_FUNCTION(0, "GPIOE11"),
1089	1157	STM32_FUNCTION(2, "TIM1_CH2"),
1090		- STM32_FUNCTION(4, "DFSDM_CK4"),
	1158	+ STM32_FUNCTION(4, "DFSDM1_CKIN4"),
1091	1159	STM32_FUNCTION(6, "SPI4_NSS"),
1092		- STM32_FUNCTION(8, "USART6_CK USART_BOOT6_CK"),
	1160	+ STM32_FUNCTION(8, "USART6_CK"),
1093	1161	STM32_FUNCTION(11, "SAI2_SD_B"),
1094		- STM32_FUNCTION(13, "FMC_D8"),
	1162	+ STM32_FUNCTION(13, "FMC_D8 FMC_DA8"),
	1163	+ STM32_FUNCTION(14, "DCMI_D4"),
1095	1164	STM32_FUNCTION(15, "LCD_G3"),
1096	1165	STM32_FUNCTION(16, "EVENTOUT"),
1097	1166	STM32_FUNCTION(17, "ANALOG")
1098	1167	),
1099		- STM32_PIN(
	1168	+ STM32_PIN_PKG(
1100	1169	PINCTRL_PIN(76, "PE12"),
	1170	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1101	1171	STM32_FUNCTION(0, "GPIOE12"),
1102	1172	STM32_FUNCTION(2, "TIM1_CH3N"),
1103		- STM32_FUNCTION(4, "DFSDM_DATA5"),
	1173	+ STM32_FUNCTION(4, "DFSDM1_DATIN5"),
1104	1174	STM32_FUNCTION(6, "SPI4_SCK"),
1105		- STM32_FUNCTION(9, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),
	1175	+ STM32_FUNCTION(9, "SDMMC1_D0DIR"),
1106	1176	STM32_FUNCTION(11, "SAI2_SCK_B"),
1107		- STM32_FUNCTION(13, "FMC_D9"),
	1177	+ STM32_FUNCTION(13, "FMC_D9 FMC_DA9"),
1108	1178	STM32_FUNCTION(15, "LCD_B4"),
1109	1179	STM32_FUNCTION(16, "EVENTOUT"),
1110	1180	STM32_FUNCTION(17, "ANALOG")
1111	1181	),
1112		- STM32_PIN(
	1182	+ STM32_PIN_PKG(
1113	1183	PINCTRL_PIN(77, "PE13"),
	1184	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1114	1185	STM32_FUNCTION(0, "GPIOE13"),
1115	1186	STM32_FUNCTION(1, "HDP2"),
1116	1187	STM32_FUNCTION(2, "TIM1_CH3"),
1117		- STM32_FUNCTION(4, "DFSDM_CK5"),
	1188	+ STM32_FUNCTION(4, "DFSDM1_CKIN5"),
1118	1189	STM32_FUNCTION(6, "SPI4_MISO"),
1119	1190	STM32_FUNCTION(11, "SAI2_FS_B"),
1120		- STM32_FUNCTION(13, "FMC_D10"),
	1191	+ STM32_FUNCTION(13, "FMC_D10 FMC_DA10"),
	1192	+ STM32_FUNCTION(14, "DCMI_D6"),
1121	1193	STM32_FUNCTION(15, "LCD_DE"),
1122	1194	STM32_FUNCTION(16, "EVENTOUT"),
1123	1195	STM32_FUNCTION(17, "ANALOG")
1124	1196	),
1125		- STM32_PIN(
	1197	+ STM32_PIN_PKG(
1126	1198	PINCTRL_PIN(78, "PE14"),
	1199	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1127	1200	STM32_FUNCTION(0, "GPIOE14"),
1128	1201	STM32_FUNCTION(2, "TIM1_CH4"),
1129	1202	STM32_FUNCTION(6, "SPI4_MOSI"),
1130		- STM32_FUNCTION(9, "UART8_RTS UART_BOOT8_RTS"),
	1203	+ STM32_FUNCTION(9, "UART8_RTS UART8_DE"),
1131	1204	STM32_FUNCTION(11, "SAI2_MCLK_B"),
1132		- STM32_FUNCTION(12, "SDMMC1_D123DIR SDMMC_BOOT1_D123DIR"),
1133		- STM32_FUNCTION(13, "FMC_D11"),
	1205	+ STM32_FUNCTION(12, "SDMMC1_D123DIR"),
	1206	+ STM32_FUNCTION(13, "FMC_D11 FMC_DA11"),
1134	1207	STM32_FUNCTION(14, "LCD_G0"),
1135	1208	STM32_FUNCTION(15, "LCD_CLK"),
1136	1209	STM32_FUNCTION(16, "EVENTOUT"),
1137	1210	STM32_FUNCTION(17, "ANALOG")
1138	1211	),
1139		- STM32_PIN(
	1212	+ STM32_PIN_PKG(
1140	1213	PINCTRL_PIN(79, "PE15"),
	1214	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1141	1215	STM32_FUNCTION(0, "GPIOE15"),
1142	1216	STM32_FUNCTION(1, "HDP3"),
1143	1217	STM32_FUNCTION(2, "TIM1_BKIN"),
1144	1218	STM32_FUNCTION(5, "TIM15_BKIN"),
1145		- STM32_FUNCTION(8, "USART2_CTS_NSS USART_BOOT2_CTS_NSS"),
1146		- STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),
1147		- STM32_FUNCTION(13, "FMC_D12"),
	1219	+ STM32_FUNCTION(8, "USART2_CTS USART2_NSS"),
	1220	+ STM32_FUNCTION(9, "UART8_CTS"),
	1221	+ STM32_FUNCTION(11, "FMC_NCE2"),
	1222	+ STM32_FUNCTION(13, "FMC_D12 FMC_DA12"),
1148	1223	STM32_FUNCTION(15, "LCD_R7"),
1149	1224	STM32_FUNCTION(16, "EVENTOUT"),
1150	1225	STM32_FUNCTION(17, "ANALOG")
1151	1226	),
1152		- STM32_PIN(
	1227	+ STM32_PIN_PKG(
1153	1228	PINCTRL_PIN(80, "PF0"),
	1229	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1154	1230	STM32_FUNCTION(0, "GPIOF0"),
1155	1231	STM32_FUNCTION(5, "I2C2_SDA"),
1156	1232	STM32_FUNCTION(10, "SDMMC3_D0"),
..	..	@@ -1159,8 +1235,9 @@
1159	1235	STM32_FUNCTION(16, "EVENTOUT"),
1160	1236	STM32_FUNCTION(17, "ANALOG")
1161	1237	),
1162		- STM32_PIN(
	1238	+ STM32_PIN_PKG(
1163	1239	PINCTRL_PIN(81, "PF1"),
	1240	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1164	1241	STM32_FUNCTION(0, "GPIOF1"),
1165	1242	STM32_FUNCTION(5, "I2C2_SCL"),
1166	1243	STM32_FUNCTION(10, "SDMMC3_CMD"),
..	..	@@ -1169,27 +1246,30 @@
1169	1246	STM32_FUNCTION(16, "EVENTOUT"),
1170	1247	STM32_FUNCTION(17, "ANALOG")
1171	1248	),
1172		- STM32_PIN(
	1249	+ STM32_PIN_PKG(
1173	1250	PINCTRL_PIN(82, "PF2"),
	1251	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1174	1252	STM32_FUNCTION(0, "GPIOF2"),
1175	1253	STM32_FUNCTION(5, "I2C2_SMBA"),
1176		- STM32_FUNCTION(10, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),
	1254	+ STM32_FUNCTION(10, "SDMMC2_D0DIR"),
1177	1255	STM32_FUNCTION(11, "SDMMC3_D0DIR"),
1178		- STM32_FUNCTION(12, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),
	1256	+ STM32_FUNCTION(12, "SDMMC1_D0DIR"),
1179	1257	STM32_FUNCTION(13, "FMC_A2"),
1180	1258	STM32_FUNCTION(16, "EVENTOUT"),
1181	1259	STM32_FUNCTION(17, "ANALOG")
1182	1260	),
1183		- STM32_PIN(
	1261	+ STM32_PIN_PKG(
1184	1262	PINCTRL_PIN(83, "PF3"),
	1263	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1185	1264	STM32_FUNCTION(0, "GPIOF3"),
1186		- STM32_FUNCTION(12, "ETH_GMII_TX_ER ETH_MII_TX_ER"),
	1265	+ STM32_FUNCTION(12, "ETH1_GMII_TX_ER ETH1_MII_TX_ER"),
1187	1266	STM32_FUNCTION(13, "FMC_A3"),
1188	1267	STM32_FUNCTION(16, "EVENTOUT"),
1189	1268	STM32_FUNCTION(17, "ANALOG")
1190	1269	),
1191		- STM32_PIN(
	1270	+ STM32_PIN_PKG(
1192	1271	PINCTRL_PIN(84, "PF4"),
	1272	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1193	1273	STM32_FUNCTION(0, "GPIOF4"),
1194	1274	STM32_FUNCTION(8, "USART2_RX"),
1195	1275	STM32_FUNCTION(10, "SDMMC3_D1"),
..	..	@@ -1198,8 +1278,9 @@
1198	1278	STM32_FUNCTION(16, "EVENTOUT"),
1199	1279	STM32_FUNCTION(17, "ANALOG")
1200	1280	),
1201		- STM32_PIN(
	1281	+ STM32_PIN_PKG(
1202	1282	PINCTRL_PIN(85, "PF5"),
	1283	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1203	1284	STM32_FUNCTION(0, "GPIOF5"),
1204	1285	STM32_FUNCTION(8, "USART2_TX"),
1205	1286	STM32_FUNCTION(10, "SDMMC3_D2"),
..	..	@@ -1207,71 +1288,77 @@
1207	1288	STM32_FUNCTION(16, "EVENTOUT"),
1208	1289	STM32_FUNCTION(17, "ANALOG")
1209	1290	),
1210		- STM32_PIN(
	1291	+ STM32_PIN_PKG(
1211	1292	PINCTRL_PIN(86, "PF6"),
	1293	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1212	1294	STM32_FUNCTION(0, "GPIOF6"),
1213	1295	STM32_FUNCTION(2, "TIM16_CH1"),
1214	1296	STM32_FUNCTION(6, "SPI5_NSS"),
1215	1297	STM32_FUNCTION(7, "SAI1_SD_B"),
1216		- STM32_FUNCTION(8, "UART7_RX UART_BOOT7_RX"),
1217		- STM32_FUNCTION(10, "QUADSPI_BK1_IO3 QUADSPI_BOOTBK1_IO3"),
	1298	+ STM32_FUNCTION(8, "UART7_RX"),
	1299	+ STM32_FUNCTION(10, "QUADSPI_BK1_IO3"),
1218	1300	STM32_FUNCTION(13, "SAI4_SCK_B"),
1219	1301	STM32_FUNCTION(16, "EVENTOUT"),
1220	1302	STM32_FUNCTION(17, "ANALOG")
1221	1303	),
1222		- STM32_PIN(
	1304	+ STM32_PIN_PKG(
1223	1305	PINCTRL_PIN(87, "PF7"),
	1306	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1224	1307	STM32_FUNCTION(0, "GPIOF7"),
1225	1308	STM32_FUNCTION(2, "TIM17_CH1"),
1226	1309	STM32_FUNCTION(6, "SPI5_SCK"),
1227	1310	STM32_FUNCTION(7, "SAI1_MCLK_B"),
1228		- STM32_FUNCTION(8, "UART7_TX UART_BOOT7_TX"),
1229		- STM32_FUNCTION(10, "QUADSPI_BK1_IO2 QUADSPI_BOOTBK1_IO2"),
	1311	+ STM32_FUNCTION(8, "UART7_TX"),
	1312	+ STM32_FUNCTION(10, "QUADSPI_BK1_IO2"),
1230	1313	STM32_FUNCTION(16, "EVENTOUT"),
1231	1314	STM32_FUNCTION(17, "ANALOG")
1232	1315	),
1233		- STM32_PIN(
	1316	+ STM32_PIN_PKG(
1234	1317	PINCTRL_PIN(88, "PF8"),
	1318	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1235	1319	STM32_FUNCTION(0, "GPIOF8"),
1236	1320	STM32_FUNCTION(1, "TRACED12"),
1237	1321	STM32_FUNCTION(2, "TIM16_CH1N"),
1238	1322	STM32_FUNCTION(6, "SPI5_MISO"),
1239	1323	STM32_FUNCTION(7, "SAI1_SCK_B"),
1240		- STM32_FUNCTION(8, "UART7_RTS UART_BOOT7_RTS"),
	1324	+ STM32_FUNCTION(8, "UART7_RTS UART7_DE"),
1241	1325	STM32_FUNCTION(10, "TIM13_CH1"),
1242		- STM32_FUNCTION(11, "QUADSPI_BK1_IO0 QUADSPI_BOOTBK1_IO0"),
	1326	+ STM32_FUNCTION(11, "QUADSPI_BK1_IO0"),
1243	1327	STM32_FUNCTION(16, "EVENTOUT"),
1244	1328	STM32_FUNCTION(17, "ANALOG")
1245	1329	),
1246		- STM32_PIN(
	1330	+ STM32_PIN_PKG(
1247	1331	PINCTRL_PIN(89, "PF9"),
	1332	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1248	1333	STM32_FUNCTION(0, "GPIOF9"),
1249	1334	STM32_FUNCTION(1, "TRACED13"),
1250	1335	STM32_FUNCTION(2, "TIM17_CH1N"),
1251	1336	STM32_FUNCTION(6, "SPI5_MOSI"),
1252	1337	STM32_FUNCTION(7, "SAI1_FS_B"),
1253		- STM32_FUNCTION(8, "UART7_CTS UART_BOOT7_CTS"),
	1338	+ STM32_FUNCTION(8, "UART7_CTS"),
1254	1339	STM32_FUNCTION(10, "TIM14_CH1"),
1255		- STM32_FUNCTION(11, "QUADSPI_BK1_IO1 QUADSPI_BOOTBK1_IO1"),
	1340	+ STM32_FUNCTION(11, "QUADSPI_BK1_IO1"),
1256	1341	STM32_FUNCTION(16, "EVENTOUT"),
1257	1342	STM32_FUNCTION(17, "ANALOG")
1258	1343	),
1259		- STM32_PIN(
	1344	+ STM32_PIN_PKG(
1260	1345	PINCTRL_PIN(90, "PF10"),
	1346	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1261	1347	STM32_FUNCTION(0, "GPIOF10"),
1262	1348	STM32_FUNCTION(2, "TIM16_BKIN"),
1263	1349	STM32_FUNCTION(3, "SAI1_D3"),
1264	1350	STM32_FUNCTION(4, "SAI4_D4"),
1265	1351	STM32_FUNCTION(7, "SAI1_D4"),
1266		- STM32_FUNCTION(10, "QUADSPI_CLK QUADSPI_BOOTCLK"),
	1352	+ STM32_FUNCTION(10, "QUADSPI_CLK"),
1267	1353	STM32_FUNCTION(13, "SAI4_D3"),
1268	1354	STM32_FUNCTION(14, "DCMI_D11"),
1269	1355	STM32_FUNCTION(15, "LCD_DE"),
1270	1356	STM32_FUNCTION(16, "EVENTOUT"),
1271	1357	STM32_FUNCTION(17, "ANALOG")
1272	1358	),
1273		- STM32_PIN(
	1359	+ STM32_PIN_PKG(
1274	1360	PINCTRL_PIN(91, "PF11"),
	1361	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1275	1362	STM32_FUNCTION(0, "GPIOF11"),
1276	1363	STM32_FUNCTION(6, "SPI5_MOSI"),
1277	1364	STM32_FUNCTION(11, "SAI2_SD_B"),
..	..	@@ -1280,138 +1367,151 @@
1280	1367	STM32_FUNCTION(16, "EVENTOUT"),
1281	1368	STM32_FUNCTION(17, "ANALOG")
1282	1369	),
1283		- STM32_PIN(
	1370	+ STM32_PIN_PKG(
1284	1371	PINCTRL_PIN(92, "PF12"),
	1372	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1285	1373	STM32_FUNCTION(0, "GPIOF12"),
1286	1374	STM32_FUNCTION(1, "TRACED4"),
1287		- STM32_FUNCTION(12, "ETH_GMII_RXD4"),
	1375	+ STM32_FUNCTION(12, "ETH1_GMII_RXD4"),
1288	1376	STM32_FUNCTION(13, "FMC_A6"),
1289	1377	STM32_FUNCTION(16, "EVENTOUT"),
1290	1378	STM32_FUNCTION(17, "ANALOG")
1291	1379	),
1292		- STM32_PIN(
	1380	+ STM32_PIN_PKG(
1293	1381	PINCTRL_PIN(93, "PF13"),
	1382	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1294	1383	STM32_FUNCTION(0, "GPIOF13"),
1295	1384	STM32_FUNCTION(1, "TRACED5"),
1296		- STM32_FUNCTION(4, "DFSDM_DATA6"),
	1385	+ STM32_FUNCTION(4, "DFSDM1_DATIN6"),
1297	1386	STM32_FUNCTION(5, "I2C4_SMBA"),
1298	1387	STM32_FUNCTION(6, "I2C1_SMBA"),
1299		- STM32_FUNCTION(7, "DFSDM_DATA3"),
1300		- STM32_FUNCTION(12, "ETH_GMII_RXD5"),
	1388	+ STM32_FUNCTION(7, "DFSDM1_DATIN3"),
	1389	+ STM32_FUNCTION(12, "ETH1_GMII_RXD5"),
1301	1390	STM32_FUNCTION(13, "FMC_A7"),
1302	1391	STM32_FUNCTION(16, "EVENTOUT"),
1303	1392	STM32_FUNCTION(17, "ANALOG")
1304	1393	),
1305		- STM32_PIN(
	1394	+ STM32_PIN_PKG(
1306	1395	PINCTRL_PIN(94, "PF14"),
	1396	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1307	1397	STM32_FUNCTION(0, "GPIOF14"),
1308	1398	STM32_FUNCTION(1, "TRACED6"),
1309		- STM32_FUNCTION(4, "DFSDM_CK6"),
	1399	+ STM32_FUNCTION(4, "DFSDM1_CKIN6"),
1310	1400	STM32_FUNCTION(5, "I2C4_SCL"),
1311	1401	STM32_FUNCTION(6, "I2C1_SCL"),
1312		- STM32_FUNCTION(12, "ETH_GMII_RXD6"),
	1402	+ STM32_FUNCTION(12, "ETH1_GMII_RXD6"),
1313	1403	STM32_FUNCTION(13, "FMC_A8"),
1314	1404	STM32_FUNCTION(16, "EVENTOUT"),
1315	1405	STM32_FUNCTION(17, "ANALOG")
1316	1406	),
1317		- STM32_PIN(
	1407	+ STM32_PIN_PKG(
1318	1408	PINCTRL_PIN(95, "PF15"),
	1409	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1319	1410	STM32_FUNCTION(0, "GPIOF15"),
1320	1411	STM32_FUNCTION(1, "TRACED7"),
1321	1412	STM32_FUNCTION(5, "I2C4_SDA"),
1322	1413	STM32_FUNCTION(6, "I2C1_SDA"),
1323		- STM32_FUNCTION(12, "ETH_GMII_RXD7"),
	1414	+ STM32_FUNCTION(12, "ETH1_GMII_RXD7"),
1324	1415	STM32_FUNCTION(13, "FMC_A9"),
1325	1416	STM32_FUNCTION(16, "EVENTOUT"),
1326	1417	STM32_FUNCTION(17, "ANALOG")
1327	1418	),
1328		- STM32_PIN(
	1419	+ STM32_PIN_PKG(
1329	1420	PINCTRL_PIN(96, "PG0"),
	1421	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1330	1422	STM32_FUNCTION(0, "GPIOG0"),
1331	1423	STM32_FUNCTION(1, "TRACED0"),
1332		- STM32_FUNCTION(4, "DFSDM_DATA0"),
1333		- STM32_FUNCTION(12, "ETH_GMII_TXD4"),
	1424	+ STM32_FUNCTION(4, "DFSDM1_DATIN0"),
	1425	+ STM32_FUNCTION(12, "ETH1_GMII_TXD4"),
1334	1426	STM32_FUNCTION(13, "FMC_A10"),
1335	1427	STM32_FUNCTION(16, "EVENTOUT"),
1336	1428	STM32_FUNCTION(17, "ANALOG")
1337	1429	),
1338		- STM32_PIN(
	1430	+ STM32_PIN_PKG(
1339	1431	PINCTRL_PIN(97, "PG1"),
	1432	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1340	1433	STM32_FUNCTION(0, "GPIOG1"),
1341	1434	STM32_FUNCTION(1, "TRACED1"),
1342		- STM32_FUNCTION(12, "ETH_GMII_TXD5"),
	1435	+ STM32_FUNCTION(12, "ETH1_GMII_TXD5"),
1343	1436	STM32_FUNCTION(13, "FMC_A11"),
1344	1437	STM32_FUNCTION(16, "EVENTOUT"),
1345	1438	STM32_FUNCTION(17, "ANALOG")
1346	1439	),
1347		- STM32_PIN(
	1440	+ STM32_PIN_PKG(
1348	1441	PINCTRL_PIN(98, "PG2"),
	1442	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1349	1443	STM32_FUNCTION(0, "GPIOG2"),
1350	1444	STM32_FUNCTION(1, "TRACED2"),
1351	1445	STM32_FUNCTION(2, "MCO2"),
1352	1446	STM32_FUNCTION(4, "TIM8_BKIN"),
1353		- STM32_FUNCTION(12, "ETH_GMII_TXD6"),
	1447	+ STM32_FUNCTION(12, "ETH1_GMII_TXD6"),
1354	1448	STM32_FUNCTION(13, "FMC_A12"),
1355	1449	STM32_FUNCTION(16, "EVENTOUT"),
1356	1450	STM32_FUNCTION(17, "ANALOG")
1357	1451	),
1358		- STM32_PIN(
	1452	+ STM32_PIN_PKG(
1359	1453	PINCTRL_PIN(99, "PG3"),
	1454	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1360	1455	STM32_FUNCTION(0, "GPIOG3"),
1361	1456	STM32_FUNCTION(1, "TRACED3"),
1362	1457	STM32_FUNCTION(4, "TIM8_BKIN2"),
1363		- STM32_FUNCTION(5, "DFSDM_CK1"),
1364		- STM32_FUNCTION(12, "ETH_GMII_TXD7"),
	1458	+ STM32_FUNCTION(5, "DFSDM1_CKIN1"),
	1459	+ STM32_FUNCTION(12, "ETH1_GMII_TXD7"),
1365	1460	STM32_FUNCTION(13, "FMC_A13"),
1366	1461	STM32_FUNCTION(16, "EVENTOUT"),
1367	1462	STM32_FUNCTION(17, "ANALOG")
1368	1463	),
1369		- STM32_PIN(
	1464	+ STM32_PIN_PKG(
1370	1465	PINCTRL_PIN(100, "PG4"),
	1466	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1371	1467	STM32_FUNCTION(0, "GPIOG4"),
1372	1468	STM32_FUNCTION(2, "TIM1_BKIN2"),
1373		- STM32_FUNCTION(12, "ETH_GMII_GTX_CLK ETH_RGMII_GTX_CLK"),
	1469	+ STM32_FUNCTION(12, "ETH1_GMII_GTX_CLK ETH1_RGMII_GTX_CLK"),
1374	1470	STM32_FUNCTION(13, "FMC_A14"),
1375	1471	STM32_FUNCTION(16, "EVENTOUT"),
1376	1472	STM32_FUNCTION(17, "ANALOG")
1377	1473	),
1378		- STM32_PIN(
	1474	+ STM32_PIN_PKG(
1379	1475	PINCTRL_PIN(101, "PG5"),
	1476	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1380	1477	STM32_FUNCTION(0, "GPIOG5"),
1381	1478	STM32_FUNCTION(2, "TIM1_ETR"),
1382		- STM32_FUNCTION(12, "ETH_GMII_CLK125 ETH_RGMII_CLK125"),
	1479	+ STM32_FUNCTION(12, "ETH1_GMII_CLK125 ETH1_RGMII_CLK125"),
1383	1480	STM32_FUNCTION(13, "FMC_A15"),
1384	1481	STM32_FUNCTION(16, "EVENTOUT"),
1385	1482	STM32_FUNCTION(17, "ANALOG")
1386	1483	),
1387		- STM32_PIN(
	1484	+ STM32_PIN_PKG(
1388	1485	PINCTRL_PIN(102, "PG6"),
	1486	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1389	1487	STM32_FUNCTION(0, "GPIOG6"),
1390	1488	STM32_FUNCTION(1, "TRACED14"),
1391	1489	STM32_FUNCTION(2, "TIM17_BKIN"),
1392		- STM32_FUNCTION(11, "SDMMC2_CMD SDMMC_BOOT2_CMD"),
	1490	+ STM32_FUNCTION(11, "SDMMC2_CMD"),
1393	1491	STM32_FUNCTION(14, "DCMI_D12"),
1394	1492	STM32_FUNCTION(15, "LCD_R7"),
1395	1493	STM32_FUNCTION(16, "EVENTOUT"),
1396	1494	STM32_FUNCTION(17, "ANALOG")
1397	1495	),
1398		- STM32_PIN(
	1496	+ STM32_PIN_PKG(
1399	1497	PINCTRL_PIN(103, "PG7"),
	1498	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1400	1499	STM32_FUNCTION(0, "GPIOG7"),
1401	1500	STM32_FUNCTION(1, "TRACED5"),
1402	1501	STM32_FUNCTION(7, "SAI1_MCLK_A"),
1403		- STM32_FUNCTION(8, "USART6_CK USART_BOOT6_CK"),
1404		- STM32_FUNCTION(9, "UART8_RTS UART_BOOT8_RTS"),
	1502	+ STM32_FUNCTION(8, "USART6_CK"),
	1503	+ STM32_FUNCTION(9, "UART8_RTS UART8_DE"),
1405	1504	STM32_FUNCTION(10, "QUADSPI_CLK"),
1406		- STM32_FUNCTION(12, "QUADSPI_BK2_IO3 QUADSPI_BOOTBK2_IO3"),
	1505	+ STM32_FUNCTION(12, "QUADSPI_BK2_IO3"),
1407	1506	STM32_FUNCTION(13, "FMC_INT"),
1408	1507	STM32_FUNCTION(14, "DCMI_D13"),
1409	1508	STM32_FUNCTION(15, "LCD_CLK"),
1410	1509	STM32_FUNCTION(16, "EVENTOUT"),
1411	1510	STM32_FUNCTION(17, "ANALOG")
1412	1511	),
1413		- STM32_PIN(
	1512	+ STM32_PIN_PKG(
1414	1513	PINCTRL_PIN(104, "PG8"),
	1514	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1415	1515	STM32_FUNCTION(0, "GPIOG8"),
1416	1516	STM32_FUNCTION(1, "TRACED15"),
1417	1517	STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),
..	..	@@ -1419,73 +1519,79 @@
1419	1519	STM32_FUNCTION(4, "TIM8_ETR"),
1420	1520	STM32_FUNCTION(6, "SPI6_NSS"),
1421	1521	STM32_FUNCTION(7, "SAI4_D2"),
1422		- STM32_FUNCTION(8, "USART6_RTS USART_BOOT6_RTS"),
1423		- STM32_FUNCTION(9, "USART3_RTS"),
1424		- STM32_FUNCTION(10, "SPDIF_IN2"),
	1522	+ STM32_FUNCTION(8, "USART6_RTS USART6_DE"),
	1523	+ STM32_FUNCTION(9, "USART3_RTS USART3_DE"),
	1524	+ STM32_FUNCTION(10, "SPDIFRX_IN2"),
1425	1525	STM32_FUNCTION(11, "SAI4_FS_A"),
1426		- STM32_FUNCTION(12, "ETH_PPS_OUT"),
	1526	+ STM32_FUNCTION(12, "ETH1_PPS_OUT"),
1427	1527	STM32_FUNCTION(15, "LCD_G7"),
1428	1528	STM32_FUNCTION(16, "EVENTOUT"),
1429	1529	STM32_FUNCTION(17, "ANALOG")
1430	1530	),
1431		- STM32_PIN(
	1531	+ STM32_PIN_PKG(
1432	1532	PINCTRL_PIN(105, "PG9"),
	1533	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1433	1534	STM32_FUNCTION(0, "GPIOG9"),
1434	1535	STM32_FUNCTION(1, "DBTRGO"),
1435	1536	STM32_FUNCTION(8, "USART6_RX"),
1436		- STM32_FUNCTION(9, "SPDIF_IN3"),
1437		- STM32_FUNCTION(10, "QUADSPI_BK2_IO2 QUADSPI_BOOTBK2_IO2"),
	1537	+ STM32_FUNCTION(9, "SPDIFRX_IN3"),
	1538	+ STM32_FUNCTION(10, "QUADSPI_BK2_IO2"),
1438	1539	STM32_FUNCTION(11, "SAI2_FS_B"),
1439		- STM32_FUNCTION(13, "FMC_NE2 FMC_NCE"),
	1540	+ STM32_FUNCTION(13, "FMC_NCE FMC_NE2"),
1440	1541	STM32_FUNCTION(14, "DCMI_VSYNC"),
	1542	+ STM32_FUNCTION(15, "LCD_R1"),
1441	1543	STM32_FUNCTION(16, "EVENTOUT"),
1442	1544	STM32_FUNCTION(17, "ANALOG")
1443	1545	),
1444		- STM32_PIN(
	1546	+ STM32_PIN_PKG(
1445	1547	PINCTRL_PIN(106, "PG10"),
	1548	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1446	1549	STM32_FUNCTION(0, "GPIOG10"),
1447	1550	STM32_FUNCTION(1, "TRACED10"),
1448		- STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),
	1551	+ STM32_FUNCTION(9, "UART8_CTS"),
1449	1552	STM32_FUNCTION(10, "LCD_G3"),
1450	1553	STM32_FUNCTION(11, "SAI2_SD_B"),
1451		- STM32_FUNCTION(12, "QUADSPI_BK2_IO2 QUADSPI_BOOTBK2_IO2"),
	1554	+ STM32_FUNCTION(12, "QUADSPI_BK2_IO2"),
1452	1555	STM32_FUNCTION(13, "FMC_NE3"),
1453	1556	STM32_FUNCTION(14, "DCMI_D2"),
1454	1557	STM32_FUNCTION(15, "LCD_B2"),
1455	1558	STM32_FUNCTION(16, "EVENTOUT"),
1456	1559	STM32_FUNCTION(17, "ANALOG")
1457	1560	),
1458		- STM32_PIN(
	1561	+ STM32_PIN_PKG(
1459	1562	PINCTRL_PIN(107, "PG11"),
	1563	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1460	1564	STM32_FUNCTION(0, "GPIOG11"),
1461	1565	STM32_FUNCTION(1, "TRACED11"),
1462	1566	STM32_FUNCTION(5, "USART1_TX"),
1463		- STM32_FUNCTION(7, "UART4_TX UART_BOOT4_TX"),
1464		- STM32_FUNCTION(9, "SPDIF_IN0"),
1465		- STM32_FUNCTION(12, "ETH_GMII_TX_EN ETH_MII_TX_EN ETH_RGMII_TX_CTL ETH_RMII_TX_EN"),
	1567	+ STM32_FUNCTION(7, "UART4_TX"),
	1568	+ STM32_FUNCTION(9, "SPDIFRX_IN0"),
	1569	+ STM32_FUNCTION(12, "ETH1_GMII_TX_EN ETH1_MII_TX_EN ETH1_RGMII_TX_CTL ETH1_RMII_TX_EN"),
1466	1570	STM32_FUNCTION(14, "DCMI_D3"),
1467	1571	STM32_FUNCTION(15, "LCD_B3"),
1468	1572	STM32_FUNCTION(16, "EVENTOUT"),
1469	1573	STM32_FUNCTION(17, "ANALOG")
1470	1574	),
1471		- STM32_PIN(
	1575	+ STM32_PIN_PKG(
1472	1576	PINCTRL_PIN(108, "PG12"),
	1577	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1473	1578	STM32_FUNCTION(0, "GPIOG12"),
1474	1579	STM32_FUNCTION(2, "LPTIM1_IN1"),
1475	1580	STM32_FUNCTION(6, "SPI6_MISO"),
1476	1581	STM32_FUNCTION(7, "SAI4_CK2"),
1477		- STM32_FUNCTION(8, "USART6_RTS USART_BOOT6_RTS"),
1478		- STM32_FUNCTION(9, "SPDIF_IN1"),
	1582	+ STM32_FUNCTION(8, "USART6_RTS USART6_DE"),
	1583	+ STM32_FUNCTION(9, "SPDIFRX_IN1"),
1479	1584	STM32_FUNCTION(10, "LCD_B4"),
1480	1585	STM32_FUNCTION(11, "SAI4_SCK_A"),
1481		- STM32_FUNCTION(12, "ETH_PHY_INTN"),
	1586	+ STM32_FUNCTION(12, "ETH1_PHY_INTN"),
1482	1587	STM32_FUNCTION(13, "FMC_NE4"),
1483	1588	STM32_FUNCTION(15, "LCD_B1"),
1484	1589	STM32_FUNCTION(16, "EVENTOUT"),
1485	1590	STM32_FUNCTION(17, "ANALOG")
1486	1591	),
1487		- STM32_PIN(
	1592	+ STM32_PIN_PKG(
1488	1593	PINCTRL_PIN(109, "PG13"),
	1594	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1489	1595	STM32_FUNCTION(0, "GPIOG13"),
1490	1596	STM32_FUNCTION(1, "TRACED0"),
1491	1597	STM32_FUNCTION(2, "LPTIM1_OUT"),
..	..	@@ -1493,79 +1599,86 @@
1493	1599	STM32_FUNCTION(5, "SAI4_CK1"),
1494	1600	STM32_FUNCTION(6, "SPI6_SCK"),
1495	1601	STM32_FUNCTION(7, "SAI1_SCK_A"),
1496		- STM32_FUNCTION(8, "USART6_CTS_NSS USART_BOOT6_CTS_NSS"),
	1602	+ STM32_FUNCTION(8, "USART6_CTS USART6_NSS"),
1497	1603	STM32_FUNCTION(11, "SAI4_MCLK_A"),
1498		- STM32_FUNCTION(12, "ETH_GMII_TXD0 ETH_MII_TXD0 ETH_RGMII_TXD0 ETH_RMII_TXD0"),
	1604	+ STM32_FUNCTION(12, "ETH1_GMII_TXD0 ETH1_MII_TXD0 ETH1_RGMII_TXD0 ETH1_RMII_TXD0"),
1499	1605	STM32_FUNCTION(13, "FMC_A24"),
1500	1606	STM32_FUNCTION(15, "LCD_R0"),
1501	1607	STM32_FUNCTION(16, "EVENTOUT"),
1502	1608	STM32_FUNCTION(17, "ANALOG")
1503	1609	),
1504		- STM32_PIN(
	1610	+ STM32_PIN_PKG(
1505	1611	PINCTRL_PIN(110, "PG14"),
	1612	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1506	1613	STM32_FUNCTION(0, "GPIOG14"),
1507	1614	STM32_FUNCTION(1, "TRACED1"),
1508	1615	STM32_FUNCTION(2, "LPTIM1_ETR"),
1509	1616	STM32_FUNCTION(6, "SPI6_MOSI"),
1510	1617	STM32_FUNCTION(7, "SAI4_D1"),
1511	1618	STM32_FUNCTION(8, "USART6_TX"),
1512		- STM32_FUNCTION(10, "QUADSPI_BK2_IO3 QUADSPI_BOOTBK2_IO3"),
	1619	+ STM32_FUNCTION(10, "QUADSPI_BK2_IO3"),
1513	1620	STM32_FUNCTION(11, "SAI4_SD_A"),
1514		- STM32_FUNCTION(12, "ETH_GMII_TXD1 ETH_MII_TXD1 ETH_RGMII_TXD1 ETH_RMII_TXD1"),
	1621	+ STM32_FUNCTION(12, "ETH1_GMII_TXD1 ETH1_MII_TXD1 ETH1_RGMII_TXD1 ETH1_RMII_TXD1"),
1515	1622	STM32_FUNCTION(13, "FMC_A25"),
1516	1623	STM32_FUNCTION(15, "LCD_B0"),
1517	1624	STM32_FUNCTION(16, "EVENTOUT"),
1518	1625	STM32_FUNCTION(17, "ANALOG")
1519	1626	),
1520		- STM32_PIN(
	1627	+ STM32_PIN_PKG(
1521	1628	PINCTRL_PIN(111, "PG15"),
	1629	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1522	1630	STM32_FUNCTION(0, "GPIOG15"),
1523	1631	STM32_FUNCTION(1, "TRACED7"),
1524	1632	STM32_FUNCTION(3, "SAI1_D2"),
1525	1633	STM32_FUNCTION(5, "I2C2_SDA"),
1526	1634	STM32_FUNCTION(7, "SAI1_FS_A"),
1527		- STM32_FUNCTION(8, "USART6_CTS_NSS USART_BOOT6_CTS_NSS"),
	1635	+ STM32_FUNCTION(8, "USART6_CTS USART6_NSS"),
1528	1636	STM32_FUNCTION(11, "SDMMC3_CK"),
1529	1637	STM32_FUNCTION(14, "DCMI_D13"),
1530	1638	STM32_FUNCTION(16, "EVENTOUT"),
1531	1639	STM32_FUNCTION(17, "ANALOG")
1532	1640	),
1533		- STM32_PIN(
	1641	+ STM32_PIN_PKG(
1534	1642	PINCTRL_PIN(112, "PH0"),
	1643	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1535	1644	STM32_FUNCTION(0, "GPIOH0"),
1536	1645	STM32_FUNCTION(16, "EVENTOUT"),
1537	1646	STM32_FUNCTION(17, "ANALOG")
1538	1647	),
1539		- STM32_PIN(
	1648	+ STM32_PIN_PKG(
1540	1649	PINCTRL_PIN(113, "PH1"),
	1650	+ STM32MP_PKG_AA \| STM32MP_PKG_AC \| STM32MP_PKG_AB \| STM32MP_PKG_AD,
1541	1651	STM32_FUNCTION(0, "GPIOH1"),
1542	1652	STM32_FUNCTION(16, "EVENTOUT"),
1543	1653	STM32_FUNCTION(17, "ANALOG")
1544	1654	),
1545		- STM32_PIN(
	1655	+ STM32_PIN_PKG(
1546	1656	PINCTRL_PIN(114, "PH2"),
	1657	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1547	1658	STM32_FUNCTION(0, "GPIOH2"),
1548	1659	STM32_FUNCTION(2, "LPTIM1_IN2"),
1549		- STM32_FUNCTION(10, "QUADSPI_BK2_IO0 QUADSPI_BOOTBK2_IO0"),
	1660	+ STM32_FUNCTION(10, "QUADSPI_BK2_IO0"),
1550	1661	STM32_FUNCTION(11, "SAI2_SCK_B"),
1551		- STM32_FUNCTION(12, "ETH_GMII_CRS ETH_MII_CRS"),
	1662	+ STM32_FUNCTION(12, "ETH1_GMII_CRS ETH1_MII_CRS"),
1552	1663	STM32_FUNCTION(15, "LCD_R0"),
1553	1664	STM32_FUNCTION(16, "EVENTOUT"),
1554	1665	STM32_FUNCTION(17, "ANALOG")
1555	1666	),
1556		- STM32_PIN(
	1667	+ STM32_PIN_PKG(
1557	1668	PINCTRL_PIN(115, "PH3"),
	1669	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1558	1670	STM32_FUNCTION(0, "GPIOH3"),
1559		- STM32_FUNCTION(4, "DFSDM_CK4"),
1560		- STM32_FUNCTION(10, "QUADSPI_BK2_IO1 QUADSPI_BOOTBK2_IO1"),
	1671	+ STM32_FUNCTION(4, "DFSDM1_CKIN4"),
	1672	+ STM32_FUNCTION(10, "QUADSPI_BK2_IO1"),
1561	1673	STM32_FUNCTION(11, "SAI2_MCLK_B"),
1562		- STM32_FUNCTION(12, "ETH_GMII_COL ETH_MII_COL"),
	1674	+ STM32_FUNCTION(12, "ETH1_GMII_COL ETH1_MII_COL"),
1563	1675	STM32_FUNCTION(15, "LCD_R1"),
1564	1676	STM32_FUNCTION(16, "EVENTOUT"),
1565	1677	STM32_FUNCTION(17, "ANALOG")
1566	1678	),
1567		- STM32_PIN(
	1679	+ STM32_PIN_PKG(
1568	1680	PINCTRL_PIN(116, "PH4"),
	1681	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1569	1682	STM32_FUNCTION(0, "GPIOH4"),
1570	1683	STM32_FUNCTION(5, "I2C2_SCL"),
1571	1684	STM32_FUNCTION(10, "LCD_G5"),
..	..	@@ -1573,8 +1686,9 @@
1573	1686	STM32_FUNCTION(16, "EVENTOUT"),
1574	1687	STM32_FUNCTION(17, "ANALOG")
1575	1688	),
1576		- STM32_PIN(
	1689	+ STM32_PIN_PKG(
1577	1690	PINCTRL_PIN(117, "PH5"),
	1691	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1578	1692	STM32_FUNCTION(0, "GPIOH5"),
1579	1693	STM32_FUNCTION(5, "I2C2_SDA"),
1580	1694	STM32_FUNCTION(6, "SPI5_NSS"),
..	..	@@ -1582,31 +1696,34 @@
1582	1696	STM32_FUNCTION(16, "EVENTOUT"),
1583	1697	STM32_FUNCTION(17, "ANALOG")
1584	1698	),
1585		- STM32_PIN(
	1699	+ STM32_PIN_PKG(
1586	1700	PINCTRL_PIN(118, "PH6"),
	1701	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1587	1702	STM32_FUNCTION(0, "GPIOH6"),
1588	1703	STM32_FUNCTION(3, "TIM12_CH1"),
1589	1704	STM32_FUNCTION(5, "I2C2_SMBA"),
1590	1705	STM32_FUNCTION(6, "SPI5_SCK"),
1591		- STM32_FUNCTION(12, "ETH_GMII_RXD2 ETH_MII_RXD2 ETH_RGMII_RXD2"),
	1706	+ STM32_FUNCTION(12, "ETH1_GMII_RXD2 ETH1_MII_RXD2 ETH1_RGMII_RXD2"),
1592	1707	STM32_FUNCTION(13, "MDIOS_MDIO"),
1593	1708	STM32_FUNCTION(14, "DCMI_D8"),
1594	1709	STM32_FUNCTION(16, "EVENTOUT"),
1595	1710	STM32_FUNCTION(17, "ANALOG")
1596	1711	),
1597		- STM32_PIN(
	1712	+ STM32_PIN_PKG(
1598	1713	PINCTRL_PIN(119, "PH7"),
	1714	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1599	1715	STM32_FUNCTION(0, "GPIOH7"),
1600	1716	STM32_FUNCTION(5, "I2C3_SCL"),
1601	1717	STM32_FUNCTION(6, "SPI5_MISO"),
1602		- STM32_FUNCTION(12, "ETH_GMII_RXD3 ETH_MII_RXD3 ETH_RGMII_RXD3"),
	1718	+ STM32_FUNCTION(12, "ETH1_GMII_RXD3 ETH1_MII_RXD3 ETH1_RGMII_RXD3"),
1603	1719	STM32_FUNCTION(13, "MDIOS_MDC"),
1604	1720	STM32_FUNCTION(14, "DCMI_D9"),
1605	1721	STM32_FUNCTION(16, "EVENTOUT"),
1606	1722	STM32_FUNCTION(17, "ANALOG")
1607	1723	),
1608		- STM32_PIN(
	1724	+ STM32_PIN_PKG(
1609	1725	PINCTRL_PIN(120, "PH8"),
	1726	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1610	1727	STM32_FUNCTION(0, "GPIOH8"),
1611	1728	STM32_FUNCTION(3, "TIM5_ETR"),
1612	1729	STM32_FUNCTION(5, "I2C3_SDA"),
..	..	@@ -1615,8 +1732,9 @@
1615	1732	STM32_FUNCTION(16, "EVENTOUT"),
1616	1733	STM32_FUNCTION(17, "ANALOG")
1617	1734	),
1618		- STM32_PIN(
	1735	+ STM32_PIN_PKG(
1619	1736	PINCTRL_PIN(121, "PH9"),
	1737	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1620	1738	STM32_FUNCTION(0, "GPIOH9"),
1621	1739	STM32_FUNCTION(3, "TIM12_CH2"),
1622	1740	STM32_FUNCTION(5, "I2C3_SMBA"),
..	..	@@ -1625,8 +1743,9 @@
1625	1743	STM32_FUNCTION(16, "EVENTOUT"),
1626	1744	STM32_FUNCTION(17, "ANALOG")
1627	1745	),
1628		- STM32_PIN(
	1746	+ STM32_PIN_PKG(
1629	1747	PINCTRL_PIN(122, "PH10"),
	1748	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1630	1749	STM32_FUNCTION(0, "GPIOH10"),
1631	1750	STM32_FUNCTION(3, "TIM5_CH1"),
1632	1751	STM32_FUNCTION(5, "I2C4_SMBA"),
..	..	@@ -1636,8 +1755,9 @@
1636	1755	STM32_FUNCTION(16, "EVENTOUT"),
1637	1756	STM32_FUNCTION(17, "ANALOG")
1638	1757	),
1639		- STM32_PIN(
	1758	+ STM32_PIN_PKG(
1640	1759	PINCTRL_PIN(123, "PH11"),
	1760	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1641	1761	STM32_FUNCTION(0, "GPIOH11"),
1642	1762	STM32_FUNCTION(3, "TIM5_CH2"),
1643	1763	STM32_FUNCTION(5, "I2C4_SCL"),
..	..	@@ -1647,8 +1767,9 @@
1647	1767	STM32_FUNCTION(16, "EVENTOUT"),
1648	1768	STM32_FUNCTION(17, "ANALOG")
1649	1769	),
1650		- STM32_PIN(
	1770	+ STM32_PIN_PKG(
1651	1771	PINCTRL_PIN(124, "PH12"),
	1772	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1652	1773	STM32_FUNCTION(0, "GPIOH12"),
1653	1774	STM32_FUNCTION(1, "HDP2"),
1654	1775	STM32_FUNCTION(3, "TIM5_CH3"),
..	..	@@ -1659,50 +1780,53 @@
1659	1780	STM32_FUNCTION(16, "EVENTOUT"),
1660	1781	STM32_FUNCTION(17, "ANALOG")
1661	1782	),
1662		- STM32_PIN(
	1783	+ STM32_PIN_PKG(
1663	1784	PINCTRL_PIN(125, "PH13"),
	1785	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1664	1786	STM32_FUNCTION(0, "GPIOH13"),
1665	1787	STM32_FUNCTION(4, "TIM8_CH1N"),
1666	1788	STM32_FUNCTION(9, "UART4_TX"),
1667		- STM32_FUNCTION(10, "CAN1_TX"),
	1789	+ STM32_FUNCTION(10, "FDCAN1_TX"),
1668	1790	STM32_FUNCTION(15, "LCD_G2"),
1669	1791	STM32_FUNCTION(16, "EVENTOUT"),
1670	1792	STM32_FUNCTION(17, "ANALOG")
1671	1793	),
1672		- STM32_PIN(
	1794	+ STM32_PIN_PKG(
1673	1795	PINCTRL_PIN(126, "PH14"),
	1796	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1674	1797	STM32_FUNCTION(0, "GPIOH14"),
1675	1798	STM32_FUNCTION(4, "TIM8_CH2N"),
1676	1799	STM32_FUNCTION(9, "UART4_RX"),
1677		- STM32_FUNCTION(10, "CAN1_RX"),
	1800	+ STM32_FUNCTION(10, "FDCAN1_RX"),
1678	1801	STM32_FUNCTION(14, "DCMI_D4"),
1679	1802	STM32_FUNCTION(15, "LCD_G3"),
1680	1803	STM32_FUNCTION(16, "EVENTOUT"),
1681	1804	STM32_FUNCTION(17, "ANALOG")
1682	1805	),
1683		- STM32_PIN(
	1806	+ STM32_PIN_PKG(
1684	1807	PINCTRL_PIN(127, "PH15"),
	1808	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1685	1809	STM32_FUNCTION(0, "GPIOH15"),
1686	1810	STM32_FUNCTION(4, "TIM8_CH3N"),
1687		- STM32_FUNCTION(10, "CAN1_TXFD"),
1688	1811	STM32_FUNCTION(14, "DCMI_D11"),
1689	1812	STM32_FUNCTION(15, "LCD_G4"),
1690	1813	STM32_FUNCTION(16, "EVENTOUT"),
1691	1814	STM32_FUNCTION(17, "ANALOG")
1692	1815	),
1693		- STM32_PIN(
	1816	+ STM32_PIN_PKG(
1694	1817	PINCTRL_PIN(128, "PI0"),
	1818	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1695	1819	STM32_FUNCTION(0, "GPIOI0"),
1696	1820	STM32_FUNCTION(3, "TIM5_CH4"),
1697	1821	STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),
1698		- STM32_FUNCTION(10, "CAN1_RXFD"),
1699	1822	STM32_FUNCTION(14, "DCMI_D13"),
1700	1823	STM32_FUNCTION(15, "LCD_G5"),
1701	1824	STM32_FUNCTION(16, "EVENTOUT"),
1702	1825	STM32_FUNCTION(17, "ANALOG")
1703	1826	),
1704		- STM32_PIN(
	1827	+ STM32_PIN_PKG(
1705	1828	PINCTRL_PIN(129, "PI1"),
	1829	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1706	1830	STM32_FUNCTION(0, "GPIOI1"),
1707	1831	STM32_FUNCTION(4, "TIM8_BKIN2"),
1708	1832	STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),
..	..	@@ -1711,8 +1835,9 @@
1711	1835	STM32_FUNCTION(16, "EVENTOUT"),
1712	1836	STM32_FUNCTION(17, "ANALOG")
1713	1837	),
1714		- STM32_PIN(
	1838	+ STM32_PIN_PKG(
1715	1839	PINCTRL_PIN(130, "PI2"),
	1840	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1716	1841	STM32_FUNCTION(0, "GPIOI2"),
1717	1842	STM32_FUNCTION(4, "TIM8_CH4"),
1718	1843	STM32_FUNCTION(6, "SPI2_MISO I2S2_SDI"),
..	..	@@ -1721,8 +1846,9 @@
1721	1846	STM32_FUNCTION(16, "EVENTOUT"),
1722	1847	STM32_FUNCTION(17, "ANALOG")
1723	1848	),
1724		- STM32_PIN(
	1849	+ STM32_PIN_PKG(
1725	1850	PINCTRL_PIN(131, "PI3"),
	1851	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1726	1852	STM32_FUNCTION(0, "GPIOI3"),
1727	1853	STM32_FUNCTION(4, "TIM8_ETR"),
1728	1854	STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),
..	..	@@ -1730,8 +1856,9 @@
1730	1856	STM32_FUNCTION(16, "EVENTOUT"),
1731	1857	STM32_FUNCTION(17, "ANALOG")
1732	1858	),
1733		- STM32_PIN(
	1859	+ STM32_PIN_PKG(
1734	1860	PINCTRL_PIN(132, "PI4"),
	1861	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1735	1862	STM32_FUNCTION(0, "GPIOI4"),
1736	1863	STM32_FUNCTION(4, "TIM8_BKIN"),
1737	1864	STM32_FUNCTION(11, "SAI2_MCLK_A"),
..	..	@@ -1740,8 +1867,9 @@
1740	1867	STM32_FUNCTION(16, "EVENTOUT"),
1741	1868	STM32_FUNCTION(17, "ANALOG")
1742	1869	),
1743		- STM32_PIN(
	1870	+ STM32_PIN_PKG(
1744	1871	PINCTRL_PIN(133, "PI5"),
	1872	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1745	1873	STM32_FUNCTION(0, "GPIOI5"),
1746	1874	STM32_FUNCTION(4, "TIM8_CH1"),
1747	1875	STM32_FUNCTION(11, "SAI2_SCK_A"),
..	..	@@ -1750,8 +1878,9 @@
1750	1878	STM32_FUNCTION(16, "EVENTOUT"),
1751	1879	STM32_FUNCTION(17, "ANALOG")
1752	1880	),
1753		- STM32_PIN(
	1881	+ STM32_PIN_PKG(
1754	1882	PINCTRL_PIN(134, "PI6"),
	1883	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1755	1884	STM32_FUNCTION(0, "GPIOI6"),
1756	1885	STM32_FUNCTION(4, "TIM8_CH2"),
1757	1886	STM32_FUNCTION(11, "SAI2_SD_A"),
..	..	@@ -1760,8 +1889,9 @@
1760	1889	STM32_FUNCTION(16, "EVENTOUT"),
1761	1890	STM32_FUNCTION(17, "ANALOG")
1762	1891	),
1763		- STM32_PIN(
	1892	+ STM32_PIN_PKG(
1764	1893	PINCTRL_PIN(135, "PI7"),
	1894	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1765	1895	STM32_FUNCTION(0, "GPIOI7"),
1766	1896	STM32_FUNCTION(4, "TIM8_CH3"),
1767	1897	STM32_FUNCTION(11, "SAI2_FS_A"),
..	..	@@ -1770,35 +1900,38 @@
1770	1900	STM32_FUNCTION(16, "EVENTOUT"),
1771	1901	STM32_FUNCTION(17, "ANALOG")
1772	1902	),
1773		- STM32_PIN(
	1903	+ STM32_PIN_PKG(
1774	1904	PINCTRL_PIN(136, "PI8"),
	1905	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1775	1906	STM32_FUNCTION(0, "GPIOI8"),
1776	1907	STM32_FUNCTION(16, "EVENTOUT"),
1777	1908	STM32_FUNCTION(17, "ANALOG")
1778	1909	),
1779		- STM32_PIN(
	1910	+ STM32_PIN_PKG(
1780	1911	PINCTRL_PIN(137, "PI9"),
	1912	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1781	1913	STM32_FUNCTION(0, "GPIOI9"),
1782	1914	STM32_FUNCTION(1, "HDP1"),
1783	1915	STM32_FUNCTION(9, "UART4_RX"),
1784		- STM32_FUNCTION(10, "CAN1_RX"),
	1916	+ STM32_FUNCTION(10, "FDCAN1_RX"),
1785	1917	STM32_FUNCTION(15, "LCD_VSYNC"),
1786	1918	STM32_FUNCTION(16, "EVENTOUT"),
1787	1919	STM32_FUNCTION(17, "ANALOG")
1788	1920	),
1789		- STM32_PIN(
	1921	+ STM32_PIN_PKG(
1790	1922	PINCTRL_PIN(138, "PI10"),
	1923	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1791	1924	STM32_FUNCTION(0, "GPIOI10"),
1792	1925	STM32_FUNCTION(1, "HDP0"),
1793		- STM32_FUNCTION(9, "USART3_CTS_NSS USART_BOOT3_CTS_NSS"),
1794		- STM32_FUNCTION(10, "CAN1_RXFD"),
1795		- STM32_FUNCTION(12, "ETH_GMII_RX_ER ETH_MII_RX_ER"),
	1926	+ STM32_FUNCTION(9, "USART3_CTS USART3_NSS"),
	1927	+ STM32_FUNCTION(12, "ETH1_GMII_RX_ER ETH1_MII_RX_ER"),
1796	1928	STM32_FUNCTION(15, "LCD_HSYNC"),
1797	1929	STM32_FUNCTION(16, "EVENTOUT"),
1798	1930	STM32_FUNCTION(17, "ANALOG")
1799	1931	),
1800		- STM32_PIN(
	1932	+ STM32_PIN_PKG(
1801	1933	PINCTRL_PIN(139, "PI11"),
	1934	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
1802	1935	STM32_FUNCTION(0, "GPIOI11"),
1803	1936	STM32_FUNCTION(1, "MCO1"),
1804	1937	STM32_FUNCTION(6, "I2S_CKIN"),
..	..	@@ -1806,8 +1939,9 @@
1806	1939	STM32_FUNCTION(16, "EVENTOUT"),
1807	1940	STM32_FUNCTION(17, "ANALOG")
1808	1941	),
1809		- STM32_PIN(
	1942	+ STM32_PIN_PKG(
1810	1943	PINCTRL_PIN(140, "PI12"),
	1944	+ STM32MP_PKG_AA,
1811	1945	STM32_FUNCTION(0, "GPIOI12"),
1812	1946	STM32_FUNCTION(1, "TRACED0"),
1813	1947	STM32_FUNCTION(3, "HDP0"),
..	..	@@ -1815,8 +1949,9 @@
1815	1949	STM32_FUNCTION(16, "EVENTOUT"),
1816	1950	STM32_FUNCTION(17, "ANALOG")
1817	1951	),
1818		- STM32_PIN(
	1952	+ STM32_PIN_PKG(
1819	1953	PINCTRL_PIN(141, "PI13"),
	1954	+ STM32MP_PKG_AA,
1820	1955	STM32_FUNCTION(0, "GPIOI13"),
1821	1956	STM32_FUNCTION(1, "TRACED1"),
1822	1957	STM32_FUNCTION(3, "HDP1"),
..	..	@@ -1824,24 +1959,27 @@
1824	1959	STM32_FUNCTION(16, "EVENTOUT"),
1825	1960	STM32_FUNCTION(17, "ANALOG")
1826	1961	),
1827		- STM32_PIN(
	1962	+ STM32_PIN_PKG(
1828	1963	PINCTRL_PIN(142, "PI14"),
	1964	+ STM32MP_PKG_AA,
1829	1965	STM32_FUNCTION(0, "GPIOI14"),
1830	1966	STM32_FUNCTION(1, "TRACECLK"),
1831	1967	STM32_FUNCTION(15, "LCD_CLK"),
1832	1968	STM32_FUNCTION(16, "EVENTOUT"),
1833	1969	STM32_FUNCTION(17, "ANALOG")
1834	1970	),
1835		- STM32_PIN(
	1971	+ STM32_PIN_PKG(
1836	1972	PINCTRL_PIN(143, "PI15"),
	1973	+ STM32MP_PKG_AA,
1837	1974	STM32_FUNCTION(0, "GPIOI15"),
1838	1975	STM32_FUNCTION(10, "LCD_G2"),
1839	1976	STM32_FUNCTION(15, "LCD_R0"),
1840	1977	STM32_FUNCTION(16, "EVENTOUT"),
1841	1978	STM32_FUNCTION(17, "ANALOG")
1842	1979	),
1843		- STM32_PIN(
	1980	+ STM32_PIN_PKG(
1844	1981	PINCTRL_PIN(144, "PJ0"),
	1982	+ STM32MP_PKG_AA,
1845	1983	STM32_FUNCTION(0, "GPIOJ0"),
1846	1984	STM32_FUNCTION(1, "TRACED8"),
1847	1985	STM32_FUNCTION(10, "LCD_R7"),
..	..	@@ -1849,16 +1987,18 @@
1849	1987	STM32_FUNCTION(16, "EVENTOUT"),
1850	1988	STM32_FUNCTION(17, "ANALOG")
1851	1989	),
1852		- STM32_PIN(
	1990	+ STM32_PIN_PKG(
1853	1991	PINCTRL_PIN(145, "PJ1"),
	1992	+ STM32MP_PKG_AA,
1854	1993	STM32_FUNCTION(0, "GPIOJ1"),
1855	1994	STM32_FUNCTION(1, "TRACED9"),
1856	1995	STM32_FUNCTION(15, "LCD_R2"),
1857	1996	STM32_FUNCTION(16, "EVENTOUT"),
1858	1997	STM32_FUNCTION(17, "ANALOG")
1859	1998	),
1860		- STM32_PIN(
	1999	+ STM32_PIN_PKG(
1861	2000	PINCTRL_PIN(146, "PJ2"),
	2001	+ STM32MP_PKG_AA,
1862	2002	STM32_FUNCTION(0, "GPIOJ2"),
1863	2003	STM32_FUNCTION(1, "TRACED10"),
1864	2004	STM32_FUNCTION(14, "DSI_TE"),
..	..	@@ -1866,24 +2006,27 @@
1866	2006	STM32_FUNCTION(16, "EVENTOUT"),
1867	2007	STM32_FUNCTION(17, "ANALOG")
1868	2008	),
1869		- STM32_PIN(
	2009	+ STM32_PIN_PKG(
1870	2010	PINCTRL_PIN(147, "PJ3"),
	2011	+ STM32MP_PKG_AA,
1871	2012	STM32_FUNCTION(0, "GPIOJ3"),
1872	2013	STM32_FUNCTION(1, "TRACED11"),
1873	2014	STM32_FUNCTION(15, "LCD_R4"),
1874	2015	STM32_FUNCTION(16, "EVENTOUT"),
1875	2016	STM32_FUNCTION(17, "ANALOG")
1876	2017	),
1877		- STM32_PIN(
	2018	+ STM32_PIN_PKG(
1878	2019	PINCTRL_PIN(148, "PJ4"),
	2020	+ STM32MP_PKG_AA,
1879	2021	STM32_FUNCTION(0, "GPIOJ4"),
1880	2022	STM32_FUNCTION(1, "TRACED12"),
1881	2023	STM32_FUNCTION(15, "LCD_R5"),
1882	2024	STM32_FUNCTION(16, "EVENTOUT"),
1883	2025	STM32_FUNCTION(17, "ANALOG")
1884	2026	),
1885		- STM32_PIN(
	2027	+ STM32_PIN_PKG(
1886	2028	PINCTRL_PIN(149, "PJ5"),
	2029	+ STM32MP_PKG_AA,
1887	2030	STM32_FUNCTION(0, "GPIOJ5"),
1888	2031	STM32_FUNCTION(1, "TRACED2"),
1889	2032	STM32_FUNCTION(3, "HDP2"),
..	..	@@ -1891,8 +2034,9 @@
1891	2034	STM32_FUNCTION(16, "EVENTOUT"),
1892	2035	STM32_FUNCTION(17, "ANALOG")
1893	2036	),
1894		- STM32_PIN(
	2037	+ STM32_PIN_PKG(
1895	2038	PINCTRL_PIN(150, "PJ6"),
	2039	+ STM32MP_PKG_AA,
1896	2040	STM32_FUNCTION(0, "GPIOJ6"),
1897	2041	STM32_FUNCTION(1, "TRACED3"),
1898	2042	STM32_FUNCTION(3, "HDP3"),
..	..	@@ -1901,8 +2045,9 @@
1901	2045	STM32_FUNCTION(16, "EVENTOUT"),
1902	2046	STM32_FUNCTION(17, "ANALOG")
1903	2047	),
1904		- STM32_PIN(
	2048	+ STM32_PIN_PKG(
1905	2049	PINCTRL_PIN(151, "PJ7"),
	2050	+ STM32MP_PKG_AA,
1906	2051	STM32_FUNCTION(0, "GPIOJ7"),
1907	2052	STM32_FUNCTION(1, "TRACED13"),
1908	2053	STM32_FUNCTION(4, "TIM8_CH2N"),
..	..	@@ -1910,8 +2055,9 @@
1910	2055	STM32_FUNCTION(16, "EVENTOUT"),
1911	2056	STM32_FUNCTION(17, "ANALOG")
1912	2057	),
1913		- STM32_PIN(
	2058	+ STM32_PIN_PKG(
1914	2059	PINCTRL_PIN(152, "PJ8"),
	2060	+ STM32MP_PKG_AA,
1915	2061	STM32_FUNCTION(0, "GPIOJ8"),
1916	2062	STM32_FUNCTION(1, "TRACED14"),
1917	2063	STM32_FUNCTION(2, "TIM1_CH3N"),
..	..	@@ -1921,8 +2067,9 @@
1921	2067	STM32_FUNCTION(16, "EVENTOUT"),
1922	2068	STM32_FUNCTION(17, "ANALOG")
1923	2069	),
1924		- STM32_PIN(
	2070	+ STM32_PIN_PKG(
1925	2071	PINCTRL_PIN(153, "PJ9"),
	2072	+ STM32MP_PKG_AA,
1926	2073	STM32_FUNCTION(0, "GPIOJ9"),
1927	2074	STM32_FUNCTION(1, "TRACED15"),
1928	2075	STM32_FUNCTION(2, "TIM1_CH3"),
..	..	@@ -1932,8 +2079,9 @@
1932	2079	STM32_FUNCTION(16, "EVENTOUT"),
1933	2080	STM32_FUNCTION(17, "ANALOG")
1934	2081	),
1935		- STM32_PIN(
	2082	+ STM32_PIN_PKG(
1936	2083	PINCTRL_PIN(154, "PJ10"),
	2084	+ STM32MP_PKG_AA,
1937	2085	STM32_FUNCTION(0, "GPIOJ10"),
1938	2086	STM32_FUNCTION(2, "TIM1_CH2N"),
1939	2087	STM32_FUNCTION(4, "TIM8_CH2"),
..	..	@@ -1942,8 +2090,9 @@
1942	2090	STM32_FUNCTION(16, "EVENTOUT"),
1943	2091	STM32_FUNCTION(17, "ANALOG")
1944	2092	),
1945		- STM32_PIN(
	2093	+ STM32_PIN_PKG(
1946	2094	PINCTRL_PIN(155, "PJ11"),
	2095	+ STM32MP_PKG_AA,
1947	2096	STM32_FUNCTION(0, "GPIOJ11"),
1948	2097	STM32_FUNCTION(2, "TIM1_CH2"),
1949	2098	STM32_FUNCTION(4, "TIM8_CH2N"),
..	..	@@ -1952,38 +2101,43 @@
1952	2101	STM32_FUNCTION(16, "EVENTOUT"),
1953	2102	STM32_FUNCTION(17, "ANALOG")
1954	2103	),
1955		- STM32_PIN(
	2104	+ STM32_PIN_PKG(
1956	2105	PINCTRL_PIN(156, "PJ12"),
	2106	+ STM32MP_PKG_AA,
1957	2107	STM32_FUNCTION(0, "GPIOJ12"),
1958	2108	STM32_FUNCTION(10, "LCD_G3"),
1959	2109	STM32_FUNCTION(15, "LCD_B0"),
1960	2110	STM32_FUNCTION(16, "EVENTOUT"),
1961	2111	STM32_FUNCTION(17, "ANALOG")
1962	2112	),
1963		- STM32_PIN(
	2113	+ STM32_PIN_PKG(
1964	2114	PINCTRL_PIN(157, "PJ13"),
	2115	+ STM32MP_PKG_AA,
1965	2116	STM32_FUNCTION(0, "GPIOJ13"),
1966	2117	STM32_FUNCTION(10, "LCD_G4"),
1967	2118	STM32_FUNCTION(15, "LCD_B1"),
1968	2119	STM32_FUNCTION(16, "EVENTOUT"),
1969	2120	STM32_FUNCTION(17, "ANALOG")
1970	2121	),
1971		- STM32_PIN(
	2122	+ STM32_PIN_PKG(
1972	2123	PINCTRL_PIN(158, "PJ14"),
	2124	+ STM32MP_PKG_AA,
1973	2125	STM32_FUNCTION(0, "GPIOJ14"),
1974	2126	STM32_FUNCTION(15, "LCD_B2"),
1975	2127	STM32_FUNCTION(16, "EVENTOUT"),
1976	2128	STM32_FUNCTION(17, "ANALOG")
1977	2129	),
1978		- STM32_PIN(
	2130	+ STM32_PIN_PKG(
1979	2131	PINCTRL_PIN(159, "PJ15"),
	2132	+ STM32MP_PKG_AA,
1980	2133	STM32_FUNCTION(0, "GPIOJ15"),
1981	2134	STM32_FUNCTION(15, "LCD_B3"),
1982	2135	STM32_FUNCTION(16, "EVENTOUT"),
1983	2136	STM32_FUNCTION(17, "ANALOG")
1984	2137	),
1985		- STM32_PIN(
	2138	+ STM32_PIN_PKG(
1986	2139	PINCTRL_PIN(160, "PK0"),
	2140	+ STM32MP_PKG_AA,
1987	2141	STM32_FUNCTION(0, "GPIOK0"),
1988	2142	STM32_FUNCTION(2, "TIM1_CH1N"),
1989	2143	STM32_FUNCTION(4, "TIM8_CH3"),
..	..	@@ -1992,8 +2146,9 @@
1992	2146	STM32_FUNCTION(16, "EVENTOUT"),
1993	2147	STM32_FUNCTION(17, "ANALOG")
1994	2148	),
1995		- STM32_PIN(
	2149	+ STM32_PIN_PKG(
1996	2150	PINCTRL_PIN(161, "PK1"),
	2151	+ STM32MP_PKG_AA,
1997	2152	STM32_FUNCTION(0, "GPIOK1"),
1998	2153	STM32_FUNCTION(1, "TRACED4"),
1999	2154	STM32_FUNCTION(2, "TIM1_CH1"),
..	..	@@ -2004,8 +2159,9 @@
2004	2159	STM32_FUNCTION(16, "EVENTOUT"),
2005	2160	STM32_FUNCTION(17, "ANALOG")
2006	2161	),
2007		- STM32_PIN(
	2162	+ STM32_PIN_PKG(
2008	2163	PINCTRL_PIN(162, "PK2"),
	2164	+ STM32MP_PKG_AA,
2009	2165	STM32_FUNCTION(0, "GPIOK2"),
2010	2166	STM32_FUNCTION(1, "TRACED5"),
2011	2167	STM32_FUNCTION(2, "TIM1_BKIN"),
..	..	@@ -2015,22 +2171,25 @@
2015	2171	STM32_FUNCTION(16, "EVENTOUT"),
2016	2172	STM32_FUNCTION(17, "ANALOG")
2017	2173	),
2018		- STM32_PIN(
	2174	+ STM32_PIN_PKG(
2019	2175	PINCTRL_PIN(163, "PK3"),
	2176	+ STM32MP_PKG_AA,
2020	2177	STM32_FUNCTION(0, "GPIOK3"),
2021	2178	STM32_FUNCTION(15, "LCD_B4"),
2022	2179	STM32_FUNCTION(16, "EVENTOUT"),
2023	2180	STM32_FUNCTION(17, "ANALOG")
2024	2181	),
2025		- STM32_PIN(
	2182	+ STM32_PIN_PKG(
2026	2183	PINCTRL_PIN(164, "PK4"),
	2184	+ STM32MP_PKG_AA,
2027	2185	STM32_FUNCTION(0, "GPIOK4"),
2028	2186	STM32_FUNCTION(15, "LCD_B5"),
2029	2187	STM32_FUNCTION(16, "EVENTOUT"),
2030	2188	STM32_FUNCTION(17, "ANALOG")
2031	2189	),
2032		- STM32_PIN(
	2190	+ STM32_PIN_PKG(
2033	2191	PINCTRL_PIN(165, "PK5"),
	2192	+ STM32MP_PKG_AA,
2034	2193	STM32_FUNCTION(0, "GPIOK5"),
2035	2194	STM32_FUNCTION(1, "TRACED6"),
2036	2195	STM32_FUNCTION(3, "HDP6"),
..	..	@@ -2038,8 +2197,9 @@
2038	2197	STM32_FUNCTION(16, "EVENTOUT"),
2039	2198	STM32_FUNCTION(17, "ANALOG")
2040	2199	),
2041		- STM32_PIN(
	2200	+ STM32_PIN_PKG(
2042	2201	PINCTRL_PIN(166, "PK6"),
	2202	+ STM32MP_PKG_AA,
2043	2203	STM32_FUNCTION(0, "GPIOK6"),
2044	2204	STM32_FUNCTION(1, "TRACED7"),
2045	2205	STM32_FUNCTION(3, "HDP7"),
..	..	@@ -2047,8 +2207,9 @@
2047	2207	STM32_FUNCTION(16, "EVENTOUT"),
2048	2208	STM32_FUNCTION(17, "ANALOG")
2049	2209	),
2050		- STM32_PIN(
	2210	+ STM32_PIN_PKG(
2051	2211	PINCTRL_PIN(167, "PK7"),
	2212	+ STM32MP_PKG_AA,
2052	2213	STM32_FUNCTION(0, "GPIOK7"),
2053	2214	STM32_FUNCTION(15, "LCD_DE"),
2054	2215	STM32_FUNCTION(16, "EVENTOUT"),
..	..	@@ -2057,8 +2218,9 @@
2057	2218	};
2058	2219
2059	2220	static const struct stm32_desc_pin stm32mp157_z_pins[] = {
2060		- STM32_PIN(
	2221	+ STM32_PIN_PKG(
2061	2222	PINCTRL_PIN(400, "PZ0"),
	2223	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2062	2224	STM32_FUNCTION(0, "GPIOZ0"),
2063	2225	STM32_FUNCTION(3, "I2C6_SCL"),
2064	2226	STM32_FUNCTION(4, "I2C2_SCL"),
..	..	@@ -2068,8 +2230,9 @@
2068	2230	STM32_FUNCTION(16, "EVENTOUT"),
2069	2231	STM32_FUNCTION(17, "ANALOG")
2070	2232	),
2071		- STM32_PIN(
	2233	+ STM32_PIN_PKG(
2072	2234	PINCTRL_PIN(401, "PZ1"),
	2235	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2073	2236	STM32_FUNCTION(0, "GPIOZ1"),
2074	2237	STM32_FUNCTION(3, "I2C6_SDA"),
2075	2238	STM32_FUNCTION(4, "I2C2_SDA"),
..	..	@@ -2081,8 +2244,9 @@
2081	2244	STM32_FUNCTION(16, "EVENTOUT"),
2082	2245	STM32_FUNCTION(17, "ANALOG")
2083	2246	),
2084		- STM32_PIN(
	2247	+ STM32_PIN_PKG(
2085	2248	PINCTRL_PIN(402, "PZ2"),
	2249	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2086	2250	STM32_FUNCTION(0, "GPIOZ2"),
2087	2251	STM32_FUNCTION(3, "I2C6_SCL"),
2088	2252	STM32_FUNCTION(4, "I2C2_SCL"),
..	..	@@ -2094,21 +2258,23 @@
2094	2258	STM32_FUNCTION(16, "EVENTOUT"),
2095	2259	STM32_FUNCTION(17, "ANALOG")
2096	2260	),
2097		- STM32_PIN(
	2261	+ STM32_PIN_PKG(
2098	2262	PINCTRL_PIN(403, "PZ3"),
	2263	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2099	2264	STM32_FUNCTION(0, "GPIOZ3"),
2100	2265	STM32_FUNCTION(3, "I2C6_SDA"),
2101	2266	STM32_FUNCTION(4, "I2C2_SDA"),
2102	2267	STM32_FUNCTION(5, "I2C5_SDA"),
2103	2268	STM32_FUNCTION(6, "SPI1_NSS I2S1_WS"),
2104	2269	STM32_FUNCTION(7, "I2C4_SDA"),
2105		- STM32_FUNCTION(8, "USART1_CTS_NSS"),
	2270	+ STM32_FUNCTION(8, "USART1_CTS USART1_NSS"),
2106	2271	STM32_FUNCTION(9, "SPI6_NSS"),
2107	2272	STM32_FUNCTION(16, "EVENTOUT"),
2108	2273	STM32_FUNCTION(17, "ANALOG")
2109	2274	),
2110		- STM32_PIN(
	2275	+ STM32_PIN_PKG(
2111	2276	PINCTRL_PIN(404, "PZ4"),
	2277	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2112	2278	STM32_FUNCTION(0, "GPIOZ4"),
2113	2279	STM32_FUNCTION(3, "I2C6_SCL"),
2114	2280	STM32_FUNCTION(4, "I2C2_SCL"),
..	..	@@ -2117,19 +2283,21 @@
2117	2283	STM32_FUNCTION(16, "EVENTOUT"),
2118	2284	STM32_FUNCTION(17, "ANALOG")
2119	2285	),
2120		- STM32_PIN(
	2286	+ STM32_PIN_PKG(
2121	2287	PINCTRL_PIN(405, "PZ5"),
	2288	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2122	2289	STM32_FUNCTION(0, "GPIOZ5"),
2123	2290	STM32_FUNCTION(3, "I2C6_SDA"),
2124	2291	STM32_FUNCTION(4, "I2C2_SDA"),
2125	2292	STM32_FUNCTION(5, "I2C5_SDA"),
2126	2293	STM32_FUNCTION(7, "I2C4_SDA"),
2127		- STM32_FUNCTION(8, "USART1_RTS"),
	2294	+ STM32_FUNCTION(8, "USART1_RTS USART1_DE"),
2128	2295	STM32_FUNCTION(16, "EVENTOUT"),
2129	2296	STM32_FUNCTION(17, "ANALOG")
2130	2297	),
2131		- STM32_PIN(
	2298	+ STM32_PIN_PKG(
2132	2299	PINCTRL_PIN(406, "PZ6"),
	2300	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2133	2301	STM32_FUNCTION(0, "GPIOZ6"),
2134	2302	STM32_FUNCTION(3, "I2C6_SCL"),
2135	2303	STM32_FUNCTION(4, "I2C2_SCL"),
..	..	@@ -2140,8 +2308,9 @@
2140	2308	STM32_FUNCTION(16, "EVENTOUT"),
2141	2309	STM32_FUNCTION(17, "ANALOG")
2142	2310	),
2143		- STM32_PIN(
	2311	+ STM32_PIN_PKG(
2144	2312	PINCTRL_PIN(407, "PZ7"),
	2313	+ STM32MP_PKG_AA \| STM32MP_PKG_AC,
2145	2314	STM32_FUNCTION(0, "GPIOZ7"),
2146	2315	STM32_FUNCTION(3, "I2C6_SDA"),
2147	2316	STM32_FUNCTION(4, "I2C2_SDA"),
..	..	@@ -2173,11 +2342,16 @@
2173	2342	{ }
2174	2343	};
2175	2344
	2345	+static const struct dev_pm_ops stm32_pinctrl_dev_pm_ops = {
	2346	+ SET_LATE_SYSTEM_SLEEP_PM_OPS(NULL, stm32_pinctrl_resume)
	2347	+};
	2348	+
2176	2349	static struct platform_driver stm32mp157_pinctrl_driver = {
2177	2350	.probe = stm32_pctl_probe,
2178	2351	.driver = {
2179	2352	.name = "stm32mp157-pinctrl",
2180	2353	.of_match_table = stm32mp157_pctrl_match,
	2354	+ .pm = &stm32_pinctrl_dev_pm_ops,
2181	2355	},
2182	2356	};
2183	2357