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

drivers/pinmux: stm32: Deprecate I2S related macros



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

Signed-off-by: default avatarErwan Gouriou <erwan.gouriou@linaro.org>
parent 8c4c37e6
Loading
Loading
Loading
Loading
+18 −18
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@

#define STM32F4_PINMUX_FUNC_PA1_PWM5_CH2 __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_2 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA1_I2S4_SD    \
#define STM32F4_PINMUX_FUNC_PA1_I2S4_SD __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA1_USART2_RTS __DEPRECATED_MACRO \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_OPENDRAIN_PULLUP)
@@ -72,9 +72,9 @@

#define STM32F4_PINMUX_FUNC_PA4_SPI1_NSS __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA4_I2S1_WS    \
#define STM32F4_PINMUX_FUNC_PA4_I2S1_WS __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PA4_I2S3_WS    \
#define STM32F4_PINMUX_FUNC_PA4_I2S3_WS __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PA4_ADC12_IN4 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE
@@ -84,7 +84,7 @@
#define STM32F4_PINMUX_FUNC_PA5_SPI1_SCK __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PA5_I2S1_CK  \
#define STM32F4_PINMUX_FUNC_PA5_I2S1_CK __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PA5_ADC12_IN5 __DEPRECATED_MACRO	\
@@ -97,7 +97,7 @@

#define STM32F4_PINMUX_FUNC_PA7_SPI1_MOSI __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)
#define STM32F4_PINMUX_FUNC_PA7_I2S1_SD  \
#define STM32F4_PINMUX_FUNC_PA7_I2S1_SD __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PA7_ETH __DEPRECATED_MACRO         \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL | \
@@ -143,7 +143,7 @@

#define STM32F4_PINMUX_FUNC_PA15_SPI1_NSS __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PA15_I2S3_WS    \
#define STM32F4_PINMUX_FUNC_PA15_I2S3_WS __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PA15_USART1_TX __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)
@@ -151,7 +151,7 @@
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_PULLUP)

/* Port B */
#define STM32F4_PINMUX_FUNC_PB0_I2S5_CK  \
#define STM32F4_PINMUX_FUNC_PB0_I2S5_CK __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB0_ETH __DEPRECATED_MACRO			    \
@@ -166,7 +166,7 @@
#define STM32F4_PINMUX_FUNC_PB1_ADC12_IN9 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE

#define STM32F4_PINMUX_FUNC_PB3_I2S3_CK   \
#define STM32F4_PINMUX_FUNC_PB3_I2S3_CK __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB3_USART1_RX __DEPRECATED_MACRO   \
@@ -192,7 +192,7 @@
#define STM32F4_PINMUX_FUNC_PB4_SPI1_MISO __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)

#define STM32F4_PINMUX_FUNC_PB5_I2S3_SD  \
#define STM32F4_PINMUX_FUNC_PB5_I2S3_SD __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB5_FDCAN2_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)
@@ -226,7 +226,7 @@
	(STM32_PINMUX_ALT_FUNC_2 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB8_I2C1_SCL __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
#define STM32F4_PINMUX_FUNC_PB8_I2S5_SD  \
#define STM32F4_PINMUX_FUNC_PB8_I2S5_SD __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB8_FDCAN1_RX __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)
@@ -270,9 +270,9 @@

#define STM32F4_PINMUX_FUNC_PB12_SPI2_NSS __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_PULLUP)
#define STM32F4_PINMUX_FUNC_PB12_I2S2_WS   \
#define STM32F4_PINMUX_FUNC_PB12_I2S2_WS __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB12_I2S4_WS   \
#define STM32F4_PINMUX_FUNC_PB12_I2S4_WS __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB12_FDCAN2_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)
@@ -285,10 +285,10 @@
#define STM32F4_PINMUX_FUNC_PB13_SPI2_SCK __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB13_I2S2_CK   \
#define STM32F4_PINMUX_FUNC_PB13_I2S2_CK __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB13_I2S4_CK   \
#define STM32F4_PINMUX_FUNC_PB13_I2S4_CK __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)
#define STM32F4_PINMUX_FUNC_PB13_USART3_CTS __DEPRECATED_MACRO \
@@ -310,7 +310,7 @@

#define STM32F4_PINMUX_FUNC_PB15_SPI2_MOSI __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)
#define STM32F4_PINMUX_FUNC_PB15_I2S2_SD  \
#define STM32F4_PINMUX_FUNC_PB15_I2S2_SD __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PB15_OTG_HS_DP __DEPRECATED_MACRO  \
	(STM32_PINMUX_ALT_FUNC_12 | STM32_PUSHPULL_NOPULL)
@@ -322,7 +322,7 @@
#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    \
#define STM32F4_PINMUX_FUNC_PC1_I2S2_SD __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PC1_ADC123_IN11 __DEPRECATED_MACRO	\
	STM32_MODER_ANALOG_MODE
@@ -366,7 +366,7 @@
	(STM32_PINMUX_ALT_FUNC_2 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PC7_USART6_RX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_NOPULL)
#define STM32F4_PINMUX_FUNC_PC7_I2S2_CK    \
#define STM32F4_PINMUX_FUNC_PC7_I2S2_CK __DEPRECATED_MACRO    \
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL | \
	 STM32_OSPEEDR_VERY_HIGH_SPEED)

@@ -486,7 +486,7 @@
#define STM32F4_PINMUX_FUNC_PE3_UART10_TX __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_PULLUP)

#define STM32F4_PINMUX_FUNC_PE4_I2S5_WS   \
#define STM32F4_PINMUX_FUNC_PE4_I2S5_WS __DEPRECATED_MACRO   \
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL)

#define STM32F4_PINMUX_FUNC_PE5_PWM9_CH1 __DEPRECATED_MACRO    \