add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/arch/mips/include/asm/octeon/cvmx-npi-defs.h
..
..
@@ -160,13 +160,6 @@
160
160
 		uint64_t baddr:61;
161
161
 #endif
162
162
 	} s;
163
-	struct cvmx_npi_base_addr_inputx_s cn30xx;
164
-	struct cvmx_npi_base_addr_inputx_s cn31xx;
165
-	struct cvmx_npi_base_addr_inputx_s cn38xx;
166
-	struct cvmx_npi_base_addr_inputx_s cn38xxp2;
167
-	struct cvmx_npi_base_addr_inputx_s cn50xx;
168
-	struct cvmx_npi_base_addr_inputx_s cn58xx;
169
-	struct cvmx_npi_base_addr_inputx_s cn58xxp1;
170
163
 };
171
164
 
172
165
 union cvmx_npi_base_addr_outputx {
..
..
@@ -180,13 +173,6 @@
180
173
 		uint64_t baddr:61;
181
174
 #endif
182
175
 	} s;
183
-	struct cvmx_npi_base_addr_outputx_s cn30xx;
184
-	struct cvmx_npi_base_addr_outputx_s cn31xx;
185
-	struct cvmx_npi_base_addr_outputx_s cn38xx;
186
-	struct cvmx_npi_base_addr_outputx_s cn38xxp2;
187
-	struct cvmx_npi_base_addr_outputx_s cn50xx;
188
-	struct cvmx_npi_base_addr_outputx_s cn58xx;
189
-	struct cvmx_npi_base_addr_outputx_s cn58xxp1;
190
176
 };
191
177
 
192
178
 union cvmx_npi_bist_status {
..
..
@@ -281,9 +267,6 @@
281
267
 		uint64_t reserved_20_63:44;
282
268
 #endif
283
269
 	} cn30xx;
284
-	struct cvmx_npi_bist_status_s cn31xx;
285
-	struct cvmx_npi_bist_status_s cn38xx;
286
-	struct cvmx_npi_bist_status_s cn38xxp2;
287
270
 	struct cvmx_npi_bist_status_cn50xx {
288
271
 #ifdef __BIG_ENDIAN_BITFIELD
289
272
 		uint64_t reserved_20_63:44;
..
..
@@ -329,8 +312,6 @@
329
312
 		uint64_t reserved_20_63:44;
330
313
 #endif
331
314
 	} cn50xx;
332
-	struct cvmx_npi_bist_status_s cn58xx;
333
-	struct cvmx_npi_bist_status_s cn58xxp1;
334
315
 };
335
316
 
336
317
 union cvmx_npi_buff_size_outputx {
..
..
@@ -346,13 +327,6 @@
346
327
 		uint64_t reserved_23_63:41;
347
328
 #endif
348
329
 	} s;
349
-	struct cvmx_npi_buff_size_outputx_s cn30xx;
350
-	struct cvmx_npi_buff_size_outputx_s cn31xx;
351
-	struct cvmx_npi_buff_size_outputx_s cn38xx;
352
-	struct cvmx_npi_buff_size_outputx_s cn38xxp2;
353
-	struct cvmx_npi_buff_size_outputx_s cn50xx;
354
-	struct cvmx_npi_buff_size_outputx_s cn58xx;
355
-	struct cvmx_npi_buff_size_outputx_s cn58xxp1;
356
330
 };
357
331
 
358
332
 union cvmx_npi_comp_ctl {
..
..
@@ -368,9 +342,6 @@
368
342
 		uint64_t reserved_10_63:54;
369
343
 #endif
370
344
 	} s;
371
-	struct cvmx_npi_comp_ctl_s cn50xx;
372
-	struct cvmx_npi_comp_ctl_s cn58xx;
373
-	struct cvmx_npi_comp_ctl_s cn58xxp1;
374
345
 };
375
346
 
376
347
 union cvmx_npi_ctl_status {
..
..
@@ -498,11 +469,6 @@
498
469
 		uint64_t reserved_63_63:1;
499
470
 #endif
500
471
 	} cn31xx;
501
-	struct cvmx_npi_ctl_status_s cn38xx;
502
-	struct cvmx_npi_ctl_status_s cn38xxp2;
503
-	struct cvmx_npi_ctl_status_cn31xx cn50xx;
504
-	struct cvmx_npi_ctl_status_s cn58xx;
505
-	struct cvmx_npi_ctl_status_s cn58xxp1;
506
472
 };
507
473
 
508
474
 union cvmx_npi_dbg_select {
..
..
@@ -516,13 +482,6 @@
516
482
 		uint64_t reserved_16_63:48;
517
483
 #endif
518
484
 	} s;
519
-	struct cvmx_npi_dbg_select_s cn30xx;
520
-	struct cvmx_npi_dbg_select_s cn31xx;
521
-	struct cvmx_npi_dbg_select_s cn38xx;
522
-	struct cvmx_npi_dbg_select_s cn38xxp2;
523
-	struct cvmx_npi_dbg_select_s cn50xx;
524
-	struct cvmx_npi_dbg_select_s cn58xx;
525
-	struct cvmx_npi_dbg_select_s cn58xxp1;
526
485
 };
527
486
 
528
487
 union cvmx_npi_dma_control {
..
..
@@ -558,13 +517,6 @@
558
517
 		uint64_t reserved_36_63:28;
559
518
 #endif
560
519
 	} s;
561
-	struct cvmx_npi_dma_control_s cn30xx;
562
-	struct cvmx_npi_dma_control_s cn31xx;
563
-	struct cvmx_npi_dma_control_s cn38xx;
564
-	struct cvmx_npi_dma_control_s cn38xxp2;
565
-	struct cvmx_npi_dma_control_s cn50xx;
566
-	struct cvmx_npi_dma_control_s cn58xx;
567
-	struct cvmx_npi_dma_control_s cn58xxp1;
568
520
 };
569
521
 
570
522
 union cvmx_npi_dma_highp_counts {
..
..
@@ -580,13 +532,6 @@
580
532
 		uint64_t reserved_39_63:25;
581
533
 #endif
582
534
 	} s;
583
-	struct cvmx_npi_dma_highp_counts_s cn30xx;
584
-	struct cvmx_npi_dma_highp_counts_s cn31xx;
585
-	struct cvmx_npi_dma_highp_counts_s cn38xx;
586
-	struct cvmx_npi_dma_highp_counts_s cn38xxp2;
587
-	struct cvmx_npi_dma_highp_counts_s cn50xx;
588
-	struct cvmx_npi_dma_highp_counts_s cn58xx;
589
-	struct cvmx_npi_dma_highp_counts_s cn58xxp1;
590
535
 };
591
536
 
592
537
 union cvmx_npi_dma_highp_naddr {
..
..
@@ -602,13 +547,6 @@
602
547
 		uint64_t reserved_40_63:24;
603
548
 #endif
604
549
 	} s;
605
-	struct cvmx_npi_dma_highp_naddr_s cn30xx;
606
-	struct cvmx_npi_dma_highp_naddr_s cn31xx;
607
-	struct cvmx_npi_dma_highp_naddr_s cn38xx;
608
-	struct cvmx_npi_dma_highp_naddr_s cn38xxp2;
609
-	struct cvmx_npi_dma_highp_naddr_s cn50xx;
610
-	struct cvmx_npi_dma_highp_naddr_s cn58xx;
611
-	struct cvmx_npi_dma_highp_naddr_s cn58xxp1;
612
550
 };
613
551
 
614
552
 union cvmx_npi_dma_lowp_counts {
..
..
@@ -624,13 +562,6 @@
624
562
 		uint64_t reserved_39_63:25;
625
563
 #endif
626
564
 	} s;
627
-	struct cvmx_npi_dma_lowp_counts_s cn30xx;
628
-	struct cvmx_npi_dma_lowp_counts_s cn31xx;
629
-	struct cvmx_npi_dma_lowp_counts_s cn38xx;
630
-	struct cvmx_npi_dma_lowp_counts_s cn38xxp2;
631
-	struct cvmx_npi_dma_lowp_counts_s cn50xx;
632
-	struct cvmx_npi_dma_lowp_counts_s cn58xx;
633
-	struct cvmx_npi_dma_lowp_counts_s cn58xxp1;
634
565
 };
635
566
 
636
567
 union cvmx_npi_dma_lowp_naddr {
..
..
@@ -646,13 +577,6 @@
646
577
 		uint64_t reserved_40_63:24;
647
578
 #endif
648
579
 	} s;
649
-	struct cvmx_npi_dma_lowp_naddr_s cn30xx;
650
-	struct cvmx_npi_dma_lowp_naddr_s cn31xx;
651
-	struct cvmx_npi_dma_lowp_naddr_s cn38xx;
652
-	struct cvmx_npi_dma_lowp_naddr_s cn38xxp2;
653
-	struct cvmx_npi_dma_lowp_naddr_s cn50xx;
654
-	struct cvmx_npi_dma_lowp_naddr_s cn58xx;
655
-	struct cvmx_npi_dma_lowp_naddr_s cn58xxp1;
656
580
 };
657
581
 
658
582
 union cvmx_npi_highp_dbell {
..
..
@@ -666,13 +590,6 @@
666
590
 		uint64_t reserved_16_63:48;
667
591
 #endif
668
592
 	} s;
669
-	struct cvmx_npi_highp_dbell_s cn30xx;
670
-	struct cvmx_npi_highp_dbell_s cn31xx;
671
-	struct cvmx_npi_highp_dbell_s cn38xx;
672
-	struct cvmx_npi_highp_dbell_s cn38xxp2;
673
-	struct cvmx_npi_highp_dbell_s cn50xx;
674
-	struct cvmx_npi_highp_dbell_s cn58xx;
675
-	struct cvmx_npi_highp_dbell_s cn58xxp1;
676
593
 };
677
594
 
678
595
 union cvmx_npi_highp_ibuff_saddr {
..
..
@@ -686,13 +603,6 @@
686
603
 		uint64_t reserved_36_63:28;
687
604
 #endif
688
605
 	} s;
689
-	struct cvmx_npi_highp_ibuff_saddr_s cn30xx;
690
-	struct cvmx_npi_highp_ibuff_saddr_s cn31xx;
691
-	struct cvmx_npi_highp_ibuff_saddr_s cn38xx;
692
-	struct cvmx_npi_highp_ibuff_saddr_s cn38xxp2;
693
-	struct cvmx_npi_highp_ibuff_saddr_s cn50xx;
694
-	struct cvmx_npi_highp_ibuff_saddr_s cn58xx;
695
-	struct cvmx_npi_highp_ibuff_saddr_s cn58xxp1;
696
606
 };
697
607
 
698
608
 union cvmx_npi_input_control {
..
..
@@ -745,12 +655,6 @@
745
655
 		uint64_t reserved_22_63:42;
746
656
 #endif
747
657
 	} cn30xx;
748
-	struct cvmx_npi_input_control_cn30xx cn31xx;
749
-	struct cvmx_npi_input_control_s cn38xx;
750
-	struct cvmx_npi_input_control_cn30xx cn38xxp2;
751
-	struct cvmx_npi_input_control_s cn50xx;
752
-	struct cvmx_npi_input_control_s cn58xx;
753
-	struct cvmx_npi_input_control_s cn58xxp1;
754
658
 };
755
659
 
756
660
 union cvmx_npi_int_enb {
..
..
@@ -1094,7 +998,6 @@
1094
998
 		uint64_t reserved_62_63:2;
1095
999
 #endif
1096
1000
 	} cn31xx;
1097
-	struct cvmx_npi_int_enb_s cn38xx;
1098
1001
 	struct cvmx_npi_int_enb_cn38xxp2 {
1099
1002
 #ifdef __BIG_ENDIAN_BITFIELD
1100
1003
 		uint64_t reserved_42_63:22;
..
..
@@ -1186,9 +1089,6 @@
1186
1089
 		uint64_t reserved_42_63:22;
1187
1090
 #endif
1188
1091
 	} cn38xxp2;
1189
-	struct cvmx_npi_int_enb_cn31xx cn50xx;
1190
-	struct cvmx_npi_int_enb_s cn58xx;
1191
-	struct cvmx_npi_int_enb_s cn58xxp1;
1192
1092
 };
1193
1093
 
1194
1094
 union cvmx_npi_int_sum {
..
..
@@ -1532,7 +1432,6 @@
1532
1432
 		uint64_t reserved_62_63:2;
1533
1433
 #endif
1534
1434
 	} cn31xx;
1535
-	struct cvmx_npi_int_sum_s cn38xx;
1536
1435
 	struct cvmx_npi_int_sum_cn38xxp2 {
1537
1436
 #ifdef __BIG_ENDIAN_BITFIELD
1538
1437
 		uint64_t reserved_42_63:22;
..
..
@@ -1624,9 +1523,6 @@
1624
1523
 		uint64_t reserved_42_63:22;
1625
1524
 #endif
1626
1525
 	} cn38xxp2;
1627
-	struct cvmx_npi_int_sum_cn31xx cn50xx;
1628
-	struct cvmx_npi_int_sum_s cn58xx;
1629
-	struct cvmx_npi_int_sum_s cn58xxp1;
1630
1526
 };
1631
1527
 
1632
1528
 union cvmx_npi_lowp_dbell {
..
..
@@ -1640,13 +1536,6 @@
1640
1536
 		uint64_t reserved_16_63:48;
1641
1537
 #endif
1642
1538
 	} s;
1643
-	struct cvmx_npi_lowp_dbell_s cn30xx;
1644
-	struct cvmx_npi_lowp_dbell_s cn31xx;
1645
-	struct cvmx_npi_lowp_dbell_s cn38xx;
1646
-	struct cvmx_npi_lowp_dbell_s cn38xxp2;
1647
-	struct cvmx_npi_lowp_dbell_s cn50xx;
1648
-	struct cvmx_npi_lowp_dbell_s cn58xx;
1649
-	struct cvmx_npi_lowp_dbell_s cn58xxp1;
1650
1539
 };
1651
1540
 
1652
1541
 union cvmx_npi_lowp_ibuff_saddr {
..
..
@@ -1660,13 +1549,6 @@
1660
1549
 		uint64_t reserved_36_63:28;
1661
1550
 #endif
1662
1551
 	} s;
1663
-	struct cvmx_npi_lowp_ibuff_saddr_s cn30xx;
1664
-	struct cvmx_npi_lowp_ibuff_saddr_s cn31xx;
1665
-	struct cvmx_npi_lowp_ibuff_saddr_s cn38xx;
1666
-	struct cvmx_npi_lowp_ibuff_saddr_s cn38xxp2;
1667
-	struct cvmx_npi_lowp_ibuff_saddr_s cn50xx;
1668
-	struct cvmx_npi_lowp_ibuff_saddr_s cn58xx;
1669
-	struct cvmx_npi_lowp_ibuff_saddr_s cn58xxp1;
1670
1552
 };
1671
1553
 
1672
1554
 union cvmx_npi_mem_access_subidx {
..
..
@@ -1696,7 +1578,6 @@
1696
1578
 		uint64_t reserved_38_63:26;
1697
1579
 #endif
1698
1580
 	} s;
1699
-	struct cvmx_npi_mem_access_subidx_s cn30xx;
1700
1581
 	struct cvmx_npi_mem_access_subidx_cn31xx {
1701
1582
 #ifdef __BIG_ENDIAN_BITFIELD
1702
1583
 		uint64_t reserved_36_63:28;
..
..
@@ -1718,11 +1599,6 @@
1718
1599
 		uint64_t reserved_36_63:28;
1719
1600
 #endif
1720
1601
 	} cn31xx;
1721
-	struct cvmx_npi_mem_access_subidx_s cn38xx;
1722
-	struct cvmx_npi_mem_access_subidx_cn31xx cn38xxp2;
1723
-	struct cvmx_npi_mem_access_subidx_s cn50xx;
1724
-	struct cvmx_npi_mem_access_subidx_s cn58xx;
1725
-	struct cvmx_npi_mem_access_subidx_s cn58xxp1;
1726
1602
 };
1727
1603
 
1728
1604
 union cvmx_npi_msi_rcv {
..
..
@@ -1734,13 +1610,6 @@
1734
1610
 		uint64_t int_vec:64;
1735
1611
 #endif
1736
1612
 	} s;
1737
-	struct cvmx_npi_msi_rcv_s cn30xx;
1738
-	struct cvmx_npi_msi_rcv_s cn31xx;
1739
-	struct cvmx_npi_msi_rcv_s cn38xx;
1740
-	struct cvmx_npi_msi_rcv_s cn38xxp2;
1741
-	struct cvmx_npi_msi_rcv_s cn50xx;
1742
-	struct cvmx_npi_msi_rcv_s cn58xx;
1743
-	struct cvmx_npi_msi_rcv_s cn58xxp1;
1744
1613
 };
1745
1614
 
1746
1615
 union cvmx_npi_num_desc_outputx {
..
..
@@ -1754,13 +1623,6 @@
1754
1623
 		uint64_t reserved_32_63:32;
1755
1624
 #endif
1756
1625
 	} s;
1757
-	struct cvmx_npi_num_desc_outputx_s cn30xx;
1758
-	struct cvmx_npi_num_desc_outputx_s cn31xx;
1759
-	struct cvmx_npi_num_desc_outputx_s cn38xx;
1760
-	struct cvmx_npi_num_desc_outputx_s cn38xxp2;
1761
-	struct cvmx_npi_num_desc_outputx_s cn50xx;
1762
-	struct cvmx_npi_num_desc_outputx_s cn58xx;
1763
-	struct cvmx_npi_num_desc_outputx_s cn58xxp1;
1764
1626
 };
1765
1627
 
1766
1628
 union cvmx_npi_output_control {
..
..
@@ -1932,7 +1794,6 @@
1932
1794
 		uint64_t reserved_46_63:18;
1933
1795
 #endif
1934
1796
 	} cn31xx;
1935
-	struct cvmx_npi_output_control_s cn38xx;
1936
1797
 	struct cvmx_npi_output_control_cn38xxp2 {
1937
1798
 #ifdef __BIG_ENDIAN_BITFIELD
1938
1799
 		uint64_t reserved_48_63:16;
..
..
@@ -2069,8 +1930,6 @@
2069
1930
 		uint64_t reserved_49_63:15;
2070
1931
 #endif
2071
1932
 	} cn50xx;
2072
-	struct cvmx_npi_output_control_s cn58xx;
2073
-	struct cvmx_npi_output_control_s cn58xxp1;
2074
1933
 };
2075
1934
 
2076
1935
 union cvmx_npi_px_dbpair_addr {
..
..
@@ -2086,13 +1945,6 @@
2086
1945
 		uint64_t reserved_63_63:1;
2087
1946
 #endif
2088
1947
 	} s;
2089
-	struct cvmx_npi_px_dbpair_addr_s cn30xx;
2090
-	struct cvmx_npi_px_dbpair_addr_s cn31xx;
2091
-	struct cvmx_npi_px_dbpair_addr_s cn38xx;
2092
-	struct cvmx_npi_px_dbpair_addr_s cn38xxp2;
2093
-	struct cvmx_npi_px_dbpair_addr_s cn50xx;
2094
-	struct cvmx_npi_px_dbpair_addr_s cn58xx;
2095
-	struct cvmx_npi_px_dbpair_addr_s cn58xxp1;
2096
1948
 };
2097
1949
 
2098
1950
 union cvmx_npi_px_instr_addr {
..
..
@@ -2106,13 +1958,6 @@
2106
1958
 		uint64_t state:3;
2107
1959
 #endif
2108
1960
 	} s;
2109
-	struct cvmx_npi_px_instr_addr_s cn30xx;
2110
-	struct cvmx_npi_px_instr_addr_s cn31xx;
2111
-	struct cvmx_npi_px_instr_addr_s cn38xx;
2112
-	struct cvmx_npi_px_instr_addr_s cn38xxp2;
2113
-	struct cvmx_npi_px_instr_addr_s cn50xx;
2114
-	struct cvmx_npi_px_instr_addr_s cn58xx;
2115
-	struct cvmx_npi_px_instr_addr_s cn58xxp1;
2116
1961
 };
2117
1962
 
2118
1963
 union cvmx_npi_px_instr_cnts {
..
..
@@ -2128,13 +1973,6 @@
2128
1973
 		uint64_t reserved_38_63:26;
2129
1974
 #endif
2130
1975
 	} s;
2131
-	struct cvmx_npi_px_instr_cnts_s cn30xx;
2132
-	struct cvmx_npi_px_instr_cnts_s cn31xx;
2133
-	struct cvmx_npi_px_instr_cnts_s cn38xx;
2134
-	struct cvmx_npi_px_instr_cnts_s cn38xxp2;
2135
-	struct cvmx_npi_px_instr_cnts_s cn50xx;
2136
-	struct cvmx_npi_px_instr_cnts_s cn58xx;
2137
-	struct cvmx_npi_px_instr_cnts_s cn58xxp1;
2138
1976
 };
2139
1977
 
2140
1978
 union cvmx_npi_px_pair_cnts {
..
..
@@ -2150,13 +1988,6 @@
2150
1988
 		uint64_t reserved_37_63:27;
2151
1989
 #endif
2152
1990
 	} s;
2153
-	struct cvmx_npi_px_pair_cnts_s cn30xx;
2154
-	struct cvmx_npi_px_pair_cnts_s cn31xx;
2155
-	struct cvmx_npi_px_pair_cnts_s cn38xx;
2156
-	struct cvmx_npi_px_pair_cnts_s cn38xxp2;
2157
-	struct cvmx_npi_px_pair_cnts_s cn50xx;
2158
-	struct cvmx_npi_px_pair_cnts_s cn58xx;
2159
-	struct cvmx_npi_px_pair_cnts_s cn58xxp1;
2160
1991
 };
2161
1992
 
2162
1993
 union cvmx_npi_pci_burst_size {
..
..
@@ -2172,13 +2003,6 @@
2172
2003
 		uint64_t reserved_14_63:50;
2173
2004
 #endif
2174
2005
 	} s;
2175
-	struct cvmx_npi_pci_burst_size_s cn30xx;
2176
-	struct cvmx_npi_pci_burst_size_s cn31xx;
2177
-	struct cvmx_npi_pci_burst_size_s cn38xx;
2178
-	struct cvmx_npi_pci_burst_size_s cn38xxp2;
2179
-	struct cvmx_npi_pci_burst_size_s cn50xx;
2180
-	struct cvmx_npi_pci_burst_size_s cn58xx;
2181
-	struct cvmx_npi_pci_burst_size_s cn58xxp1;
2182
2006
 };
2183
2007
 
2184
2008
 union cvmx_npi_pci_int_arb_cfg {
..
..
@@ -2215,12 +2039,6 @@
2215
2039
 		uint64_t reserved_5_63:59;
2216
2040
 #endif
2217
2041
 	} cn30xx;
2218
-	struct cvmx_npi_pci_int_arb_cfg_cn30xx cn31xx;
2219
-	struct cvmx_npi_pci_int_arb_cfg_cn30xx cn38xx;
2220
-	struct cvmx_npi_pci_int_arb_cfg_cn30xx cn38xxp2;
2221
-	struct cvmx_npi_pci_int_arb_cfg_s cn50xx;
2222
-	struct cvmx_npi_pci_int_arb_cfg_s cn58xx;
2223
-	struct cvmx_npi_pci_int_arb_cfg_s cn58xxp1;
2224
2042
 };
2225
2043
 
2226
2044
 union cvmx_npi_pci_read_cmd {
..
..
@@ -2234,13 +2052,6 @@
2234
2052
 		uint64_t reserved_11_63:53;
2235
2053
 #endif
2236
2054
 	} s;
2237
-	struct cvmx_npi_pci_read_cmd_s cn30xx;
2238
-	struct cvmx_npi_pci_read_cmd_s cn31xx;
2239
-	struct cvmx_npi_pci_read_cmd_s cn38xx;
2240
-	struct cvmx_npi_pci_read_cmd_s cn38xxp2;
2241
-	struct cvmx_npi_pci_read_cmd_s cn50xx;
2242
-	struct cvmx_npi_pci_read_cmd_s cn58xx;
2243
-	struct cvmx_npi_pci_read_cmd_s cn58xxp1;
2244
2055
 };
2245
2056
 
2246
2057
 union cvmx_npi_port32_instr_hdr {
..
..
@@ -2276,13 +2087,6 @@
2276
2087
 		uint64_t reserved_44_63:20;
2277
2088
 #endif
2278
2089
 	} s;
2279
-	struct cvmx_npi_port32_instr_hdr_s cn30xx;
2280
-	struct cvmx_npi_port32_instr_hdr_s cn31xx;
2281
-	struct cvmx_npi_port32_instr_hdr_s cn38xx;
2282
-	struct cvmx_npi_port32_instr_hdr_s cn38xxp2;
2283
-	struct cvmx_npi_port32_instr_hdr_s cn50xx;
2284
-	struct cvmx_npi_port32_instr_hdr_s cn58xx;
2285
-	struct cvmx_npi_port32_instr_hdr_s cn58xxp1;
2286
2090
 };
2287
2091
 
2288
2092
 union cvmx_npi_port33_instr_hdr {
..
..
@@ -2318,12 +2122,6 @@
2318
2122
 		uint64_t reserved_44_63:20;
2319
2123
 #endif
2320
2124
 	} s;
2321
-	struct cvmx_npi_port33_instr_hdr_s cn31xx;
2322
-	struct cvmx_npi_port33_instr_hdr_s cn38xx;
2323
-	struct cvmx_npi_port33_instr_hdr_s cn38xxp2;
2324
-	struct cvmx_npi_port33_instr_hdr_s cn50xx;
2325
-	struct cvmx_npi_port33_instr_hdr_s cn58xx;
2326
-	struct cvmx_npi_port33_instr_hdr_s cn58xxp1;
2327
2125
 };
2328
2126
 
2329
2127
 union cvmx_npi_port34_instr_hdr {
..
..
@@ -2359,10 +2157,6 @@
2359
2157
 		uint64_t reserved_44_63:20;
2360
2158
 #endif
2361
2159
 	} s;
2362
-	struct cvmx_npi_port34_instr_hdr_s cn38xx;
2363
-	struct cvmx_npi_port34_instr_hdr_s cn38xxp2;
2364
-	struct cvmx_npi_port34_instr_hdr_s cn58xx;
2365
-	struct cvmx_npi_port34_instr_hdr_s cn58xxp1;
2366
2160
 };
2367
2161
 
2368
2162
 union cvmx_npi_port35_instr_hdr {
..
..
@@ -2398,10 +2192,6 @@
2398
2192
 		uint64_t reserved_44_63:20;
2399
2193
 #endif
2400
2194
 	} s;
2401
-	struct cvmx_npi_port35_instr_hdr_s cn38xx;
2402
-	struct cvmx_npi_port35_instr_hdr_s cn38xxp2;
2403
-	struct cvmx_npi_port35_instr_hdr_s cn58xx;
2404
-	struct cvmx_npi_port35_instr_hdr_s cn58xxp1;
2405
2195
 };
2406
2196
 
2407
2197
 union cvmx_npi_port_bp_control {
..
..
@@ -2417,13 +2207,6 @@
2417
2207
 		uint64_t reserved_8_63:56;
2418
2208
 #endif
2419
2209
 	} s;
2420
-	struct cvmx_npi_port_bp_control_s cn30xx;
2421
-	struct cvmx_npi_port_bp_control_s cn31xx;
2422
-	struct cvmx_npi_port_bp_control_s cn38xx;
2423
-	struct cvmx_npi_port_bp_control_s cn38xxp2;
2424
-	struct cvmx_npi_port_bp_control_s cn50xx;
2425
-	struct cvmx_npi_port_bp_control_s cn58xx;
2426
-	struct cvmx_npi_port_bp_control_s cn58xxp1;
2427
2210
 };
2428
2211
 
2429
2212
 union cvmx_npi_rsl_int_blocks {
..
..
@@ -2566,7 +2349,6 @@
2566
2349
 		uint64_t reserved_32_63:32;
2567
2350
 #endif
2568
2351
 	} cn30xx;
2569
-	struct cvmx_npi_rsl_int_blocks_cn30xx cn31xx;
2570
2352
 	struct cvmx_npi_rsl_int_blocks_cn38xx {
2571
2353
 #ifdef __BIG_ENDIAN_BITFIELD
2572
2354
 		uint64_t reserved_32_63:32;
..
..
@@ -2638,7 +2420,6 @@
2638
2420
 		uint64_t reserved_32_63:32;
2639
2421
 #endif
2640
2422
 	} cn38xx;
2641
-	struct cvmx_npi_rsl_int_blocks_cn38xx cn38xxp2;
2642
2423
 	struct cvmx_npi_rsl_int_blocks_cn50xx {
2643
2424
 #ifdef __BIG_ENDIAN_BITFIELD
2644
2425
 		uint64_t reserved_31_63:33;
..
..
@@ -2702,8 +2483,6 @@
2702
2483
 		uint64_t reserved_31_63:33;
2703
2484
 #endif
2704
2485
 	} cn50xx;
2705
-	struct cvmx_npi_rsl_int_blocks_cn38xx cn58xx;
2706
-	struct cvmx_npi_rsl_int_blocks_cn38xx cn58xxp1;
2707
2486
 };
2708
2487
 
2709
2488
 union cvmx_npi_size_inputx {
..
..
@@ -2717,13 +2496,6 @@
2717
2496
 		uint64_t reserved_32_63:32;
2718
2497
 #endif
2719
2498
 	} s;
2720
-	struct cvmx_npi_size_inputx_s cn30xx;
2721
-	struct cvmx_npi_size_inputx_s cn31xx;
2722
-	struct cvmx_npi_size_inputx_s cn38xx;
2723
-	struct cvmx_npi_size_inputx_s cn38xxp2;
2724
-	struct cvmx_npi_size_inputx_s cn50xx;
2725
-	struct cvmx_npi_size_inputx_s cn58xx;
2726
-	struct cvmx_npi_size_inputx_s cn58xxp1;
2727
2499
 };
2728
2500
 
2729
2501
 union cvmx_npi_win_read_to {
..
..
@@ -2737,13 +2509,6 @@
2737
2509
 		uint64_t reserved_32_63:32;
2738
2510
 #endif
2739
2511
 	} s;
2740
-	struct cvmx_npi_win_read_to_s cn30xx;
2741
-	struct cvmx_npi_win_read_to_s cn31xx;
2742
-	struct cvmx_npi_win_read_to_s cn38xx;
2743
-	struct cvmx_npi_win_read_to_s cn38xxp2;
2744
-	struct cvmx_npi_win_read_to_s cn50xx;
2745
-	struct cvmx_npi_win_read_to_s cn58xx;
2746
-	struct cvmx_npi_win_read_to_s cn58xxp1;
2747
2512
 };
2748
2513
 
2749
2514
 #endif