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 <troy.kisky@boundarydevices.com>
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

diff --git a/common/usb.c b/common/usb.c
index 3b433372d9ba9635d67607f589a55515d35e74ac..a5e7314702a2ac572532cc6d4cd3fc49c37f83c0 100644 (file)
--- 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 56db68b3fd6261fa101129ddfcab6022a90143e1..f290fb2c7b7f81dbd370df6ecf87e4a62fca8691 100644 (file)
--- 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