michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb device: Remove MCUX controller type

Browse source 
The CONFIG_USB_MCUX_CONTROLLER_TYPE choice config
is not necessary, let's just remove it. Theoretically,
if there was an SOC with the EHCI and LPCIP3511, then
it might cause a build error, but there is no SOC
which is supported on this legacy driver that has that.

Remove all settings of it in the SOC files.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-08-12 14:41:47 -05:00 • committed by Alberto Escolar
commit 4e9227641e
7 changed files with 4 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/usb/device/Kconfig
View file

@ -154,13 +154,10 @@ config USB_MCUX
if USB_MCUX if USB_MCUX
choice USB_MCUX_CONTROLLER_TYPE
prompt "USB Controller type"
help
Select the type of controller available in the SoC.
config USB_DC_NXP_EHCI config USB_DC_NXP_EHCI
bool "MXRT EHCI USB Device Controller" bool "MXRT EHCI USB Device Controller"
default y
depends on DT_HAS_NXP_EHCI_ENABLED
select NOCACHE_MEMORY if ARCH_HAS_NOCACHE_MEMORY_SUPPORT select NOCACHE_MEMORY if ARCH_HAS_NOCACHE_MEMORY_SUPPORT
select USB_DC_HAS_HS_SUPPORT select USB_DC_HAS_HS_SUPPORT
help help
@ -168,13 +165,13 @@ config USB_DC_NXP_EHCI
config USB_DC_NXP_LPCIP3511 config USB_DC_NXP_LPCIP3511
bool "LPC USB Device Controller" bool "LPC USB Device Controller"
default y
depends on DT_HAS_NXP_LPCIP3511_ENABLED
select USB_DC_HAS_HS_SUPPORT if "$(dt_nodelabel_enabled,usbhs)" select USB_DC_HAS_HS_SUPPORT if "$(dt_nodelabel_enabled,usbhs)"
select PINCTRL select PINCTRL
help help
LPC USB Device Controller Driver. LPC USB Device Controller Driver.
endchoice
config USB_DC_MSG_QUEUE_LEN config USB_DC_MSG_QUEUE_LEN
int int
default 10 default 10

4
soc/nxp/imxrt/Kconfig.defconfig
View file

@ -73,10 +73,6 @@ endif # ETH_NXP_ENET
config MEMC config MEMC
default y if !SOC_SERIES_IMXRT118X # RT118X lacks FLEXRAM default y if !SOC_SERIES_IMXRT118X # RT118X lacks FLEXRAM
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_EHCI
endchoice
DT_CHOSEN_Z_DTCM := zephyr,dtcm DT_CHOSEN_Z_DTCM := zephyr,dtcm
choice SEGGER_RTT_SECTION choice SEGGER_RTT_SECTION

4
soc/nxp/imxrt/imxrt5xx/Kconfig.defconfig
View file

@ -46,10 +46,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
endif # CORTEX_M_SYSTICK endif # CORTEX_M_SYSTICK
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511
endchoice
if PM_DEVICE if PM_DEVICE
# Enable the MEMC FlexSPI driver when using device power # Enable the MEMC FlexSPI driver when using device power
# management so we can reconfigure the FlexSPI pins to # management so we can reconfigure the FlexSPI pins to

4
soc/nxp/imxrt/imxrt6xx/Kconfig.defconfig
View file

@ -70,8 +70,4 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
endif # CORTEX_M_SYSTICK endif # CORTEX_M_SYSTICK
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511
endchoice
endif # SOC_MIMXRT685S_CM33 endif # SOC_MIMXRT685S_CM33

34
soc/nxp/lpc/lpc55xxx/Kconfig.defconfig
View file

@ -19,7 +19,6 @@ config SECOND_CORE_MCUX
# Workaround for not being able to have commas in macro arguments # Workaround for not being able to have commas in macro arguments
DT_CHOSEN_Z_CODE_CPU1_PARTITION := zephyr,code-cpu1-partition DT_CHOSEN_Z_CODE_CPU1_PARTITION := zephyr,code-cpu1-partition
# Move the LMA for the second core image to be in the flash region of primary # Move the LMA for the second core image to be in the flash region of primary
# core, so that JLink flash will load it correctly. # core, so that JLink flash will load it correctly.
config BUILD_OUTPUT_ADJUST_LMA config BUILD_OUTPUT_ADJUST_LMA
@ -52,36 +51,8 @@ config CAN_MCUX_MCAN
default y default y
depends on CAN depends on CAN
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511
endchoice
endif # SOC_LPC55S16 endif # SOC_LPC55S16
if SOC_LPC55S26
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511
endchoice
endif # SOC_LPC55S26
if SOC_LPC55S28
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511
endchoice
endif # SOC_LPC55S28
if SOC_LPC55S36
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511
endchoice
endif # SOC_LPC55S36
if SOC_LPC55S69 if SOC_LPC55S69
config SOC_FLASH_MCUX config SOC_FLASH_MCUX
@ -89,10 +60,6 @@ config SOC_FLASH_MCUX
depends on FLASH depends on FLASH
depends on !TRUSTED_EXECUTION_NONSECURE depends on !TRUSTED_EXECUTION_NONSECURE
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511
endchoice
config I2S_MCUX_FLEXCOMM config I2S_MCUX_FLEXCOMM
select INIT_PLL0 select INIT_PLL0
@ -100,7 +67,6 @@ endif # SOC_LPC55S69
if SOC_LPC55S69_CPU1 if SOC_LPC55S69_CPU1
config GPIO config GPIO
default y default y

4
soc/nxp/mcx/mcxn/Kconfig.defconfig
View file

@ -6,10 +6,6 @@ if SOC_SERIES_MCXN
config MFD config MFD
default y if DT_HAS_NXP_LP_FLEXCOMM_ENABLED default y if DT_HAS_NXP_LP_FLEXCOMM_ENABLED
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_EHCI
endchoice
config NUM_IRQS config NUM_IRQS
default 155 default 155

4
soc/nxp/rw/Kconfig.defconfig
View file

@ -38,10 +38,6 @@ config BUILD_OUTPUT_ADJUST_LMA
endif # NXP_RW_ROM_RAMLOADER endif # NXP_RW_ROM_RAMLOADER
choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_EHCI
endchoice
if BT if BT
config FLASH config FLASH