forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29 
 kernel/arch/mips/include/asm/octeon/cvmx-npei-defs.h
....@@ -154,10 +154,6 @@
154154 		uint32_t reserved_18_31:14;
155155 #endif
156156 	} s;
157
-	struct cvmx_npei_bar1_indexx_s cn52xx;
158
-	struct cvmx_npei_bar1_indexx_s cn52xxp1;
159
-	struct cvmx_npei_bar1_indexx_s cn56xx;
160
-	struct cvmx_npei_bar1_indexx_s cn56xxp1;
161157 };
162158 
163159 union cvmx_npei_bist_status {
....@@ -485,7 +481,6 @@
485481 		uint64_t reserved_46_63:18;
486482 #endif
487483 	} cn52xxp1;
488
-	struct cvmx_npei_bist_status_cn52xx cn56xx;
489484 	struct cvmx_npei_bist_status_cn56xxp1 {
490485 #ifdef __BIG_ENDIAN_BITFIELD
491486 		uint64_t reserved_58_63:6;
....@@ -648,8 +643,6 @@
648643 		uint64_t reserved_14_63:50;
649644 #endif
650645 	} s;
651
-	struct cvmx_npei_bist_status2_s cn52xx;
652
-	struct cvmx_npei_bist_status2_s cn56xx;
653646 };
654647 
655648 union cvmx_npei_ctl_port0 {
....@@ -693,10 +686,6 @@
693686 		uint64_t reserved_21_63:43;
694687 #endif
695688 	} s;
696
-	struct cvmx_npei_ctl_port0_s cn52xx;
697
-	struct cvmx_npei_ctl_port0_s cn52xxp1;
698
-	struct cvmx_npei_ctl_port0_s cn56xx;
699
-	struct cvmx_npei_ctl_port0_s cn56xxp1;
700689 };
701690 
702691 union cvmx_npei_ctl_port1 {
....@@ -740,10 +729,6 @@
740729 		uint64_t reserved_21_63:43;
741730 #endif
742731 	} s;
743
-	struct cvmx_npei_ctl_port1_s cn52xx;
744
-	struct cvmx_npei_ctl_port1_s cn52xxp1;
745
-	struct cvmx_npei_ctl_port1_s cn56xx;
746
-	struct cvmx_npei_ctl_port1_s cn56xxp1;
747732 };
748733 
749734 union cvmx_npei_ctl_status {
....@@ -773,7 +758,6 @@
773758 		uint64_t reserved_44_63:20;
774759 #endif
775760 	} s;
776
-	struct cvmx_npei_ctl_status_s cn52xx;
777761 	struct cvmx_npei_ctl_status_cn52xxp1 {
778762 #ifdef __BIG_ENDIAN_BITFIELD
779763 		uint64_t reserved_44_63:20;
....@@ -799,7 +783,6 @@
799783 		uint64_t reserved_44_63:20;
800784 #endif
801785 	} cn52xxp1;
802
-	struct cvmx_npei_ctl_status_s cn56xx;
803786 	struct cvmx_npei_ctl_status_cn56xxp1 {
804787 #ifdef __BIG_ENDIAN_BITFIELD
805788 		uint64_t reserved_15_63:49;
....@@ -848,10 +831,6 @@
848831 		uint64_t reserved_16_63:48;
849832 #endif
850833 	} s;
851
-	struct cvmx_npei_ctl_status2_s cn52xx;
852
-	struct cvmx_npei_ctl_status2_s cn52xxp1;
853
-	struct cvmx_npei_ctl_status2_s cn56xx;
854
-	struct cvmx_npei_ctl_status2_s cn56xxp1;
855834 };
856835 
857836 union cvmx_npei_data_out_cnt {
....@@ -871,10 +850,6 @@
871850 		uint64_t reserved_44_63:20;
872851 #endif
873852 	} s;
874
-	struct cvmx_npei_data_out_cnt_s cn52xx;
875
-	struct cvmx_npei_data_out_cnt_s cn52xxp1;
876
-	struct cvmx_npei_data_out_cnt_s cn56xx;
877
-	struct cvmx_npei_data_out_cnt_s cn56xxp1;
878853 };
879854 
880855 union cvmx_npei_dbg_data {
....@@ -919,7 +894,6 @@
919894 		uint64_t reserved_29_63:35;
920895 #endif
921896 	} cn52xx;
922
-	struct cvmx_npei_dbg_data_cn52xx cn52xxp1;
923897 	struct cvmx_npei_dbg_data_cn56xx {
924898 #ifdef __BIG_ENDIAN_BITFIELD
925899 		uint64_t reserved_29_63:35;
....@@ -941,7 +915,6 @@
941915 		uint64_t reserved_29_63:35;
942916 #endif
943917 	} cn56xx;
944
-	struct cvmx_npei_dbg_data_cn56xx cn56xxp1;
945918 };
946919 
947920 union cvmx_npei_dbg_select {
....@@ -955,10 +928,6 @@
955928 		uint64_t reserved_16_63:48;
956929 #endif
957930 	} s;
958
-	struct cvmx_npei_dbg_select_s cn52xx;
959
-	struct cvmx_npei_dbg_select_s cn52xxp1;
960
-	struct cvmx_npei_dbg_select_s cn56xx;
961
-	struct cvmx_npei_dbg_select_s cn56xxp1;
962931 };
963932 
964933 union cvmx_npei_dmax_counts {
....@@ -974,10 +943,6 @@
974943 		uint64_t reserved_39_63:25;
975944 #endif
976945 	} s;
977
-	struct cvmx_npei_dmax_counts_s cn52xx;
978
-	struct cvmx_npei_dmax_counts_s cn52xxp1;
979
-	struct cvmx_npei_dmax_counts_s cn56xx;
980
-	struct cvmx_npei_dmax_counts_s cn56xxp1;
981946 };
982947 
983948 union cvmx_npei_dmax_dbell {
....@@ -991,10 +956,6 @@
991956 		uint32_t reserved_16_31:16;
992957 #endif
993958 	} s;
994
-	struct cvmx_npei_dmax_dbell_s cn52xx;
995
-	struct cvmx_npei_dmax_dbell_s cn52xxp1;
996
-	struct cvmx_npei_dmax_dbell_s cn56xx;
997
-	struct cvmx_npei_dmax_dbell_s cn56xxp1;
998959 };
999960 
1000961 union cvmx_npei_dmax_ibuff_saddr {
....@@ -1012,7 +973,6 @@
1012973 		uint64_t reserved_37_63:27;
1013974 #endif
1014975 	} s;
1015
-	struct cvmx_npei_dmax_ibuff_saddr_s cn52xx;
1016976 	struct cvmx_npei_dmax_ibuff_saddr_cn52xxp1 {
1017977 #ifdef __BIG_ENDIAN_BITFIELD
1018978 		uint64_t reserved_36_63:28;
....@@ -1024,8 +984,6 @@
1024984 		uint64_t reserved_36_63:28;
1025985 #endif
1026986 	} cn52xxp1;
1027
-	struct cvmx_npei_dmax_ibuff_saddr_s cn56xx;
1028
-	struct cvmx_npei_dmax_ibuff_saddr_cn52xxp1 cn56xxp1;
1029987 };
1030988 
1031989 union cvmx_npei_dmax_naddr {
....@@ -1039,10 +997,6 @@
1039997 		uint64_t reserved_36_63:28;
1040998 #endif
1041999 	} s;
1042
-	struct cvmx_npei_dmax_naddr_s cn52xx;
1043
-	struct cvmx_npei_dmax_naddr_s cn52xxp1;
1044
-	struct cvmx_npei_dmax_naddr_s cn56xx;
1045
-	struct cvmx_npei_dmax_naddr_s cn56xxp1;
10461000 };
10471001 
10481002 union cvmx_npei_dma0_int_level {
....@@ -1056,10 +1010,6 @@
10561010 		uint64_t time:32;
10571011 #endif
10581012 	} s;
1059
-	struct cvmx_npei_dma0_int_level_s cn52xx;
1060
-	struct cvmx_npei_dma0_int_level_s cn52xxp1;
1061
-	struct cvmx_npei_dma0_int_level_s cn56xx;
1062
-	struct cvmx_npei_dma0_int_level_s cn56xxp1;
10631013 };
10641014 
10651015 union cvmx_npei_dma1_int_level {
....@@ -1073,10 +1023,6 @@
10731023 		uint64_t time:32;
10741024 #endif
10751025 	} s;
1076
-	struct cvmx_npei_dma1_int_level_s cn52xx;
1077
-	struct cvmx_npei_dma1_int_level_s cn52xxp1;
1078
-	struct cvmx_npei_dma1_int_level_s cn56xx;
1079
-	struct cvmx_npei_dma1_int_level_s cn56xxp1;
10801026 };
10811027 
10821028 union cvmx_npei_dma_cnts {
....@@ -1090,10 +1036,6 @@
10901036 		uint64_t dma1:32;
10911037 #endif
10921038 	} s;
1093
-	struct cvmx_npei_dma_cnts_s cn52xx;
1094
-	struct cvmx_npei_dma_cnts_s cn52xxp1;
1095
-	struct cvmx_npei_dma_cnts_s cn56xx;
1096
-	struct cvmx_npei_dma_cnts_s cn56xxp1;
10971039 };
10981040 
10991041 union cvmx_npei_dma_control {
....@@ -1137,7 +1079,6 @@
11371079 		uint64_t reserved_40_63:24;
11381080 #endif
11391081 	} s;
1140
-	struct cvmx_npei_dma_control_s cn52xx;
11411082 	struct cvmx_npei_dma_control_cn52xxp1 {
11421083 #ifdef __BIG_ENDIAN_BITFIELD
11431084 		uint64_t reserved_38_63:26;
....@@ -1173,7 +1114,6 @@
11731114 		uint64_t reserved_38_63:26;
11741115 #endif
11751116 	} cn52xxp1;
1176
-	struct cvmx_npei_dma_control_s cn56xx;
11771117 	struct cvmx_npei_dma_control_cn56xxp1 {
11781118 #ifdef __BIG_ENDIAN_BITFIELD
11791119 		uint64_t reserved_39_63:25;
....@@ -1250,8 +1190,6 @@
12501190 		uint64_t dma_arb:1;
12511191 #endif
12521192 	} s;
1253
-	struct cvmx_npei_dma_pcie_req_num_s cn52xx;
1254
-	struct cvmx_npei_dma_pcie_req_num_s cn56xx;
12551193 };
12561194 
12571195 union cvmx_npei_dma_state1 {
....@@ -1273,7 +1211,6 @@
12731211 		uint64_t reserved_40_63:24;
12741212 #endif
12751213 	} s;
1276
-	struct cvmx_npei_dma_state1_s cn52xx;
12771214 };
12781215 
12791216 union cvmx_npei_dma_state1_p1 {
....@@ -1332,7 +1269,6 @@
13321269 		uint64_t reserved_60_63:4;
13331270 #endif
13341271 	} cn52xxp1;
1335
-	struct cvmx_npei_dma_state1_p1_s cn56xxp1;
13361272 };
13371273 
13381274 union cvmx_npei_dma_state2 {
....@@ -1354,7 +1290,6 @@
13541290 		uint64_t reserved_28_63:36;
13551291 #endif
13561292 	} s;
1357
-	struct cvmx_npei_dma_state2_s cn52xx;
13581293 };
13591294 
13601295 union cvmx_npei_dma_state2_p1 {
....@@ -1393,7 +1328,6 @@
13931328 		uint64_t reserved_45_63:19;
13941329 #endif
13951330 	} cn52xxp1;
1396
-	struct cvmx_npei_dma_state2_p1_s cn56xxp1;
13971331 };
13981332 
13991333 union cvmx_npei_dma_state3_p1 {
....@@ -1413,8 +1347,6 @@
14131347 		uint64_t reserved_60_63:4;
14141348 #endif
14151349 	} s;
1416
-	struct cvmx_npei_dma_state3_p1_s cn52xxp1;
1417
-	struct cvmx_npei_dma_state3_p1_s cn56xxp1;
14181350 };
14191351 
14201352 union cvmx_npei_dma_state4_p1 {
....@@ -1434,8 +1366,6 @@
14341366 		uint64_t reserved_52_63:12;
14351367 #endif
14361368 	} s;
1437
-	struct cvmx_npei_dma_state4_p1_s cn52xxp1;
1438
-	struct cvmx_npei_dma_state4_p1_s cn56xxp1;
14391369 };
14401370 
14411371 union cvmx_npei_dma_state5_p1 {
....@@ -1451,7 +1381,6 @@
14511381 		uint64_t reserved_28_63:36;
14521382 #endif
14531383 	} s;
1454
-	struct cvmx_npei_dma_state5_p1_s cn56xxp1;
14551384 };
14561385 
14571386 union cvmx_npei_int_a_enb {
....@@ -1483,7 +1412,6 @@
14831412 		uint64_t reserved_10_63:54;
14841413 #endif
14851414 	} s;
1486
-	struct cvmx_npei_int_a_enb_s cn52xx;
14871415 	struct cvmx_npei_int_a_enb_cn52xxp1 {
14881416 #ifdef __BIG_ENDIAN_BITFIELD
14891417 		uint64_t reserved_2_63:62;
....@@ -1495,7 +1423,6 @@
14951423 		uint64_t reserved_2_63:62;
14961424 #endif
14971425 	} cn52xxp1;
1498
-	struct cvmx_npei_int_a_enb_s cn56xx;
14991426 };
15001427 
15011428 union cvmx_npei_int_a_enb2 {
....@@ -1527,7 +1454,6 @@
15271454 		uint64_t reserved_10_63:54;
15281455 #endif
15291456 	} s;
1530
-	struct cvmx_npei_int_a_enb2_s cn52xx;
15311457 	struct cvmx_npei_int_a_enb2_cn52xxp1 {
15321458 #ifdef __BIG_ENDIAN_BITFIELD
15331459 		uint64_t reserved_2_63:62;
....@@ -1539,7 +1465,6 @@
15391465 		uint64_t reserved_2_63:62;
15401466 #endif
15411467 	} cn52xxp1;
1542
-	struct cvmx_npei_int_a_enb2_s cn56xx;
15431468 };
15441469 
15451470 union cvmx_npei_int_a_sum {
....@@ -1571,7 +1496,6 @@
15711496 		uint64_t reserved_10_63:54;
15721497 #endif
15731498 	} s;
1574
-	struct cvmx_npei_int_a_sum_s cn52xx;
15751499 	struct cvmx_npei_int_a_sum_cn52xxp1 {
15761500 #ifdef __BIG_ENDIAN_BITFIELD
15771501 		uint64_t reserved_2_63:62;
....@@ -1583,7 +1507,6 @@
15831507 		uint64_t reserved_2_63:62;
15841508 #endif
15851509 	} cn52xxp1;
1586
-	struct cvmx_npei_int_a_sum_s cn56xx;
15871510 };
15881511 
15891512 union cvmx_npei_int_enb {
....@@ -1721,7 +1644,6 @@
17211644 		uint64_t mio_inta:1;
17221645 #endif
17231646 	} s;
1724
-	struct cvmx_npei_int_enb_s cn52xx;
17251647 	struct cvmx_npei_int_enb_cn52xxp1 {
17261648 #ifdef __BIG_ENDIAN_BITFIELD
17271649 		uint64_t mio_inta:1;
....@@ -1855,7 +1777,6 @@
18551777 		uint64_t mio_inta:1;
18561778 #endif
18571779 	} cn52xxp1;
1858
-	struct cvmx_npei_int_enb_s cn56xx;
18591780 	struct cvmx_npei_int_enb_cn56xxp1 {
18601781 #ifdef __BIG_ENDIAN_BITFIELD
18611782 		uint64_t mio_inta:1;
....@@ -2122,7 +2043,6 @@
21222043 		uint64_t reserved_62_63:2;
21232044 #endif
21242045 	} s;
2125
-	struct cvmx_npei_int_enb2_s cn52xx;
21262046 	struct cvmx_npei_int_enb2_cn52xxp1 {
21272047 #ifdef __BIG_ENDIAN_BITFIELD
21282048 		uint64_t reserved_62_63:2;
....@@ -2254,7 +2174,6 @@
22542174 		uint64_t reserved_62_63:2;
22552175 #endif
22562176 	} cn52xxp1;
2257
-	struct cvmx_npei_int_enb2_s cn56xx;
22582177 	struct cvmx_npei_int_enb2_cn56xxp1 {
22592178 #ifdef __BIG_ENDIAN_BITFIELD
22602179 		uint64_t reserved_61_63:3;
....@@ -2399,9 +2318,6 @@
23992318 		uint64_t reserved_12_63:52;
24002319 #endif
24012320 	} s;
2402
-	struct cvmx_npei_int_info_s cn52xx;
2403
-	struct cvmx_npei_int_info_s cn56xx;
2404
-	struct cvmx_npei_int_info_s cn56xxp1;
24052321 };
24062322 
24072323 union cvmx_npei_int_sum {
....@@ -2539,7 +2455,6 @@
25392455 		uint64_t mio_inta:1;
25402456 #endif
25412457 	} s;
2542
-	struct cvmx_npei_int_sum_s cn52xx;
25432458 	struct cvmx_npei_int_sum_cn52xxp1 {
25442459 #ifdef __BIG_ENDIAN_BITFIELD
25452460 		uint64_t mio_inta:1;
....@@ -2667,7 +2582,6 @@
26672582 		uint64_t mio_inta:1;
26682583 #endif
26692584 	} cn52xxp1;
2670
-	struct cvmx_npei_int_sum_s cn56xx;
26712585 	struct cvmx_npei_int_sum_cn56xxp1 {
26722586 #ifdef __BIG_ENDIAN_BITFIELD
26732587 		uint64_t mio_inta:1;
....@@ -2924,9 +2838,6 @@
29242838 		uint64_t mio_inta:1;
29252839 #endif
29262840 	} s;
2927
-	struct cvmx_npei_int_sum2_s cn52xx;
2928
-	struct cvmx_npei_int_sum2_s cn52xxp1;
2929
-	struct cvmx_npei_int_sum2_s cn56xx;
29302841 };
29312842 
29322843 union cvmx_npei_last_win_rdata0 {
....@@ -2938,10 +2849,6 @@
29382849 		uint64_t data:64;
29392850 #endif
29402851 	} s;
2941
-	struct cvmx_npei_last_win_rdata0_s cn52xx;
2942
-	struct cvmx_npei_last_win_rdata0_s cn52xxp1;
2943
-	struct cvmx_npei_last_win_rdata0_s cn56xx;
2944
-	struct cvmx_npei_last_win_rdata0_s cn56xxp1;
29452852 };
29462853 
29472854 union cvmx_npei_last_win_rdata1 {
....@@ -2953,10 +2860,6 @@
29532860 		uint64_t data:64;
29542861 #endif
29552862 	} s;
2956
-	struct cvmx_npei_last_win_rdata1_s cn52xx;
2957
-	struct cvmx_npei_last_win_rdata1_s cn52xxp1;
2958
-	struct cvmx_npei_last_win_rdata1_s cn56xx;
2959
-	struct cvmx_npei_last_win_rdata1_s cn56xxp1;
29602863 };
29612864 
29622865 union cvmx_npei_mem_access_ctl {
....@@ -2972,10 +2875,6 @@
29722875 		uint64_t reserved_14_63:50;
29732876 #endif
29742877 	} s;
2975
-	struct cvmx_npei_mem_access_ctl_s cn52xx;
2976
-	struct cvmx_npei_mem_access_ctl_s cn52xxp1;
2977
-	struct cvmx_npei_mem_access_ctl_s cn56xx;
2978
-	struct cvmx_npei_mem_access_ctl_s cn56xxp1;
29792878 };
29802879 
29812880 union cvmx_npei_mem_access_subidx {
....@@ -3007,10 +2906,6 @@
30072906 		uint64_t reserved_42_63:22;
30082907 #endif
30092908 	} s;
3010
-	struct cvmx_npei_mem_access_subidx_s cn52xx;
3011
-	struct cvmx_npei_mem_access_subidx_s cn52xxp1;
3012
-	struct cvmx_npei_mem_access_subidx_s cn56xx;
3013
-	struct cvmx_npei_mem_access_subidx_s cn56xxp1;
30142909 };
30152910 
30162911 union cvmx_npei_msi_enb0 {
....@@ -3022,10 +2917,6 @@
30222917 		uint64_t enb:64;
30232918 #endif
30242919 	} s;
3025
-	struct cvmx_npei_msi_enb0_s cn52xx;
3026
-	struct cvmx_npei_msi_enb0_s cn52xxp1;
3027
-	struct cvmx_npei_msi_enb0_s cn56xx;
3028
-	struct cvmx_npei_msi_enb0_s cn56xxp1;
30292920 };
30302921 
30312922 union cvmx_npei_msi_enb1 {
....@@ -3037,10 +2928,6 @@
30372928 		uint64_t enb:64;
30382929 #endif
30392930 	} s;
3040
-	struct cvmx_npei_msi_enb1_s cn52xx;
3041
-	struct cvmx_npei_msi_enb1_s cn52xxp1;
3042
-	struct cvmx_npei_msi_enb1_s cn56xx;
3043
-	struct cvmx_npei_msi_enb1_s cn56xxp1;
30442931 };
30452932 
30462933 union cvmx_npei_msi_enb2 {
....@@ -3052,10 +2939,6 @@
30522939 		uint64_t enb:64;
30532940 #endif
30542941 	} s;
3055
-	struct cvmx_npei_msi_enb2_s cn52xx;
3056
-	struct cvmx_npei_msi_enb2_s cn52xxp1;
3057
-	struct cvmx_npei_msi_enb2_s cn56xx;
3058
-	struct cvmx_npei_msi_enb2_s cn56xxp1;
30592942 };
30602943 
30612944 union cvmx_npei_msi_enb3 {
....@@ -3067,10 +2950,6 @@
30672950 		uint64_t enb:64;
30682951 #endif
30692952 	} s;
3070
-	struct cvmx_npei_msi_enb3_s cn52xx;
3071
-	struct cvmx_npei_msi_enb3_s cn52xxp1;
3072
-	struct cvmx_npei_msi_enb3_s cn56xx;
3073
-	struct cvmx_npei_msi_enb3_s cn56xxp1;
30742953 };
30752954 
30762955 union cvmx_npei_msi_rcv0 {
....@@ -3082,10 +2961,6 @@
30822961 		uint64_t intr:64;
30832962 #endif
30842963 	} s;
3085
-	struct cvmx_npei_msi_rcv0_s cn52xx;
3086
-	struct cvmx_npei_msi_rcv0_s cn52xxp1;
3087
-	struct cvmx_npei_msi_rcv0_s cn56xx;
3088
-	struct cvmx_npei_msi_rcv0_s cn56xxp1;
30892964 };
30902965 
30912966 union cvmx_npei_msi_rcv1 {
....@@ -3097,10 +2972,6 @@
30972972 		uint64_t intr:64;
30982973 #endif
30992974 	} s;
3100
-	struct cvmx_npei_msi_rcv1_s cn52xx;
3101
-	struct cvmx_npei_msi_rcv1_s cn52xxp1;
3102
-	struct cvmx_npei_msi_rcv1_s cn56xx;
3103
-	struct cvmx_npei_msi_rcv1_s cn56xxp1;
31042975 };
31052976 
31062977 union cvmx_npei_msi_rcv2 {
....@@ -3112,10 +2983,6 @@
31122983 		uint64_t intr:64;
31132984 #endif
31142985 	} s;
3115
-	struct cvmx_npei_msi_rcv2_s cn52xx;
3116
-	struct cvmx_npei_msi_rcv2_s cn52xxp1;
3117
-	struct cvmx_npei_msi_rcv2_s cn56xx;
3118
-	struct cvmx_npei_msi_rcv2_s cn56xxp1;
31192986 };
31202987 
31212988 union cvmx_npei_msi_rcv3 {
....@@ -3127,10 +2994,6 @@
31272994 		uint64_t intr:64;
31282995 #endif
31292996 	} s;
3130
-	struct cvmx_npei_msi_rcv3_s cn52xx;
3131
-	struct cvmx_npei_msi_rcv3_s cn52xxp1;
3132
-	struct cvmx_npei_msi_rcv3_s cn56xx;
3133
-	struct cvmx_npei_msi_rcv3_s cn56xxp1;
31342997 };
31352998 
31362999 union cvmx_npei_msi_rd_map {
....@@ -3146,10 +3009,6 @@
31463009 		uint64_t reserved_16_63:48;
31473010 #endif
31483011 	} s;
3149
-	struct cvmx_npei_msi_rd_map_s cn52xx;
3150
-	struct cvmx_npei_msi_rd_map_s cn52xxp1;
3151
-	struct cvmx_npei_msi_rd_map_s cn56xx;
3152
-	struct cvmx_npei_msi_rd_map_s cn56xxp1;
31533012 };
31543013 
31553014 union cvmx_npei_msi_w1c_enb0 {
....@@ -3161,8 +3020,6 @@
31613020 		uint64_t clr:64;
31623021 #endif
31633022 	} s;
3164
-	struct cvmx_npei_msi_w1c_enb0_s cn52xx;
3165
-	struct cvmx_npei_msi_w1c_enb0_s cn56xx;
31663023 };
31673024 
31683025 union cvmx_npei_msi_w1c_enb1 {
....@@ -3174,8 +3031,6 @@
31743031 		uint64_t clr:64;
31753032 #endif
31763033 	} s;
3177
-	struct cvmx_npei_msi_w1c_enb1_s cn52xx;
3178
-	struct cvmx_npei_msi_w1c_enb1_s cn56xx;
31793034 };
31803035 
31813036 union cvmx_npei_msi_w1c_enb2 {
....@@ -3187,8 +3042,6 @@
31873042 		uint64_t clr:64;
31883043 #endif
31893044 	} s;
3190
-	struct cvmx_npei_msi_w1c_enb2_s cn52xx;
3191
-	struct cvmx_npei_msi_w1c_enb2_s cn56xx;
31923045 };
31933046 
31943047 union cvmx_npei_msi_w1c_enb3 {
....@@ -3200,8 +3053,6 @@
32003053 		uint64_t clr:64;
32013054 #endif
32023055 	} s;
3203
-	struct cvmx_npei_msi_w1c_enb3_s cn52xx;
3204
-	struct cvmx_npei_msi_w1c_enb3_s cn56xx;
32053056 };
32063057 
32073058 union cvmx_npei_msi_w1s_enb0 {
....@@ -3213,8 +3064,6 @@
32133064 		uint64_t set:64;
32143065 #endif
32153066 	} s;
3216
-	struct cvmx_npei_msi_w1s_enb0_s cn52xx;
3217
-	struct cvmx_npei_msi_w1s_enb0_s cn56xx;
32183067 };
32193068 
32203069 union cvmx_npei_msi_w1s_enb1 {
....@@ -3226,8 +3075,6 @@
32263075 		uint64_t set:64;
32273076 #endif
32283077 	} s;
3229
-	struct cvmx_npei_msi_w1s_enb1_s cn52xx;
3230
-	struct cvmx_npei_msi_w1s_enb1_s cn56xx;
32313078 };
32323079 
32333080 union cvmx_npei_msi_w1s_enb2 {
....@@ -3239,8 +3086,6 @@
32393086 		uint64_t set:64;
32403087 #endif
32413088 	} s;
3242
-	struct cvmx_npei_msi_w1s_enb2_s cn52xx;
3243
-	struct cvmx_npei_msi_w1s_enb2_s cn56xx;
32443089 };
32453090 
32463091 union cvmx_npei_msi_w1s_enb3 {
....@@ -3252,8 +3097,6 @@
32523097 		uint64_t set:64;
32533098 #endif
32543099 	} s;
3255
-	struct cvmx_npei_msi_w1s_enb3_s cn52xx;
3256
-	struct cvmx_npei_msi_w1s_enb3_s cn56xx;
32573100 };
32583101 
32593102 union cvmx_npei_msi_wr_map {
....@@ -3269,10 +3112,6 @@
32693112 		uint64_t reserved_16_63:48;
32703113 #endif
32713114 	} s;
3272
-	struct cvmx_npei_msi_wr_map_s cn52xx;
3273
-	struct cvmx_npei_msi_wr_map_s cn52xxp1;
3274
-	struct cvmx_npei_msi_wr_map_s cn56xx;
3275
-	struct cvmx_npei_msi_wr_map_s cn56xxp1;
32763115 };
32773116 
32783117 union cvmx_npei_pcie_credit_cnt {
....@@ -3296,8 +3135,6 @@
32963135 		uint64_t reserved_48_63:16;
32973136 #endif
32983137 	} s;
3299
-	struct cvmx_npei_pcie_credit_cnt_s cn52xx;
3300
-	struct cvmx_npei_pcie_credit_cnt_s cn56xx;
33013138 };
33023139 
33033140 union cvmx_npei_pcie_msi_rcv {
....@@ -3311,10 +3148,6 @@
33113148 		uint64_t reserved_8_63:56;
33123149 #endif
33133150 	} s;
3314
-	struct cvmx_npei_pcie_msi_rcv_s cn52xx;
3315
-	struct cvmx_npei_pcie_msi_rcv_s cn52xxp1;
3316
-	struct cvmx_npei_pcie_msi_rcv_s cn56xx;
3317
-	struct cvmx_npei_pcie_msi_rcv_s cn56xxp1;
33183151 };
33193152 
33203153 union cvmx_npei_pcie_msi_rcv_b1 {
....@@ -3330,10 +3163,6 @@
33303163 		uint64_t reserved_16_63:48;
33313164 #endif
33323165 	} s;
3333
-	struct cvmx_npei_pcie_msi_rcv_b1_s cn52xx;
3334
-	struct cvmx_npei_pcie_msi_rcv_b1_s cn52xxp1;
3335
-	struct cvmx_npei_pcie_msi_rcv_b1_s cn56xx;
3336
-	struct cvmx_npei_pcie_msi_rcv_b1_s cn56xxp1;
33373166 };
33383167 
33393168 union cvmx_npei_pcie_msi_rcv_b2 {
....@@ -3349,10 +3178,6 @@
33493178 		uint64_t reserved_24_63:40;
33503179 #endif
33513180 	} s;
3352
-	struct cvmx_npei_pcie_msi_rcv_b2_s cn52xx;
3353
-	struct cvmx_npei_pcie_msi_rcv_b2_s cn52xxp1;
3354
-	struct cvmx_npei_pcie_msi_rcv_b2_s cn56xx;
3355
-	struct cvmx_npei_pcie_msi_rcv_b2_s cn56xxp1;
33563181 };
33573182 
33583183 union cvmx_npei_pcie_msi_rcv_b3 {
....@@ -3368,10 +3193,6 @@
33683193 		uint64_t reserved_32_63:32;
33693194 #endif
33703195 	} s;
3371
-	struct cvmx_npei_pcie_msi_rcv_b3_s cn52xx;
3372
-	struct cvmx_npei_pcie_msi_rcv_b3_s cn52xxp1;
3373
-	struct cvmx_npei_pcie_msi_rcv_b3_s cn56xx;
3374
-	struct cvmx_npei_pcie_msi_rcv_b3_s cn56xxp1;
33753196 };
33763197 
33773198 union cvmx_npei_pktx_cnts {
....@@ -3387,8 +3208,6 @@
33873208 		uint64_t reserved_54_63:10;
33883209 #endif
33893210 	} s;
3390
-	struct cvmx_npei_pktx_cnts_s cn52xx;
3391
-	struct cvmx_npei_pktx_cnts_s cn56xx;
33923211 };
33933212 
33943213 union cvmx_npei_pktx_in_bp {
....@@ -3402,8 +3221,6 @@
34023221 		uint64_t wmark:32;
34033222 #endif
34043223 	} s;
3405
-	struct cvmx_npei_pktx_in_bp_s cn52xx;
3406
-	struct cvmx_npei_pktx_in_bp_s cn56xx;
34073224 };
34083225 
34093226 union cvmx_npei_pktx_instr_baddr {
....@@ -3417,8 +3234,6 @@
34173234 		uint64_t addr:61;
34183235 #endif
34193236 	} s;
3420
-	struct cvmx_npei_pktx_instr_baddr_s cn52xx;
3421
-	struct cvmx_npei_pktx_instr_baddr_s cn56xx;
34223237 };
34233238 
34243239 union cvmx_npei_pktx_instr_baoff_dbell {
....@@ -3432,8 +3247,6 @@
34323247 		uint64_t aoff:32;
34333248 #endif
34343249 	} s;
3435
-	struct cvmx_npei_pktx_instr_baoff_dbell_s cn52xx;
3436
-	struct cvmx_npei_pktx_instr_baoff_dbell_s cn56xx;
34373250 };
34383251 
34393252 union cvmx_npei_pktx_instr_fifo_rsize {
....@@ -3453,8 +3266,6 @@
34533266 		uint64_t max:9;
34543267 #endif
34553268 	} s;
3456
-	struct cvmx_npei_pktx_instr_fifo_rsize_s cn52xx;
3457
-	struct cvmx_npei_pktx_instr_fifo_rsize_s cn56xx;
34583269 };
34593270 
34603271 union cvmx_npei_pktx_instr_header {
....@@ -3490,8 +3301,6 @@
34903301 		uint64_t reserved_44_63:20;
34913302 #endif
34923303 	} s;
3493
-	struct cvmx_npei_pktx_instr_header_s cn52xx;
3494
-	struct cvmx_npei_pktx_instr_header_s cn56xx;
34953304 };
34963305 
34973306 union cvmx_npei_pktx_slist_baddr {
....@@ -3505,8 +3314,6 @@
35053314 		uint64_t addr:60;
35063315 #endif
35073316 	} s;
3508
-	struct cvmx_npei_pktx_slist_baddr_s cn52xx;
3509
-	struct cvmx_npei_pktx_slist_baddr_s cn56xx;
35103317 };
35113318 
35123319 union cvmx_npei_pktx_slist_baoff_dbell {
....@@ -3520,8 +3327,6 @@
35203327 		uint64_t aoff:32;
35213328 #endif
35223329 	} s;
3523
-	struct cvmx_npei_pktx_slist_baoff_dbell_s cn52xx;
3524
-	struct cvmx_npei_pktx_slist_baoff_dbell_s cn56xx;
35253330 };
35263331 
35273332 union cvmx_npei_pktx_slist_fifo_rsize {
....@@ -3535,8 +3340,6 @@
35353340 		uint64_t reserved_32_63:32;
35363341 #endif
35373342 	} s;
3538
-	struct cvmx_npei_pktx_slist_fifo_rsize_s cn52xx;
3539
-	struct cvmx_npei_pktx_slist_fifo_rsize_s cn56xx;
35403343 };
35413344 
35423345 union cvmx_npei_pkt_cnt_int {
....@@ -3550,8 +3353,6 @@
35503353 		uint64_t reserved_32_63:32;
35513354 #endif
35523355 	} s;
3553
-	struct cvmx_npei_pkt_cnt_int_s cn52xx;
3554
-	struct cvmx_npei_pkt_cnt_int_s cn56xx;
35553356 };
35563357 
35573358 union cvmx_npei_pkt_cnt_int_enb {
....@@ -3565,8 +3366,6 @@
35653366 		uint64_t reserved_32_63:32;
35663367 #endif
35673368 	} s;
3568
-	struct cvmx_npei_pkt_cnt_int_enb_s cn52xx;
3569
-	struct cvmx_npei_pkt_cnt_int_enb_s cn56xx;
35703369 };
35713370 
35723371 union cvmx_npei_pkt_data_out_es {
....@@ -3578,8 +3377,6 @@
35783377 		uint64_t es:64;
35793378 #endif
35803379 	} s;
3581
-	struct cvmx_npei_pkt_data_out_es_s cn52xx;
3582
-	struct cvmx_npei_pkt_data_out_es_s cn56xx;
35833380 };
35843381 
35853382 union cvmx_npei_pkt_data_out_ns {
....@@ -3593,8 +3390,6 @@
35933390 		uint64_t reserved_32_63:32;
35943391 #endif
35953392 	} s;
3596
-	struct cvmx_npei_pkt_data_out_ns_s cn52xx;
3597
-	struct cvmx_npei_pkt_data_out_ns_s cn56xx;
35983393 };
35993394 
36003395 union cvmx_npei_pkt_data_out_ror {
....@@ -3608,8 +3403,6 @@
36083403 		uint64_t reserved_32_63:32;
36093404 #endif
36103405 	} s;
3611
-	struct cvmx_npei_pkt_data_out_ror_s cn52xx;
3612
-	struct cvmx_npei_pkt_data_out_ror_s cn56xx;
36133406 };
36143407 
36153408 union cvmx_npei_pkt_dpaddr {
....@@ -3623,8 +3416,6 @@
36233416 		uint64_t reserved_32_63:32;
36243417 #endif
36253418 	} s;
3626
-	struct cvmx_npei_pkt_dpaddr_s cn52xx;
3627
-	struct cvmx_npei_pkt_dpaddr_s cn56xx;
36283419 };
36293420 
36303421 union cvmx_npei_pkt_in_bp {
....@@ -3638,8 +3429,6 @@
36383429 		uint64_t reserved_32_63:32;
36393430 #endif
36403431 	} s;
3641
-	struct cvmx_npei_pkt_in_bp_s cn52xx;
3642
-	struct cvmx_npei_pkt_in_bp_s cn56xx;
36433432 };
36443433 
36453434 union cvmx_npei_pkt_in_donex_cnts {
....@@ -3653,8 +3442,6 @@
36533442 		uint64_t reserved_32_63:32;
36543443 #endif
36553444 	} s;
3656
-	struct cvmx_npei_pkt_in_donex_cnts_s cn52xx;
3657
-	struct cvmx_npei_pkt_in_donex_cnts_s cn56xx;
36583445 };
36593446 
36603447 union cvmx_npei_pkt_in_instr_counts {
....@@ -3668,8 +3455,6 @@
36683455 		uint64_t wr_cnt:32;
36693456 #endif
36703457 	} s;
3671
-	struct cvmx_npei_pkt_in_instr_counts_s cn52xx;
3672
-	struct cvmx_npei_pkt_in_instr_counts_s cn56xx;
36733458 };
36743459 
36753460 union cvmx_npei_pkt_in_pcie_port {
....@@ -3681,8 +3466,6 @@
36813466 		uint64_t pp:64;
36823467 #endif
36833468 	} s;
3684
-	struct cvmx_npei_pkt_in_pcie_port_s cn52xx;
3685
-	struct cvmx_npei_pkt_in_pcie_port_s cn56xx;
36863469 };
36873470 
36883471 union cvmx_npei_pkt_input_control {
....@@ -3712,8 +3495,6 @@
37123495 		uint64_t reserved_23_63:41;
37133496 #endif
37143497 	} s;
3715
-	struct cvmx_npei_pkt_input_control_s cn52xx;
3716
-	struct cvmx_npei_pkt_input_control_s cn56xx;
37173498 };
37183499 
37193500 union cvmx_npei_pkt_instr_enb {
....@@ -3727,8 +3508,6 @@
37273508 		uint64_t reserved_32_63:32;
37283509 #endif
37293510 	} s;
3730
-	struct cvmx_npei_pkt_instr_enb_s cn52xx;
3731
-	struct cvmx_npei_pkt_instr_enb_s cn56xx;
37323511 };
37333512 
37343513 union cvmx_npei_pkt_instr_rd_size {
....@@ -3740,8 +3519,6 @@
37403519 		uint64_t rdsize:64;
37413520 #endif
37423521 	} s;
3743
-	struct cvmx_npei_pkt_instr_rd_size_s cn52xx;
3744
-	struct cvmx_npei_pkt_instr_rd_size_s cn56xx;
37453522 };
37463523 
37473524 union cvmx_npei_pkt_instr_size {
....@@ -3755,8 +3532,6 @@
37553532 		uint64_t reserved_32_63:32;
37563533 #endif
37573534 	} s;
3758
-	struct cvmx_npei_pkt_instr_size_s cn52xx;
3759
-	struct cvmx_npei_pkt_instr_size_s cn56xx;
37603535 };
37613536 
37623537 union cvmx_npei_pkt_int_levels {
....@@ -3772,8 +3547,6 @@
37723547 		uint64_t reserved_54_63:10;
37733548 #endif
37743549 	} s;
3775
-	struct cvmx_npei_pkt_int_levels_s cn52xx;
3776
-	struct cvmx_npei_pkt_int_levels_s cn56xx;
37773550 };
37783551 
37793552 union cvmx_npei_pkt_iptr {
....@@ -3787,8 +3560,6 @@
37873560 		uint64_t reserved_32_63:32;
37883561 #endif
37893562 	} s;
3790
-	struct cvmx_npei_pkt_iptr_s cn52xx;
3791
-	struct cvmx_npei_pkt_iptr_s cn56xx;
37923563 };
37933564 
37943565 union cvmx_npei_pkt_out_bmode {
....@@ -3802,8 +3573,6 @@
38023573 		uint64_t reserved_32_63:32;
38033574 #endif
38043575 	} s;
3805
-	struct cvmx_npei_pkt_out_bmode_s cn52xx;
3806
-	struct cvmx_npei_pkt_out_bmode_s cn56xx;
38073576 };
38083577 
38093578 union cvmx_npei_pkt_out_enb {
....@@ -3817,8 +3586,6 @@
38173586 		uint64_t reserved_32_63:32;
38183587 #endif
38193588 	} s;
3820
-	struct cvmx_npei_pkt_out_enb_s cn52xx;
3821
-	struct cvmx_npei_pkt_out_enb_s cn56xx;
38223589 };
38233590 
38243591 union cvmx_npei_pkt_output_wmark {
....@@ -3832,8 +3599,6 @@
38323599 		uint64_t reserved_32_63:32;
38333600 #endif
38343601 	} s;
3835
-	struct cvmx_npei_pkt_output_wmark_s cn52xx;
3836
-	struct cvmx_npei_pkt_output_wmark_s cn56xx;
38373602 };
38383603 
38393604 union cvmx_npei_pkt_pcie_port {
....@@ -3845,8 +3610,6 @@
38453610 		uint64_t pp:64;
38463611 #endif
38473612 	} s;
3848
-	struct cvmx_npei_pkt_pcie_port_s cn52xx;
3849
-	struct cvmx_npei_pkt_pcie_port_s cn56xx;
38503613 };
38513614 
38523615 union cvmx_npei_pkt_port_in_rst {
....@@ -3860,8 +3623,6 @@
38603623 		uint64_t in_rst:32;
38613624 #endif
38623625 	} s;
3863
-	struct cvmx_npei_pkt_port_in_rst_s cn52xx;
3864
-	struct cvmx_npei_pkt_port_in_rst_s cn56xx;
38653626 };
38663627 
38673628 union cvmx_npei_pkt_slist_es {
....@@ -3873,8 +3634,6 @@
38733634 		uint64_t es:64;
38743635 #endif
38753636 	} s;
3876
-	struct cvmx_npei_pkt_slist_es_s cn52xx;
3877
-	struct cvmx_npei_pkt_slist_es_s cn56xx;
38783637 };
38793638 
38803639 union cvmx_npei_pkt_slist_id_size {
....@@ -3890,8 +3649,6 @@
38903649 		uint64_t reserved_23_63:41;
38913650 #endif
38923651 	} s;
3893
-	struct cvmx_npei_pkt_slist_id_size_s cn52xx;
3894
-	struct cvmx_npei_pkt_slist_id_size_s cn56xx;
38953652 };
38963653 
38973654 union cvmx_npei_pkt_slist_ns {
....@@ -3905,8 +3662,6 @@
39053662 		uint64_t reserved_32_63:32;
39063663 #endif
39073664 	} s;
3908
-	struct cvmx_npei_pkt_slist_ns_s cn52xx;
3909
-	struct cvmx_npei_pkt_slist_ns_s cn56xx;
39103665 };
39113666 
39123667 union cvmx_npei_pkt_slist_ror {
....@@ -3920,8 +3675,6 @@
39203675 		uint64_t reserved_32_63:32;
39213676 #endif
39223677 	} s;
3923
-	struct cvmx_npei_pkt_slist_ror_s cn52xx;
3924
-	struct cvmx_npei_pkt_slist_ror_s cn56xx;
39253678 };
39263679 
39273680 union cvmx_npei_pkt_time_int {
....@@ -3935,8 +3688,6 @@
39353688 		uint64_t reserved_32_63:32;
39363689 #endif
39373690 	} s;
3938
-	struct cvmx_npei_pkt_time_int_s cn52xx;
3939
-	struct cvmx_npei_pkt_time_int_s cn56xx;
39403691 };
39413692 
39423693 union cvmx_npei_pkt_time_int_enb {
....@@ -3950,8 +3701,6 @@
39503701 		uint64_t reserved_32_63:32;
39513702 #endif
39523703 	} s;
3953
-	struct cvmx_npei_pkt_time_int_enb_s cn52xx;
3954
-	struct cvmx_npei_pkt_time_int_enb_s cn56xx;
39553704 };
39563705 
39573706 union cvmx_npei_rsl_int_blocks {
....@@ -4019,10 +3768,6 @@
40193768 		uint64_t reserved_31_63:33;
40203769 #endif
40213770 	} s;
4022
-	struct cvmx_npei_rsl_int_blocks_s cn52xx;
4023
-	struct cvmx_npei_rsl_int_blocks_s cn52xxp1;
4024
-	struct cvmx_npei_rsl_int_blocks_s cn56xx;
4025
-	struct cvmx_npei_rsl_int_blocks_s cn56xxp1;
40263771 };
40273772 
40283773 union cvmx_npei_scratch_1 {
....@@ -4034,10 +3779,6 @@
40343779 		uint64_t data:64;
40353780 #endif
40363781 	} s;
4037
-	struct cvmx_npei_scratch_1_s cn52xx;
4038
-	struct cvmx_npei_scratch_1_s cn52xxp1;
4039
-	struct cvmx_npei_scratch_1_s cn56xx;
4040
-	struct cvmx_npei_scratch_1_s cn56xxp1;
40413782 };
40423783 
40433784 union cvmx_npei_state1 {
....@@ -4055,10 +3796,6 @@
40553796 		uint64_t cpl1:12;
40563797 #endif
40573798 	} s;
4058
-	struct cvmx_npei_state1_s cn52xx;
4059
-	struct cvmx_npei_state1_s cn52xxp1;
4060
-	struct cvmx_npei_state1_s cn56xx;
4061
-	struct cvmx_npei_state1_s cn56xxp1;
40623799 };
40633800 
40643801 union cvmx_npei_state2 {
....@@ -4082,10 +3819,6 @@
40823819 		uint64_t reserved_48_63:16;
40833820 #endif
40843821 	} s;
4085
-	struct cvmx_npei_state2_s cn52xx;
4086
-	struct cvmx_npei_state2_s cn52xxp1;
4087
-	struct cvmx_npei_state2_s cn56xx;
4088
-	struct cvmx_npei_state2_s cn56xxp1;
40893822 };
40903823 
40913824 union cvmx_npei_state3 {
....@@ -4105,10 +3838,6 @@
41053838 		uint64_t reserved_56_63:8;
41063839 #endif
41073840 	} s;
4108
-	struct cvmx_npei_state3_s cn52xx;
4109
-	struct cvmx_npei_state3_s cn52xxp1;
4110
-	struct cvmx_npei_state3_s cn56xx;
4111
-	struct cvmx_npei_state3_s cn56xxp1;
41123841 };
41133842 
41143843 union cvmx_npei_win_rd_addr {
....@@ -4126,10 +3855,6 @@
41263855 		uint64_t reserved_51_63:13;
41273856 #endif
41283857 	} s;
4129
-	struct cvmx_npei_win_rd_addr_s cn52xx;
4130
-	struct cvmx_npei_win_rd_addr_s cn52xxp1;
4131
-	struct cvmx_npei_win_rd_addr_s cn56xx;
4132
-	struct cvmx_npei_win_rd_addr_s cn56xxp1;
41333858 };
41343859 
41353860 union cvmx_npei_win_rd_data {
....@@ -4141,10 +3866,6 @@
41413866 		uint64_t rd_data:64;
41423867 #endif
41433868 	} s;
4144
-	struct cvmx_npei_win_rd_data_s cn52xx;
4145
-	struct cvmx_npei_win_rd_data_s cn52xxp1;
4146
-	struct cvmx_npei_win_rd_data_s cn56xx;
4147
-	struct cvmx_npei_win_rd_data_s cn56xxp1;
41483869 };
41493870 
41503871 union cvmx_npei_win_wr_addr {
....@@ -4162,10 +3883,6 @@
41623883 		uint64_t reserved_49_63:15;
41633884 #endif
41643885 	} s;
4165
-	struct cvmx_npei_win_wr_addr_s cn52xx;
4166
-	struct cvmx_npei_win_wr_addr_s cn52xxp1;
4167
-	struct cvmx_npei_win_wr_addr_s cn56xx;
4168
-	struct cvmx_npei_win_wr_addr_s cn56xxp1;
41693886 };
41703887 
41713888 union cvmx_npei_win_wr_data {
....@@ -4177,10 +3894,6 @@
41773894 		uint64_t wr_data:64;
41783895 #endif
41793896 	} s;
4180
-	struct cvmx_npei_win_wr_data_s cn52xx;
4181
-	struct cvmx_npei_win_wr_data_s cn52xxp1;
4182
-	struct cvmx_npei_win_wr_data_s cn56xx;
4183
-	struct cvmx_npei_win_wr_data_s cn56xxp1;
41843897 };
41853898 
41863899 union cvmx_npei_win_wr_mask {
....@@ -4194,10 +3907,6 @@
41943907 		uint64_t reserved_8_63:56;
41953908 #endif
41963909 	} s;
4197
-	struct cvmx_npei_win_wr_mask_s cn52xx;
4198
-	struct cvmx_npei_win_wr_mask_s cn52xxp1;
4199
-	struct cvmx_npei_win_wr_mask_s cn56xx;
4200
-	struct cvmx_npei_win_wr_mask_s cn56xxp1;
42013910 };
42023911 
42033912 union cvmx_npei_window_ctl {
....@@ -4211,10 +3920,6 @@
42113920 		uint64_t reserved_32_63:32;
42123921 #endif
42133922 	} s;
4214
-	struct cvmx_npei_window_ctl_s cn52xx;
4215
-	struct cvmx_npei_window_ctl_s cn52xxp1;
4216
-	struct cvmx_npei_window_ctl_s cn56xx;
4217
-	struct cvmx_npei_window_ctl_s cn56xxp1;
42183923 };
42193924 
42203925 #endif