Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2df9d5c431fca07c9868a36b48ee771bde6b19e8

Authored by Michal Simek
1 parent f8c1be9816
Exists in v2017.01-smarct4x and in 40 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-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_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.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

fpga: xilinx: Fix the rest of CamelCases 

No functional changes.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Showing 5 changed files with 99 additions and 99 deletions Side-by-side Diff

board/astro/mcf5373l/fpga.c
Diff comments   View file @ 2df9d5c
... ... @@ -203,7 +203,7 @@
203 203 }
204 204  
205 205 /* Set the FPGA's PROG_B line to the specified level */
206   -int xilinx_pgm_fn(int assert, int flush, int cookie)
  206 +int xilinx_pgm_config_fn(int assert, int flush, int cookie)
207 207 {
208 208 gpio_t *gpiop = (gpio_t *)MMAP_GPIO;
209 209  
... ... @@ -218,7 +218,7 @@
218 218 * Test the state of the active-low FPGA INIT line. Return 1 on INIT
219 219 * asserted (low).
220 220 */
221   -int xilinx_init_fn(int cookie)
  221 +int xilinx_init_config_fn(int cookie)
222 222 {
223 223 gpio_t *gpiop = (gpio_t *)MMAP_GPIO;
224 224  
... ... @@ -226,7 +226,7 @@
226 226 }
227 227  
228 228 /* Test the state of the active-high FPGA DONE pin */
229   -int xilinx_done_fn(int cookie)
  229 +int xilinx_done_config_fn(int cookie)
230 230 {
231 231 gpio_t *gpiop = (gpio_t *)MMAP_GPIO;
232 232  
... ... @@ -234,7 +234,7 @@
234 234 }
235 235  
236 236 /* Abort an FPGA operation */
237   -int xilinx_abort_fn(int cookie)
  237 +int xilinx_abort_config_fn(int cookie)
238 238 {
239 239 gpio_t *gpiop = (gpio_t *)MMAP_GPIO;
240 240 /* ensure all SPI peripherals and FPGAs are deselected */
... ... @@ -300,7 +300,7 @@
300 300 return rc;
301 301 }
302 302  
303   -int xilinx_clk_fn(int assert_clk, int flush, int cookie)
  303 +int xilinx_clk_config_fn(int assert_clk, int flush, int cookie)
304 304 {
305 305 gpio_t *gpiop = (gpio_t *)MMAP_GPIO;
306 306  
... ... @@ -311,7 +311,7 @@
311 311 return assert_clk;
312 312 }
313 313  
314   -int xilinx_wr_fn(int assert_write, int flush, int cookie)
  314 +int xilinx_wr_config_fn(int assert_write, int flush, int cookie)
315 315 {
316 316 gpio_t *gpiop = (gpio_t *)MMAP_GPIO;
317 317  
... ... @@ -322,7 +322,7 @@
322 322 return assert_write;
323 323 }
324 324  
325   -int xilinx_fastwr_fn(void *buf, size_t len, int flush, int cookie)
  325 +int xilinx_fastwr_config_fn(void *buf, size_t len, int flush, int cookie)
326 326 {
327 327 size_t bytecount = 0;
328 328 gpio_t *gpiop = (gpio_t *)MMAP_GPIO;
329 329  
... ... @@ -365,13 +365,13 @@
365 365 */
366 366 xilinx_spartan3_slave_serial_fns xilinx_fns = {
367 367 xilinx_pre_config_fn,
368   - xilinx_pgm_fn,
369   - xilinx_clk_fn,
370   - xilinx_init_fn,
371   - xilinx_done_fn,
372   - xilinx_wr_fn,
  368 + xilinx_pgm_config_fn,
  369 + xilinx_clk_config_fn,
  370 + xilinx_init_config_fn,
  371 + xilinx_done_config_fn,
  372 + xilinx_wr_config_fn,
373 373 0,
374   - xilinx_fastwr_fn
  374 + xilinx_fastwr_config_fn
375 375 };
376 376  
377 377 xilinx_desc xilinx_fpga[CONFIG_FPGA_COUNT] = {
... ... @@ -395,12 +395,12 @@
395 395 * so set stuff here instead of static initialisation:
396 396 */
397 397 xilinx_fns.pre = xilinx_pre_config_fn;
398   - xilinx_fns.pgm = xilinx_pgm_fn;
399   - xilinx_fns.clk = xilinx_clk_fn;
400   - xilinx_fns.init = xilinx_init_fn;
401   - xilinx_fns.done = xilinx_done_fn;
402   - xilinx_fns.wr = xilinx_wr_fn;
403   - xilinx_fns.bwr = xilinx_fastwr_fn;
  398 + xilinx_fns.pgm = xilinx_pgm_config_fn;
  399 + xilinx_fns.clk = xilinx_clk_config_fn;
  400 + xilinx_fns.init = xilinx_init_config_fn;
  401 + xilinx_fns.done = xilinx_done_config_fn;
  402 + xilinx_fns.wr = xilinx_wr_config_fn;
  403 + xilinx_fns.bwr = xilinx_fastwr_config_fn;
404 404 xilinx_fpga[i].iface_fns = (void *)&xilinx_fns;
405 405 fpga_add(fpga_xilinx, &xilinx_fpga[i]);
406 406 }
... ... @@ -16,30 +16,30 @@
16 16  
17 17 /* Slave Parallel Implementation function table */
18 18 typedef struct {
19   - Xilinx_pre_fn pre;
20   - Xilinx_pgm_fn pgm;
21   - Xilinx_init_fn init;
22   - Xilinx_err_fn err;
23   - Xilinx_done_fn done;
24   - Xilinx_clk_fn clk;
25   - Xilinx_cs_fn cs;
26   - Xilinx_wr_fn wr;
27   - Xilinx_rdata_fn rdata;
28   - Xilinx_wdata_fn wdata;
29   - Xilinx_busy_fn busy;
30   - Xilinx_abort_fn abort;
31   - Xilinx_post_fn post;
  19 + xilinx_pre_fn pre;
  20 + xilinx_pgm_fn pgm;
  21 + xilinx_init_fn init;
  22 + xilinx_err_fn err;
  23 + xilinx_done_fn done;
  24 + xilinx_clk_fn clk;
  25 + xilinx_cs_fn cs;
  26 + xilinx_wr_fn wr;
  27 + xilinx_rdata_fn rdata;
  28 + xilinx_wdata_fn wdata;
  29 + xilinx_busy_fn busy;
  30 + xilinx_abort_fn abort;
  31 + xilinx_post_fn post;
32 32 } xilinx_spartan2_slave_parallel_fns;
33 33  
34 34 /* Slave Serial Implementation function table */
35 35 typedef struct {
36   - Xilinx_pre_fn pre;
37   - Xilinx_pgm_fn pgm;
38   - Xilinx_clk_fn clk;
39   - Xilinx_init_fn init;
40   - Xilinx_done_fn done;
41   - Xilinx_wr_fn wr;
42   - Xilinx_post_fn post;
  36 + xilinx_pre_fn pre;
  37 + xilinx_pgm_fn pgm;
  38 + xilinx_clk_fn clk;
  39 + xilinx_init_fn init;
  40 + xilinx_done_fn done;
  41 + xilinx_wr_fn wr;
  42 + xilinx_post_fn post;
43 43 } xilinx_spartan2_slave_serial_fns;
44 44  
45 45 /* Device Image Sizes
... ... @@ -16,32 +16,32 @@
16 16  
17 17 /* Slave Parallel Implementation function table */
18 18 typedef struct {
19   - Xilinx_pre_fn pre;
20   - Xilinx_pgm_fn pgm;
21   - Xilinx_init_fn init;
22   - Xilinx_err_fn err;
23   - Xilinx_done_fn done;
24   - Xilinx_clk_fn clk;
25   - Xilinx_cs_fn cs;
26   - Xilinx_wr_fn wr;
27   - Xilinx_rdata_fn rdata;
28   - Xilinx_wdata_fn wdata;
29   - Xilinx_busy_fn busy;
30   - Xilinx_abort_fn abort;
31   - Xilinx_post_fn post;
  19 + xilinx_pre_fn pre;
  20 + xilinx_pgm_fn pgm;
  21 + xilinx_init_fn init;
  22 + xilinx_err_fn err;
  23 + xilinx_done_fn done;
  24 + xilinx_clk_fn clk;
  25 + xilinx_cs_fn cs;
  26 + xilinx_wr_fn wr;
  27 + xilinx_rdata_fn rdata;
  28 + xilinx_wdata_fn wdata;
  29 + xilinx_busy_fn busy;
  30 + xilinx_abort_fn abort;
  31 + xilinx_post_fn post;
32 32 } xilinx_spartan3_slave_parallel_fns;
33 33  
34 34 /* Slave Serial Implementation function table */
35 35 typedef struct {
36   - Xilinx_pre_fn pre;
37   - Xilinx_pgm_fn pgm;
38   - Xilinx_clk_fn clk;
39   - Xilinx_init_fn init;
40   - Xilinx_done_fn done;
41   - Xilinx_wr_fn wr;
42   - Xilinx_post_fn post;
43   - Xilinx_bwr_fn bwr; /* block write function */
44   - Xilinx_abort_fn abort;
  36 + xilinx_pre_fn pre;
  37 + xilinx_pgm_fn pgm;
  38 + xilinx_clk_fn clk;
  39 + xilinx_init_fn init;
  40 + xilinx_done_fn done;
  41 + xilinx_wr_fn wr;
  42 + xilinx_post_fn post;
  43 + xilinx_bwr_fn bwr; /* block write function */
  44 + xilinx_abort_fn abort;
45 45 } xilinx_spartan3_slave_serial_fns;
46 46  
47 47 /* Device Image Sizes
... ... @@ -19,27 +19,27 @@
19 19 * Slave SelectMap Implementation function table.
20 20 */
21 21 typedef struct {
22   - Xilinx_pre_fn pre;
23   - Xilinx_pgm_fn pgm;
24   - Xilinx_init_fn init;
25   - Xilinx_err_fn err;
26   - Xilinx_done_fn done;
27   - Xilinx_clk_fn clk;
28   - Xilinx_cs_fn cs;
29   - Xilinx_wr_fn wr;
30   - Xilinx_rdata_fn rdata;
31   - Xilinx_wdata_fn wdata;
32   - Xilinx_busy_fn busy;
33   - Xilinx_abort_fn abort;
34   - Xilinx_post_fn post;
  22 + xilinx_pre_fn pre;
  23 + xilinx_pgm_fn pgm;
  24 + xilinx_init_fn init;
  25 + xilinx_err_fn err;
  26 + xilinx_done_fn done;
  27 + xilinx_clk_fn clk;
  28 + xilinx_cs_fn cs;
  29 + xilinx_wr_fn wr;
  30 + xilinx_rdata_fn rdata;
  31 + xilinx_wdata_fn wdata;
  32 + xilinx_busy_fn busy;
  33 + xilinx_abort_fn abort;
  34 + xilinx_post_fn post;
35 35 } xilinx_virtex2_slave_selectmap_fns;
36 36  
37 37 /* Slave Serial Implementation function table */
38 38 typedef struct {
39   - Xilinx_pgm_fn pgm;
40   - Xilinx_clk_fn clk;
41   - Xilinx_rdata_fn rdata;
42   - Xilinx_wdata_fn wdata;
  39 + xilinx_pgm_fn pgm;
  40 + xilinx_clk_fn clk;
  41 + xilinx_rdata_fn rdata;
  42 + xilinx_wdata_fn wdata;
43 43 } xilinx_virtex2_slave_serial_fns;
44 44  
45 45 /* Device Image Sizes (in bytes)
... ... @@ -12,7 +12,7 @@
12 12  
13 13 /* Xilinx types
14 14 *********************************************************************/
15   -typedef enum { /* typedef Xilinx_iface */
  15 +typedef enum { /* typedef xilinx_iface */
16 16 min_xilinx_iface_type, /* low range check value */
17 17 slave_serial, /* serial data and external clock */
18 18 master_serial, /* serial data w/ internal clock (not used) */
19 19  
20 20  
21 21  
22 22  
... ... @@ -22,21 +22,21 @@
22 22 slave_selectmap, /* slave SelectMap (virtex2) */
23 23 devcfg, /* devcfg interface (zynq) */
24 24 max_xilinx_iface_type /* insert all new types before this */
25   -} Xilinx_iface; /* end, typedef Xilinx_iface */
  25 +} xilinx_iface; /* end, typedef xilinx_iface */
26 26  
27   -typedef enum { /* typedef Xilinx_Family */
  27 +typedef enum { /* typedef xilinx_family */
28 28 min_xilinx_type, /* low range check value */
29 29 xilinx_spartan2, /* Spartan-II Family */
30   - Xilinx_VirtexE, /* Virtex-E Family */
  30 + xilinx_virtexE, /* Virtex-E Family */
31 31 xilinx_virtex2, /* Virtex2 Family */
32 32 xilinx_spartan3, /* Spartan-III Family */
33 33 xilinx_zynq, /* Zynq Family */
34 34 max_xilinx_type /* insert all new types before this */
35   -} Xilinx_Family; /* end, typedef Xilinx_Family */
  35 +} xilinx_family; /* end, typedef xilinx_family */
36 36  
37 37 typedef struct { /* typedef xilinx_desc */
38   - Xilinx_Family family; /* part type */
39   - Xilinx_iface iface; /* interface type */
  38 + xilinx_family family; /* part type */
  39 + xilinx_iface iface; /* interface type */
40 40 size_t size; /* bytes of data part can accept */
41 41 void *iface_fns; /* interface function table */
42 42 int cookie; /* implementation specific cookie */
... ... @@ -51,20 +51,20 @@
51 51  
52 52 /* Board specific implementation specific function types
53 53 *********************************************************************/
54   -typedef int (*Xilinx_pgm_fn)( int assert_pgm, int flush, int cookie );
55   -typedef int (*Xilinx_init_fn)( int cookie );
56   -typedef int (*Xilinx_err_fn)( int cookie );
57   -typedef int (*Xilinx_done_fn)( int cookie );
58   -typedef int (*Xilinx_clk_fn)( int assert_clk, int flush, int cookie );
59   -typedef int (*Xilinx_cs_fn)( int assert_cs, int flush, int cookie );
60   -typedef int (*Xilinx_wr_fn)( int assert_write, int flush, int cookie );
61   -typedef int (*Xilinx_rdata_fn)( unsigned char *data, int cookie );
62   -typedef int (*Xilinx_wdata_fn)( unsigned char data, int flush, int cookie );
63   -typedef int (*Xilinx_busy_fn)( int cookie );
64   -typedef int (*Xilinx_abort_fn)( int cookie );
65   -typedef int (*Xilinx_pre_fn)( int cookie );
66   -typedef int (*Xilinx_post_fn)( int cookie );
67   -typedef int (*Xilinx_bwr_fn)( void *buf, size_t len, int flush, int cookie );
  54 +typedef int (*xilinx_pgm_fn)(int assert_pgm, int flush, int cookie);
  55 +typedef int (*xilinx_init_fn)(int cookie);
  56 +typedef int (*xilinx_err_fn)(int cookie);
  57 +typedef int (*xilinx_done_fn)(int cookie);
  58 +typedef int (*xilinx_clk_fn)(int assert_clk, int flush, int cookie);
  59 +typedef int (*xilinx_cs_fn)(int assert_cs, int flush, int cookie);
  60 +typedef int (*xilinx_wr_fn)(int assert_write, int flush, int cookie);
  61 +typedef int (*xilinx_rdata_fn)(unsigned char *data, int cookie);
  62 +typedef int (*xilinx_wdata_fn)(unsigned char data, int flush, int cookie);
  63 +typedef int (*xilinx_busy_fn)(int cookie);
  64 +typedef int (*xilinx_abort_fn)(int cookie);
  65 +typedef int (*xilinx_pre_fn)(int cookie);
  66 +typedef int (*xilinx_post_fn)(int cookie);
  67 +typedef int (*xilinx_bwr_fn)(void *buf, size_t len, int flush, int cookie);
68 68  
69 69 #endif /* _XILINX_H_ */