patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

usbc: fix conflicting Kconfigs for USB-C related init priority

Browse source 
There was a new Kconfig for USB-C init priority that is conflicting
with currently used Kconfig for init of VBUS and TCPC.
This commit changes the names to more specific related to the subsystem
they belong to.

Signed-off-by: Michał Barnaś <mb@semihalf.com>
This commit is contained in:
Michał Barnaś 2023-09-19 18:49:39 +02:00 committed by Fabio Baltieri
parent 4a250c26b1
commit 9608c8f667
6 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb_c/tcpc/Kconfig
View file

@ -10,8 +10,8 @@ menuconfig USBC_TCPC_DRIVER
if USBC_TCPC_DRIVER if USBC_TCPC_DRIVER
config USBC_INIT_PRIORITY config USBC_TCPC_INIT_PRIORITY
int "USBC driver init priority" int "USB-C TCPC driver init priority"
default 80 default 80
help help
USB-C device driver initialization priority. USB-C device driver initialization priority.

2
drivers/usb_c/tcpc/ucpd_stm32.c
View file

@ -1500,7 +1500,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) > 0,
&drv_data_##inst, \ &drv_data_##inst, \
&drv_config_##inst, \ &drv_config_##inst, \
POST_KERNEL, \ POST_KERNEL, \
CONFIG_USBC_INIT_PRIORITY, \ CONFIG_USBC_TCPC_INIT_PRIORITY, \
&driver_api); &driver_api);
DT_INST_FOREACH_STATUS_OKAY(TCPC_DRIVER_INIT) DT_INST_FOREACH_STATUS_OKAY(TCPC_DRIVER_INIT)

6
drivers/usb_c/vbus/Kconfig
View file

@ -10,6 +10,12 @@ menuconfig USBC_VBUS_DRIVER
if USBC_VBUS_DRIVER if USBC_VBUS_DRIVER
config USBC_VBUS_INIT_PRIORITY
int "USB-C VBUS driver init priority"
default 85
help
Initialization priority of the USB-C VBUS measurement drivers in POST_KERNEL.
source "drivers/usb_c/vbus/Kconfig.usbc_vbus_adc" source "drivers/usb_c/vbus/Kconfig.usbc_vbus_adc"
endif # USBC_VBUS_DRIVER endif # USBC_VBUS_DRIVER

2
drivers/usb_c/vbus/usbc_vbus_adc.c
View file

@ -218,7 +218,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) > 0,
&drv_data_##inst, \ &drv_data_##inst, \
&drv_config_##inst, \ &drv_config_##inst, \
POST_KERNEL, \ POST_KERNEL, \
CONFIG_USBC_INIT_PRIORITY, \ CONFIG_USBC_VBUS_INIT_PRIORITY, \
&driver_api); &driver_api);
DT_INST_FOREACH_STATUS_OKAY(DRIVER_INIT) DT_INST_FOREACH_STATUS_OKAY(DRIVER_INIT)

6
subsys/usb/usb_c/Kconfig
View file

@ -14,11 +14,13 @@ menuconfig USBC_STACK
if USBC_STACK if USBC_STACK
config USBC_INIT_PRIORITY config USBC_STACK_INIT_PRIORITY
int "USB-C initialization priority" int "USB-C stack init priority"
default 90 default 90
help help
Initialization priority of the USB-C connector driver in POST_KERNEL. Initialization priority of the USB-C connector driver in POST_KERNEL.
This driver must be initialized after devices referenced by USB-C connectors
like VBUS and TCPC.
config USBC_THREAD_PRIORITY config USBC_THREAD_PRIORITY
int "USB-C thread priority" int "USB-C thread priority"

2
subsys/usb/usb_c/usbc_stack.c
View file

@ -83,7 +83,7 @@ static ALWAYS_INLINE void usbc_handler(void *port_dev)
\ \
DEVICE_DT_INST_DEFINE(inst, &usbc_subsys_init, NULL, &usbc_port_data_##inst, \ DEVICE_DT_INST_DEFINE(inst, &usbc_subsys_init, NULL, &usbc_port_data_##inst, \
&usbc_port_config_##inst, POST_KERNEL, \ &usbc_port_config_##inst, POST_KERNEL, \
CONFIG_USBC_INIT_PRIORITY, NULL); CONFIG_USBC_STACK_INIT_PRIORITY, NULL);
DT_INST_FOREACH_STATUS_OKAY(USBC_SUBSYS_INIT) DT_INST_FOREACH_STATUS_OKAY(USBC_SUBSYS_INIT)