change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/mips/include/asm/octeon/cvmx-iob-defs.h
..
..
@@ -119,16 +119,6 @@
119
119
 		uint64_t reserved_18_63:46;
120
120
 #endif
121
121
 	} cn30xx;
122
-	struct cvmx_iob_bist_status_cn30xx cn31xx;
123
-	struct cvmx_iob_bist_status_cn30xx cn38xx;
124
-	struct cvmx_iob_bist_status_cn30xx cn38xxp2;
125
-	struct cvmx_iob_bist_status_cn30xx cn50xx;
126
-	struct cvmx_iob_bist_status_cn30xx cn52xx;
127
-	struct cvmx_iob_bist_status_cn30xx cn52xxp1;
128
-	struct cvmx_iob_bist_status_cn30xx cn56xx;
129
-	struct cvmx_iob_bist_status_cn30xx cn56xxp1;
130
-	struct cvmx_iob_bist_status_cn30xx cn58xx;
131
-	struct cvmx_iob_bist_status_cn30xx cn58xxp1;
132
122
 	struct cvmx_iob_bist_status_cn61xx {
133
123
 #ifdef __BIG_ENDIAN_BITFIELD
134
124
 		uint64_t reserved_23_63:41;
..
..
@@ -182,9 +172,6 @@
182
172
 		uint64_t reserved_23_63:41;
183
173
 #endif
184
174
 	} cn61xx;
185
-	struct cvmx_iob_bist_status_cn61xx cn63xx;
186
-	struct cvmx_iob_bist_status_cn61xx cn63xxp1;
187
-	struct cvmx_iob_bist_status_cn61xx cn66xx;
188
175
 	struct cvmx_iob_bist_status_cn68xx {
189
176
 #ifdef __BIG_ENDIAN_BITFIELD
190
177
 		uint64_t reserved_18_63:46;
..
..
@@ -228,8 +215,6 @@
228
215
 		uint64_t reserved_18_63:46;
229
216
 #endif
230
217
 	} cn68xx;
231
-	struct cvmx_iob_bist_status_cn68xx cn68xxp1;
232
-	struct cvmx_iob_bist_status_cn61xx cnf71xx;
233
218
 };
234
219
 
235
220
 union cvmx_iob_ctl_status {
..
..
@@ -274,10 +259,6 @@
274
259
 		uint64_t reserved_5_63:59;
275
260
 #endif
276
261
 	} cn30xx;
277
-	struct cvmx_iob_ctl_status_cn30xx cn31xx;
278
-	struct cvmx_iob_ctl_status_cn30xx cn38xx;
279
-	struct cvmx_iob_ctl_status_cn30xx cn38xxp2;
280
-	struct cvmx_iob_ctl_status_cn30xx cn50xx;
281
262
 	struct cvmx_iob_ctl_status_cn52xx {
282
263
 #ifdef __BIG_ENDIAN_BITFIELD
283
264
 		uint64_t reserved_6_63:58;
..
..
@@ -297,11 +278,6 @@
297
278
 		uint64_t reserved_6_63:58;
298
279
 #endif
299
280
 	} cn52xx;
300
-	struct cvmx_iob_ctl_status_cn30xx cn52xxp1;
301
-	struct cvmx_iob_ctl_status_cn30xx cn56xx;
302
-	struct cvmx_iob_ctl_status_cn30xx cn56xxp1;
303
-	struct cvmx_iob_ctl_status_cn30xx cn58xx;
304
-	struct cvmx_iob_ctl_status_cn30xx cn58xxp1;
305
281
 	struct cvmx_iob_ctl_status_cn61xx {
306
282
 #ifdef __BIG_ENDIAN_BITFIELD
307
283
 		uint64_t reserved_11_63:53;
..
..
@@ -346,8 +322,6 @@
346
322
 		uint64_t reserved_10_63:54;
347
323
 #endif
348
324
 	} cn63xx;
349
-	struct cvmx_iob_ctl_status_cn63xx cn63xxp1;
350
-	struct cvmx_iob_ctl_status_cn61xx cn66xx;
351
325
 	struct cvmx_iob_ctl_status_cn68xx {
352
326
 #ifdef __BIG_ENDIAN_BITFIELD
353
327
 		uint64_t reserved_11_63:53;
..
..
@@ -371,8 +345,6 @@
371
345
 		uint64_t reserved_11_63:53;
372
346
 #endif
373
347
 	} cn68xx;
374
-	struct cvmx_iob_ctl_status_cn68xx cn68xxp1;
375
-	struct cvmx_iob_ctl_status_cn61xx cnf71xx;
376
348
 };
377
349
 
378
350
 union cvmx_iob_dwb_pri_cnt {
..
..
@@ -388,19 +360,6 @@
388
360
 		uint64_t reserved_16_63:48;
389
361
 #endif
390
362
 	} s;
391
-	struct cvmx_iob_dwb_pri_cnt_s cn38xx;
392
-	struct cvmx_iob_dwb_pri_cnt_s cn38xxp2;
393
-	struct cvmx_iob_dwb_pri_cnt_s cn52xx;
394
-	struct cvmx_iob_dwb_pri_cnt_s cn52xxp1;
395
-	struct cvmx_iob_dwb_pri_cnt_s cn56xx;
396
-	struct cvmx_iob_dwb_pri_cnt_s cn56xxp1;
397
-	struct cvmx_iob_dwb_pri_cnt_s cn58xx;
398
-	struct cvmx_iob_dwb_pri_cnt_s cn58xxp1;
399
-	struct cvmx_iob_dwb_pri_cnt_s cn61xx;
400
-	struct cvmx_iob_dwb_pri_cnt_s cn63xx;
401
-	struct cvmx_iob_dwb_pri_cnt_s cn63xxp1;
402
-	struct cvmx_iob_dwb_pri_cnt_s cn66xx;
403
-	struct cvmx_iob_dwb_pri_cnt_s cnf71xx;
404
363
 };
405
364
 
406
365
 union cvmx_iob_fau_timeout {
..
..
@@ -416,24 +375,6 @@
416
375
 		uint64_t reserved_13_63:51;
417
376
 #endif
418
377
 	} s;
419
-	struct cvmx_iob_fau_timeout_s cn30xx;
420
-	struct cvmx_iob_fau_timeout_s cn31xx;
421
-	struct cvmx_iob_fau_timeout_s cn38xx;
422
-	struct cvmx_iob_fau_timeout_s cn38xxp2;
423
-	struct cvmx_iob_fau_timeout_s cn50xx;
424
-	struct cvmx_iob_fau_timeout_s cn52xx;
425
-	struct cvmx_iob_fau_timeout_s cn52xxp1;
426
-	struct cvmx_iob_fau_timeout_s cn56xx;
427
-	struct cvmx_iob_fau_timeout_s cn56xxp1;
428
-	struct cvmx_iob_fau_timeout_s cn58xx;
429
-	struct cvmx_iob_fau_timeout_s cn58xxp1;
430
-	struct cvmx_iob_fau_timeout_s cn61xx;
431
-	struct cvmx_iob_fau_timeout_s cn63xx;
432
-	struct cvmx_iob_fau_timeout_s cn63xxp1;
433
-	struct cvmx_iob_fau_timeout_s cn66xx;
434
-	struct cvmx_iob_fau_timeout_s cn68xx;
435
-	struct cvmx_iob_fau_timeout_s cn68xxp1;
436
-	struct cvmx_iob_fau_timeout_s cnf71xx;
437
378
 };
438
379
 
439
380
 union cvmx_iob_i2c_pri_cnt {
..
..
@@ -449,19 +390,6 @@
449
390
 		uint64_t reserved_16_63:48;
450
391
 #endif
451
392
 	} s;
452
-	struct cvmx_iob_i2c_pri_cnt_s cn38xx;
453
-	struct cvmx_iob_i2c_pri_cnt_s cn38xxp2;
454
-	struct cvmx_iob_i2c_pri_cnt_s cn52xx;
455
-	struct cvmx_iob_i2c_pri_cnt_s cn52xxp1;
456
-	struct cvmx_iob_i2c_pri_cnt_s cn56xx;
457
-	struct cvmx_iob_i2c_pri_cnt_s cn56xxp1;
458
-	struct cvmx_iob_i2c_pri_cnt_s cn58xx;
459
-	struct cvmx_iob_i2c_pri_cnt_s cn58xxp1;
460
-	struct cvmx_iob_i2c_pri_cnt_s cn61xx;
461
-	struct cvmx_iob_i2c_pri_cnt_s cn63xx;
462
-	struct cvmx_iob_i2c_pri_cnt_s cn63xxp1;
463
-	struct cvmx_iob_i2c_pri_cnt_s cn66xx;
464
-	struct cvmx_iob_i2c_pri_cnt_s cnf71xx;
465
393
 };
466
394
 
467
395
 union cvmx_iob_inb_control_match {
..
..
@@ -481,24 +409,6 @@
481
409
 		uint64_t reserved_29_63:35;
482
410
 #endif
483
411
 	} s;
484
-	struct cvmx_iob_inb_control_match_s cn30xx;
485
-	struct cvmx_iob_inb_control_match_s cn31xx;
486
-	struct cvmx_iob_inb_control_match_s cn38xx;
487
-	struct cvmx_iob_inb_control_match_s cn38xxp2;
488
-	struct cvmx_iob_inb_control_match_s cn50xx;
489
-	struct cvmx_iob_inb_control_match_s cn52xx;
490
-	struct cvmx_iob_inb_control_match_s cn52xxp1;
491
-	struct cvmx_iob_inb_control_match_s cn56xx;
492
-	struct cvmx_iob_inb_control_match_s cn56xxp1;
493
-	struct cvmx_iob_inb_control_match_s cn58xx;
494
-	struct cvmx_iob_inb_control_match_s cn58xxp1;
495
-	struct cvmx_iob_inb_control_match_s cn61xx;
496
-	struct cvmx_iob_inb_control_match_s cn63xx;
497
-	struct cvmx_iob_inb_control_match_s cn63xxp1;
498
-	struct cvmx_iob_inb_control_match_s cn66xx;
499
-	struct cvmx_iob_inb_control_match_s cn68xx;
500
-	struct cvmx_iob_inb_control_match_s cn68xxp1;
501
-	struct cvmx_iob_inb_control_match_s cnf71xx;
502
412
 };
503
413
 
504
414
 union cvmx_iob_inb_control_match_enb {
..
..
@@ -518,24 +428,6 @@
518
428
 		uint64_t reserved_29_63:35;
519
429
 #endif
520
430
 	} s;
521
-	struct cvmx_iob_inb_control_match_enb_s cn30xx;
522
-	struct cvmx_iob_inb_control_match_enb_s cn31xx;
523
-	struct cvmx_iob_inb_control_match_enb_s cn38xx;
524
-	struct cvmx_iob_inb_control_match_enb_s cn38xxp2;
525
-	struct cvmx_iob_inb_control_match_enb_s cn50xx;
526
-	struct cvmx_iob_inb_control_match_enb_s cn52xx;
527
-	struct cvmx_iob_inb_control_match_enb_s cn52xxp1;
528
-	struct cvmx_iob_inb_control_match_enb_s cn56xx;
529
-	struct cvmx_iob_inb_control_match_enb_s cn56xxp1;
530
-	struct cvmx_iob_inb_control_match_enb_s cn58xx;
531
-	struct cvmx_iob_inb_control_match_enb_s cn58xxp1;
532
-	struct cvmx_iob_inb_control_match_enb_s cn61xx;
533
-	struct cvmx_iob_inb_control_match_enb_s cn63xx;
534
-	struct cvmx_iob_inb_control_match_enb_s cn63xxp1;
535
-	struct cvmx_iob_inb_control_match_enb_s cn66xx;
536
-	struct cvmx_iob_inb_control_match_enb_s cn68xx;
537
-	struct cvmx_iob_inb_control_match_enb_s cn68xxp1;
538
-	struct cvmx_iob_inb_control_match_enb_s cnf71xx;
539
431
 };
540
432
 
541
433
 union cvmx_iob_inb_data_match {
..
..
@@ -547,24 +439,6 @@
547
439
 		uint64_t data:64;
548
440
 #endif
549
441
 	} s;
550
-	struct cvmx_iob_inb_data_match_s cn30xx;
551
-	struct cvmx_iob_inb_data_match_s cn31xx;
552
-	struct cvmx_iob_inb_data_match_s cn38xx;
553
-	struct cvmx_iob_inb_data_match_s cn38xxp2;
554
-	struct cvmx_iob_inb_data_match_s cn50xx;
555
-	struct cvmx_iob_inb_data_match_s cn52xx;
556
-	struct cvmx_iob_inb_data_match_s cn52xxp1;
557
-	struct cvmx_iob_inb_data_match_s cn56xx;
558
-	struct cvmx_iob_inb_data_match_s cn56xxp1;
559
-	struct cvmx_iob_inb_data_match_s cn58xx;
560
-	struct cvmx_iob_inb_data_match_s cn58xxp1;
561
-	struct cvmx_iob_inb_data_match_s cn61xx;
562
-	struct cvmx_iob_inb_data_match_s cn63xx;
563
-	struct cvmx_iob_inb_data_match_s cn63xxp1;
564
-	struct cvmx_iob_inb_data_match_s cn66xx;
565
-	struct cvmx_iob_inb_data_match_s cn68xx;
566
-	struct cvmx_iob_inb_data_match_s cn68xxp1;
567
-	struct cvmx_iob_inb_data_match_s cnf71xx;
568
442
 };
569
443
 
570
444
 union cvmx_iob_inb_data_match_enb {
..
..
@@ -576,24 +450,6 @@
576
450
 		uint64_t data:64;
577
451
 #endif
578
452
 	} s;
579
-	struct cvmx_iob_inb_data_match_enb_s cn30xx;
580
-	struct cvmx_iob_inb_data_match_enb_s cn31xx;
581
-	struct cvmx_iob_inb_data_match_enb_s cn38xx;
582
-	struct cvmx_iob_inb_data_match_enb_s cn38xxp2;
583
-	struct cvmx_iob_inb_data_match_enb_s cn50xx;
584
-	struct cvmx_iob_inb_data_match_enb_s cn52xx;
585
-	struct cvmx_iob_inb_data_match_enb_s cn52xxp1;
586
-	struct cvmx_iob_inb_data_match_enb_s cn56xx;
587
-	struct cvmx_iob_inb_data_match_enb_s cn56xxp1;
588
-	struct cvmx_iob_inb_data_match_enb_s cn58xx;
589
-	struct cvmx_iob_inb_data_match_enb_s cn58xxp1;
590
-	struct cvmx_iob_inb_data_match_enb_s cn61xx;
591
-	struct cvmx_iob_inb_data_match_enb_s cn63xx;
592
-	struct cvmx_iob_inb_data_match_enb_s cn63xxp1;
593
-	struct cvmx_iob_inb_data_match_enb_s cn66xx;
594
-	struct cvmx_iob_inb_data_match_enb_s cn68xx;
595
-	struct cvmx_iob_inb_data_match_enb_s cn68xxp1;
596
-	struct cvmx_iob_inb_data_match_enb_s cnf71xx;
597
453
 };
598
454
 
599
455
 union cvmx_iob_int_enb {
..
..
@@ -632,20 +488,6 @@
632
488
 		uint64_t reserved_4_63:60;
633
489
 #endif
634
490
 	} cn30xx;
635
-	struct cvmx_iob_int_enb_cn30xx cn31xx;
636
-	struct cvmx_iob_int_enb_cn30xx cn38xx;
637
-	struct cvmx_iob_int_enb_cn30xx cn38xxp2;
638
-	struct cvmx_iob_int_enb_s cn50xx;
639
-	struct cvmx_iob_int_enb_s cn52xx;
640
-	struct cvmx_iob_int_enb_s cn52xxp1;
641
-	struct cvmx_iob_int_enb_s cn56xx;
642
-	struct cvmx_iob_int_enb_s cn56xxp1;
643
-	struct cvmx_iob_int_enb_s cn58xx;
644
-	struct cvmx_iob_int_enb_s cn58xxp1;
645
-	struct cvmx_iob_int_enb_s cn61xx;
646
-	struct cvmx_iob_int_enb_s cn63xx;
647
-	struct cvmx_iob_int_enb_s cn63xxp1;
648
-	struct cvmx_iob_int_enb_s cn66xx;
649
491
 	struct cvmx_iob_int_enb_cn68xx {
650
492
 #ifdef __BIG_ENDIAN_BITFIELD
651
493
 		uint64_t reserved_0_63:64;
..
..
@@ -653,8 +495,6 @@
653
495
 		uint64_t reserved_0_63:64;
654
496
 #endif
655
497
 	} cn68xx;
656
-	struct cvmx_iob_int_enb_cn68xx cn68xxp1;
657
-	struct cvmx_iob_int_enb_s cnf71xx;
658
498
 };
659
499
 
660
500
 union cvmx_iob_int_sum {
..
..
@@ -693,20 +533,6 @@
693
533
 		uint64_t reserved_4_63:60;
694
534
 #endif
695
535
 	} cn30xx;
696
-	struct cvmx_iob_int_sum_cn30xx cn31xx;
697
-	struct cvmx_iob_int_sum_cn30xx cn38xx;
698
-	struct cvmx_iob_int_sum_cn30xx cn38xxp2;
699
-	struct cvmx_iob_int_sum_s cn50xx;
700
-	struct cvmx_iob_int_sum_s cn52xx;
701
-	struct cvmx_iob_int_sum_s cn52xxp1;
702
-	struct cvmx_iob_int_sum_s cn56xx;
703
-	struct cvmx_iob_int_sum_s cn56xxp1;
704
-	struct cvmx_iob_int_sum_s cn58xx;
705
-	struct cvmx_iob_int_sum_s cn58xxp1;
706
-	struct cvmx_iob_int_sum_s cn61xx;
707
-	struct cvmx_iob_int_sum_s cn63xx;
708
-	struct cvmx_iob_int_sum_s cn63xxp1;
709
-	struct cvmx_iob_int_sum_s cn66xx;
710
536
 	struct cvmx_iob_int_sum_cn68xx {
711
537
 #ifdef __BIG_ENDIAN_BITFIELD
712
538
 		uint64_t reserved_0_63:64;
..
..
@@ -714,8 +540,6 @@
714
540
 		uint64_t reserved_0_63:64;
715
541
 #endif
716
542
 	} cn68xx;
717
-	struct cvmx_iob_int_sum_cn68xx cn68xxp1;
718
-	struct cvmx_iob_int_sum_s cnf71xx;
719
543
 };
720
544
 
721
545
 union cvmx_iob_n2c_l2c_pri_cnt {
..
..
@@ -731,19 +555,6 @@
731
555
 		uint64_t reserved_16_63:48;
732
556
 #endif
733
557
 	} s;
734
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn38xx;
735
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn38xxp2;
736
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn52xx;
737
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn52xxp1;
738
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn56xx;
739
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn56xxp1;
740
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn58xx;
741
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn58xxp1;
742
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn61xx;
743
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn63xx;
744
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn63xxp1;
745
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cn66xx;
746
-	struct cvmx_iob_n2c_l2c_pri_cnt_s cnf71xx;
747
558
 };
748
559
 
749
560
 union cvmx_iob_n2c_rsp_pri_cnt {
..
..
@@ -759,19 +570,6 @@
759
570
 		uint64_t reserved_16_63:48;
760
571
 #endif
761
572
 	} s;
762
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn38xx;
763
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn38xxp2;
764
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn52xx;
765
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn52xxp1;
766
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn56xx;
767
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn56xxp1;
768
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn58xx;
769
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn58xxp1;
770
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn61xx;
771
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn63xx;
772
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn63xxp1;
773
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cn66xx;
774
-	struct cvmx_iob_n2c_rsp_pri_cnt_s cnf71xx;
775
573
 };
776
574
 
777
575
 union cvmx_iob_outb_com_pri_cnt {
..
..
@@ -787,21 +585,6 @@
787
585
 		uint64_t reserved_16_63:48;
788
586
 #endif
789
587
 	} s;
790
-	struct cvmx_iob_outb_com_pri_cnt_s cn38xx;
791
-	struct cvmx_iob_outb_com_pri_cnt_s cn38xxp2;
792
-	struct cvmx_iob_outb_com_pri_cnt_s cn52xx;
793
-	struct cvmx_iob_outb_com_pri_cnt_s cn52xxp1;
794
-	struct cvmx_iob_outb_com_pri_cnt_s cn56xx;
795
-	struct cvmx_iob_outb_com_pri_cnt_s cn56xxp1;
796
-	struct cvmx_iob_outb_com_pri_cnt_s cn58xx;
797
-	struct cvmx_iob_outb_com_pri_cnt_s cn58xxp1;
798
-	struct cvmx_iob_outb_com_pri_cnt_s cn61xx;
799
-	struct cvmx_iob_outb_com_pri_cnt_s cn63xx;
800
-	struct cvmx_iob_outb_com_pri_cnt_s cn63xxp1;
801
-	struct cvmx_iob_outb_com_pri_cnt_s cn66xx;
802
-	struct cvmx_iob_outb_com_pri_cnt_s cn68xx;
803
-	struct cvmx_iob_outb_com_pri_cnt_s cn68xxp1;
804
-	struct cvmx_iob_outb_com_pri_cnt_s cnf71xx;
805
588
 };
806
589
 
807
590
 union cvmx_iob_outb_control_match {
..
..
@@ -821,24 +604,6 @@
821
604
 		uint64_t reserved_26_63:38;
822
605
 #endif
823
606
 	} s;
824
-	struct cvmx_iob_outb_control_match_s cn30xx;
825
-	struct cvmx_iob_outb_control_match_s cn31xx;
826
-	struct cvmx_iob_outb_control_match_s cn38xx;
827
-	struct cvmx_iob_outb_control_match_s cn38xxp2;
828
-	struct cvmx_iob_outb_control_match_s cn50xx;
829
-	struct cvmx_iob_outb_control_match_s cn52xx;
830
-	struct cvmx_iob_outb_control_match_s cn52xxp1;
831
-	struct cvmx_iob_outb_control_match_s cn56xx;
832
-	struct cvmx_iob_outb_control_match_s cn56xxp1;
833
-	struct cvmx_iob_outb_control_match_s cn58xx;
834
-	struct cvmx_iob_outb_control_match_s cn58xxp1;
835
-	struct cvmx_iob_outb_control_match_s cn61xx;
836
-	struct cvmx_iob_outb_control_match_s cn63xx;
837
-	struct cvmx_iob_outb_control_match_s cn63xxp1;
838
-	struct cvmx_iob_outb_control_match_s cn66xx;
839
-	struct cvmx_iob_outb_control_match_s cn68xx;
840
-	struct cvmx_iob_outb_control_match_s cn68xxp1;
841
-	struct cvmx_iob_outb_control_match_s cnf71xx;
842
607
 };
843
608
 
844
609
 union cvmx_iob_outb_control_match_enb {
..
..
@@ -858,24 +623,6 @@
858
623
 		uint64_t reserved_26_63:38;
859
624
 #endif
860
625
 	} s;
861
-	struct cvmx_iob_outb_control_match_enb_s cn30xx;
862
-	struct cvmx_iob_outb_control_match_enb_s cn31xx;
863
-	struct cvmx_iob_outb_control_match_enb_s cn38xx;
864
-	struct cvmx_iob_outb_control_match_enb_s cn38xxp2;
865
-	struct cvmx_iob_outb_control_match_enb_s cn50xx;
866
-	struct cvmx_iob_outb_control_match_enb_s cn52xx;
867
-	struct cvmx_iob_outb_control_match_enb_s cn52xxp1;
868
-	struct cvmx_iob_outb_control_match_enb_s cn56xx;
869
-	struct cvmx_iob_outb_control_match_enb_s cn56xxp1;
870
-	struct cvmx_iob_outb_control_match_enb_s cn58xx;
871
-	struct cvmx_iob_outb_control_match_enb_s cn58xxp1;
872
-	struct cvmx_iob_outb_control_match_enb_s cn61xx;
873
-	struct cvmx_iob_outb_control_match_enb_s cn63xx;
874
-	struct cvmx_iob_outb_control_match_enb_s cn63xxp1;
875
-	struct cvmx_iob_outb_control_match_enb_s cn66xx;
876
-	struct cvmx_iob_outb_control_match_enb_s cn68xx;
877
-	struct cvmx_iob_outb_control_match_enb_s cn68xxp1;
878
-	struct cvmx_iob_outb_control_match_enb_s cnf71xx;
879
626
 };
880
627
 
881
628
 union cvmx_iob_outb_data_match {
..
..
@@ -887,24 +634,6 @@
887
634
 		uint64_t data:64;
888
635
 #endif
889
636
 	} s;
890
-	struct cvmx_iob_outb_data_match_s cn30xx;
891
-	struct cvmx_iob_outb_data_match_s cn31xx;
892
-	struct cvmx_iob_outb_data_match_s cn38xx;
893
-	struct cvmx_iob_outb_data_match_s cn38xxp2;
894
-	struct cvmx_iob_outb_data_match_s cn50xx;
895
-	struct cvmx_iob_outb_data_match_s cn52xx;
896
-	struct cvmx_iob_outb_data_match_s cn52xxp1;
897
-	struct cvmx_iob_outb_data_match_s cn56xx;
898
-	struct cvmx_iob_outb_data_match_s cn56xxp1;
899
-	struct cvmx_iob_outb_data_match_s cn58xx;
900
-	struct cvmx_iob_outb_data_match_s cn58xxp1;
901
-	struct cvmx_iob_outb_data_match_s cn61xx;
902
-	struct cvmx_iob_outb_data_match_s cn63xx;
903
-	struct cvmx_iob_outb_data_match_s cn63xxp1;
904
-	struct cvmx_iob_outb_data_match_s cn66xx;
905
-	struct cvmx_iob_outb_data_match_s cn68xx;
906
-	struct cvmx_iob_outb_data_match_s cn68xxp1;
907
-	struct cvmx_iob_outb_data_match_s cnf71xx;
908
637
 };
909
638
 
910
639
 union cvmx_iob_outb_data_match_enb {
..
..
@@ -916,24 +645,6 @@
916
645
 		uint64_t data:64;
917
646
 #endif
918
647
 	} s;
919
-	struct cvmx_iob_outb_data_match_enb_s cn30xx;
920
-	struct cvmx_iob_outb_data_match_enb_s cn31xx;
921
-	struct cvmx_iob_outb_data_match_enb_s cn38xx;
922
-	struct cvmx_iob_outb_data_match_enb_s cn38xxp2;
923
-	struct cvmx_iob_outb_data_match_enb_s cn50xx;
924
-	struct cvmx_iob_outb_data_match_enb_s cn52xx;
925
-	struct cvmx_iob_outb_data_match_enb_s cn52xxp1;
926
-	struct cvmx_iob_outb_data_match_enb_s cn56xx;
927
-	struct cvmx_iob_outb_data_match_enb_s cn56xxp1;
928
-	struct cvmx_iob_outb_data_match_enb_s cn58xx;
929
-	struct cvmx_iob_outb_data_match_enb_s cn58xxp1;
930
-	struct cvmx_iob_outb_data_match_enb_s cn61xx;
931
-	struct cvmx_iob_outb_data_match_enb_s cn63xx;
932
-	struct cvmx_iob_outb_data_match_enb_s cn63xxp1;
933
-	struct cvmx_iob_outb_data_match_enb_s cn66xx;
934
-	struct cvmx_iob_outb_data_match_enb_s cn68xx;
935
-	struct cvmx_iob_outb_data_match_enb_s cn68xxp1;
936
-	struct cvmx_iob_outb_data_match_enb_s cnf71xx;
937
648
 };
938
649
 
939
650
 union cvmx_iob_outb_fpa_pri_cnt {
..
..
@@ -949,21 +660,6 @@
949
660
 		uint64_t reserved_16_63:48;
950
661
 #endif
951
662
 	} s;
952
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn38xx;
953
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn38xxp2;
954
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn52xx;
955
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn52xxp1;
956
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn56xx;
957
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn56xxp1;
958
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn58xx;
959
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn58xxp1;
960
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn61xx;
961
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn63xx;
962
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn63xxp1;
963
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn66xx;
964
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn68xx;
965
-	struct cvmx_iob_outb_fpa_pri_cnt_s cn68xxp1;
966
-	struct cvmx_iob_outb_fpa_pri_cnt_s cnf71xx;
967
663
 };
968
664
 
969
665
 union cvmx_iob_outb_req_pri_cnt {
..
..
@@ -979,21 +675,6 @@
979
675
 		uint64_t reserved_16_63:48;
980
676
 #endif
981
677
 	} s;
982
-	struct cvmx_iob_outb_req_pri_cnt_s cn38xx;
983
-	struct cvmx_iob_outb_req_pri_cnt_s cn38xxp2;
984
-	struct cvmx_iob_outb_req_pri_cnt_s cn52xx;
985
-	struct cvmx_iob_outb_req_pri_cnt_s cn52xxp1;
986
-	struct cvmx_iob_outb_req_pri_cnt_s cn56xx;
987
-	struct cvmx_iob_outb_req_pri_cnt_s cn56xxp1;
988
-	struct cvmx_iob_outb_req_pri_cnt_s cn58xx;
989
-	struct cvmx_iob_outb_req_pri_cnt_s cn58xxp1;
990
-	struct cvmx_iob_outb_req_pri_cnt_s cn61xx;
991
-	struct cvmx_iob_outb_req_pri_cnt_s cn63xx;
992
-	struct cvmx_iob_outb_req_pri_cnt_s cn63xxp1;
993
-	struct cvmx_iob_outb_req_pri_cnt_s cn66xx;
994
-	struct cvmx_iob_outb_req_pri_cnt_s cn68xx;
995
-	struct cvmx_iob_outb_req_pri_cnt_s cn68xxp1;
996
-	struct cvmx_iob_outb_req_pri_cnt_s cnf71xx;
997
678
 };
998
679
 
999
680
 union cvmx_iob_p2c_req_pri_cnt {
..
..
@@ -1009,19 +690,6 @@
1009
690
 		uint64_t reserved_16_63:48;
1010
691
 #endif
1011
692
 	} s;
1012
-	struct cvmx_iob_p2c_req_pri_cnt_s cn38xx;
1013
-	struct cvmx_iob_p2c_req_pri_cnt_s cn38xxp2;
1014
-	struct cvmx_iob_p2c_req_pri_cnt_s cn52xx;
1015
-	struct cvmx_iob_p2c_req_pri_cnt_s cn52xxp1;
1016
-	struct cvmx_iob_p2c_req_pri_cnt_s cn56xx;
1017
-	struct cvmx_iob_p2c_req_pri_cnt_s cn56xxp1;
1018
-	struct cvmx_iob_p2c_req_pri_cnt_s cn58xx;
1019
-	struct cvmx_iob_p2c_req_pri_cnt_s cn58xxp1;
1020
-	struct cvmx_iob_p2c_req_pri_cnt_s cn61xx;
1021
-	struct cvmx_iob_p2c_req_pri_cnt_s cn63xx;
1022
-	struct cvmx_iob_p2c_req_pri_cnt_s cn63xxp1;
1023
-	struct cvmx_iob_p2c_req_pri_cnt_s cn66xx;
1024
-	struct cvmx_iob_p2c_req_pri_cnt_s cnf71xx;
1025
693
 };
1026
694
 
1027
695
 union cvmx_iob_pkt_err {
..
..
@@ -1046,21 +714,6 @@
1046
714
 		uint64_t reserved_6_63:58;
1047
715
 #endif
1048
716
 	} cn30xx;
1049
-	struct cvmx_iob_pkt_err_cn30xx cn31xx;
1050
-	struct cvmx_iob_pkt_err_cn30xx cn38xx;
1051
-	struct cvmx_iob_pkt_err_cn30xx cn38xxp2;
1052
-	struct cvmx_iob_pkt_err_cn30xx cn50xx;
1053
-	struct cvmx_iob_pkt_err_cn30xx cn52xx;
1054
-	struct cvmx_iob_pkt_err_cn30xx cn52xxp1;
1055
-	struct cvmx_iob_pkt_err_cn30xx cn56xx;
1056
-	struct cvmx_iob_pkt_err_cn30xx cn56xxp1;
1057
-	struct cvmx_iob_pkt_err_cn30xx cn58xx;
1058
-	struct cvmx_iob_pkt_err_cn30xx cn58xxp1;
1059
-	struct cvmx_iob_pkt_err_s cn61xx;
1060
-	struct cvmx_iob_pkt_err_s cn63xx;
1061
-	struct cvmx_iob_pkt_err_s cn63xxp1;
1062
-	struct cvmx_iob_pkt_err_s cn66xx;
1063
-	struct cvmx_iob_pkt_err_s cnf71xx;
1064
717
 };
1065
718
 
1066
719
 union cvmx_iob_to_cmb_credits {
..
..
@@ -1089,10 +742,6 @@
1089
742
 		uint64_t reserved_9_63:55;
1090
743
 #endif
1091
744
 	} cn52xx;
1092
-	struct cvmx_iob_to_cmb_credits_cn52xx cn61xx;
1093
-	struct cvmx_iob_to_cmb_credits_cn52xx cn63xx;
1094
-	struct cvmx_iob_to_cmb_credits_cn52xx cn63xxp1;
1095
-	struct cvmx_iob_to_cmb_credits_cn52xx cn66xx;
1096
745
 	struct cvmx_iob_to_cmb_credits_cn68xx {
1097
746
 #ifdef __BIG_ENDIAN_BITFIELD
1098
747
 		uint64_t reserved_9_63:55;
..
..
@@ -1106,8 +755,6 @@
1106
755
 		uint64_t reserved_9_63:55;
1107
756
 #endif
1108
757
 	} cn68xx;
1109
-	struct cvmx_iob_to_cmb_credits_cn68xx cn68xxp1;
1110
-	struct cvmx_iob_to_cmb_credits_cn52xx cnf71xx;
1111
758
 };
1112
759
 
1113
760
 union cvmx_iob_to_ncb_did_00_credits {
..
..
@@ -1121,8 +768,6 @@
1121
768
 		uint64_t reserved_7_63:57;
1122
769
 #endif
1123
770
 	} s;
1124
-	struct cvmx_iob_to_ncb_did_00_credits_s cn68xx;
1125
-	struct cvmx_iob_to_ncb_did_00_credits_s cn68xxp1;
1126
771
 };
1127
772
 
1128
773
 union cvmx_iob_to_ncb_did_111_credits {
..
..
@@ -1136,8 +781,6 @@
1136
781
 		uint64_t reserved_7_63:57;
1137
782
 #endif
1138
783
 	} s;
1139
-	struct cvmx_iob_to_ncb_did_111_credits_s cn68xx;
1140
-	struct cvmx_iob_to_ncb_did_111_credits_s cn68xxp1;
1141
784
 };
1142
785
 
1143
786
 union cvmx_iob_to_ncb_did_223_credits {
..
..
@@ -1151,8 +794,6 @@
1151
794
 		uint64_t reserved_7_63:57;
1152
795
 #endif
1153
796
 	} s;
1154
-	struct cvmx_iob_to_ncb_did_223_credits_s cn68xx;
1155
-	struct cvmx_iob_to_ncb_did_223_credits_s cn68xxp1;
1156
797
 };
1157
798
 
1158
799
 union cvmx_iob_to_ncb_did_24_credits {
..
..
@@ -1166,8 +807,6 @@
1166
807
 		uint64_t reserved_7_63:57;
1167
808
 #endif
1168
809
 	} s;
1169
-	struct cvmx_iob_to_ncb_did_24_credits_s cn68xx;
1170
-	struct cvmx_iob_to_ncb_did_24_credits_s cn68xxp1;
1171
810
 };
1172
811
 
1173
812
 union cvmx_iob_to_ncb_did_32_credits {
..
..
@@ -1181,8 +820,6 @@
1181
820
 		uint64_t reserved_7_63:57;
1182
821
 #endif
1183
822
 	} s;
1184
-	struct cvmx_iob_to_ncb_did_32_credits_s cn68xx;
1185
-	struct cvmx_iob_to_ncb_did_32_credits_s cn68xxp1;
1186
823
 };
1187
824
 
1188
825
 union cvmx_iob_to_ncb_did_40_credits {
..
..
@@ -1196,8 +833,6 @@
1196
833
 		uint64_t reserved_7_63:57;
1197
834
 #endif
1198
835
 	} s;
1199
-	struct cvmx_iob_to_ncb_did_40_credits_s cn68xx;
1200
-	struct cvmx_iob_to_ncb_did_40_credits_s cn68xxp1;
1201
836
 };
1202
837
 
1203
838
 union cvmx_iob_to_ncb_did_55_credits {
..
..
@@ -1211,8 +846,6 @@
1211
846
 		uint64_t reserved_7_63:57;
1212
847
 #endif
1213
848
 	} s;
1214
-	struct cvmx_iob_to_ncb_did_55_credits_s cn68xx;
1215
-	struct cvmx_iob_to_ncb_did_55_credits_s cn68xxp1;
1216
849
 };
1217
850
 
1218
851
 union cvmx_iob_to_ncb_did_64_credits {
..
..
@@ -1226,8 +859,6 @@
1226
859
 		uint64_t reserved_7_63:57;
1227
860
 #endif
1228
861
 	} s;
1229
-	struct cvmx_iob_to_ncb_did_64_credits_s cn68xx;
1230
-	struct cvmx_iob_to_ncb_did_64_credits_s cn68xxp1;
1231
862
 };
1232
863
 
1233
864
 union cvmx_iob_to_ncb_did_79_credits {
..
..
@@ -1241,8 +872,6 @@
1241
872
 		uint64_t reserved_7_63:57;
1242
873
 #endif
1243
874
 	} s;
1244
-	struct cvmx_iob_to_ncb_did_79_credits_s cn68xx;
1245
-	struct cvmx_iob_to_ncb_did_79_credits_s cn68xxp1;
1246
875
 };
1247
876
 
1248
877
 union cvmx_iob_to_ncb_did_96_credits {
..
..
@@ -1256,8 +885,6 @@
1256
885
 		uint64_t reserved_7_63:57;
1257
886
 #endif
1258
887
 	} s;
1259
-	struct cvmx_iob_to_ncb_did_96_credits_s cn68xx;
1260
-	struct cvmx_iob_to_ncb_did_96_credits_s cn68xxp1;
1261
888
 };
1262
889
 
1263
890
 union cvmx_iob_to_ncb_did_98_credits {
..
..
@@ -1271,8 +898,6 @@
1271
898
 		uint64_t reserved_7_63:57;
1272
899
 #endif
1273
900
 	} s;
1274
-	struct cvmx_iob_to_ncb_did_98_credits_s cn68xx;
1275
-	struct cvmx_iob_to_ncb_did_98_credits_s cn68xxp1;
1276
901
 };
1277
902
 
1278
903
 #endif