From 0ff3616bdffa17a69e2fa5e1a4ba29d2da4e4125 Mon Sep 17 00:00:00 2001 From: Gerson Fernando Budke Date: Fri, 13 Mar 2020 23:32:42 -0300 Subject: [PATCH] drivers: usb: device: Rename usb_dc_sam to usb_dc_sam_usbhs The SoC driver name is 'USB High-Speed Interface (USBHS)'. This rename from usb_dc_sam to usb_dc_sam_usbhs allowing add others SoC drivers like 'USB Device Port (UDP)' that is found at SAM4S/E variations. Signed-off-by: Gerson Fernando Budke --- drivers/usb/device/CMakeLists.txt | 12 ++++++------ drivers/usb/device/Kconfig | 2 +- .../usb/device/{usb_dc_sam.c => usb_dc_sam_usbhs.c} | 2 +- soc/arm/atmel_sam/same70/Kconfig.defconfig.series | 2 +- soc/arm/atmel_sam/samv71/Kconfig.defconfig.series | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename drivers/usb/device/{usb_dc_sam.c => usb_dc_sam_usbhs.c} (99%) diff --git a/drivers/usb/device/CMakeLists.txt b/drivers/usb/device/CMakeLists.txt index 89eae3a0d97..1bb39cf837f 100644 --- a/drivers/usb/device/CMakeLists.txt +++ b/drivers/usb/device/CMakeLists.txt @@ -1,11 +1,11 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_sources_ifdef(CONFIG_USB_DW usb_dc_dw.c) -zephyr_sources_ifdef(CONFIG_USB_DC_STM32 usb_dc_stm32.c) -zephyr_sources_ifdef(CONFIG_USB_DC_SAM0 usb_dc_sam0.c) -zephyr_sources_ifdef(CONFIG_USB_DC_SAM usb_dc_sam.c) -zephyr_sources_ifdef(CONFIG_USB_NRFX usb_dc_nrfx.c) -zephyr_sources_ifdef(CONFIG_USB_KINETIS usb_dc_kinetis.c) +zephyr_sources_ifdef(CONFIG_USB_DW usb_dc_dw.c) +zephyr_sources_ifdef(CONFIG_USB_DC_STM32 usb_dc_stm32.c) +zephyr_sources_ifdef(CONFIG_USB_DC_SAM0 usb_dc_sam0.c) +zephyr_sources_ifdef(CONFIG_USB_DC_SAM_USBHS usb_dc_sam_usbhs.c) +zephyr_sources_ifdef(CONFIG_USB_NRFX usb_dc_nrfx.c) +zephyr_sources_ifdef(CONFIG_USB_KINETIS usb_dc_kinetis.c) zephyr_sources_ifdef(CONFIG_USB_NATIVE_POSIX usb_dc_native_posix.c usb_dc_native_posix_adapt.c diff --git a/drivers/usb/device/Kconfig b/drivers/usb/device/Kconfig index 00a56341d53..e734d7f8dd7 100644 --- a/drivers/usb/device/Kconfig +++ b/drivers/usb/device/Kconfig @@ -39,7 +39,7 @@ config USB_DC_SAM0 help SAM0 family USB device controller Driver. -config USB_DC_SAM +config USB_DC_SAM_USBHS bool "SAM series USB HS Device Controller driver" depends on SOC_SERIES_SAME70 || \ SOC_SERIES_SAMV71 diff --git a/drivers/usb/device/usb_dc_sam.c b/drivers/usb/device/usb_dc_sam_usbhs.c similarity index 99% rename from drivers/usb/device/usb_dc_sam.c rename to drivers/usb/device/usb_dc_sam_usbhs.c index e474423989a..b4f13383c07 100644 --- a/drivers/usb/device/usb_dc_sam.c +++ b/drivers/usb/device/usb_dc_sam_usbhs.c @@ -12,7 +12,7 @@ #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL #include -LOG_MODULE_REGISTER(usb_dc_sam); +LOG_MODULE_REGISTER(usb_dc_sam_usbhs); /* * This is defined in the support files for the SAM S7x, but not for diff --git a/soc/arm/atmel_sam/same70/Kconfig.defconfig.series b/soc/arm/atmel_sam/same70/Kconfig.defconfig.series index 4e7c0bc6dd0..68668308e3c 100644 --- a/soc/arm/atmel_sam/same70/Kconfig.defconfig.series +++ b/soc/arm/atmel_sam/same70/Kconfig.defconfig.series @@ -65,7 +65,7 @@ config SPI_SAM default y depends on SPI -config USB_DC_SAM +config USB_DC_SAM_USBHS default y depends on USB diff --git a/soc/arm/atmel_sam/samv71/Kconfig.defconfig.series b/soc/arm/atmel_sam/samv71/Kconfig.defconfig.series index 3af787ed032..d10a7aa4914 100644 --- a/soc/arm/atmel_sam/samv71/Kconfig.defconfig.series +++ b/soc/arm/atmel_sam/samv71/Kconfig.defconfig.series @@ -66,7 +66,7 @@ config SPI_SAM default y depends on SPI -config USB_DC_SAM +config USB_DC_SAM_USBHS default y depends on USB