From ee351328a4e460ab8df4ea5f6635778478a2003a Mon Sep 17 00:00:00 2001 From: Yannis Damigos Date: Fri, 17 Jan 2020 19:56:16 +0200 Subject: [PATCH] usb_dc_stm32: Convert usb disconnect gpio to new gpio api Convert usb disconnect gpio to new gpio api. Updates device tree for the olimexino_stm32. Signed-off-by: Yannis Damigos --- boards/arm/olimexino_stm32/olimexino_stm32.dts | 2 +- drivers/usb/device/usb_dc_stm32.c | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/boards/arm/olimexino_stm32/olimexino_stm32.dts b/boards/arm/olimexino_stm32/olimexino_stm32.dts index 6620221e725..e6cb55de376 100644 --- a/boards/arm/olimexino_stm32/olimexino_stm32.dts +++ b/boards/arm/olimexino_stm32/olimexino_stm32.dts @@ -92,7 +92,7 @@ uext_serial: &usart1 {}; &usb { status = "okay"; - disconnect-gpios = <&gpioc 12 0>; + disconnect-gpios = <&gpioc 12 GPIO_ACTIVE_LOW>; }; &timers1 { diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c index 4119f008b9c..d9ad95f456e 100644 --- a/drivers/usb/device/usb_dc_stm32.c +++ b/drivers/usb/device/usb_dc_stm32.c @@ -990,17 +990,10 @@ void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state) usb_disconnect = device_get_binding( DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_CONTROLLER); - gpio_pin_configure(usb_disconnect, - DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_PIN, GPIO_DIR_OUT); - if (state) { - gpio_pin_write(usb_disconnect, - DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_PIN, - DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_FLAGS); - } else { - gpio_pin_write(usb_disconnect, - DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_PIN, - !DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_FLAGS); - } + gpio_pin_configure(usb_disconnect, + DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_PIN, + DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_FLAGS | + (state ? GPIO_OUTPUT_ACTIVE : GPIO_OUTPUT_INACTIVE)); } #endif /* USB && CONFIG_USB_DC_STM32_DISCONN_ENABLE */