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

drivers/pinmux: stm32: Deprecate USB related macros 



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

Signed-off-by: default avatarErwan Gouriou <erwan.gouriou@linaro.org>
parent 543b9e3c

drivers/pinmux/stm32/pinmux_stm32f1.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#define STM32F1_PINMUX_FUNC_PA7_SPI1_MASTER_MOSI __DEPRECATED_MACRO     STM32_PIN_SPI_MASTER_MOSI

#define STM32F1_PINMUX_FUNC_PA7_SPI1_SLAVE_MOSI __DEPRECATED_MACRO      STM32_PIN_SPI_SLAVE_MOSI



#define STM32F1_PINMUX_FUNC_PA11_USB_DM		     STM32_PIN_USB

#define STM32F1_PINMUX_FUNC_PA12_USB_DP		     STM32_PIN_USB

#define STM32F1_PINMUX_FUNC_PA11_USB_DM __DEPRECATED_MACRO		     STM32_PIN_USB

#define STM32F1_PINMUX_FUNC_PA12_USB_DP __DEPRECATED_MACRO		     STM32_PIN_USB



#define STM32F1_PINMUX_FUNC_PD5_USART2_TX __DEPRECATED_MACRO	     STM32_PIN_USART_TX

#define STM32F1_PINMUX_FUNC_PD6_USART2_RX __DEPRECATED_MACRO	     STM32_PIN_USART_RX

drivers/pinmux/stm32/pinmux_stm32f2.h

+2 −2
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ 
#define STM32F2_PINMUX_FUNC_PA10_USART1_RX __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)



#define STM32F2_PINMUX_FUNC_PA11_OTG_FS_DM  \

#define STM32F2_PINMUX_FUNC_PA11_OTG_FS_DM __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_10 | STM32_PUSHPULL_NOPULL)



#define STM32F2_PINMUX_FUNC_PA12_OTG_FS_DP  \

#define STM32F2_PINMUX_FUNC_PA12_OTG_FS_DP __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_10 | STM32_PUSHPULL_NOPULL)



/* Port B */

drivers/pinmux/stm32/pinmux_stm32f3.h

+4 −4
Original line number Diff line number Diff line
@@ -98,14 +98,14 @@ 
	(STM32_PINMUX_ALT_FUNC_6 | STM32_PUSHPULL_NOPULL)



#if CONFIG_SOC_STM32F302X8

#define STM32F3_PINMUX_FUNC_PA11_USB_DM	    \

#define STM32F3_PINMUX_FUNC_PA11_USB_DM __DEPRECATED_MACRO	    \

	STM32_MODER_ANALOG_MODE

#define STM32F3_PINMUX_FUNC_PA12_USB_DP     \

#define STM32F3_PINMUX_FUNC_PA12_USB_DP __DEPRECATED_MACRO     \

	STM32_MODER_ANALOG_MODE

#else

#define STM32F3_PINMUX_FUNC_PA11_USB_DM	    \

#define STM32F3_PINMUX_FUNC_PA11_USB_DM __DEPRECATED_MACRO	    \

	(STM32_PINMUX_ALT_FUNC_14 | STM32_PUSHPULL_NOPULL)

#define STM32F3_PINMUX_FUNC_PA12_USB_DP     \

#define STM32F3_PINMUX_FUNC_PA12_USB_DP __DEPRECATED_MACRO     \

	(STM32_PINMUX_ALT_FUNC_14 | STM32_PUSHPULL_NOPULL)

#endif

drivers/pinmux/stm32/pinmux_stm32f4.h

+4 −4
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_PULLUP)

#define STM32F4_PINMUX_FUNC_PA11_UART4_RX __DEPRECATED_MACRO   \

	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_NOPULL)

#define STM32F4_PINMUX_FUNC_PA11_OTG_FS_DM  \

#define STM32F4_PINMUX_FUNC_PA11_OTG_FS_DM __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_10 | STM32_PUSHPULL_NOPULL)



#define STM32F4_PINMUX_FUNC_PA12_USART1_RTS __DEPRECATED_MACRO \
@@ -138,7 +138,7 @@ 
	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_NOPULL)

#define STM32F4_PINMUX_FUNC_PA12_UART4_TX __DEPRECATED_MACRO   \

	(STM32_PINMUX_ALT_FUNC_11 | STM32_PUSHPULL_PULLUP)

#define STM32F4_PINMUX_FUNC_PA12_OTG_FS_DP  \

#define STM32F4_PINMUX_FUNC_PA12_OTG_FS_DP __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_10 | STM32_PUSHPULL_NOPULL)



#define STM32F4_PINMUX_FUNC_PA15_SPI1_NSS __DEPRECATED_MACRO   \
@@ -305,14 +305,14 @@ 
	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUPDR_PULL_DOWN)

#define STM32F4_PINMUX_FUNC_PB14_USART3_RTS __DEPRECATED_MACRO \

	(STM32_PINMUX_ALT_FUNC_7 | STM32_OPENDRAIN_PULLUP)

#define STM32F4_PINMUX_FUNC_PB14_OTG_HS_DM  \

#define STM32F4_PINMUX_FUNC_PB14_OTG_HS_DM __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_12 | STM32_PUSHPULL_NOPULL)



#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  \

	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL)

#define STM32F4_PINMUX_FUNC_PB15_OTG_HS_DP  \

#define STM32F4_PINMUX_FUNC_PB15_OTG_HS_DP __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_12 | STM32_PUSHPULL_NOPULL)



/* Port C */

drivers/pinmux/stm32/pinmux_stm32f7.h

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)

#define STM32F7_PINMUX_FUNC_PA11_FDCAN1_RX __DEPRECATED_MACRO \

	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUPDR_PULL_UP)

#define STM32F7_PINMUX_FUNC_PA11_OTG_FS_DM  \

#define STM32F7_PINMUX_FUNC_PA11_OTG_FS_DM __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_10 | STM32_PUSHPULL_NOPULL)

#define STM32F7_PINMUX_FUNC_PA11_LTDC_R4 \

	(STM32_PINMUX_ALT_FUNC_14 | STM32_PUSHPULL_NOPULL)
@@ -156,7 +156,7 @@ 
	(STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)

#define STM32F7_PINMUX_FUNC_PA12_FDCAN1_TX __DEPRECATED_MACRO \

	(STM32_PINMUX_ALT_FUNC_9 | STM32_PUSHPULL_NOPULL)

#define STM32F7_PINMUX_FUNC_PA12_OTG_FS_DP  \

#define STM32F7_PINMUX_FUNC_PA12_OTG_FS_DP __DEPRECATED_MACRO  \

	(STM32_PINMUX_ALT_FUNC_10 | STM32_PUSHPULL_NOPULL)

#define STM32F7_PINMUX_FUNC_PA12_LTDC_R5 \

	(STM32_PINMUX_ALT_FUNC_14 | STM32_PUSHPULL_NOPULL)

CRA Git | Maintained and supported by SUSTech CRA and CCSE