From dd51a7128f25cfcde698f3611ca25030f93310b4 Mon Sep 17 00:00:00 2001 From: Troy Kisky Date: Thu, 10 Oct 2013 15:27:55 -0700 Subject: [PATCH] usb: rename board_usb_init_type to usb_init_type This will be used by usb_lowlevel_init so it will no longer be used by only board specific functions. Move definition of enum usb_init_type higher in file so that it will be available for usb_low_level_init. Signed-off-by: Troy Kisky Conflicts: board/amcc/canyonlands/canyonlands.c board/balloon3/balloon3.c board/esd/apc405/apc405.c board/esd/pmc440/pmc440.c board/samsung/trats/trats.c board/toradex/colibri_pxa270/colibri_pxa270.c board/trizepsiv/conxs.c board/vpac270/vpac270.c --- common/usb.c | 2 +- include/usb.h | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/usb.c b/common/usb.c index 3b433372d..a5e731470 100644 --- a/common/usb.c +++ b/common/usb.c @@ -1037,7 +1037,7 @@ int usb_new_device(struct usb_device *dev) } __weak -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { return 0; } diff --git a/include/usb.h b/include/usb.h index 56db68b3f..f290fb2c7 100644 --- a/include/usb.h +++ b/include/usb.h @@ -146,6 +146,16 @@ struct usb_device { unsigned int slot_id; }; +/* + * You can initialize platform's USB host or device + * ports by passing this enum as an argument to + * board_usb_init(). + */ +enum usb_init_type { + USB_INIT_HOST, + USB_INIT_DEVICE +}; + /********************************************************************** * this is how the lowlevel part communicate with the outer world */ @@ -186,16 +196,6 @@ extern void udc_disconnect(void); #endif -/* - * You can initialize platform's USB host or device - * ports by passing this enum as an argument to - * board_usb_init(). - */ -enum board_usb_init_type { - USB_INIT_HOST, - USB_INIT_DEVICE -}; - /* * board-specific hardware initialization, called by * usb drivers and u-boot commands @@ -203,16 +203,16 @@ enum board_usb_init_type { * @param index USB controller number * @param init initializes controller as USB host or device */ -int board_usb_init(int index, enum board_usb_init_type init); +int board_usb_init(int index, enum usb_init_type init); /* * can be used to clean up after failed USB initialization attempt * vide: board_usb_init() * * @param index USB controller number for selective cleanup - * @param init board_usb_init_type passed to board_usb_init() + * @param init usb_init_type passed to board_usb_init() */ -int board_usb_cleanup(int index, enum board_usb_init_type init); +int board_usb_cleanup(int index, enum usb_init_type init); #ifdef CONFIG_USB_STORAGE -- 2.34.1