Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit bba679144d25b91bcd7befff5a96728a30875f54

Authored by Troy Kisky
Committed by Marek Vasut
1 parent ea02b653c2
Exists in master and in 50 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 11 changed files with 31 additions and 31 deletions Side-by-side Diff

board/amcc/canyonlands/canyonlands.c
Diff comments   View file @ bba6791
... ... @@ -189,7 +189,7 @@
189 189 }
190 190  
191 191 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT)
192   -int board_usb_init(int index, enum board_usb_init_type init)
  192 +int board_usb_init(int index, enum usb_init_type init)
193 193 {
194 194 struct board_bcsr *bcsr_data =
195 195 (struct board_bcsr *)CONFIG_SYS_BCSR_BASE;
... ... @@ -230,7 +230,7 @@
230 230 return 0;
231 231 }
232 232  
233   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  233 +int board_usb_cleanup(int index, enum usb_init_type init)
234 234 {
235 235 return usb_board_stop();
236 236 }
board/balloon3/balloon3.c
Diff comments   View file @ bba6791
... ... @@ -60,7 +60,7 @@
60 60 }
61 61  
62 62 #ifdef CONFIG_CMD_USB
63   -int board_usb_init(int index, enum board_usb_init_type init)
  63 +int board_usb_init(int index, enum usb_init_type init)
64 64 {
65 65 writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
66 66 ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
... ... @@ -91,7 +91,7 @@
91 91 return 0;
92 92 }
93 93  
94   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  94 +int board_usb_cleanup(int index, enum usb_init_type init)
95 95 {
96 96 return 0;
97 97 }
board/esd/apc405/apc405.c
Diff comments   View file @ bba6791
... ... @@ -429,7 +429,7 @@
429 429 }
430 430  
431 431 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT)
432   -int board_usb_init(int index, enum board_usb_init_type init)
  432 +int board_usb_init(int index, enum usb_init_type init)
433 433 {
434 434 return 0;
435 435 }
... ... @@ -454,7 +454,7 @@
454 454 return 0;
455 455 }
456 456  
457   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  457 +int board_usb_cleanup(int index, enum usb_init_type init)
458 458 {
459 459 return usb_board_stop();
460 460 }
board/esd/pmc440/pmc440.c
Diff comments   View file @ bba6791
... ... @@ -822,7 +822,7 @@
822 822 }
823 823  
824 824 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT)
825   -int board_usb_init(int index, enum board_usb_init_type init)
  825 +int board_usb_init(int index, enum usb_init_type init)
826 826 {
827 827 char *act = getenv("usbact");
828 828 int i;
... ... @@ -846,7 +846,7 @@
846 846 return 0;
847 847 }
848 848  
849   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  849 +int board_usb_cleanup(int index, enum usb_init_type init)
850 850 {
851 851 return usb_board_stop();
852 852 }
board/icpdas/lp8x4x/lp8x4x.c
Diff comments   View file @ bba6791
... ... @@ -59,7 +59,7 @@
59 59 #endif
60 60  
61 61 #ifdef CONFIG_CMD_USB
62   -int board_usb_init(int index, enum board_usb_init_type init)
  62 +int board_usb_init(int index, enum usb_init_type init)
63 63 {
64 64 writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
65 65 ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
... ... @@ -90,7 +90,7 @@
90 90 return 0;
91 91 }
92 92  
93   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  93 +int board_usb_cleanup(int index, enum usb_init_type init)
94 94 {
95 95 return 0;
96 96 }
board/samsung/trats/trats.c
Diff comments   View file @ bba6791
... ... @@ -496,7 +496,7 @@
496 496 .usb_flags = PHY0_SLEEP,
497 497 };
498 498  
499   -int board_usb_init(int index, enum board_usb_init_type init)
  499 +int board_usb_init(int index, enum usb_init_type init)
500 500 {
501 501 debug("USB_udc_probe\n");
502 502 return s3c_udc_probe(&s5pc210_otg_data);
board/toradex/colibri_pxa270/colibri_pxa270.c
Diff comments   View file @ bba6791
... ... @@ -40,7 +40,7 @@
40 40 }
41 41  
42 42 #ifdef CONFIG_CMD_USB
43   -int board_usb_init(int index, enum board_usb_init_type init)
  43 +int board_usb_init(int index, enum usb_init_type init)
44 44 {
45 45 writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
46 46 ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
... ... @@ -71,7 +71,7 @@
71 71 return 0;
72 72 }
73 73  
74   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  74 +int board_usb_cleanup(int index, enum usb_init_type init)
75 75 {
76 76 return 0;
77 77 }
board/trizepsiv/conxs.c
Diff comments   View file @ bba6791
... ... @@ -43,7 +43,7 @@
43 43 * Miscelaneous platform dependent initialisations
44 44 */
45 45  
46   -int board_usb_init(int index, enum board_usb_init_type init)
  46 +int board_usb_init(int index, enum usb_init_type init)
47 47 {
48 48 writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
49 49 ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
... ... @@ -70,7 +70,7 @@
70 70 return 0;
71 71 }
72 72  
73   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  73 +int board_usb_cleanup(int index, enum usb_init_type init)
74 74 {
75 75 return 0;
76 76 }
board/vpac270/vpac270.c
Diff comments   View file @ bba6791
... ... @@ -67,7 +67,7 @@
67 67 #endif
68 68  
69 69 #ifdef CONFIG_CMD_USB
70   -int board_usb_init(int index, enum board_usb_init_type init)
  70 +int board_usb_init(int index, enum usb_init_type init)
71 71 {
72 72 writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
73 73 ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
... ... @@ -98,7 +98,7 @@
98 98 return 0;
99 99 }
100 100  
101   -int board_usb_cleanup(int index, enum board_usb_init_type init)
  101 +int board_usb_cleanup(int index, enum usb_init_type init)
102 102 {
103 103 return 0;
104 104 }
... ... @@ -1068,7 +1068,7 @@
1068 1068 }
1069 1069  
1070 1070 __weak
1071   -int board_usb_init(int index, enum board_usb_init_type init)
  1071 +int board_usb_init(int index, enum usb_init_type init)
1072 1072 {
1073 1073 return 0;
1074 1074 }
... ... @@ -129,6 +129,16 @@
129 129 unsigned int slot_id;
130 130 };
131 131  
  132 +/*
  133 + * You can initialize platform's USB host or device
  134 + * ports by passing this enum as an argument to
  135 + * board_usb_init().
  136 + */
  137 +enum usb_init_type {
  138 + USB_INIT_HOST,
  139 + USB_INIT_DEVICE
  140 +};
  141 +
132 142 /**********************************************************************
133 143 * this is how the lowlevel part communicate with the outer world
134 144 */
135 145  
136 146  
137 147  
... ... @@ -170,32 +180,22 @@
170 180 #endif
171 181  
172 182 /*
173   - * You can initialize platform's USB host or device
174   - * ports by passing this enum as an argument to
175   - * board_usb_init().
176   - */
177   -enum board_usb_init_type {
178   - USB_INIT_HOST,
179   - USB_INIT_DEVICE
180   -};
181   -
182   -/*
183 183 * board-specific hardware initialization, called by
184 184 * usb drivers and u-boot commands
185 185 *
186 186 * @param index USB controller number
187 187 * @param init initializes controller as USB host or device
188 188 */
189   -int board_usb_init(int index, enum board_usb_init_type init);
  189 +int board_usb_init(int index, enum usb_init_type init);
190 190  
191 191 /*
192 192 * can be used to clean up after failed USB initialization attempt
193 193 * vide: board_usb_init()
194 194 *
195 195 * @param index USB controller number for selective cleanup
196   - * @param init board_usb_init_type passed to board_usb_init()
  196 + * @param init usb_init_type passed to board_usb_init()
197 197 */
198   -int board_usb_cleanup(int index, enum board_usb_init_type init);
  198 +int board_usb_cleanup(int index, enum usb_init_type init);
199 199  
200 200 #ifdef CONFIG_USB_STORAGE
201 201