Commit 543b9e3c authored by Erwan Gouriou's avatar Erwan Gouriou Committed by Carles Cufi
Browse files

drivers/pinmux: stm32: Deprecate ETH related macros



Following migration of all in-tree boards to device tree bindings
for ETH pins configuration, deprecate ETH related macros.

Signed-off-by: default avatarErwan Gouriou <erwan.gouriou@linaro.org>
parent e9926592
Loading
Loading
Loading
Loading
+13 −13
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@
/* Port A */
#define STM32F2_PINMUX_FUNC_PA0_UART4_TX __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_PULLUP)
#define STM32F2_PINMUX_FUNC_PA1_ETH         \
#define STM32F2_PINMUX_FUNC_PA1_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PA0_ADC123_IN0 __DEPRECATED_MACRO	\
@@ -34,7 +34,7 @@

#define STM32F2_PINMUX_FUNC_PA2_USART2_TX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
#define STM32F2_PINMUX_FUNC_PA2_ETH         \
#define STM32F2_PINMUX_FUNC_PA2_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PA2_ADC123_IN2 __DEPRECATED_MACRO	\
@@ -42,7 +42,7 @@

#define STM32F2_PINMUX_FUNC_PA3_USART2_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F2_PINMUX_FUNC_PA3_ETH         \
#define STM32F2_PINMUX_FUNC_PA3_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PA3_ADC123_IN3 __DEPRECATED_MACRO	\
@@ -61,7 +61,7 @@
#define STM32F2_PINMUX_FUNC_PA6_ADC12_IN6 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F2_PINMUX_FUNC_PA7_ETH         \
#define STM32F2_PINMUX_FUNC_PA7_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PA7_ADC12_IN7 __DEPRECATED_MACRO	\
@@ -97,15 +97,15 @@

#define STM32F2_PINMUX_FUNC_PB11_USART3_RX __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F2_PINMUX_FUNC_PB11_ETH        \
#define STM32F2_PINMUX_FUNC_PB11_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F2_PINMUX_FUNC_PB12_ETH        \
#define STM32F2_PINMUX_FUNC_PB12_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F2_PINMUX_FUNC_PB13_ETH        \
#define STM32F2_PINMUX_FUNC_PB13_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -113,7 +113,7 @@
#define STM32F2_PINMUX_FUNC_PC0_ADC123_IN10 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F2_PINMUX_FUNC_PC1_ETH         \
#define STM32F2_PINMUX_FUNC_PC1_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PC1_ADC123_IN11 __DEPRECATED_MACRO	\
@@ -125,13 +125,13 @@
#define STM32F2_PINMUX_FUNC_PC3_ADC123_IN13 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F2_PINMUX_FUNC_PC4_ETH         \
#define STM32F2_PINMUX_FUNC_PC4_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PC4_ADC12_IN14 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F2_PINMUX_FUNC_PC5_ETH         \
#define STM32F2_PINMUX_FUNC_PC5_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PC5_ADC12_IN15 __DEPRECATED_MACRO	\
@@ -196,15 +196,15 @@
#define STM32F2_PINMUX_FUNC_PG9_USART6_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_NOPULL)

#define STM32F2_PINMUX_FUNC_PG11_ETH        \
#define STM32F2_PINMUX_FUNC_PG11_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F2_PINMUX_FUNC_PG13_ETH        \
#define STM32F2_PINMUX_FUNC_PG13_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F2_PINMUX_FUNC_PG14_ETH        \
#define STM32F2_PINMUX_FUNC_PG14_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F2_PINMUX_FUNC_PG14_USART6_TX __DEPRECATED_MACRO   \
+27 −27
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@
	(STM32_PINMUX_ALT_FUNC_7 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PA0_UART4_TX __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA0_ETH			    \
#define STM32F4_PINMUX_FUNC_PA0_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PA0_ADC123_IN0 __DEPRECATED_MACRO		\
@@ -42,7 +42,7 @@
	(STM32_PINMUX_ALT_FUNC_7 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PA1_UART4_RX __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PA1_ETH         \
#define STM32F4_PINMUX_FUNC_PA1_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PA1_ADC123_IN1 __DEPRECATED_MACRO	\
@@ -52,7 +52,7 @@
	(STM32_PINMUX_ALT_FUNC_2 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA2_USART2_TX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA2_ETH         \
#define STM32F4_PINMUX_FUNC_PA2_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PA2_ADC123_IN2 __DEPRECATED_MACRO	\
@@ -62,7 +62,7 @@
	(STM32_PINMUX_ALT_FUNC_2 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA3_USART2_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PA3_ETH         \
#define STM32F4_PINMUX_FUNC_PA3_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PA3_ADC123_IN3 __DEPRECATED_MACRO	\
@@ -99,7 +99,7 @@
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)
#define STM32F4_PINMUX_FUNC_PA7_I2S1_SD  \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PA7_ETH         \
#define STM32F4_PINMUX_FUNC_PA7_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PA7_ADC12_IN7 __DEPRECATED_MACRO	\
@@ -154,7 +154,7 @@
#define STM32F4_PINMUX_FUNC_PB0_I2S5_CK  \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB0_ETH			    \
#define STM32F4_PINMUX_FUNC_PB0_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB0_ADC12_IN8 __DEPRECATED_MACRO	\
@@ -175,7 +175,7 @@
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB3_I2C2_SDA __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_9 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PB1_ETH			    \
#define STM32F4_PINMUX_FUNC_PB1_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB3_SPI1_SCK __DEPRECATED_MACRO    \
@@ -198,7 +198,7 @@
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PB5_UART5_RX __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB5_ETH			    \
#define STM32F4_PINMUX_FUNC_PB5_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB5_SPI1_MOSI __DEPRECATED_MACRO   \
@@ -232,7 +232,7 @@
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PB8_UART5_RX __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB8_ETH			    \
#define STM32F4_PINMUX_FUNC_PB8_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -253,7 +253,7 @@
	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PB10_USART3_TX __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PB10_ETH			    \
#define STM32F4_PINMUX_FUNC_PB10_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB10_SPI2_SCK __DEPRECATED_MACRO \
@@ -264,7 +264,7 @@
	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PB11_USART3_RX __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB11_ETH        \
#define STM32F4_PINMUX_FUNC_PB11_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -278,7 +278,7 @@
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PB12_UART5_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB12_ETH        \
#define STM32F4_PINMUX_FUNC_PB12_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -297,7 +297,7 @@
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB13_UART5_TX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PB13_ETH        \
#define STM32F4_PINMUX_FUNC_PB13_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -319,7 +319,7 @@
#define STM32F4_PINMUX_FUNC_PC0_ADC123_IN10 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F4_PINMUX_FUNC_PC1_ETH         \
#define STM32F4_PINMUX_FUNC_PC1_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PC1_I2S2_SD    \
@@ -327,7 +327,7 @@
#define STM32F4_PINMUX_FUNC_PC1_ADC123_IN11 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F4_PINMUX_FUNC_PC2_ETH         \
#define STM32F4_PINMUX_FUNC_PC2_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PC2_ADC123_IN12 __DEPRECATED_MACRO	\
@@ -335,7 +335,7 @@
#define STM32F4_PINMUX_FUNC_PC2_SPI2_MISO __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)

#define STM32F4_PINMUX_FUNC_PC3_ETH			    \
#define STM32F4_PINMUX_FUNC_PC3_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PC3_ADC123_IN13 __DEPRECATED_MACRO	\
@@ -343,7 +343,7 @@
#define STM32F4_PINMUX_FUNC_PC3_SPI2_MOSI __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)

#define STM32F4_PINMUX_FUNC_PC4_ETH         \
#define STM32F4_PINMUX_FUNC_PC4_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PC4_ADC12_IN14 __DEPRECATED_MACRO	\
@@ -351,7 +351,7 @@

#define STM32F4_PINMUX_FUNC_PC5_USART3_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PC5_ETH         \
#define STM32F4_PINMUX_FUNC_PC5_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PC5_ADC12_IN15 __DEPRECATED_MACRO	\
@@ -479,7 +479,7 @@

#define STM32F4_PINMUX_FUNC_PE2_UART10_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PE2_ETH			    \
#define STM32F4_PINMUX_FUNC_PE2_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -577,13 +577,13 @@

#define STM32F4_PINMUX_FUNC_PG8_USART6_RTS __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PG8_ETH			    \
#define STM32F4_PINMUX_FUNC_PG8_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F4_PINMUX_FUNC_PG11_UART10_RX __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PG11_ETH        \
#define STM32F4_PINMUX_FUNC_PG11_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -594,24 +594,24 @@

#define STM32F4_PINMUX_FUNC_PG13_USART6_CTS __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PG13_ETH        \
#define STM32F4_PINMUX_FUNC_PG13_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F4_PINMUX_FUNC_PG14_USART6_TX __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PG14_ETH        \
#define STM32F4_PINMUX_FUNC_PG14_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F4_PINMUX_FUNC_PG15_USART6_CTS __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_OPENDRAIN_PULLUP)
/* Port H */
#define STM32F4_PINMUX_FUNC_PH2_ETH			    \
#define STM32F4_PINMUX_FUNC_PH2_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

#define STM32F4_PINMUX_FUNC_PH3_ETH			    \
#define STM32F4_PINMUX_FUNC_PH3_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -623,7 +623,7 @@

#define STM32F4_PINMUX_FUNC_PH7_I2C3_SCL __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PH7_ETH			    \
#define STM32F4_PINMUX_FUNC_PH7_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -637,7 +637,7 @@
#define STM32F4_PINMUX_FUNC_PI9_FDCAN1_RX __DEPRECATED_MACRO     \
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)

#define STM32F4_PINMUX_FUNC_PI10_ETH			    \
#define STM32F4_PINMUX_FUNC_PI10_ETH __DEPRECATED_MACRO			    \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

+12 −12
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
#define STM32F7_PINMUX_FUNC_PA1_UART4_RX __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_NOPULL)
#define STM32F7_PINMUX_FUNC_PA1_ETH         \
#define STM32F7_PINMUX_FUNC_PA1_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PA1_LTDC_R2 \
@@ -48,7 +48,7 @@
	(STM32_PINMUX_ALT_FUNC_3 | STM32_PUSHPULL_PULLUP)
#define STM32F7_PINMUX_FUNC_PA2_USART2_TX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
#define STM32F7_PINMUX_FUNC_PA2_ETH         \
#define STM32F7_PINMUX_FUNC_PA2_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PA2_LTDC_R1 \
@@ -64,7 +64,7 @@
	(STM32_PINMUX_ALT_FUNC_3 | STM32_PUSHPULL_PULLUP)
#define STM32F7_PINMUX_FUNC_PA3_USART2_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F7_PINMUX_FUNC_PA3_ETH         \
#define STM32F7_PINMUX_FUNC_PA3_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PA3_LTDC_B5 \
@@ -112,7 +112,7 @@
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)
#define STM32F7_PINMUX_FUNC_PA7_PWM14_CH1 __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)
#define STM32F7_PINMUX_FUNC_PA7_ETH         \
#define STM32F7_PINMUX_FUNC_PA7_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PA7_ADC12_IN7 __DEPRECATED_MACRO	\
@@ -284,7 +284,7 @@
	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
#define STM32F7_PINMUX_FUNC_PB11_USART3_RX __DEPRECATED_MACRO	\
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F7_PINMUX_FUNC_PB11_ETH        \
#define STM32F7_PINMUX_FUNC_PB11_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PB11_LTDC_G5 \
@@ -308,7 +308,7 @@
#define STM32F7_PINMUX_FUNC_PB13_FDCAN2_TX __DEPRECATED_MACRO     \
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_NOPULL)
#endif
#define STM32F7_PINMUX_FUNC_PB13_ETH        \
#define STM32F7_PINMUX_FUNC_PB13_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -340,7 +340,7 @@

#define STM32F7_PINMUX_FUNC_PC1_SPI2_MOSI __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)
#define STM32F7_PINMUX_FUNC_PC1_ETH         \
#define STM32F7_PINMUX_FUNC_PC1_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PC1_ADC123_IN11 __DEPRECATED_MACRO	\
@@ -356,13 +356,13 @@
#define STM32F7_PINMUX_FUNC_PC3_ADC123_IN13 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F7_PINMUX_FUNC_PC4_ETH         \
#define STM32F7_PINMUX_FUNC_PC4_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PC4_ADC12_IN14 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F7_PINMUX_FUNC_PC5_ETH         \
#define STM32F7_PINMUX_FUNC_PC5_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PC5_ADC12_IN15 __DEPRECATED_MACRO	\
@@ -702,7 +702,7 @@
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL \
	| STM32_OSPEEDR_VERY_HIGH_SPEED)
#endif
#define STM32F7_PINMUX_FUNC_PG11_ETH        \
#define STM32F7_PINMUX_FUNC_PG11_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PG11_LTDC_B3 \
@@ -726,7 +726,7 @@
#endif
#define STM32F7_PINMUX_FUNC_PG13_USART6_CTS __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_PULLUP)
#define STM32F7_PINMUX_FUNC_PG13_ETH        \
#define STM32F7_PINMUX_FUNC_PG13_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PG13_LTDC_R0 \
@@ -738,7 +738,7 @@
#endif
#define STM32F7_PINMUX_FUNC_PG14_USART6_TX __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_PULLUP)
#define STM32F7_PINMUX_FUNC_PG14_ETH        \
#define STM32F7_PINMUX_FUNC_PG14_ETH __DEPRECATED_MACRO        \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F7_PINMUX_FUNC_PG14_LTDC_B0 \
+9 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PA1_C_ADC12_INP1 __DEPRECATED_MACRO \
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PA1_ETH_REF_CLK \
#define STM32H7_PINMUX_FUNC_PA1_ETH_REF_CLK __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -58,7 +58,7 @@
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
#define STM32H7_PINMUX_FUNC_PA2_ADC12_INP14 __DEPRECATED_MACRO \
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PA2_ETH_MDIO \
#define STM32H7_PINMUX_FUNC_PA2_ETH_MDIO __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -104,7 +104,7 @@
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PA7_ADC12_INP7 __DEPRECATED_MACRO \
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PA7_ETH_CRS_DV \
#define STM32H7_PINMUX_FUNC_PA7_ETH_CRS_DV __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -236,7 +236,7 @@
	(STM32_PINMUX_ALT_FUNC_14 | STM32_OPENDRAIN_PULLUP)
#define STM32H7_PINMUX_FUNC_PB13_UART5_TX __DEPRECATED_MACRO	\
	(STM32_PINMUX_ALT_FUNC_14 | STM32_PUSHPULL_NOPULL)
#define STM32H7_PINMUX_FUNC_PB13_ETH_TXD1 \
#define STM32H7_PINMUX_FUNC_PB13_ETH_TXD1 __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -264,7 +264,7 @@
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PC1_ADC123_INP11 __DEPRECATED_MACRO \
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PC1_ETH_MDC \
#define STM32H7_PINMUX_FUNC_PC1_ETH_MDC __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -286,7 +286,7 @@

#define STM32H7_PINMUX_FUNC_PC4_ADC12_INP4 __DEPRECATED_MACRO \
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PC4_ETH_RXD0 \
#define STM32H7_PINMUX_FUNC_PC4_ETH_RXD0 __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -294,7 +294,7 @@
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PC5_ADC12_INP8 __DEPRECATED_MACRO \
	STM32_MODER_ANALOG_MODE
#define STM32H7_PINMUX_FUNC_PC5_ETH_RXD1 \
#define STM32H7_PINMUX_FUNC_PC5_ETH_RXD1 __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -521,7 +521,7 @@
#define STM32H7_PINMUX_FUNC_PG9_USART6_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)

#define STM32H7_PINMUX_FUNC_PG11_ETH_TX_EN \
#define STM32H7_PINMUX_FUNC_PG11_ETH_TX_EN __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -530,7 +530,7 @@

#define STM32H7_PINMUX_FUNC_PG13_USART6_CTS __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
#define STM32H7_PINMUX_FUNC_PG13_ETH_TXD0 \
#define STM32H7_PINMUX_FUNC_PG13_ETH_TXD0 __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)