~hc/RK356X_SDK_RELEASE.git

..	..	@@ -188,7 +188,6 @@
188	188	uint64_t reserved_4_63:60;
189	189	#endif
190	190	} cn30xx;
191		- struct cvmx_mio_boot_bist_stat_cn30xx cn31xx;
192	191	struct cvmx_mio_boot_bist_stat_cn38xx {
193	192	#ifdef __BIG_ENDIAN_BITFIELD
194	193	uint64_t reserved_3_63:61;
..	..	@@ -202,7 +201,6 @@
202	201	uint64_t reserved_3_63:61;
203	202	#endif
204	203	} cn38xx;
205		- struct cvmx_mio_boot_bist_stat_cn38xx cn38xxp2;
206	204	struct cvmx_mio_boot_bist_stat_cn50xx {
207	205	#ifdef __BIG_ENDIAN_BITFIELD
208	206	uint64_t reserved_6_63:58;
..	..	@@ -254,10 +252,6 @@
254	252	uint64_t reserved_4_63:60;
255	253	#endif
256	254	} cn52xxp1;
257		- struct cvmx_mio_boot_bist_stat_cn52xxp1 cn56xx;
258		- struct cvmx_mio_boot_bist_stat_cn52xxp1 cn56xxp1;
259		- struct cvmx_mio_boot_bist_stat_cn38xx cn58xx;
260		- struct cvmx_mio_boot_bist_stat_cn38xx cn58xxp1;
261	255	struct cvmx_mio_boot_bist_stat_cn61xx {
262	256	#ifdef __BIG_ENDIAN_BITFIELD
263	257	uint64_t reserved_12_63:52;
..	..	@@ -276,7 +270,6 @@
276	270	uint64_t reserved_9_63:55;
277	271	#endif
278	272	} cn63xx;
279		- struct cvmx_mio_boot_bist_stat_cn63xx cn63xxp1;
280	273	struct cvmx_mio_boot_bist_stat_cn66xx {
281	274	#ifdef __BIG_ENDIAN_BITFIELD
282	275	uint64_t reserved_10_63:54;
..	..	@@ -286,9 +279,6 @@
286	279	uint64_t reserved_10_63:54;
287	280	#endif
288	281	} cn66xx;
289		- struct cvmx_mio_boot_bist_stat_cn66xx cn68xx;
290		- struct cvmx_mio_boot_bist_stat_cn66xx cn68xxp1;
291		- struct cvmx_mio_boot_bist_stat_cn61xx cnf71xx;
292	282	};
293	283
294	284	union cvmx_mio_boot_comp {
..	..	@@ -311,10 +301,6 @@
311	301	uint64_t reserved_10_63:54;
312	302	#endif
313	303	} cn50xx;
314		- struct cvmx_mio_boot_comp_cn50xx cn52xx;
315		- struct cvmx_mio_boot_comp_cn50xx cn52xxp1;
316		- struct cvmx_mio_boot_comp_cn50xx cn56xx;
317		- struct cvmx_mio_boot_comp_cn50xx cn56xxp1;
318	304	struct cvmx_mio_boot_comp_cn61xx {
319	305	#ifdef __BIG_ENDIAN_BITFIELD
320	306	uint64_t reserved_12_63:52;
..	..	@@ -326,12 +312,6 @@
326	312	uint64_t reserved_12_63:52;
327	313	#endif
328	314	} cn61xx;
329		- struct cvmx_mio_boot_comp_cn61xx cn63xx;
330		- struct cvmx_mio_boot_comp_cn61xx cn63xxp1;
331		- struct cvmx_mio_boot_comp_cn61xx cn66xx;
332		- struct cvmx_mio_boot_comp_cn61xx cn68xx;
333		- struct cvmx_mio_boot_comp_cn61xx cn68xxp1;
334		- struct cvmx_mio_boot_comp_cn61xx cnf71xx;
335	315	};
336	316
337	317	union cvmx_mio_boot_dma_cfgx {
..	..	@@ -361,17 +341,6 @@
361	341	uint64_t en:1;
362	342	#endif
363	343	} s;
364		- struct cvmx_mio_boot_dma_cfgx_s cn52xx;
365		- struct cvmx_mio_boot_dma_cfgx_s cn52xxp1;
366		- struct cvmx_mio_boot_dma_cfgx_s cn56xx;
367		- struct cvmx_mio_boot_dma_cfgx_s cn56xxp1;
368		- struct cvmx_mio_boot_dma_cfgx_s cn61xx;
369		- struct cvmx_mio_boot_dma_cfgx_s cn63xx;
370		- struct cvmx_mio_boot_dma_cfgx_s cn63xxp1;
371		- struct cvmx_mio_boot_dma_cfgx_s cn66xx;
372		- struct cvmx_mio_boot_dma_cfgx_s cn68xx;
373		- struct cvmx_mio_boot_dma_cfgx_s cn68xxp1;
374		- struct cvmx_mio_boot_dma_cfgx_s cnf71xx;
375	344	};
376	345
377	346	union cvmx_mio_boot_dma_intx {
..	..	@@ -387,17 +356,6 @@
387	356	uint64_t reserved_2_63:62;
388	357	#endif
389	358	} s;
390		- struct cvmx_mio_boot_dma_intx_s cn52xx;
391		- struct cvmx_mio_boot_dma_intx_s cn52xxp1;
392		- struct cvmx_mio_boot_dma_intx_s cn56xx;
393		- struct cvmx_mio_boot_dma_intx_s cn56xxp1;
394		- struct cvmx_mio_boot_dma_intx_s cn61xx;
395		- struct cvmx_mio_boot_dma_intx_s cn63xx;
396		- struct cvmx_mio_boot_dma_intx_s cn63xxp1;
397		- struct cvmx_mio_boot_dma_intx_s cn66xx;
398		- struct cvmx_mio_boot_dma_intx_s cn68xx;
399		- struct cvmx_mio_boot_dma_intx_s cn68xxp1;
400		- struct cvmx_mio_boot_dma_intx_s cnf71xx;
401	359	};
402	360
403	361	union cvmx_mio_boot_dma_int_enx {
..	..	@@ -413,17 +371,6 @@
413	371	uint64_t reserved_2_63:62;
414	372	#endif
415	373	} s;
416		- struct cvmx_mio_boot_dma_int_enx_s cn52xx;
417		- struct cvmx_mio_boot_dma_int_enx_s cn52xxp1;
418		- struct cvmx_mio_boot_dma_int_enx_s cn56xx;
419		- struct cvmx_mio_boot_dma_int_enx_s cn56xxp1;
420		- struct cvmx_mio_boot_dma_int_enx_s cn61xx;
421		- struct cvmx_mio_boot_dma_int_enx_s cn63xx;
422		- struct cvmx_mio_boot_dma_int_enx_s cn63xxp1;
423		- struct cvmx_mio_boot_dma_int_enx_s cn66xx;
424		- struct cvmx_mio_boot_dma_int_enx_s cn68xx;
425		- struct cvmx_mio_boot_dma_int_enx_s cn68xxp1;
426		- struct cvmx_mio_boot_dma_int_enx_s cnf71xx;
427	374	};
428	375
429	376	union cvmx_mio_boot_dma_timx {
..	..	@@ -463,17 +410,6 @@
463	410	uint64_t dmack_pi:1;
464	411	#endif
465	412	} s;
466		- struct cvmx_mio_boot_dma_timx_s cn52xx;
467		- struct cvmx_mio_boot_dma_timx_s cn52xxp1;
468		- struct cvmx_mio_boot_dma_timx_s cn56xx;
469		- struct cvmx_mio_boot_dma_timx_s cn56xxp1;
470		- struct cvmx_mio_boot_dma_timx_s cn61xx;
471		- struct cvmx_mio_boot_dma_timx_s cn63xx;
472		- struct cvmx_mio_boot_dma_timx_s cn63xxp1;
473		- struct cvmx_mio_boot_dma_timx_s cn66xx;
474		- struct cvmx_mio_boot_dma_timx_s cn68xx;
475		- struct cvmx_mio_boot_dma_timx_s cn68xxp1;
476		- struct cvmx_mio_boot_dma_timx_s cnf71xx;
477	413	};
478	414
479	415	union cvmx_mio_boot_err {
..	..	@@ -489,24 +425,6 @@
489	425	uint64_t reserved_2_63:62;
490	426	#endif
491	427	} s;
492		- struct cvmx_mio_boot_err_s cn30xx;
493		- struct cvmx_mio_boot_err_s cn31xx;
494		- struct cvmx_mio_boot_err_s cn38xx;
495		- struct cvmx_mio_boot_err_s cn38xxp2;
496		- struct cvmx_mio_boot_err_s cn50xx;
497		- struct cvmx_mio_boot_err_s cn52xx;
498		- struct cvmx_mio_boot_err_s cn52xxp1;
499		- struct cvmx_mio_boot_err_s cn56xx;
500		- struct cvmx_mio_boot_err_s cn56xxp1;
501		- struct cvmx_mio_boot_err_s cn58xx;
502		- struct cvmx_mio_boot_err_s cn58xxp1;
503		- struct cvmx_mio_boot_err_s cn61xx;
504		- struct cvmx_mio_boot_err_s cn63xx;
505		- struct cvmx_mio_boot_err_s cn63xxp1;
506		- struct cvmx_mio_boot_err_s cn66xx;
507		- struct cvmx_mio_boot_err_s cn68xx;
508		- struct cvmx_mio_boot_err_s cn68xxp1;
509		- struct cvmx_mio_boot_err_s cnf71xx;
510	428	};
511	429
512	430	union cvmx_mio_boot_int {
..	..	@@ -522,24 +440,6 @@
522	440	uint64_t reserved_2_63:62;
523	441	#endif
524	442	} s;
525		- struct cvmx_mio_boot_int_s cn30xx;
526		- struct cvmx_mio_boot_int_s cn31xx;
527		- struct cvmx_mio_boot_int_s cn38xx;
528		- struct cvmx_mio_boot_int_s cn38xxp2;
529		- struct cvmx_mio_boot_int_s cn50xx;
530		- struct cvmx_mio_boot_int_s cn52xx;
531		- struct cvmx_mio_boot_int_s cn52xxp1;
532		- struct cvmx_mio_boot_int_s cn56xx;
533		- struct cvmx_mio_boot_int_s cn56xxp1;
534		- struct cvmx_mio_boot_int_s cn58xx;
535		- struct cvmx_mio_boot_int_s cn58xxp1;
536		- struct cvmx_mio_boot_int_s cn61xx;
537		- struct cvmx_mio_boot_int_s cn63xx;
538		- struct cvmx_mio_boot_int_s cn63xxp1;
539		- struct cvmx_mio_boot_int_s cn66xx;
540		- struct cvmx_mio_boot_int_s cn68xx;
541		- struct cvmx_mio_boot_int_s cn68xxp1;
542		- struct cvmx_mio_boot_int_s cnf71xx;
543	443	};
544	444
545	445	union cvmx_mio_boot_loc_adr {
..	..	@@ -555,24 +455,6 @@
555	455	uint64_t reserved_8_63:56;
556	456	#endif
557	457	} s;
558		- struct cvmx_mio_boot_loc_adr_s cn30xx;
559		- struct cvmx_mio_boot_loc_adr_s cn31xx;
560		- struct cvmx_mio_boot_loc_adr_s cn38xx;
561		- struct cvmx_mio_boot_loc_adr_s cn38xxp2;
562		- struct cvmx_mio_boot_loc_adr_s cn50xx;
563		- struct cvmx_mio_boot_loc_adr_s cn52xx;
564		- struct cvmx_mio_boot_loc_adr_s cn52xxp1;
565		- struct cvmx_mio_boot_loc_adr_s cn56xx;
566		- struct cvmx_mio_boot_loc_adr_s cn56xxp1;
567		- struct cvmx_mio_boot_loc_adr_s cn58xx;
568		- struct cvmx_mio_boot_loc_adr_s cn58xxp1;
569		- struct cvmx_mio_boot_loc_adr_s cn61xx;
570		- struct cvmx_mio_boot_loc_adr_s cn63xx;
571		- struct cvmx_mio_boot_loc_adr_s cn63xxp1;
572		- struct cvmx_mio_boot_loc_adr_s cn66xx;
573		- struct cvmx_mio_boot_loc_adr_s cn68xx;
574		- struct cvmx_mio_boot_loc_adr_s cn68xxp1;
575		- struct cvmx_mio_boot_loc_adr_s cnf71xx;
576	458	};
577	459
578	460	union cvmx_mio_boot_loc_cfgx {
..	..	@@ -592,24 +474,6 @@
592	474	uint64_t reserved_32_63:32;
593	475	#endif
594	476	} s;
595		- struct cvmx_mio_boot_loc_cfgx_s cn30xx;
596		- struct cvmx_mio_boot_loc_cfgx_s cn31xx;
597		- struct cvmx_mio_boot_loc_cfgx_s cn38xx;
598		- struct cvmx_mio_boot_loc_cfgx_s cn38xxp2;
599		- struct cvmx_mio_boot_loc_cfgx_s cn50xx;
600		- struct cvmx_mio_boot_loc_cfgx_s cn52xx;
601		- struct cvmx_mio_boot_loc_cfgx_s cn52xxp1;
602		- struct cvmx_mio_boot_loc_cfgx_s cn56xx;
603		- struct cvmx_mio_boot_loc_cfgx_s cn56xxp1;
604		- struct cvmx_mio_boot_loc_cfgx_s cn58xx;
605		- struct cvmx_mio_boot_loc_cfgx_s cn58xxp1;
606		- struct cvmx_mio_boot_loc_cfgx_s cn61xx;
607		- struct cvmx_mio_boot_loc_cfgx_s cn63xx;
608		- struct cvmx_mio_boot_loc_cfgx_s cn63xxp1;
609		- struct cvmx_mio_boot_loc_cfgx_s cn66xx;
610		- struct cvmx_mio_boot_loc_cfgx_s cn68xx;
611		- struct cvmx_mio_boot_loc_cfgx_s cn68xxp1;
612		- struct cvmx_mio_boot_loc_cfgx_s cnf71xx;
613	477	};
614	478
615	479	union cvmx_mio_boot_loc_dat {
..	..	@@ -621,24 +485,6 @@
621	485	uint64_t data:64;
622	486	#endif
623	487	} s;
624		- struct cvmx_mio_boot_loc_dat_s cn30xx;
625		- struct cvmx_mio_boot_loc_dat_s cn31xx;
626		- struct cvmx_mio_boot_loc_dat_s cn38xx;
627		- struct cvmx_mio_boot_loc_dat_s cn38xxp2;
628		- struct cvmx_mio_boot_loc_dat_s cn50xx;
629		- struct cvmx_mio_boot_loc_dat_s cn52xx;
630		- struct cvmx_mio_boot_loc_dat_s cn52xxp1;
631		- struct cvmx_mio_boot_loc_dat_s cn56xx;
632		- struct cvmx_mio_boot_loc_dat_s cn56xxp1;
633		- struct cvmx_mio_boot_loc_dat_s cn58xx;
634		- struct cvmx_mio_boot_loc_dat_s cn58xxp1;
635		- struct cvmx_mio_boot_loc_dat_s cn61xx;
636		- struct cvmx_mio_boot_loc_dat_s cn63xx;
637		- struct cvmx_mio_boot_loc_dat_s cn63xxp1;
638		- struct cvmx_mio_boot_loc_dat_s cn66xx;
639		- struct cvmx_mio_boot_loc_dat_s cn68xx;
640		- struct cvmx_mio_boot_loc_dat_s cn68xxp1;
641		- struct cvmx_mio_boot_loc_dat_s cnf71xx;
642	488	};
643	489
644	490	union cvmx_mio_boot_pin_defs {
..	..	@@ -737,12 +583,6 @@
737	583	uint64_t reserved_32_63:32;
738	584	#endif
739	585	} cn61xx;
740		- struct cvmx_mio_boot_pin_defs_cn52xx cn63xx;
741		- struct cvmx_mio_boot_pin_defs_cn52xx cn63xxp1;
742		- struct cvmx_mio_boot_pin_defs_cn52xx cn66xx;
743		- struct cvmx_mio_boot_pin_defs_cn52xx cn68xx;
744		- struct cvmx_mio_boot_pin_defs_cn52xx cn68xxp1;
745		- struct cvmx_mio_boot_pin_defs_cn61xx cnf71xx;
746	586	};
747	587
748	588	union cvmx_mio_boot_reg_cfgx {
..	..	@@ -803,7 +643,6 @@
803	643	uint64_t reserved_37_63:27;
804	644	#endif
805	645	} cn30xx;
806		- struct cvmx_mio_boot_reg_cfgx_cn30xx cn31xx;
807	646	struct cvmx_mio_boot_reg_cfgx_cn38xx {
808	647	#ifdef __BIG_ENDIAN_BITFIELD
809	648	uint64_t reserved_32_63:32;
..	..	@@ -821,7 +660,6 @@
821	660	uint64_t reserved_32_63:32;
822	661	#endif
823	662	} cn38xx;
824		- struct cvmx_mio_boot_reg_cfgx_cn38xx cn38xxp2;
825	663	struct cvmx_mio_boot_reg_cfgx_cn50xx {
826	664	#ifdef __BIG_ENDIAN_BITFIELD
827	665	uint64_t reserved_42_63:22;
..	..	@@ -851,19 +689,6 @@
851	689	uint64_t reserved_42_63:22;
852	690	#endif
853	691	} cn50xx;
854		- struct cvmx_mio_boot_reg_cfgx_s cn52xx;
855		- struct cvmx_mio_boot_reg_cfgx_s cn52xxp1;
856		- struct cvmx_mio_boot_reg_cfgx_s cn56xx;
857		- struct cvmx_mio_boot_reg_cfgx_s cn56xxp1;
858		- struct cvmx_mio_boot_reg_cfgx_cn30xx cn58xx;
859		- struct cvmx_mio_boot_reg_cfgx_cn30xx cn58xxp1;
860		- struct cvmx_mio_boot_reg_cfgx_s cn61xx;
861		- struct cvmx_mio_boot_reg_cfgx_s cn63xx;
862		- struct cvmx_mio_boot_reg_cfgx_s cn63xxp1;
863		- struct cvmx_mio_boot_reg_cfgx_s cn66xx;
864		- struct cvmx_mio_boot_reg_cfgx_s cn68xx;
865		- struct cvmx_mio_boot_reg_cfgx_s cn68xxp1;
866		- struct cvmx_mio_boot_reg_cfgx_s cnf71xx;
867	692	};
868	693
869	694	union cvmx_mio_boot_reg_timx {
..	..	@@ -899,8 +724,6 @@
899	724	uint64_t pagem:1;
900	725	#endif
901	726	} s;
902		- struct cvmx_mio_boot_reg_timx_s cn30xx;
903		- struct cvmx_mio_boot_reg_timx_s cn31xx;
904	727	struct cvmx_mio_boot_reg_timx_cn38xx {
905	728	#ifdef __BIG_ENDIAN_BITFIELD
906	729	uint64_t pagem:1;
..	..	@@ -932,21 +755,6 @@
932	755	uint64_t pagem:1;
933	756	#endif
934	757	} cn38xx;
935		- struct cvmx_mio_boot_reg_timx_cn38xx cn38xxp2;
936		- struct cvmx_mio_boot_reg_timx_s cn50xx;
937		- struct cvmx_mio_boot_reg_timx_s cn52xx;
938		- struct cvmx_mio_boot_reg_timx_s cn52xxp1;
939		- struct cvmx_mio_boot_reg_timx_s cn56xx;
940		- struct cvmx_mio_boot_reg_timx_s cn56xxp1;
941		- struct cvmx_mio_boot_reg_timx_s cn58xx;
942		- struct cvmx_mio_boot_reg_timx_s cn58xxp1;
943		- struct cvmx_mio_boot_reg_timx_s cn61xx;
944		- struct cvmx_mio_boot_reg_timx_s cn63xx;
945		- struct cvmx_mio_boot_reg_timx_s cn63xxp1;
946		- struct cvmx_mio_boot_reg_timx_s cn66xx;
947		- struct cvmx_mio_boot_reg_timx_s cn68xx;
948		- struct cvmx_mio_boot_reg_timx_s cn68xxp1;
949		- struct cvmx_mio_boot_reg_timx_s cnf71xx;
950	758	};
951	759
952	760	union cvmx_mio_boot_thr {
..	..	@@ -981,23 +789,6 @@
981	789	uint64_t reserved_14_63:50;
982	790	#endif
983	791	} cn30xx;
984		- struct cvmx_mio_boot_thr_cn30xx cn31xx;
985		- struct cvmx_mio_boot_thr_cn30xx cn38xx;
986		- struct cvmx_mio_boot_thr_cn30xx cn38xxp2;
987		- struct cvmx_mio_boot_thr_cn30xx cn50xx;
988		- struct cvmx_mio_boot_thr_s cn52xx;
989		- struct cvmx_mio_boot_thr_s cn52xxp1;
990		- struct cvmx_mio_boot_thr_s cn56xx;
991		- struct cvmx_mio_boot_thr_s cn56xxp1;
992		- struct cvmx_mio_boot_thr_cn30xx cn58xx;
993		- struct cvmx_mio_boot_thr_cn30xx cn58xxp1;
994		- struct cvmx_mio_boot_thr_s cn61xx;
995		- struct cvmx_mio_boot_thr_s cn63xx;
996		- struct cvmx_mio_boot_thr_s cn63xxp1;
997		- struct cvmx_mio_boot_thr_s cn66xx;
998		- struct cvmx_mio_boot_thr_s cn68xx;
999		- struct cvmx_mio_boot_thr_s cn68xxp1;
1000		- struct cvmx_mio_boot_thr_s cnf71xx;
1001	792	};
1002	793
1003	794	union cvmx_mio_emm_buf_dat {
..	..	@@ -1009,8 +800,6 @@
1009	800	uint64_t dat:64;
1010	801	#endif
1011	802	} s;
1012		- struct cvmx_mio_emm_buf_dat_s cn61xx;
1013		- struct cvmx_mio_emm_buf_dat_s cnf71xx;
1014	803	};
1015	804
1016	805	union cvmx_mio_emm_buf_idx {
..	..	@@ -1030,8 +819,6 @@
1030	819	uint64_t reserved_17_63:47;
1031	820	#endif
1032	821	} s;
1033		- struct cvmx_mio_emm_buf_idx_s cn61xx;
1034		- struct cvmx_mio_emm_buf_idx_s cnf71xx;
1035	822	};
1036	823
1037	824	union cvmx_mio_emm_cfg {
..	..	@@ -1049,8 +836,6 @@
1049	836	uint64_t reserved_17_63:47;
1050	837	#endif
1051	838	} s;
1052		- struct cvmx_mio_emm_cfg_s cn61xx;
1053		- struct cvmx_mio_emm_cfg_s cnf71xx;
1054	839	};
1055	840
1056	841	union cvmx_mio_emm_cmd {
..	..	@@ -1082,8 +867,6 @@
1082	867	uint64_t reserved_62_63:2;
1083	868	#endif
1084	869	} s;
1085		- struct cvmx_mio_emm_cmd_s cn61xx;
1086		- struct cvmx_mio_emm_cmd_s cnf71xx;
1087	870	};
1088	871
1089	872	union cvmx_mio_emm_dma {
..	..	@@ -1115,8 +898,6 @@
1115	898	uint64_t reserved_62_63:2;
1116	899	#endif
1117	900	} s;
1118		- struct cvmx_mio_emm_dma_s cn61xx;
1119		- struct cvmx_mio_emm_dma_s cnf71xx;
1120	901	};
1121	902
1122	903	union cvmx_mio_emm_int {
..	..	@@ -1142,8 +923,6 @@
1142	923	uint64_t reserved_7_63:57;
1143	924	#endif
1144	925	} s;
1145		- struct cvmx_mio_emm_int_s cn61xx;
1146		- struct cvmx_mio_emm_int_s cnf71xx;
1147	926	};
1148	927
1149	928	union cvmx_mio_emm_int_en {
..	..	@@ -1169,8 +948,6 @@
1169	948	uint64_t reserved_7_63:57;
1170	949	#endif
1171	950	} s;
1172		- struct cvmx_mio_emm_int_en_s cn61xx;
1173		- struct cvmx_mio_emm_int_en_s cnf71xx;
1174	951	};
1175	952
1176	953	union cvmx_mio_emm_modex {
..	..	@@ -1196,8 +973,6 @@
1196	973	uint64_t reserved_49_63:15;
1197	974	#endif
1198	975	} s;
1199		- struct cvmx_mio_emm_modex_s cn61xx;
1200		- struct cvmx_mio_emm_modex_s cnf71xx;
1201	976	};
1202	977
1203	978	union cvmx_mio_emm_rca {
..	..	@@ -1211,8 +986,6 @@
1211	986	uint64_t reserved_16_63:48;
1212	987	#endif
1213	988	} s;
1214		- struct cvmx_mio_emm_rca_s cn61xx;
1215		- struct cvmx_mio_emm_rca_s cnf71xx;
1216	989	};
1217	990
1218	991	union cvmx_mio_emm_rsp_hi {
..	..	@@ -1224,8 +997,6 @@
1224	997	uint64_t dat:64;
1225	998	#endif
1226	999	} s;
1227		- struct cvmx_mio_emm_rsp_hi_s cn61xx;
1228		- struct cvmx_mio_emm_rsp_hi_s cnf71xx;
1229	1000	};
1230	1001
1231	1002	union cvmx_mio_emm_rsp_lo {
..	..	@@ -1237,8 +1008,6 @@
1237	1008	uint64_t dat:64;
1238	1009	#endif
1239	1010	} s;
1240		- struct cvmx_mio_emm_rsp_lo_s cn61xx;
1241		- struct cvmx_mio_emm_rsp_lo_s cnf71xx;
1242	1011	};
1243	1012
1244	1013	union cvmx_mio_emm_rsp_sts {
..	..	@@ -1298,8 +1067,6 @@
1298	1067	uint64_t reserved_62_63:2;
1299	1068	#endif
1300	1069	} s;
1301		- struct cvmx_mio_emm_rsp_sts_s cn61xx;
1302		- struct cvmx_mio_emm_rsp_sts_s cnf71xx;
1303	1070	};
1304	1071
1305	1072	union cvmx_mio_emm_sample {
..	..	@@ -1317,8 +1084,6 @@
1317	1084	uint64_t reserved_26_63:38;
1318	1085	#endif
1319	1086	} s;
1320		- struct cvmx_mio_emm_sample_s cn61xx;
1321		- struct cvmx_mio_emm_sample_s cnf71xx;
1322	1087	};
1323	1088
1324	1089	union cvmx_mio_emm_sts_mask {
..	..	@@ -1332,8 +1097,6 @@
1332	1097	uint64_t reserved_32_63:32;
1333	1098	#endif
1334	1099	} s;
1335		- struct cvmx_mio_emm_sts_mask_s cn61xx;
1336		- struct cvmx_mio_emm_sts_mask_s cnf71xx;
1337	1100	};
1338	1101
1339	1102	union cvmx_mio_emm_switch {
..	..	@@ -1371,8 +1134,6 @@
1371	1134	uint64_t reserved_62_63:2;
1372	1135	#endif
1373	1136	} s;
1374		- struct cvmx_mio_emm_switch_s cn61xx;
1375		- struct cvmx_mio_emm_switch_s cnf71xx;
1376	1137	};
1377	1138
1378	1139	union cvmx_mio_emm_wdog {
..	..	@@ -1386,8 +1147,6 @@
1386	1147	uint64_t reserved_26_63:38;
1387	1148	#endif
1388	1149	} s;
1389		- struct cvmx_mio_emm_wdog_s cn61xx;
1390		- struct cvmx_mio_emm_wdog_s cnf71xx;
1391	1150	};
1392	1151
1393	1152	union cvmx_mio_fus_bnk_datx {
..	..	@@ -1399,20 +1158,6 @@
1399	1158	uint64_t dat:64;
1400	1159	#endif
1401	1160	} s;
1402		- struct cvmx_mio_fus_bnk_datx_s cn50xx;
1403		- struct cvmx_mio_fus_bnk_datx_s cn52xx;
1404		- struct cvmx_mio_fus_bnk_datx_s cn52xxp1;
1405		- struct cvmx_mio_fus_bnk_datx_s cn56xx;
1406		- struct cvmx_mio_fus_bnk_datx_s cn56xxp1;
1407		- struct cvmx_mio_fus_bnk_datx_s cn58xx;
1408		- struct cvmx_mio_fus_bnk_datx_s cn58xxp1;
1409		- struct cvmx_mio_fus_bnk_datx_s cn61xx;
1410		- struct cvmx_mio_fus_bnk_datx_s cn63xx;
1411		- struct cvmx_mio_fus_bnk_datx_s cn63xxp1;
1412		- struct cvmx_mio_fus_bnk_datx_s cn66xx;
1413		- struct cvmx_mio_fus_bnk_datx_s cn68xx;
1414		- struct cvmx_mio_fus_bnk_datx_s cn68xxp1;
1415		- struct cvmx_mio_fus_bnk_datx_s cnf71xx;
1416	1161	};
1417	1162
1418	1163	union cvmx_mio_fus_dat0 {
..	..	@@ -1426,24 +1171,6 @@
1426	1171	uint64_t reserved_32_63:32;
1427	1172	#endif
1428	1173	} s;
1429		- struct cvmx_mio_fus_dat0_s cn30xx;
1430		- struct cvmx_mio_fus_dat0_s cn31xx;
1431		- struct cvmx_mio_fus_dat0_s cn38xx;
1432		- struct cvmx_mio_fus_dat0_s cn38xxp2;
1433		- struct cvmx_mio_fus_dat0_s cn50xx;
1434		- struct cvmx_mio_fus_dat0_s cn52xx;
1435		- struct cvmx_mio_fus_dat0_s cn52xxp1;
1436		- struct cvmx_mio_fus_dat0_s cn56xx;
1437		- struct cvmx_mio_fus_dat0_s cn56xxp1;
1438		- struct cvmx_mio_fus_dat0_s cn58xx;
1439		- struct cvmx_mio_fus_dat0_s cn58xxp1;
1440		- struct cvmx_mio_fus_dat0_s cn61xx;
1441		- struct cvmx_mio_fus_dat0_s cn63xx;
1442		- struct cvmx_mio_fus_dat0_s cn63xxp1;
1443		- struct cvmx_mio_fus_dat0_s cn66xx;
1444		- struct cvmx_mio_fus_dat0_s cn68xx;
1445		- struct cvmx_mio_fus_dat0_s cn68xxp1;
1446		- struct cvmx_mio_fus_dat0_s cnf71xx;
1447	1174	};
1448	1175
1449	1176	union cvmx_mio_fus_dat1 {
..	..	@@ -1457,24 +1184,6 @@
1457	1184	uint64_t reserved_32_63:32;
1458	1185	#endif
1459	1186	} s;
1460		- struct cvmx_mio_fus_dat1_s cn30xx;
1461		- struct cvmx_mio_fus_dat1_s cn31xx;
1462		- struct cvmx_mio_fus_dat1_s cn38xx;
1463		- struct cvmx_mio_fus_dat1_s cn38xxp2;
1464		- struct cvmx_mio_fus_dat1_s cn50xx;
1465		- struct cvmx_mio_fus_dat1_s cn52xx;
1466		- struct cvmx_mio_fus_dat1_s cn52xxp1;
1467		- struct cvmx_mio_fus_dat1_s cn56xx;
1468		- struct cvmx_mio_fus_dat1_s cn56xxp1;
1469		- struct cvmx_mio_fus_dat1_s cn58xx;
1470		- struct cvmx_mio_fus_dat1_s cn58xxp1;
1471		- struct cvmx_mio_fus_dat1_s cn61xx;
1472		- struct cvmx_mio_fus_dat1_s cn63xx;
1473		- struct cvmx_mio_fus_dat1_s cn63xxp1;
1474		- struct cvmx_mio_fus_dat1_s cn66xx;
1475		- struct cvmx_mio_fus_dat1_s cn68xx;
1476		- struct cvmx_mio_fus_dat1_s cn68xxp1;
1477		- struct cvmx_mio_fus_dat1_s cnf71xx;
1478	1187	};
1479	1188
1480	1189	union cvmx_mio_fus_dat2 {
..	..	@@ -1591,7 +1300,6 @@
1591	1300	uint64_t reserved_29_63:35;
1592	1301	#endif
1593	1302	} cn38xx;
1594		- struct cvmx_mio_fus_dat2_cn38xx cn38xxp2;
1595	1303	struct cvmx_mio_fus_dat2_cn50xx {
1596	1304	#ifdef __BIG_ENDIAN_BITFIELD
1597	1305	uint64_t reserved_34_63:30;
..	..	@@ -1654,7 +1362,6 @@
1654	1362	uint64_t reserved_34_63:30;
1655	1363	#endif
1656	1364	} cn52xx;
1657		- struct cvmx_mio_fus_dat2_cn52xx cn52xxp1;
1658	1365	struct cvmx_mio_fus_dat2_cn56xx {
1659	1366	#ifdef __BIG_ENDIAN_BITFIELD
1660	1367	uint64_t reserved_34_63:30;
..	..	@@ -1686,7 +1393,6 @@
1686	1393	uint64_t reserved_34_63:30;
1687	1394	#endif
1688	1395	} cn56xx;
1689		- struct cvmx_mio_fus_dat2_cn56xx cn56xxp1;
1690	1396	struct cvmx_mio_fus_dat2_cn58xx {
1691	1397	#ifdef __BIG_ENDIAN_BITFIELD
1692	1398	uint64_t reserved_30_63:34;
..	..	@@ -1710,7 +1416,6 @@
1710	1416	uint64_t reserved_30_63:34;
1711	1417	#endif
1712	1418	} cn58xx;
1713		- struct cvmx_mio_fus_dat2_cn58xx cn58xxp1;
1714	1419	struct cvmx_mio_fus_dat2_cn61xx {
1715	1420	#ifdef __BIG_ENDIAN_BITFIELD
1716	1421	uint64_t reserved_48_63:16;
..	..	@@ -1775,7 +1480,6 @@
1775	1480	uint64_t reserved_35_63:29;
1776	1481	#endif
1777	1482	} cn63xx;
1778		- struct cvmx_mio_fus_dat2_cn63xx cn63xxp1;
1779	1483	struct cvmx_mio_fus_dat2_cn66xx {
1780	1484	#ifdef __BIG_ENDIAN_BITFIELD
1781	1485	uint64_t reserved_48_63:16;
..	..	@@ -1840,7 +1544,6 @@
1840	1544	uint64_t reserved_37_63:27;
1841	1545	#endif
1842	1546	} cn68xx;
1843		- struct cvmx_mio_fus_dat2_cn68xx cn68xxp1;
1844	1547	struct cvmx_mio_fus_dat2_cn70xx {
1845	1548	#ifdef __BIG_ENDIAN_BITFIELD
1846	1549	uint64_t reserved_48_63:16;
..	..	@@ -1874,7 +1577,6 @@
1874	1577	uint64_t reserved_48_63:16;
1875	1578	#endif
1876	1579	} cn70xx;
1877		- struct cvmx_mio_fus_dat2_cn70xx cn70xxp1;
1878	1580	struct cvmx_mio_fus_dat2_cn73xx {
1879	1581	#ifdef __BIG_ENDIAN_BITFIELD
1880	1582	uint64_t reserved_59_63:5;
..	..	@@ -1986,8 +1688,6 @@
1986	1688	uint64_t reserved_59_63:5;
1987	1689	#endif
1988	1690	} cn78xxp2;
1989		- struct cvmx_mio_fus_dat2_cn61xx cnf71xx;
1990		- struct cvmx_mio_fus_dat2_cn73xx cnf75xx;
1991	1691	};
1992	1692
1993	1693	union cvmx_mio_fus_dat3 {
..	..	@@ -2115,13 +1815,6 @@
2115	1815	uint64_t reserved_29_63:35;
2116	1816	#endif
2117	1817	} cn38xxp2;
2118		- struct cvmx_mio_fus_dat3_cn38xx cn50xx;
2119		- struct cvmx_mio_fus_dat3_cn38xx cn52xx;
2120		- struct cvmx_mio_fus_dat3_cn38xx cn52xxp1;
2121		- struct cvmx_mio_fus_dat3_cn38xx cn56xx;
2122		- struct cvmx_mio_fus_dat3_cn38xx cn56xxp1;
2123		- struct cvmx_mio_fus_dat3_cn38xx cn58xx;
2124		- struct cvmx_mio_fus_dat3_cn38xx cn58xxp1;
2125	1818	struct cvmx_mio_fus_dat3_cn61xx {
2126	1819	#ifdef __BIG_ENDIAN_BITFIELD
2127	1820	uint64_t reserved_58_63:6;
..	..	@@ -2163,11 +1856,6 @@
2163	1856	uint64_t reserved_58_63:6;
2164	1857	#endif
2165	1858	} cn61xx;
2166		- struct cvmx_mio_fus_dat3_cn61xx cn63xx;
2167		- struct cvmx_mio_fus_dat3_cn61xx cn63xxp1;
2168		- struct cvmx_mio_fus_dat3_cn61xx cn66xx;
2169		- struct cvmx_mio_fus_dat3_cn61xx cn68xx;
2170		- struct cvmx_mio_fus_dat3_cn61xx cn68xxp1;
2171	1859	struct cvmx_mio_fus_dat3_cn70xx {
2172	1860	#ifdef __BIG_ENDIAN_BITFIELD
2173	1861	uint64_t ema0:6;
..	..	@@ -2352,8 +2040,6 @@
2352	2040	uint64_t ema0:6;
2353	2041	#endif
2354	2042	} cn78xx;
2355		- struct cvmx_mio_fus_dat3_cn73xx cn78xxp2;
2356		- struct cvmx_mio_fus_dat3_cn61xx cnf71xx;
2357	2043	struct cvmx_mio_fus_dat3_cnf75xx {
2358	2044	#ifdef __BIG_ENDIAN_BITFIELD
2359	2045	uint64_t ema0:6;
..	..	@@ -2418,11 +2104,6 @@
2418	2104	uint64_t reserved_7_63:57;
2419	2105	#endif
2420	2106	} s;
2421		- struct cvmx_mio_fus_ema_s cn50xx;
2422		- struct cvmx_mio_fus_ema_s cn52xx;
2423		- struct cvmx_mio_fus_ema_s cn52xxp1;
2424		- struct cvmx_mio_fus_ema_s cn56xx;
2425		- struct cvmx_mio_fus_ema_s cn56xxp1;
2426	2107	struct cvmx_mio_fus_ema_cn58xx {
2427	2108	#ifdef __BIG_ENDIAN_BITFIELD
2428	2109	uint64_t reserved_2_63:62;
..	..	@@ -2432,14 +2113,6 @@
2432	2113	uint64_t reserved_2_63:62;
2433	2114	#endif
2434	2115	} cn58xx;
2435		- struct cvmx_mio_fus_ema_cn58xx cn58xxp1;
2436		- struct cvmx_mio_fus_ema_s cn61xx;
2437		- struct cvmx_mio_fus_ema_s cn63xx;
2438		- struct cvmx_mio_fus_ema_s cn63xxp1;
2439		- struct cvmx_mio_fus_ema_s cn66xx;
2440		- struct cvmx_mio_fus_ema_s cn68xx;
2441		- struct cvmx_mio_fus_ema_s cn68xxp1;
2442		- struct cvmx_mio_fus_ema_s cnf71xx;
2443	2116	};
2444	2117
2445	2118	union cvmx_mio_fus_pdf {
..	..	@@ -2451,19 +2124,6 @@
2451	2124	uint64_t pdf:64;
2452	2125	#endif
2453	2126	} s;
2454		- struct cvmx_mio_fus_pdf_s cn50xx;
2455		- struct cvmx_mio_fus_pdf_s cn52xx;
2456		- struct cvmx_mio_fus_pdf_s cn52xxp1;
2457		- struct cvmx_mio_fus_pdf_s cn56xx;
2458		- struct cvmx_mio_fus_pdf_s cn56xxp1;
2459		- struct cvmx_mio_fus_pdf_s cn58xx;
2460		- struct cvmx_mio_fus_pdf_s cn61xx;
2461		- struct cvmx_mio_fus_pdf_s cn63xx;
2462		- struct cvmx_mio_fus_pdf_s cn63xxp1;
2463		- struct cvmx_mio_fus_pdf_s cn66xx;
2464		- struct cvmx_mio_fus_pdf_s cn68xx;
2465		- struct cvmx_mio_fus_pdf_s cn68xxp1;
2466		- struct cvmx_mio_fus_pdf_s cnf71xx;
2467	2127	};
2468	2128
2469	2129	union cvmx_mio_fus_pll {
..	..	@@ -2504,12 +2164,6 @@
2504	2164	uint64_t reserved_2_63:62;
2505	2165	#endif
2506	2166	} cn50xx;
2507		- struct cvmx_mio_fus_pll_cn50xx cn52xx;
2508		- struct cvmx_mio_fus_pll_cn50xx cn52xxp1;
2509		- struct cvmx_mio_fus_pll_cn50xx cn56xx;
2510		- struct cvmx_mio_fus_pll_cn50xx cn56xxp1;
2511		- struct cvmx_mio_fus_pll_cn50xx cn58xx;
2512		- struct cvmx_mio_fus_pll_cn50xx cn58xxp1;
2513	2167	struct cvmx_mio_fus_pll_cn61xx {
2514	2168	#ifdef __BIG_ENDIAN_BITFIELD
2515	2169	uint64_t reserved_8_63:56;
..	..	@@ -2529,12 +2183,6 @@
2529	2183	uint64_t reserved_8_63:56;
2530	2184	#endif
2531	2185	} cn61xx;
2532		- struct cvmx_mio_fus_pll_cn61xx cn63xx;
2533		- struct cvmx_mio_fus_pll_cn61xx cn63xxp1;
2534		- struct cvmx_mio_fus_pll_cn61xx cn66xx;
2535		- struct cvmx_mio_fus_pll_s cn68xx;
2536		- struct cvmx_mio_fus_pll_s cn68xxp1;
2537		- struct cvmx_mio_fus_pll_cn61xx cnf71xx;
2538	2186	};
2539	2187
2540	2188	union cvmx_mio_fus_prog {
..	..	@@ -2559,23 +2207,6 @@
2559	2207	uint64_t reserved_1_63:63;
2560	2208	#endif
2561	2209	} cn30xx;
2562		- struct cvmx_mio_fus_prog_cn30xx cn31xx;
2563		- struct cvmx_mio_fus_prog_cn30xx cn38xx;
2564		- struct cvmx_mio_fus_prog_cn30xx cn38xxp2;
2565		- struct cvmx_mio_fus_prog_cn30xx cn50xx;
2566		- struct cvmx_mio_fus_prog_cn30xx cn52xx;
2567		- struct cvmx_mio_fus_prog_cn30xx cn52xxp1;
2568		- struct cvmx_mio_fus_prog_cn30xx cn56xx;
2569		- struct cvmx_mio_fus_prog_cn30xx cn56xxp1;
2570		- struct cvmx_mio_fus_prog_cn30xx cn58xx;
2571		- struct cvmx_mio_fus_prog_cn30xx cn58xxp1;
2572		- struct cvmx_mio_fus_prog_s cn61xx;
2573		- struct cvmx_mio_fus_prog_s cn63xx;
2574		- struct cvmx_mio_fus_prog_s cn63xxp1;
2575		- struct cvmx_mio_fus_prog_s cn66xx;
2576		- struct cvmx_mio_fus_prog_s cn68xx;
2577		- struct cvmx_mio_fus_prog_s cn68xxp1;
2578		- struct cvmx_mio_fus_prog_s cnf71xx;
2579	2210	};
2580	2211
2581	2212	union cvmx_mio_fus_prog_times {
..	..	@@ -2614,12 +2245,6 @@
2614	2245	uint64_t reserved_33_63:31;
2615	2246	#endif
2616	2247	} cn50xx;
2617		- struct cvmx_mio_fus_prog_times_cn50xx cn52xx;
2618		- struct cvmx_mio_fus_prog_times_cn50xx cn52xxp1;
2619		- struct cvmx_mio_fus_prog_times_cn50xx cn56xx;
2620		- struct cvmx_mio_fus_prog_times_cn50xx cn56xxp1;
2621		- struct cvmx_mio_fus_prog_times_cn50xx cn58xx;
2622		- struct cvmx_mio_fus_prog_times_cn50xx cn58xxp1;
2623	2248	struct cvmx_mio_fus_prog_times_cn61xx {
2624	2249	#ifdef __BIG_ENDIAN_BITFIELD
2625	2250	uint64_t reserved_35_63:29;
..	..	@@ -2641,12 +2266,6 @@
2641	2266	uint64_t reserved_35_63:29;
2642	2267	#endif
2643	2268	} cn61xx;
2644		- struct cvmx_mio_fus_prog_times_cn61xx cn63xx;
2645		- struct cvmx_mio_fus_prog_times_cn61xx cn63xxp1;
2646		- struct cvmx_mio_fus_prog_times_cn61xx cn66xx;
2647		- struct cvmx_mio_fus_prog_times_cn61xx cn68xx;
2648		- struct cvmx_mio_fus_prog_times_cn61xx cn68xxp1;
2649		- struct cvmx_mio_fus_prog_times_cn61xx cnf71xx;
2650	2269	};
2651	2270
2652	2271	union cvmx_mio_fus_rcmd {
..	..	@@ -2691,23 +2310,6 @@
2691	2310	uint64_t reserved_24_63:40;
2692	2311	#endif
2693	2312	} cn30xx;
2694		- struct cvmx_mio_fus_rcmd_cn30xx cn31xx;
2695		- struct cvmx_mio_fus_rcmd_cn30xx cn38xx;
2696		- struct cvmx_mio_fus_rcmd_cn30xx cn38xxp2;
2697		- struct cvmx_mio_fus_rcmd_cn30xx cn50xx;
2698		- struct cvmx_mio_fus_rcmd_s cn52xx;
2699		- struct cvmx_mio_fus_rcmd_s cn52xxp1;
2700		- struct cvmx_mio_fus_rcmd_s cn56xx;
2701		- struct cvmx_mio_fus_rcmd_s cn56xxp1;
2702		- struct cvmx_mio_fus_rcmd_cn30xx cn58xx;
2703		- struct cvmx_mio_fus_rcmd_cn30xx cn58xxp1;
2704		- struct cvmx_mio_fus_rcmd_s cn61xx;
2705		- struct cvmx_mio_fus_rcmd_s cn63xx;
2706		- struct cvmx_mio_fus_rcmd_s cn63xxp1;
2707		- struct cvmx_mio_fus_rcmd_s cn66xx;
2708		- struct cvmx_mio_fus_rcmd_s cn68xx;
2709		- struct cvmx_mio_fus_rcmd_s cn68xxp1;
2710		- struct cvmx_mio_fus_rcmd_s cnf71xx;
2711	2313	};
2712	2314
2713	2315	union cvmx_mio_fus_read_times {
..	..	@@ -2729,13 +2331,6 @@
2729	2331	uint64_t reserved_26_63:38;
2730	2332	#endif
2731	2333	} s;
2732		- struct cvmx_mio_fus_read_times_s cn61xx;
2733		- struct cvmx_mio_fus_read_times_s cn63xx;
2734		- struct cvmx_mio_fus_read_times_s cn63xxp1;
2735		- struct cvmx_mio_fus_read_times_s cn66xx;
2736		- struct cvmx_mio_fus_read_times_s cn68xx;
2737		- struct cvmx_mio_fus_read_times_s cn68xxp1;
2738		- struct cvmx_mio_fus_read_times_s cnf71xx;
2739	2334	};
2740	2335
2741	2336	union cvmx_mio_fus_repair_res0 {
..	..	@@ -2755,13 +2350,6 @@
2755	2350	uint64_t reserved_55_63:9;
2756	2351	#endif
2757	2352	} s;
2758		- struct cvmx_mio_fus_repair_res0_s cn61xx;
2759		- struct cvmx_mio_fus_repair_res0_s cn63xx;
2760		- struct cvmx_mio_fus_repair_res0_s cn63xxp1;
2761		- struct cvmx_mio_fus_repair_res0_s cn66xx;
2762		- struct cvmx_mio_fus_repair_res0_s cn68xx;
2763		- struct cvmx_mio_fus_repair_res0_s cn68xxp1;
2764		- struct cvmx_mio_fus_repair_res0_s cnf71xx;
2765	2353	};
2766	2354
2767	2355	union cvmx_mio_fus_repair_res1 {
..	..	@@ -2779,13 +2367,6 @@
2779	2367	uint64_t reserved_54_63:10;
2780	2368	#endif
2781	2369	} s;
2782		- struct cvmx_mio_fus_repair_res1_s cn61xx;
2783		- struct cvmx_mio_fus_repair_res1_s cn63xx;
2784		- struct cvmx_mio_fus_repair_res1_s cn63xxp1;
2785		- struct cvmx_mio_fus_repair_res1_s cn66xx;
2786		- struct cvmx_mio_fus_repair_res1_s cn68xx;
2787		- struct cvmx_mio_fus_repair_res1_s cn68xxp1;
2788		- struct cvmx_mio_fus_repair_res1_s cnf71xx;
2789	2370	};
2790	2371
2791	2372	union cvmx_mio_fus_repair_res2 {
..	..	@@ -2799,13 +2380,6 @@
2799	2380	uint64_t reserved_18_63:46;
2800	2381	#endif
2801	2382	} s;
2802		- struct cvmx_mio_fus_repair_res2_s cn61xx;
2803		- struct cvmx_mio_fus_repair_res2_s cn63xx;
2804		- struct cvmx_mio_fus_repair_res2_s cn63xxp1;
2805		- struct cvmx_mio_fus_repair_res2_s cn66xx;
2806		- struct cvmx_mio_fus_repair_res2_s cn68xx;
2807		- struct cvmx_mio_fus_repair_res2_s cn68xxp1;
2808		- struct cvmx_mio_fus_repair_res2_s cnf71xx;
2809	2383	};
2810	2384
2811	2385	union cvmx_mio_fus_spr_repair_res {
..	..	@@ -2823,23 +2397,6 @@
2823	2397	uint64_t reserved_42_63:22;
2824	2398	#endif
2825	2399	} s;
2826		- struct cvmx_mio_fus_spr_repair_res_s cn30xx;
2827		- struct cvmx_mio_fus_spr_repair_res_s cn31xx;
2828		- struct cvmx_mio_fus_spr_repair_res_s cn38xx;
2829		- struct cvmx_mio_fus_spr_repair_res_s cn50xx;
2830		- struct cvmx_mio_fus_spr_repair_res_s cn52xx;
2831		- struct cvmx_mio_fus_spr_repair_res_s cn52xxp1;
2832		- struct cvmx_mio_fus_spr_repair_res_s cn56xx;
2833		- struct cvmx_mio_fus_spr_repair_res_s cn56xxp1;
2834		- struct cvmx_mio_fus_spr_repair_res_s cn58xx;
2835		- struct cvmx_mio_fus_spr_repair_res_s cn58xxp1;
2836		- struct cvmx_mio_fus_spr_repair_res_s cn61xx;
2837		- struct cvmx_mio_fus_spr_repair_res_s cn63xx;
2838		- struct cvmx_mio_fus_spr_repair_res_s cn63xxp1;
2839		- struct cvmx_mio_fus_spr_repair_res_s cn66xx;
2840		- struct cvmx_mio_fus_spr_repair_res_s cn68xx;
2841		- struct cvmx_mio_fus_spr_repair_res_s cn68xxp1;
2842		- struct cvmx_mio_fus_spr_repair_res_s cnf71xx;
2843	2400	};
2844	2401
2845	2402	union cvmx_mio_fus_spr_repair_sum {
..	..	@@ -2853,23 +2410,6 @@
2853	2410	uint64_t reserved_1_63:63;
2854	2411	#endif
2855	2412	} s;
2856		- struct cvmx_mio_fus_spr_repair_sum_s cn30xx;
2857		- struct cvmx_mio_fus_spr_repair_sum_s cn31xx;
2858		- struct cvmx_mio_fus_spr_repair_sum_s cn38xx;
2859		- struct cvmx_mio_fus_spr_repair_sum_s cn50xx;
2860		- struct cvmx_mio_fus_spr_repair_sum_s cn52xx;
2861		- struct cvmx_mio_fus_spr_repair_sum_s cn52xxp1;
2862		- struct cvmx_mio_fus_spr_repair_sum_s cn56xx;
2863		- struct cvmx_mio_fus_spr_repair_sum_s cn56xxp1;
2864		- struct cvmx_mio_fus_spr_repair_sum_s cn58xx;
2865		- struct cvmx_mio_fus_spr_repair_sum_s cn58xxp1;
2866		- struct cvmx_mio_fus_spr_repair_sum_s cn61xx;
2867		- struct cvmx_mio_fus_spr_repair_sum_s cn63xx;
2868		- struct cvmx_mio_fus_spr_repair_sum_s cn63xxp1;
2869		- struct cvmx_mio_fus_spr_repair_sum_s cn66xx;
2870		- struct cvmx_mio_fus_spr_repair_sum_s cn68xx;
2871		- struct cvmx_mio_fus_spr_repair_sum_s cn68xxp1;
2872		- struct cvmx_mio_fus_spr_repair_sum_s cnf71xx;
2873	2413	};
2874	2414
2875	2415	union cvmx_mio_fus_tgg {
..	..	@@ -2883,9 +2423,6 @@
2883	2423	uint64_t val:1;
2884	2424	#endif
2885	2425	} s;
2886		- struct cvmx_mio_fus_tgg_s cn61xx;
2887		- struct cvmx_mio_fus_tgg_s cn66xx;
2888		- struct cvmx_mio_fus_tgg_s cnf71xx;
2889	2426	};
2890	2427
2891	2428	union cvmx_mio_fus_unlock {
..	..	@@ -2899,8 +2436,6 @@
2899	2436	uint64_t reserved_24_63:40;
2900	2437	#endif
2901	2438	} s;
2902		- struct cvmx_mio_fus_unlock_s cn30xx;
2903		- struct cvmx_mio_fus_unlock_s cn31xx;
2904	2439	};
2905	2440
2906	2441	union cvmx_mio_fus_wadr {
..	..	@@ -2914,10 +2449,6 @@
2914	2449	uint64_t reserved_10_63:54;
2915	2450	#endif
2916	2451	} s;
2917		- struct cvmx_mio_fus_wadr_s cn30xx;
2918		- struct cvmx_mio_fus_wadr_s cn31xx;
2919		- struct cvmx_mio_fus_wadr_s cn38xx;
2920		- struct cvmx_mio_fus_wadr_s cn38xxp2;
2921	2452	struct cvmx_mio_fus_wadr_cn50xx {
2922	2453	#ifdef __BIG_ENDIAN_BITFIELD
2923	2454	uint64_t reserved_2_63:62;
..	..	@@ -2936,11 +2467,6 @@
2936	2467	uint64_t reserved_3_63:61;
2937	2468	#endif
2938	2469	} cn52xx;
2939		- struct cvmx_mio_fus_wadr_cn52xx cn52xxp1;
2940		- struct cvmx_mio_fus_wadr_cn52xx cn56xx;
2941		- struct cvmx_mio_fus_wadr_cn52xx cn56xxp1;
2942		- struct cvmx_mio_fus_wadr_cn50xx cn58xx;
2943		- struct cvmx_mio_fus_wadr_cn50xx cn58xxp1;
2944	2470	struct cvmx_mio_fus_wadr_cn61xx {
2945	2471	#ifdef __BIG_ENDIAN_BITFIELD
2946	2472	uint64_t reserved_4_63:60;
..	..	@@ -2950,12 +2476,6 @@
2950	2476	uint64_t reserved_4_63:60;
2951	2477	#endif
2952	2478	} cn61xx;
2953		- struct cvmx_mio_fus_wadr_cn61xx cn63xx;
2954		- struct cvmx_mio_fus_wadr_cn61xx cn63xxp1;
2955		- struct cvmx_mio_fus_wadr_cn61xx cn66xx;
2956		- struct cvmx_mio_fus_wadr_cn61xx cn68xx;
2957		- struct cvmx_mio_fus_wadr_cn61xx cn68xxp1;
2958		- struct cvmx_mio_fus_wadr_cn61xx cnf71xx;
2959	2479	};
2960	2480
2961	2481	union cvmx_mio_gpio_comp {
..	..	@@ -2971,13 +2491,6 @@
2971	2491	uint64_t reserved_12_63:52;
2972	2492	#endif
2973	2493	} s;
2974		- struct cvmx_mio_gpio_comp_s cn61xx;
2975		- struct cvmx_mio_gpio_comp_s cn63xx;
2976		- struct cvmx_mio_gpio_comp_s cn63xxp1;
2977		- struct cvmx_mio_gpio_comp_s cn66xx;
2978		- struct cvmx_mio_gpio_comp_s cn68xx;
2979		- struct cvmx_mio_gpio_comp_s cn68xxp1;
2980		- struct cvmx_mio_gpio_comp_s cnf71xx;
2981	2494	};
2982	2495
2983	2496	union cvmx_mio_ndf_dma_cfg {
..	..	@@ -3007,14 +2520,6 @@
3007	2520	uint64_t en:1;
3008	2521	#endif
3009	2522	} s;
3010		- struct cvmx_mio_ndf_dma_cfg_s cn52xx;
3011		- struct cvmx_mio_ndf_dma_cfg_s cn61xx;
3012		- struct cvmx_mio_ndf_dma_cfg_s cn63xx;
3013		- struct cvmx_mio_ndf_dma_cfg_s cn63xxp1;
3014		- struct cvmx_mio_ndf_dma_cfg_s cn66xx;
3015		- struct cvmx_mio_ndf_dma_cfg_s cn68xx;
3016		- struct cvmx_mio_ndf_dma_cfg_s cn68xxp1;
3017		- struct cvmx_mio_ndf_dma_cfg_s cnf71xx;
3018	2523	};
3019	2524
3020	2525	union cvmx_mio_ndf_dma_int {
..	..	@@ -3028,14 +2533,6 @@
3028	2533	uint64_t reserved_1_63:63;
3029	2534	#endif
3030	2535	} s;
3031		- struct cvmx_mio_ndf_dma_int_s cn52xx;
3032		- struct cvmx_mio_ndf_dma_int_s cn61xx;
3033		- struct cvmx_mio_ndf_dma_int_s cn63xx;
3034		- struct cvmx_mio_ndf_dma_int_s cn63xxp1;
3035		- struct cvmx_mio_ndf_dma_int_s cn66xx;
3036		- struct cvmx_mio_ndf_dma_int_s cn68xx;
3037		- struct cvmx_mio_ndf_dma_int_s cn68xxp1;
3038		- struct cvmx_mio_ndf_dma_int_s cnf71xx;
3039	2536	};
3040	2537
3041	2538	union cvmx_mio_ndf_dma_int_en {
..	..	@@ -3049,14 +2546,6 @@
3049	2546	uint64_t reserved_1_63:63;
3050	2547	#endif
3051	2548	} s;
3052		- struct cvmx_mio_ndf_dma_int_en_s cn52xx;
3053		- struct cvmx_mio_ndf_dma_int_en_s cn61xx;
3054		- struct cvmx_mio_ndf_dma_int_en_s cn63xx;
3055		- struct cvmx_mio_ndf_dma_int_en_s cn63xxp1;
3056		- struct cvmx_mio_ndf_dma_int_en_s cn66xx;
3057		- struct cvmx_mio_ndf_dma_int_en_s cn68xx;
3058		- struct cvmx_mio_ndf_dma_int_en_s cn68xxp1;
3059		- struct cvmx_mio_ndf_dma_int_en_s cnf71xx;
3060	2549	};
3061	2550
3062	2551	union cvmx_mio_pll_ctl {
..	..	@@ -3070,8 +2559,6 @@
3070	2559	uint64_t reserved_5_63:59;
3071	2560	#endif
3072	2561	} s;
3073		- struct cvmx_mio_pll_ctl_s cn30xx;
3074		- struct cvmx_mio_pll_ctl_s cn31xx;
3075	2562	};
3076	2563
3077	2564	union cvmx_mio_pll_setting {
..	..	@@ -3085,8 +2572,6 @@
3085	2572	uint64_t reserved_17_63:47;
3086	2573	#endif
3087	2574	} s;
3088		- struct cvmx_mio_pll_setting_s cn30xx;
3089		- struct cvmx_mio_pll_setting_s cn31xx;
3090	2575	};
3091	2576
3092	2577	union cvmx_mio_ptp_ckout_hi_incr {
..	..	@@ -3100,10 +2585,6 @@
3100	2585	uint64_t nanosec:32;
3101	2586	#endif
3102	2587	} s;
3103		- struct cvmx_mio_ptp_ckout_hi_incr_s cn61xx;
3104		- struct cvmx_mio_ptp_ckout_hi_incr_s cn66xx;
3105		- struct cvmx_mio_ptp_ckout_hi_incr_s cn68xx;
3106		- struct cvmx_mio_ptp_ckout_hi_incr_s cnf71xx;
3107	2588	};
3108	2589
3109	2590	union cvmx_mio_ptp_ckout_lo_incr {
..	..	@@ -3117,10 +2598,6 @@
3117	2598	uint64_t nanosec:32;
3118	2599	#endif
3119	2600	} s;
3120		- struct cvmx_mio_ptp_ckout_lo_incr_s cn61xx;
3121		- struct cvmx_mio_ptp_ckout_lo_incr_s cn66xx;
3122		- struct cvmx_mio_ptp_ckout_lo_incr_s cn68xx;
3123		- struct cvmx_mio_ptp_ckout_lo_incr_s cnf71xx;
3124	2601	};
3125	2602
3126	2603	union cvmx_mio_ptp_ckout_thresh_hi {
..	..	@@ -3132,10 +2609,6 @@
3132	2609	uint64_t nanosec:64;
3133	2610	#endif
3134	2611	} s;
3135		- struct cvmx_mio_ptp_ckout_thresh_hi_s cn61xx;
3136		- struct cvmx_mio_ptp_ckout_thresh_hi_s cn66xx;
3137		- struct cvmx_mio_ptp_ckout_thresh_hi_s cn68xx;
3138		- struct cvmx_mio_ptp_ckout_thresh_hi_s cnf71xx;
3139	2612	};
3140	2613
3141	2614	union cvmx_mio_ptp_ckout_thresh_lo {
..	..	@@ -3149,10 +2622,6 @@
3149	2622	uint64_t reserved_32_63:32;
3150	2623	#endif
3151	2624	} s;
3152		- struct cvmx_mio_ptp_ckout_thresh_lo_s cn61xx;
3153		- struct cvmx_mio_ptp_ckout_thresh_lo_s cn66xx;
3154		- struct cvmx_mio_ptp_ckout_thresh_lo_s cn68xx;
3155		- struct cvmx_mio_ptp_ckout_thresh_lo_s cnf71xx;
3156	2625	};
3157	2626
3158	2627	union cvmx_mio_ptp_clock_cfg {
..	..	@@ -3202,7 +2671,6 @@
3202	2671	uint64_t reserved_42_63:22;
3203	2672	#endif
3204	2673	} s;
3205		- struct cvmx_mio_ptp_clock_cfg_s cn61xx;
3206	2674	struct cvmx_mio_ptp_clock_cfg_cn63xx {
3207	2675	#ifdef __BIG_ENDIAN_BITFIELD
3208	2676	uint64_t reserved_24_63:40;
..	..	@@ -3228,7 +2696,6 @@
3228	2696	uint64_t reserved_24_63:40;
3229	2697	#endif
3230	2698	} cn63xx;
3231		- struct cvmx_mio_ptp_clock_cfg_cn63xx cn63xxp1;
3232	2699	struct cvmx_mio_ptp_clock_cfg_cn66xx {
3233	2700	#ifdef __BIG_ENDIAN_BITFIELD
3234	2701	uint64_t reserved_40_63:24;
..	..	@@ -3270,9 +2737,6 @@
3270	2737	uint64_t reserved_40_63:24;
3271	2738	#endif
3272	2739	} cn66xx;
3273		- struct cvmx_mio_ptp_clock_cfg_s cn68xx;
3274		- struct cvmx_mio_ptp_clock_cfg_cn63xx cn68xxp1;
3275		- struct cvmx_mio_ptp_clock_cfg_s cnf71xx;
3276	2740	};
3277	2741
3278	2742	union cvmx_mio_ptp_clock_comp {
..	..	@@ -3286,13 +2750,6 @@
3286	2750	uint64_t nanosec:32;
3287	2751	#endif
3288	2752	} s;
3289		- struct cvmx_mio_ptp_clock_comp_s cn61xx;
3290		- struct cvmx_mio_ptp_clock_comp_s cn63xx;
3291		- struct cvmx_mio_ptp_clock_comp_s cn63xxp1;
3292		- struct cvmx_mio_ptp_clock_comp_s cn66xx;
3293		- struct cvmx_mio_ptp_clock_comp_s cn68xx;
3294		- struct cvmx_mio_ptp_clock_comp_s cn68xxp1;
3295		- struct cvmx_mio_ptp_clock_comp_s cnf71xx;
3296	2753	};
3297	2754
3298	2755	union cvmx_mio_ptp_clock_hi {
..	..	@@ -3304,13 +2761,6 @@
3304	2761	uint64_t nanosec:64;
3305	2762	#endif
3306	2763	} s;
3307		- struct cvmx_mio_ptp_clock_hi_s cn61xx;
3308		- struct cvmx_mio_ptp_clock_hi_s cn63xx;
3309		- struct cvmx_mio_ptp_clock_hi_s cn63xxp1;
3310		- struct cvmx_mio_ptp_clock_hi_s cn66xx;
3311		- struct cvmx_mio_ptp_clock_hi_s cn68xx;
3312		- struct cvmx_mio_ptp_clock_hi_s cn68xxp1;
3313		- struct cvmx_mio_ptp_clock_hi_s cnf71xx;
3314	2764	};
3315	2765
3316	2766	union cvmx_mio_ptp_clock_lo {
..	..	@@ -3324,13 +2774,6 @@
3324	2774	uint64_t reserved_32_63:32;
3325	2775	#endif
3326	2776	} s;
3327		- struct cvmx_mio_ptp_clock_lo_s cn61xx;
3328		- struct cvmx_mio_ptp_clock_lo_s cn63xx;
3329		- struct cvmx_mio_ptp_clock_lo_s cn63xxp1;
3330		- struct cvmx_mio_ptp_clock_lo_s cn66xx;
3331		- struct cvmx_mio_ptp_clock_lo_s cn68xx;
3332		- struct cvmx_mio_ptp_clock_lo_s cn68xxp1;
3333		- struct cvmx_mio_ptp_clock_lo_s cnf71xx;
3334	2777	};
3335	2778
3336	2779	union cvmx_mio_ptp_evt_cnt {
..	..	@@ -3342,13 +2785,6 @@
3342	2785	uint64_t cntr:64;
3343	2786	#endif
3344	2787	} s;
3345		- struct cvmx_mio_ptp_evt_cnt_s cn61xx;
3346		- struct cvmx_mio_ptp_evt_cnt_s cn63xx;
3347		- struct cvmx_mio_ptp_evt_cnt_s cn63xxp1;
3348		- struct cvmx_mio_ptp_evt_cnt_s cn66xx;
3349		- struct cvmx_mio_ptp_evt_cnt_s cn68xx;
3350		- struct cvmx_mio_ptp_evt_cnt_s cn68xxp1;
3351		- struct cvmx_mio_ptp_evt_cnt_s cnf71xx;
3352	2788	};
3353	2789
3354	2790	union cvmx_mio_ptp_phy_1pps_in {
..	..	@@ -3362,7 +2798,6 @@
3362	2798	uint64_t reserved_5_63:59;
3363	2799	#endif
3364	2800	} s;
3365		- struct cvmx_mio_ptp_phy_1pps_in_s cnf71xx;
3366	2801	};
3367	2802
3368	2803	union cvmx_mio_ptp_pps_hi_incr {
..	..	@@ -3376,10 +2811,6 @@
3376	2811	uint64_t nanosec:32;
3377	2812	#endif
3378	2813	} s;
3379		- struct cvmx_mio_ptp_pps_hi_incr_s cn61xx;
3380		- struct cvmx_mio_ptp_pps_hi_incr_s cn66xx;
3381		- struct cvmx_mio_ptp_pps_hi_incr_s cn68xx;
3382		- struct cvmx_mio_ptp_pps_hi_incr_s cnf71xx;
3383	2814	};
3384	2815
3385	2816	union cvmx_mio_ptp_pps_lo_incr {
..	..	@@ -3393,10 +2824,6 @@
3393	2824	uint64_t nanosec:32;
3394	2825	#endif
3395	2826	} s;
3396		- struct cvmx_mio_ptp_pps_lo_incr_s cn61xx;
3397		- struct cvmx_mio_ptp_pps_lo_incr_s cn66xx;
3398		- struct cvmx_mio_ptp_pps_lo_incr_s cn68xx;
3399		- struct cvmx_mio_ptp_pps_lo_incr_s cnf71xx;
3400	2827	};
3401	2828
3402	2829	union cvmx_mio_ptp_pps_thresh_hi {
..	..	@@ -3408,10 +2835,6 @@
3408	2835	uint64_t nanosec:64;
3409	2836	#endif
3410	2837	} s;
3411		- struct cvmx_mio_ptp_pps_thresh_hi_s cn61xx;
3412		- struct cvmx_mio_ptp_pps_thresh_hi_s cn66xx;
3413		- struct cvmx_mio_ptp_pps_thresh_hi_s cn68xx;
3414		- struct cvmx_mio_ptp_pps_thresh_hi_s cnf71xx;
3415	2838	};
3416	2839
3417	2840	union cvmx_mio_ptp_pps_thresh_lo {
..	..	@@ -3425,10 +2848,6 @@
3425	2848	uint64_t reserved_32_63:32;
3426	2849	#endif
3427	2850	} s;
3428		- struct cvmx_mio_ptp_pps_thresh_lo_s cn61xx;
3429		- struct cvmx_mio_ptp_pps_thresh_lo_s cn66xx;
3430		- struct cvmx_mio_ptp_pps_thresh_lo_s cn68xx;
3431		- struct cvmx_mio_ptp_pps_thresh_lo_s cnf71xx;
3432	2851	};
3433	2852
3434	2853	union cvmx_mio_ptp_timestamp {
..	..	@@ -3440,13 +2859,6 @@
3440	2859	uint64_t nanosec:64;
3441	2860	#endif
3442	2861	} s;
3443		- struct cvmx_mio_ptp_timestamp_s cn61xx;
3444		- struct cvmx_mio_ptp_timestamp_s cn63xx;
3445		- struct cvmx_mio_ptp_timestamp_s cn63xxp1;
3446		- struct cvmx_mio_ptp_timestamp_s cn66xx;
3447		- struct cvmx_mio_ptp_timestamp_s cn68xx;
3448		- struct cvmx_mio_ptp_timestamp_s cn68xxp1;
3449		- struct cvmx_mio_ptp_timestamp_s cnf71xx;
3450	2862	};
3451	2863
3452	2864	union cvmx_mio_qlmx_cfg {
..	..	@@ -3511,8 +2923,6 @@
3511	2923	uint64_t reserved_12_63:52;
3512	2924	#endif
3513	2925	} cn68xx;
3514		- struct cvmx_mio_qlmx_cfg_cn68xx cn68xxp1;
3515		- struct cvmx_mio_qlmx_cfg_cn61xx cnf71xx;
3516	2926	};
3517	2927
3518	2928	union cvmx_mio_rst_boot {
..	..	@@ -3622,7 +3032,6 @@
3622	3032	uint64_t reserved_36_63:28;
3623	3033	#endif
3624	3034	} cn63xx;
3625		- struct cvmx_mio_rst_boot_cn63xx cn63xxp1;
3626	3035	struct cvmx_mio_rst_boot_cn66xx {
3627	3036	#ifdef __BIG_ENDIAN_BITFIELD
3628	3037	uint64_t chipkill:1;
..	..	@@ -3718,7 +3127,6 @@
3718	3127	uint64_t reserved_44_63:20;
3719	3128	#endif
3720	3129	} cn68xxp1;
3721		- struct cvmx_mio_rst_boot_cn61xx cnf71xx;
3722	3130	};
3723	3131
3724	3132	union cvmx_mio_rst_cfg {
..	..	@@ -3751,7 +3159,6 @@
3751	3159	uint64_t bist_delay:58;
3752	3160	#endif
3753	3161	} cn61xx;
3754		- struct cvmx_mio_rst_cfg_cn61xx cn63xx;
3755	3162	struct cvmx_mio_rst_cfg_cn63xxp1 {
3756	3163	#ifdef __BIG_ENDIAN_BITFIELD
3757	3164	uint64_t bist_delay:58;
..	..	@@ -3765,7 +3172,6 @@
3765	3172	uint64_t bist_delay:58;
3766	3173	#endif
3767	3174	} cn63xxp1;
3768		- struct cvmx_mio_rst_cfg_cn61xx cn66xx;
3769	3175	struct cvmx_mio_rst_cfg_cn68xx {
3770	3176	#ifdef __BIG_ENDIAN_BITFIELD
3771	3177	uint64_t bist_delay:56;
..	..	@@ -3781,8 +3187,6 @@
3781	3187	uint64_t bist_delay:56;
3782	3188	#endif
3783	3189	} cn68xx;
3784		- struct cvmx_mio_rst_cfg_cn68xx cn68xxp1;
3785		- struct cvmx_mio_rst_cfg_cn61xx cnf71xx;
3786	3190	};
3787	3191
3788	3192	union cvmx_mio_rst_ckill {
..	..	@@ -3796,9 +3200,6 @@
3796	3200	uint64_t reserved_47_63:17;
3797	3201	#endif
3798	3202	} s;
3799		- struct cvmx_mio_rst_ckill_s cn61xx;
3800		- struct cvmx_mio_rst_ckill_s cn66xx;
3801		- struct cvmx_mio_rst_ckill_s cnf71xx;
3802	3203	};
3803	3204
3804	3205	union cvmx_mio_rst_cntlx {
..	..	@@ -3834,7 +3235,6 @@
3834	3235	uint64_t reserved_13_63:51;
3835	3236	#endif
3836	3237	} s;
3837		- struct cvmx_mio_rst_cntlx_s cn61xx;
3838	3238	struct cvmx_mio_rst_cntlx_cn66xx {
3839	3239	#ifdef __BIG_ENDIAN_BITFIELD
3840	3240	uint64_t reserved_10_63:54;
..	..	@@ -3860,8 +3260,6 @@
3860	3260	uint64_t reserved_10_63:54;
3861	3261	#endif
3862	3262	} cn66xx;
3863		- struct cvmx_mio_rst_cntlx_cn66xx cn68xx;
3864		- struct cvmx_mio_rst_cntlx_s cnf71xx;
3865	3263	};
3866	3264
3867	3265	union cvmx_mio_rst_ctlx {
..	..	@@ -3897,7 +3295,6 @@
3897	3295	uint64_t reserved_13_63:51;
3898	3296	#endif
3899	3297	} s;
3900		- struct cvmx_mio_rst_ctlx_s cn61xx;
3901	3298	struct cvmx_mio_rst_ctlx_cn63xx {
3902	3299	#ifdef __BIG_ENDIAN_BITFIELD
3903	3300	uint64_t reserved_10_63:54;
..	..	@@ -3946,10 +3343,6 @@
3946	3343	uint64_t reserved_9_63:55;
3947	3344	#endif
3948	3345	} cn63xxp1;
3949		- struct cvmx_mio_rst_ctlx_cn63xx cn66xx;
3950		- struct cvmx_mio_rst_ctlx_cn63xx cn68xx;
3951		- struct cvmx_mio_rst_ctlx_cn63xx cn68xxp1;
3952		- struct cvmx_mio_rst_ctlx_s cnf71xx;
3953	3346	};
3954	3347
3955	3348	union cvmx_mio_rst_delay {
..	..	@@ -3965,13 +3358,6 @@
3965	3358	uint64_t reserved_32_63:32;
3966	3359	#endif
3967	3360	} s;
3968		- struct cvmx_mio_rst_delay_s cn61xx;
3969		- struct cvmx_mio_rst_delay_s cn63xx;
3970		- struct cvmx_mio_rst_delay_s cn63xxp1;
3971		- struct cvmx_mio_rst_delay_s cn66xx;
3972		- struct cvmx_mio_rst_delay_s cn68xx;
3973		- struct cvmx_mio_rst_delay_s cn68xxp1;
3974		- struct cvmx_mio_rst_delay_s cnf71xx;
3975	3361	};
3976	3362
3977	3363	union cvmx_mio_rst_int {
..	..	@@ -4014,12 +3400,6 @@
4014	3400	uint64_t reserved_10_63:54;
4015	3401	#endif
4016	3402	} cn61xx;
4017		- struct cvmx_mio_rst_int_cn61xx cn63xx;
4018		- struct cvmx_mio_rst_int_cn61xx cn63xxp1;
4019		- struct cvmx_mio_rst_int_s cn66xx;
4020		- struct cvmx_mio_rst_int_cn61xx cn68xx;
4021		- struct cvmx_mio_rst_int_cn61xx cn68xxp1;
4022		- struct cvmx_mio_rst_int_cn61xx cnf71xx;
4023	3403	};
4024	3404
4025	3405	union cvmx_mio_rst_int_en {
..	..	@@ -4062,12 +3442,6 @@
4062	3442	uint64_t reserved_10_63:54;
4063	3443	#endif
4064	3444	} cn61xx;
4065		- struct cvmx_mio_rst_int_en_cn61xx cn63xx;
4066		- struct cvmx_mio_rst_int_en_cn61xx cn63xxp1;
4067		- struct cvmx_mio_rst_int_en_s cn66xx;
4068		- struct cvmx_mio_rst_int_en_cn61xx cn68xx;
4069		- struct cvmx_mio_rst_int_en_cn61xx cn68xxp1;
4070		- struct cvmx_mio_rst_int_en_cn61xx cnf71xx;
4071	3445	};
4072	3446
4073	3447	union cvmx_mio_twsx_int {
..	..	@@ -4103,9 +3477,6 @@
4103	3477	uint64_t reserved_12_63:52;
4104	3478	#endif
4105	3479	} s;
4106		- struct cvmx_mio_twsx_int_s cn30xx;
4107		- struct cvmx_mio_twsx_int_s cn31xx;
4108		- struct cvmx_mio_twsx_int_s cn38xx;
4109	3480	struct cvmx_mio_twsx_int_cn38xxp2 {
4110	3481	#ifdef __BIG_ENDIAN_BITFIELD
4111	3482	uint64_t reserved_7_63:57;
..	..	@@ -4127,20 +3498,6 @@
4127	3498	uint64_t reserved_7_63:57;
4128	3499	#endif
4129	3500	} cn38xxp2;
4130		- struct cvmx_mio_twsx_int_s cn50xx;
4131		- struct cvmx_mio_twsx_int_s cn52xx;
4132		- struct cvmx_mio_twsx_int_s cn52xxp1;
4133		- struct cvmx_mio_twsx_int_s cn56xx;
4134		- struct cvmx_mio_twsx_int_s cn56xxp1;
4135		- struct cvmx_mio_twsx_int_s cn58xx;
4136		- struct cvmx_mio_twsx_int_s cn58xxp1;
4137		- struct cvmx_mio_twsx_int_s cn61xx;
4138		- struct cvmx_mio_twsx_int_s cn63xx;
4139		- struct cvmx_mio_twsx_int_s cn63xxp1;
4140		- struct cvmx_mio_twsx_int_s cn66xx;
4141		- struct cvmx_mio_twsx_int_s cn68xx;
4142		- struct cvmx_mio_twsx_int_s cn68xxp1;
4143		- struct cvmx_mio_twsx_int_s cnf71xx;
4144	3501	};
4145	3502
4146	3503	union cvmx_mio_twsx_sw_twsi {
..	..	@@ -4174,24 +3531,6 @@
4174	3531	uint64_t v:1;
4175	3532	#endif
4176	3533	} s;
4177		- struct cvmx_mio_twsx_sw_twsi_s cn30xx;
4178		- struct cvmx_mio_twsx_sw_twsi_s cn31xx;
4179		- struct cvmx_mio_twsx_sw_twsi_s cn38xx;
4180		- struct cvmx_mio_twsx_sw_twsi_s cn38xxp2;
4181		- struct cvmx_mio_twsx_sw_twsi_s cn50xx;
4182		- struct cvmx_mio_twsx_sw_twsi_s cn52xx;
4183		- struct cvmx_mio_twsx_sw_twsi_s cn52xxp1;
4184		- struct cvmx_mio_twsx_sw_twsi_s cn56xx;
4185		- struct cvmx_mio_twsx_sw_twsi_s cn56xxp1;
4186		- struct cvmx_mio_twsx_sw_twsi_s cn58xx;
4187		- struct cvmx_mio_twsx_sw_twsi_s cn58xxp1;
4188		- struct cvmx_mio_twsx_sw_twsi_s cn61xx;
4189		- struct cvmx_mio_twsx_sw_twsi_s cn63xx;
4190		- struct cvmx_mio_twsx_sw_twsi_s cn63xxp1;
4191		- struct cvmx_mio_twsx_sw_twsi_s cn66xx;
4192		- struct cvmx_mio_twsx_sw_twsi_s cn68xx;
4193		- struct cvmx_mio_twsx_sw_twsi_s cn68xxp1;
4194		- struct cvmx_mio_twsx_sw_twsi_s cnf71xx;
4195	3534	};
4196	3535
4197	3536	union cvmx_mio_twsx_sw_twsi_ext {
..	..	@@ -4207,24 +3546,6 @@
4207	3546	uint64_t reserved_40_63:24;
4208	3547	#endif
4209	3548	} s;
4210		- struct cvmx_mio_twsx_sw_twsi_ext_s cn30xx;
4211		- struct cvmx_mio_twsx_sw_twsi_ext_s cn31xx;
4212		- struct cvmx_mio_twsx_sw_twsi_ext_s cn38xx;
4213		- struct cvmx_mio_twsx_sw_twsi_ext_s cn38xxp2;
4214		- struct cvmx_mio_twsx_sw_twsi_ext_s cn50xx;
4215		- struct cvmx_mio_twsx_sw_twsi_ext_s cn52xx;
4216		- struct cvmx_mio_twsx_sw_twsi_ext_s cn52xxp1;
4217		- struct cvmx_mio_twsx_sw_twsi_ext_s cn56xx;
4218		- struct cvmx_mio_twsx_sw_twsi_ext_s cn56xxp1;
4219		- struct cvmx_mio_twsx_sw_twsi_ext_s cn58xx;
4220		- struct cvmx_mio_twsx_sw_twsi_ext_s cn58xxp1;
4221		- struct cvmx_mio_twsx_sw_twsi_ext_s cn61xx;
4222		- struct cvmx_mio_twsx_sw_twsi_ext_s cn63xx;
4223		- struct cvmx_mio_twsx_sw_twsi_ext_s cn63xxp1;
4224		- struct cvmx_mio_twsx_sw_twsi_ext_s cn66xx;
4225		- struct cvmx_mio_twsx_sw_twsi_ext_s cn68xx;
4226		- struct cvmx_mio_twsx_sw_twsi_ext_s cn68xxp1;
4227		- struct cvmx_mio_twsx_sw_twsi_ext_s cnf71xx;
4228	3549	};
4229	3550
4230	3551	union cvmx_mio_twsx_twsi_sw {
..	..	@@ -4240,24 +3561,6 @@
4240	3561	uint64_t v:2;
4241	3562	#endif
4242	3563	} s;
4243		- struct cvmx_mio_twsx_twsi_sw_s cn30xx;
4244		- struct cvmx_mio_twsx_twsi_sw_s cn31xx;
4245		- struct cvmx_mio_twsx_twsi_sw_s cn38xx;
4246		- struct cvmx_mio_twsx_twsi_sw_s cn38xxp2;
4247		- struct cvmx_mio_twsx_twsi_sw_s cn50xx;
4248		- struct cvmx_mio_twsx_twsi_sw_s cn52xx;
4249		- struct cvmx_mio_twsx_twsi_sw_s cn52xxp1;
4250		- struct cvmx_mio_twsx_twsi_sw_s cn56xx;
4251		- struct cvmx_mio_twsx_twsi_sw_s cn56xxp1;
4252		- struct cvmx_mio_twsx_twsi_sw_s cn58xx;
4253		- struct cvmx_mio_twsx_twsi_sw_s cn58xxp1;
4254		- struct cvmx_mio_twsx_twsi_sw_s cn61xx;
4255		- struct cvmx_mio_twsx_twsi_sw_s cn63xx;
4256		- struct cvmx_mio_twsx_twsi_sw_s cn63xxp1;
4257		- struct cvmx_mio_twsx_twsi_sw_s cn66xx;
4258		- struct cvmx_mio_twsx_twsi_sw_s cn68xx;
4259		- struct cvmx_mio_twsx_twsi_sw_s cn68xxp1;
4260		- struct cvmx_mio_twsx_twsi_sw_s cnf71xx;
4261	3564	};
4262	3565
4263	3566	union cvmx_mio_uartx_dlh {
..	..	@@ -4271,24 +3574,6 @@
4271	3574	uint64_t reserved_8_63:56;
4272	3575	#endif
4273	3576	} s;
4274		- struct cvmx_mio_uartx_dlh_s cn30xx;
4275		- struct cvmx_mio_uartx_dlh_s cn31xx;
4276		- struct cvmx_mio_uartx_dlh_s cn38xx;
4277		- struct cvmx_mio_uartx_dlh_s cn38xxp2;
4278		- struct cvmx_mio_uartx_dlh_s cn50xx;
4279		- struct cvmx_mio_uartx_dlh_s cn52xx;
4280		- struct cvmx_mio_uartx_dlh_s cn52xxp1;
4281		- struct cvmx_mio_uartx_dlh_s cn56xx;
4282		- struct cvmx_mio_uartx_dlh_s cn56xxp1;
4283		- struct cvmx_mio_uartx_dlh_s cn58xx;
4284		- struct cvmx_mio_uartx_dlh_s cn58xxp1;
4285		- struct cvmx_mio_uartx_dlh_s cn61xx;
4286		- struct cvmx_mio_uartx_dlh_s cn63xx;
4287		- struct cvmx_mio_uartx_dlh_s cn63xxp1;
4288		- struct cvmx_mio_uartx_dlh_s cn66xx;
4289		- struct cvmx_mio_uartx_dlh_s cn68xx;
4290		- struct cvmx_mio_uartx_dlh_s cn68xxp1;
4291		- struct cvmx_mio_uartx_dlh_s cnf71xx;
4292	3577	};
4293	3578
4294	3579	union cvmx_mio_uartx_dll {
..	..	@@ -4302,24 +3587,6 @@
4302	3587	uint64_t reserved_8_63:56;
4303	3588	#endif
4304	3589	} s;
4305		- struct cvmx_mio_uartx_dll_s cn30xx;
4306		- struct cvmx_mio_uartx_dll_s cn31xx;
4307		- struct cvmx_mio_uartx_dll_s cn38xx;
4308		- struct cvmx_mio_uartx_dll_s cn38xxp2;
4309		- struct cvmx_mio_uartx_dll_s cn50xx;
4310		- struct cvmx_mio_uartx_dll_s cn52xx;
4311		- struct cvmx_mio_uartx_dll_s cn52xxp1;
4312		- struct cvmx_mio_uartx_dll_s cn56xx;
4313		- struct cvmx_mio_uartx_dll_s cn56xxp1;
4314		- struct cvmx_mio_uartx_dll_s cn58xx;
4315		- struct cvmx_mio_uartx_dll_s cn58xxp1;
4316		- struct cvmx_mio_uartx_dll_s cn61xx;
4317		- struct cvmx_mio_uartx_dll_s cn63xx;
4318		- struct cvmx_mio_uartx_dll_s cn63xxp1;
4319		- struct cvmx_mio_uartx_dll_s cn66xx;
4320		- struct cvmx_mio_uartx_dll_s cn68xx;
4321		- struct cvmx_mio_uartx_dll_s cn68xxp1;
4322		- struct cvmx_mio_uartx_dll_s cnf71xx;
4323	3590	};
4324	3591
4325	3592	union cvmx_mio_uartx_far {
..	..	@@ -4333,24 +3600,6 @@
4333	3600	uint64_t reserved_1_63:63;
4334	3601	#endif
4335	3602	} s;
4336		- struct cvmx_mio_uartx_far_s cn30xx;
4337		- struct cvmx_mio_uartx_far_s cn31xx;
4338		- struct cvmx_mio_uartx_far_s cn38xx;
4339		- struct cvmx_mio_uartx_far_s cn38xxp2;
4340		- struct cvmx_mio_uartx_far_s cn50xx;
4341		- struct cvmx_mio_uartx_far_s cn52xx;
4342		- struct cvmx_mio_uartx_far_s cn52xxp1;
4343		- struct cvmx_mio_uartx_far_s cn56xx;
4344		- struct cvmx_mio_uartx_far_s cn56xxp1;
4345		- struct cvmx_mio_uartx_far_s cn58xx;
4346		- struct cvmx_mio_uartx_far_s cn58xxp1;
4347		- struct cvmx_mio_uartx_far_s cn61xx;
4348		- struct cvmx_mio_uartx_far_s cn63xx;
4349		- struct cvmx_mio_uartx_far_s cn63xxp1;
4350		- struct cvmx_mio_uartx_far_s cn66xx;
4351		- struct cvmx_mio_uartx_far_s cn68xx;
4352		- struct cvmx_mio_uartx_far_s cn68xxp1;
4353		- struct cvmx_mio_uartx_far_s cnf71xx;
4354	3603	};
4355	3604
4356	3605	union cvmx_mio_uartx_fcr {
..	..	@@ -4374,24 +3623,6 @@
4374	3623	uint64_t reserved_8_63:56;
4375	3624	#endif
4376	3625	} s;
4377		- struct cvmx_mio_uartx_fcr_s cn30xx;
4378		- struct cvmx_mio_uartx_fcr_s cn31xx;
4379		- struct cvmx_mio_uartx_fcr_s cn38xx;
4380		- struct cvmx_mio_uartx_fcr_s cn38xxp2;
4381		- struct cvmx_mio_uartx_fcr_s cn50xx;
4382		- struct cvmx_mio_uartx_fcr_s cn52xx;
4383		- struct cvmx_mio_uartx_fcr_s cn52xxp1;
4384		- struct cvmx_mio_uartx_fcr_s cn56xx;
4385		- struct cvmx_mio_uartx_fcr_s cn56xxp1;
4386		- struct cvmx_mio_uartx_fcr_s cn58xx;
4387		- struct cvmx_mio_uartx_fcr_s cn58xxp1;
4388		- struct cvmx_mio_uartx_fcr_s cn61xx;
4389		- struct cvmx_mio_uartx_fcr_s cn63xx;
4390		- struct cvmx_mio_uartx_fcr_s cn63xxp1;
4391		- struct cvmx_mio_uartx_fcr_s cn66xx;
4392		- struct cvmx_mio_uartx_fcr_s cn68xx;
4393		- struct cvmx_mio_uartx_fcr_s cn68xxp1;
4394		- struct cvmx_mio_uartx_fcr_s cnf71xx;
4395	3626	};
4396	3627
4397	3628	union cvmx_mio_uartx_htx {
..	..	@@ -4405,24 +3636,6 @@
4405	3636	uint64_t reserved_1_63:63;
4406	3637	#endif
4407	3638	} s;
4408		- struct cvmx_mio_uartx_htx_s cn30xx;
4409		- struct cvmx_mio_uartx_htx_s cn31xx;
4410		- struct cvmx_mio_uartx_htx_s cn38xx;
4411		- struct cvmx_mio_uartx_htx_s cn38xxp2;
4412		- struct cvmx_mio_uartx_htx_s cn50xx;
4413		- struct cvmx_mio_uartx_htx_s cn52xx;
4414		- struct cvmx_mio_uartx_htx_s cn52xxp1;
4415		- struct cvmx_mio_uartx_htx_s cn56xx;
4416		- struct cvmx_mio_uartx_htx_s cn56xxp1;
4417		- struct cvmx_mio_uartx_htx_s cn58xx;
4418		- struct cvmx_mio_uartx_htx_s cn58xxp1;
4419		- struct cvmx_mio_uartx_htx_s cn61xx;
4420		- struct cvmx_mio_uartx_htx_s cn63xx;
4421		- struct cvmx_mio_uartx_htx_s cn63xxp1;
4422		- struct cvmx_mio_uartx_htx_s cn66xx;
4423		- struct cvmx_mio_uartx_htx_s cn68xx;
4424		- struct cvmx_mio_uartx_htx_s cn68xxp1;
4425		- struct cvmx_mio_uartx_htx_s cnf71xx;
4426	3639	};
4427	3640
4428	3641	union cvmx_mio_uartx_ier {
..	..	@@ -4446,24 +3659,6 @@
4446	3659	uint64_t reserved_8_63:56;
4447	3660	#endif
4448	3661	} s;
4449		- struct cvmx_mio_uartx_ier_s cn30xx;
4450		- struct cvmx_mio_uartx_ier_s cn31xx;
4451		- struct cvmx_mio_uartx_ier_s cn38xx;
4452		- struct cvmx_mio_uartx_ier_s cn38xxp2;
4453		- struct cvmx_mio_uartx_ier_s cn50xx;
4454		- struct cvmx_mio_uartx_ier_s cn52xx;
4455		- struct cvmx_mio_uartx_ier_s cn52xxp1;
4456		- struct cvmx_mio_uartx_ier_s cn56xx;
4457		- struct cvmx_mio_uartx_ier_s cn56xxp1;
4458		- struct cvmx_mio_uartx_ier_s cn58xx;
4459		- struct cvmx_mio_uartx_ier_s cn58xxp1;
4460		- struct cvmx_mio_uartx_ier_s cn61xx;
4461		- struct cvmx_mio_uartx_ier_s cn63xx;
4462		- struct cvmx_mio_uartx_ier_s cn63xxp1;
4463		- struct cvmx_mio_uartx_ier_s cn66xx;
4464		- struct cvmx_mio_uartx_ier_s cn68xx;
4465		- struct cvmx_mio_uartx_ier_s cn68xxp1;
4466		- struct cvmx_mio_uartx_ier_s cnf71xx;
4467	3662	};
4468	3663
4469	3664	union cvmx_mio_uartx_iir {
..	..	@@ -4481,24 +3676,6 @@
4481	3676	uint64_t reserved_8_63:56;
4482	3677	#endif
4483	3678	} s;
4484		- struct cvmx_mio_uartx_iir_s cn30xx;
4485		- struct cvmx_mio_uartx_iir_s cn31xx;
4486		- struct cvmx_mio_uartx_iir_s cn38xx;
4487		- struct cvmx_mio_uartx_iir_s cn38xxp2;
4488		- struct cvmx_mio_uartx_iir_s cn50xx;
4489		- struct cvmx_mio_uartx_iir_s cn52xx;
4490		- struct cvmx_mio_uartx_iir_s cn52xxp1;
4491		- struct cvmx_mio_uartx_iir_s cn56xx;
4492		- struct cvmx_mio_uartx_iir_s cn56xxp1;
4493		- struct cvmx_mio_uartx_iir_s cn58xx;
4494		- struct cvmx_mio_uartx_iir_s cn58xxp1;
4495		- struct cvmx_mio_uartx_iir_s cn61xx;
4496		- struct cvmx_mio_uartx_iir_s cn63xx;
4497		- struct cvmx_mio_uartx_iir_s cn63xxp1;
4498		- struct cvmx_mio_uartx_iir_s cn66xx;
4499		- struct cvmx_mio_uartx_iir_s cn68xx;
4500		- struct cvmx_mio_uartx_iir_s cn68xxp1;
4501		- struct cvmx_mio_uartx_iir_s cnf71xx;
4502	3679	};
4503	3680
4504	3681	union cvmx_mio_uartx_lcr {
..	..	@@ -4524,24 +3701,6 @@
4524	3701	uint64_t reserved_8_63:56;
4525	3702	#endif
4526	3703	} s;
4527		- struct cvmx_mio_uartx_lcr_s cn30xx;
4528		- struct cvmx_mio_uartx_lcr_s cn31xx;
4529		- struct cvmx_mio_uartx_lcr_s cn38xx;
4530		- struct cvmx_mio_uartx_lcr_s cn38xxp2;
4531		- struct cvmx_mio_uartx_lcr_s cn50xx;
4532		- struct cvmx_mio_uartx_lcr_s cn52xx;
4533		- struct cvmx_mio_uartx_lcr_s cn52xxp1;
4534		- struct cvmx_mio_uartx_lcr_s cn56xx;
4535		- struct cvmx_mio_uartx_lcr_s cn56xxp1;
4536		- struct cvmx_mio_uartx_lcr_s cn58xx;
4537		- struct cvmx_mio_uartx_lcr_s cn58xxp1;
4538		- struct cvmx_mio_uartx_lcr_s cn61xx;
4539		- struct cvmx_mio_uartx_lcr_s cn63xx;
4540		- struct cvmx_mio_uartx_lcr_s cn63xxp1;
4541		- struct cvmx_mio_uartx_lcr_s cn66xx;
4542		- struct cvmx_mio_uartx_lcr_s cn68xx;
4543		- struct cvmx_mio_uartx_lcr_s cn68xxp1;
4544		- struct cvmx_mio_uartx_lcr_s cnf71xx;
4545	3704	};
4546	3705
4547	3706	union cvmx_mio_uartx_lsr {
..	..	@@ -4569,24 +3728,6 @@
4569	3728	uint64_t reserved_8_63:56;
4570	3729	#endif
4571	3730	} s;
4572		- struct cvmx_mio_uartx_lsr_s cn30xx;
4573		- struct cvmx_mio_uartx_lsr_s cn31xx;
4574		- struct cvmx_mio_uartx_lsr_s cn38xx;
4575		- struct cvmx_mio_uartx_lsr_s cn38xxp2;
4576		- struct cvmx_mio_uartx_lsr_s cn50xx;
4577		- struct cvmx_mio_uartx_lsr_s cn52xx;
4578		- struct cvmx_mio_uartx_lsr_s cn52xxp1;
4579		- struct cvmx_mio_uartx_lsr_s cn56xx;
4580		- struct cvmx_mio_uartx_lsr_s cn56xxp1;
4581		- struct cvmx_mio_uartx_lsr_s cn58xx;
4582		- struct cvmx_mio_uartx_lsr_s cn58xxp1;
4583		- struct cvmx_mio_uartx_lsr_s cn61xx;
4584		- struct cvmx_mio_uartx_lsr_s cn63xx;
4585		- struct cvmx_mio_uartx_lsr_s cn63xxp1;
4586		- struct cvmx_mio_uartx_lsr_s cn66xx;
4587		- struct cvmx_mio_uartx_lsr_s cn68xx;
4588		- struct cvmx_mio_uartx_lsr_s cn68xxp1;
4589		- struct cvmx_mio_uartx_lsr_s cnf71xx;
4590	3731	};
4591	3732
4592	3733	union cvmx_mio_uartx_mcr {
..	..	@@ -4610,24 +3751,6 @@
4610	3751	uint64_t reserved_6_63:58;
4611	3752	#endif
4612	3753	} s;
4613		- struct cvmx_mio_uartx_mcr_s cn30xx;
4614		- struct cvmx_mio_uartx_mcr_s cn31xx;
4615		- struct cvmx_mio_uartx_mcr_s cn38xx;
4616		- struct cvmx_mio_uartx_mcr_s cn38xxp2;
4617		- struct cvmx_mio_uartx_mcr_s cn50xx;
4618		- struct cvmx_mio_uartx_mcr_s cn52xx;
4619		- struct cvmx_mio_uartx_mcr_s cn52xxp1;
4620		- struct cvmx_mio_uartx_mcr_s cn56xx;
4621		- struct cvmx_mio_uartx_mcr_s cn56xxp1;
4622		- struct cvmx_mio_uartx_mcr_s cn58xx;
4623		- struct cvmx_mio_uartx_mcr_s cn58xxp1;
4624		- struct cvmx_mio_uartx_mcr_s cn61xx;
4625		- struct cvmx_mio_uartx_mcr_s cn63xx;
4626		- struct cvmx_mio_uartx_mcr_s cn63xxp1;
4627		- struct cvmx_mio_uartx_mcr_s cn66xx;
4628		- struct cvmx_mio_uartx_mcr_s cn68xx;
4629		- struct cvmx_mio_uartx_mcr_s cn68xxp1;
4630		- struct cvmx_mio_uartx_mcr_s cnf71xx;
4631	3754	};
4632	3755
4633	3756	union cvmx_mio_uartx_msr {
..	..	@@ -4655,24 +3778,6 @@
4655	3778	uint64_t reserved_8_63:56;
4656	3779	#endif
4657	3780	} s;
4658		- struct cvmx_mio_uartx_msr_s cn30xx;
4659		- struct cvmx_mio_uartx_msr_s cn31xx;
4660		- struct cvmx_mio_uartx_msr_s cn38xx;
4661		- struct cvmx_mio_uartx_msr_s cn38xxp2;
4662		- struct cvmx_mio_uartx_msr_s cn50xx;
4663		- struct cvmx_mio_uartx_msr_s cn52xx;
4664		- struct cvmx_mio_uartx_msr_s cn52xxp1;
4665		- struct cvmx_mio_uartx_msr_s cn56xx;
4666		- struct cvmx_mio_uartx_msr_s cn56xxp1;
4667		- struct cvmx_mio_uartx_msr_s cn58xx;
4668		- struct cvmx_mio_uartx_msr_s cn58xxp1;
4669		- struct cvmx_mio_uartx_msr_s cn61xx;
4670		- struct cvmx_mio_uartx_msr_s cn63xx;
4671		- struct cvmx_mio_uartx_msr_s cn63xxp1;
4672		- struct cvmx_mio_uartx_msr_s cn66xx;
4673		- struct cvmx_mio_uartx_msr_s cn68xx;
4674		- struct cvmx_mio_uartx_msr_s cn68xxp1;
4675		- struct cvmx_mio_uartx_msr_s cnf71xx;
4676	3781	};
4677	3782
4678	3783	union cvmx_mio_uartx_rbr {
..	..	@@ -4686,24 +3791,6 @@
4686	3791	uint64_t reserved_8_63:56;
4687	3792	#endif
4688	3793	} s;
4689		- struct cvmx_mio_uartx_rbr_s cn30xx;
4690		- struct cvmx_mio_uartx_rbr_s cn31xx;
4691		- struct cvmx_mio_uartx_rbr_s cn38xx;
4692		- struct cvmx_mio_uartx_rbr_s cn38xxp2;
4693		- struct cvmx_mio_uartx_rbr_s cn50xx;
4694		- struct cvmx_mio_uartx_rbr_s cn52xx;
4695		- struct cvmx_mio_uartx_rbr_s cn52xxp1;
4696		- struct cvmx_mio_uartx_rbr_s cn56xx;
4697		- struct cvmx_mio_uartx_rbr_s cn56xxp1;
4698		- struct cvmx_mio_uartx_rbr_s cn58xx;
4699		- struct cvmx_mio_uartx_rbr_s cn58xxp1;
4700		- struct cvmx_mio_uartx_rbr_s cn61xx;
4701		- struct cvmx_mio_uartx_rbr_s cn63xx;
4702		- struct cvmx_mio_uartx_rbr_s cn63xxp1;
4703		- struct cvmx_mio_uartx_rbr_s cn66xx;
4704		- struct cvmx_mio_uartx_rbr_s cn68xx;
4705		- struct cvmx_mio_uartx_rbr_s cn68xxp1;
4706		- struct cvmx_mio_uartx_rbr_s cnf71xx;
4707	3794	};
4708	3795
4709	3796	union cvmx_mio_uartx_rfl {
..	..	@@ -4717,24 +3804,6 @@
4717	3804	uint64_t reserved_7_63:57;
4718	3805	#endif
4719	3806	} s;
4720		- struct cvmx_mio_uartx_rfl_s cn30xx;
4721		- struct cvmx_mio_uartx_rfl_s cn31xx;
4722		- struct cvmx_mio_uartx_rfl_s cn38xx;
4723		- struct cvmx_mio_uartx_rfl_s cn38xxp2;
4724		- struct cvmx_mio_uartx_rfl_s cn50xx;
4725		- struct cvmx_mio_uartx_rfl_s cn52xx;
4726		- struct cvmx_mio_uartx_rfl_s cn52xxp1;
4727		- struct cvmx_mio_uartx_rfl_s cn56xx;
4728		- struct cvmx_mio_uartx_rfl_s cn56xxp1;
4729		- struct cvmx_mio_uartx_rfl_s cn58xx;
4730		- struct cvmx_mio_uartx_rfl_s cn58xxp1;
4731		- struct cvmx_mio_uartx_rfl_s cn61xx;
4732		- struct cvmx_mio_uartx_rfl_s cn63xx;
4733		- struct cvmx_mio_uartx_rfl_s cn63xxp1;
4734		- struct cvmx_mio_uartx_rfl_s cn66xx;
4735		- struct cvmx_mio_uartx_rfl_s cn68xx;
4736		- struct cvmx_mio_uartx_rfl_s cn68xxp1;
4737		- struct cvmx_mio_uartx_rfl_s cnf71xx;
4738	3807	};
4739	3808
4740	3809	union cvmx_mio_uartx_rfw {
..	..	@@ -4752,24 +3821,6 @@
4752	3821	uint64_t reserved_10_63:54;
4753	3822	#endif
4754	3823	} s;
4755		- struct cvmx_mio_uartx_rfw_s cn30xx;
4756		- struct cvmx_mio_uartx_rfw_s cn31xx;
4757		- struct cvmx_mio_uartx_rfw_s cn38xx;
4758		- struct cvmx_mio_uartx_rfw_s cn38xxp2;
4759		- struct cvmx_mio_uartx_rfw_s cn50xx;
4760		- struct cvmx_mio_uartx_rfw_s cn52xx;
4761		- struct cvmx_mio_uartx_rfw_s cn52xxp1;
4762		- struct cvmx_mio_uartx_rfw_s cn56xx;
4763		- struct cvmx_mio_uartx_rfw_s cn56xxp1;
4764		- struct cvmx_mio_uartx_rfw_s cn58xx;
4765		- struct cvmx_mio_uartx_rfw_s cn58xxp1;
4766		- struct cvmx_mio_uartx_rfw_s cn61xx;
4767		- struct cvmx_mio_uartx_rfw_s cn63xx;
4768		- struct cvmx_mio_uartx_rfw_s cn63xxp1;
4769		- struct cvmx_mio_uartx_rfw_s cn66xx;
4770		- struct cvmx_mio_uartx_rfw_s cn68xx;
4771		- struct cvmx_mio_uartx_rfw_s cn68xxp1;
4772		- struct cvmx_mio_uartx_rfw_s cnf71xx;
4773	3824	};
4774	3825
4775	3826	union cvmx_mio_uartx_sbcr {
..	..	@@ -4783,24 +3834,6 @@
4783	3834	uint64_t reserved_1_63:63;
4784	3835	#endif
4785	3836	} s;
4786		- struct cvmx_mio_uartx_sbcr_s cn30xx;
4787		- struct cvmx_mio_uartx_sbcr_s cn31xx;
4788		- struct cvmx_mio_uartx_sbcr_s cn38xx;
4789		- struct cvmx_mio_uartx_sbcr_s cn38xxp2;
4790		- struct cvmx_mio_uartx_sbcr_s cn50xx;
4791		- struct cvmx_mio_uartx_sbcr_s cn52xx;
4792		- struct cvmx_mio_uartx_sbcr_s cn52xxp1;
4793		- struct cvmx_mio_uartx_sbcr_s cn56xx;
4794		- struct cvmx_mio_uartx_sbcr_s cn56xxp1;
4795		- struct cvmx_mio_uartx_sbcr_s cn58xx;
4796		- struct cvmx_mio_uartx_sbcr_s cn58xxp1;
4797		- struct cvmx_mio_uartx_sbcr_s cn61xx;
4798		- struct cvmx_mio_uartx_sbcr_s cn63xx;
4799		- struct cvmx_mio_uartx_sbcr_s cn63xxp1;
4800		- struct cvmx_mio_uartx_sbcr_s cn66xx;
4801		- struct cvmx_mio_uartx_sbcr_s cn68xx;
4802		- struct cvmx_mio_uartx_sbcr_s cn68xxp1;
4803		- struct cvmx_mio_uartx_sbcr_s cnf71xx;
4804	3837	};
4805	3838
4806	3839	union cvmx_mio_uartx_scr {
..	..	@@ -4814,24 +3847,6 @@
4814	3847	uint64_t reserved_8_63:56;
4815	3848	#endif
4816	3849	} s;
4817		- struct cvmx_mio_uartx_scr_s cn30xx;
4818		- struct cvmx_mio_uartx_scr_s cn31xx;
4819		- struct cvmx_mio_uartx_scr_s cn38xx;
4820		- struct cvmx_mio_uartx_scr_s cn38xxp2;
4821		- struct cvmx_mio_uartx_scr_s cn50xx;
4822		- struct cvmx_mio_uartx_scr_s cn52xx;
4823		- struct cvmx_mio_uartx_scr_s cn52xxp1;
4824		- struct cvmx_mio_uartx_scr_s cn56xx;
4825		- struct cvmx_mio_uartx_scr_s cn56xxp1;
4826		- struct cvmx_mio_uartx_scr_s cn58xx;
4827		- struct cvmx_mio_uartx_scr_s cn58xxp1;
4828		- struct cvmx_mio_uartx_scr_s cn61xx;
4829		- struct cvmx_mio_uartx_scr_s cn63xx;
4830		- struct cvmx_mio_uartx_scr_s cn63xxp1;
4831		- struct cvmx_mio_uartx_scr_s cn66xx;
4832		- struct cvmx_mio_uartx_scr_s cn68xx;
4833		- struct cvmx_mio_uartx_scr_s cn68xxp1;
4834		- struct cvmx_mio_uartx_scr_s cnf71xx;
4835	3850	};
4836	3851
4837	3852	union cvmx_mio_uartx_sfe {
..	..	@@ -4845,24 +3860,6 @@
4845	3860	uint64_t reserved_1_63:63;
4846	3861	#endif
4847	3862	} s;
4848		- struct cvmx_mio_uartx_sfe_s cn30xx;
4849		- struct cvmx_mio_uartx_sfe_s cn31xx;
4850		- struct cvmx_mio_uartx_sfe_s cn38xx;
4851		- struct cvmx_mio_uartx_sfe_s cn38xxp2;
4852		- struct cvmx_mio_uartx_sfe_s cn50xx;
4853		- struct cvmx_mio_uartx_sfe_s cn52xx;
4854		- struct cvmx_mio_uartx_sfe_s cn52xxp1;
4855		- struct cvmx_mio_uartx_sfe_s cn56xx;
4856		- struct cvmx_mio_uartx_sfe_s cn56xxp1;
4857		- struct cvmx_mio_uartx_sfe_s cn58xx;
4858		- struct cvmx_mio_uartx_sfe_s cn58xxp1;
4859		- struct cvmx_mio_uartx_sfe_s cn61xx;
4860		- struct cvmx_mio_uartx_sfe_s cn63xx;
4861		- struct cvmx_mio_uartx_sfe_s cn63xxp1;
4862		- struct cvmx_mio_uartx_sfe_s cn66xx;
4863		- struct cvmx_mio_uartx_sfe_s cn68xx;
4864		- struct cvmx_mio_uartx_sfe_s cn68xxp1;
4865		- struct cvmx_mio_uartx_sfe_s cnf71xx;
4866	3863	};
4867	3864
4868	3865	union cvmx_mio_uartx_srr {
..	..	@@ -4880,24 +3877,6 @@
4880	3877	uint64_t reserved_3_63:61;
4881	3878	#endif
4882	3879	} s;
4883		- struct cvmx_mio_uartx_srr_s cn30xx;
4884		- struct cvmx_mio_uartx_srr_s cn31xx;
4885		- struct cvmx_mio_uartx_srr_s cn38xx;
4886		- struct cvmx_mio_uartx_srr_s cn38xxp2;
4887		- struct cvmx_mio_uartx_srr_s cn50xx;
4888		- struct cvmx_mio_uartx_srr_s cn52xx;
4889		- struct cvmx_mio_uartx_srr_s cn52xxp1;
4890		- struct cvmx_mio_uartx_srr_s cn56xx;
4891		- struct cvmx_mio_uartx_srr_s cn56xxp1;
4892		- struct cvmx_mio_uartx_srr_s cn58xx;
4893		- struct cvmx_mio_uartx_srr_s cn58xxp1;
4894		- struct cvmx_mio_uartx_srr_s cn61xx;
4895		- struct cvmx_mio_uartx_srr_s cn63xx;
4896		- struct cvmx_mio_uartx_srr_s cn63xxp1;
4897		- struct cvmx_mio_uartx_srr_s cn66xx;
4898		- struct cvmx_mio_uartx_srr_s cn68xx;
4899		- struct cvmx_mio_uartx_srr_s cn68xxp1;
4900		- struct cvmx_mio_uartx_srr_s cnf71xx;
4901	3880	};
4902	3881
4903	3882	union cvmx_mio_uartx_srt {
..	..	@@ -4911,24 +3890,6 @@
4911	3890	uint64_t reserved_2_63:62;
4912	3891	#endif
4913	3892	} s;
4914		- struct cvmx_mio_uartx_srt_s cn30xx;
4915		- struct cvmx_mio_uartx_srt_s cn31xx;
4916		- struct cvmx_mio_uartx_srt_s cn38xx;
4917		- struct cvmx_mio_uartx_srt_s cn38xxp2;
4918		- struct cvmx_mio_uartx_srt_s cn50xx;
4919		- struct cvmx_mio_uartx_srt_s cn52xx;
4920		- struct cvmx_mio_uartx_srt_s cn52xxp1;
4921		- struct cvmx_mio_uartx_srt_s cn56xx;
4922		- struct cvmx_mio_uartx_srt_s cn56xxp1;
4923		- struct cvmx_mio_uartx_srt_s cn58xx;
4924		- struct cvmx_mio_uartx_srt_s cn58xxp1;
4925		- struct cvmx_mio_uartx_srt_s cn61xx;
4926		- struct cvmx_mio_uartx_srt_s cn63xx;
4927		- struct cvmx_mio_uartx_srt_s cn63xxp1;
4928		- struct cvmx_mio_uartx_srt_s cn66xx;
4929		- struct cvmx_mio_uartx_srt_s cn68xx;
4930		- struct cvmx_mio_uartx_srt_s cn68xxp1;
4931		- struct cvmx_mio_uartx_srt_s cnf71xx;
4932	3893	};
4933	3894
4934	3895	union cvmx_mio_uartx_srts {
..	..	@@ -4942,24 +3903,6 @@
4942	3903	uint64_t reserved_1_63:63;
4943	3904	#endif
4944	3905	} s;
4945		- struct cvmx_mio_uartx_srts_s cn30xx;
4946		- struct cvmx_mio_uartx_srts_s cn31xx;
4947		- struct cvmx_mio_uartx_srts_s cn38xx;
4948		- struct cvmx_mio_uartx_srts_s cn38xxp2;
4949		- struct cvmx_mio_uartx_srts_s cn50xx;
4950		- struct cvmx_mio_uartx_srts_s cn52xx;
4951		- struct cvmx_mio_uartx_srts_s cn52xxp1;
4952		- struct cvmx_mio_uartx_srts_s cn56xx;
4953		- struct cvmx_mio_uartx_srts_s cn56xxp1;
4954		- struct cvmx_mio_uartx_srts_s cn58xx;
4955		- struct cvmx_mio_uartx_srts_s cn58xxp1;
4956		- struct cvmx_mio_uartx_srts_s cn61xx;
4957		- struct cvmx_mio_uartx_srts_s cn63xx;
4958		- struct cvmx_mio_uartx_srts_s cn63xxp1;
4959		- struct cvmx_mio_uartx_srts_s cn66xx;
4960		- struct cvmx_mio_uartx_srts_s cn68xx;
4961		- struct cvmx_mio_uartx_srts_s cn68xxp1;
4962		- struct cvmx_mio_uartx_srts_s cnf71xx;
4963	3906	};
4964	3907
4965	3908	union cvmx_mio_uartx_stt {
..	..	@@ -4973,24 +3916,6 @@
4973	3916	uint64_t reserved_2_63:62;
4974	3917	#endif
4975	3918	} s;
4976		- struct cvmx_mio_uartx_stt_s cn30xx;
4977		- struct cvmx_mio_uartx_stt_s cn31xx;
4978		- struct cvmx_mio_uartx_stt_s cn38xx;
4979		- struct cvmx_mio_uartx_stt_s cn38xxp2;
4980		- struct cvmx_mio_uartx_stt_s cn50xx;
4981		- struct cvmx_mio_uartx_stt_s cn52xx;
4982		- struct cvmx_mio_uartx_stt_s cn52xxp1;
4983		- struct cvmx_mio_uartx_stt_s cn56xx;
4984		- struct cvmx_mio_uartx_stt_s cn56xxp1;
4985		- struct cvmx_mio_uartx_stt_s cn58xx;
4986		- struct cvmx_mio_uartx_stt_s cn58xxp1;
4987		- struct cvmx_mio_uartx_stt_s cn61xx;
4988		- struct cvmx_mio_uartx_stt_s cn63xx;
4989		- struct cvmx_mio_uartx_stt_s cn63xxp1;
4990		- struct cvmx_mio_uartx_stt_s cn66xx;
4991		- struct cvmx_mio_uartx_stt_s cn68xx;
4992		- struct cvmx_mio_uartx_stt_s cn68xxp1;
4993		- struct cvmx_mio_uartx_stt_s cnf71xx;
4994	3919	};
4995	3920
4996	3921	union cvmx_mio_uartx_tfl {
..	..	@@ -5004,24 +3929,6 @@
5004	3929	uint64_t reserved_7_63:57;
5005	3930	#endif
5006	3931	} s;
5007		- struct cvmx_mio_uartx_tfl_s cn30xx;
5008		- struct cvmx_mio_uartx_tfl_s cn31xx;
5009		- struct cvmx_mio_uartx_tfl_s cn38xx;
5010		- struct cvmx_mio_uartx_tfl_s cn38xxp2;
5011		- struct cvmx_mio_uartx_tfl_s cn50xx;
5012		- struct cvmx_mio_uartx_tfl_s cn52xx;
5013		- struct cvmx_mio_uartx_tfl_s cn52xxp1;
5014		- struct cvmx_mio_uartx_tfl_s cn56xx;
5015		- struct cvmx_mio_uartx_tfl_s cn56xxp1;
5016		- struct cvmx_mio_uartx_tfl_s cn58xx;
5017		- struct cvmx_mio_uartx_tfl_s cn58xxp1;
5018		- struct cvmx_mio_uartx_tfl_s cn61xx;
5019		- struct cvmx_mio_uartx_tfl_s cn63xx;
5020		- struct cvmx_mio_uartx_tfl_s cn63xxp1;
5021		- struct cvmx_mio_uartx_tfl_s cn66xx;
5022		- struct cvmx_mio_uartx_tfl_s cn68xx;
5023		- struct cvmx_mio_uartx_tfl_s cn68xxp1;
5024		- struct cvmx_mio_uartx_tfl_s cnf71xx;
5025	3932	};
5026	3933
5027	3934	union cvmx_mio_uartx_tfr {
..	..	@@ -5035,24 +3942,6 @@
5035	3942	uint64_t reserved_8_63:56;
5036	3943	#endif
5037	3944	} s;
5038		- struct cvmx_mio_uartx_tfr_s cn30xx;
5039		- struct cvmx_mio_uartx_tfr_s cn31xx;
5040		- struct cvmx_mio_uartx_tfr_s cn38xx;
5041		- struct cvmx_mio_uartx_tfr_s cn38xxp2;
5042		- struct cvmx_mio_uartx_tfr_s cn50xx;
5043		- struct cvmx_mio_uartx_tfr_s cn52xx;
5044		- struct cvmx_mio_uartx_tfr_s cn52xxp1;
5045		- struct cvmx_mio_uartx_tfr_s cn56xx;
5046		- struct cvmx_mio_uartx_tfr_s cn56xxp1;
5047		- struct cvmx_mio_uartx_tfr_s cn58xx;
5048		- struct cvmx_mio_uartx_tfr_s cn58xxp1;
5049		- struct cvmx_mio_uartx_tfr_s cn61xx;
5050		- struct cvmx_mio_uartx_tfr_s cn63xx;
5051		- struct cvmx_mio_uartx_tfr_s cn63xxp1;
5052		- struct cvmx_mio_uartx_tfr_s cn66xx;
5053		- struct cvmx_mio_uartx_tfr_s cn68xx;
5054		- struct cvmx_mio_uartx_tfr_s cn68xxp1;
5055		- struct cvmx_mio_uartx_tfr_s cnf71xx;
5056	3945	};
5057	3946
5058	3947	union cvmx_mio_uartx_thr {
..	..	@@ -5066,24 +3955,6 @@
5066	3955	uint64_t reserved_8_63:56;
5067	3956	#endif
5068	3957	} s;
5069		- struct cvmx_mio_uartx_thr_s cn30xx;
5070		- struct cvmx_mio_uartx_thr_s cn31xx;
5071		- struct cvmx_mio_uartx_thr_s cn38xx;
5072		- struct cvmx_mio_uartx_thr_s cn38xxp2;
5073		- struct cvmx_mio_uartx_thr_s cn50xx;
5074		- struct cvmx_mio_uartx_thr_s cn52xx;
5075		- struct cvmx_mio_uartx_thr_s cn52xxp1;
5076		- struct cvmx_mio_uartx_thr_s cn56xx;
5077		- struct cvmx_mio_uartx_thr_s cn56xxp1;
5078		- struct cvmx_mio_uartx_thr_s cn58xx;
5079		- struct cvmx_mio_uartx_thr_s cn58xxp1;
5080		- struct cvmx_mio_uartx_thr_s cn61xx;
5081		- struct cvmx_mio_uartx_thr_s cn63xx;
5082		- struct cvmx_mio_uartx_thr_s cn63xxp1;
5083		- struct cvmx_mio_uartx_thr_s cn66xx;
5084		- struct cvmx_mio_uartx_thr_s cn68xx;
5085		- struct cvmx_mio_uartx_thr_s cn68xxp1;
5086		- struct cvmx_mio_uartx_thr_s cnf71xx;
5087	3958	};
5088	3959
5089	3960	union cvmx_mio_uartx_usr {
..	..	@@ -5105,24 +3976,6 @@
5105	3976	uint64_t reserved_5_63:59;
5106	3977	#endif
5107	3978	} s;
5108		- struct cvmx_mio_uartx_usr_s cn30xx;
5109		- struct cvmx_mio_uartx_usr_s cn31xx;
5110		- struct cvmx_mio_uartx_usr_s cn38xx;
5111		- struct cvmx_mio_uartx_usr_s cn38xxp2;
5112		- struct cvmx_mio_uartx_usr_s cn50xx;
5113		- struct cvmx_mio_uartx_usr_s cn52xx;
5114		- struct cvmx_mio_uartx_usr_s cn52xxp1;
5115		- struct cvmx_mio_uartx_usr_s cn56xx;
5116		- struct cvmx_mio_uartx_usr_s cn56xxp1;
5117		- struct cvmx_mio_uartx_usr_s cn58xx;
5118		- struct cvmx_mio_uartx_usr_s cn58xxp1;
5119		- struct cvmx_mio_uartx_usr_s cn61xx;
5120		- struct cvmx_mio_uartx_usr_s cn63xx;
5121		- struct cvmx_mio_uartx_usr_s cn63xxp1;
5122		- struct cvmx_mio_uartx_usr_s cn66xx;
5123		- struct cvmx_mio_uartx_usr_s cn68xx;
5124		- struct cvmx_mio_uartx_usr_s cn68xxp1;
5125		- struct cvmx_mio_uartx_usr_s cnf71xx;
5126	3979	};
5127	3980
5128	3981	union cvmx_mio_uart2_dlh {
..	..	@@ -5136,8 +3989,6 @@
5136	3989	uint64_t reserved_8_63:56;
5137	3990	#endif
5138	3991	} s;
5139		- struct cvmx_mio_uart2_dlh_s cn52xx;
5140		- struct cvmx_mio_uart2_dlh_s cn52xxp1;
5141	3992	};
5142	3993
5143	3994	union cvmx_mio_uart2_dll {
..	..	@@ -5151,8 +4002,6 @@
5151	4002	uint64_t reserved_8_63:56;
5152	4003	#endif
5153	4004	} s;
5154		- struct cvmx_mio_uart2_dll_s cn52xx;
5155		- struct cvmx_mio_uart2_dll_s cn52xxp1;
5156	4005	};
5157	4006
5158	4007	union cvmx_mio_uart2_far {
..	..	@@ -5166,8 +4015,6 @@
5166	4015	uint64_t reserved_1_63:63;
5167	4016	#endif
5168	4017	} s;
5169		- struct cvmx_mio_uart2_far_s cn52xx;
5170		- struct cvmx_mio_uart2_far_s cn52xxp1;
5171	4018	};
5172	4019
5173	4020	union cvmx_mio_uart2_fcr {
..	..	@@ -5191,8 +4038,6 @@
5191	4038	uint64_t reserved_8_63:56;
5192	4039	#endif
5193	4040	} s;
5194		- struct cvmx_mio_uart2_fcr_s cn52xx;
5195		- struct cvmx_mio_uart2_fcr_s cn52xxp1;
5196	4041	};
5197	4042
5198	4043	union cvmx_mio_uart2_htx {
..	..	@@ -5206,8 +4051,6 @@
5206	4051	uint64_t reserved_1_63:63;
5207	4052	#endif
5208	4053	} s;
5209		- struct cvmx_mio_uart2_htx_s cn52xx;
5210		- struct cvmx_mio_uart2_htx_s cn52xxp1;
5211	4054	};
5212	4055
5213	4056	union cvmx_mio_uart2_ier {
..	..	@@ -5231,8 +4074,6 @@
5231	4074	uint64_t reserved_8_63:56;
5232	4075	#endif
5233	4076	} s;
5234		- struct cvmx_mio_uart2_ier_s cn52xx;
5235		- struct cvmx_mio_uart2_ier_s cn52xxp1;
5236	4077	};
5237	4078
5238	4079	union cvmx_mio_uart2_iir {
..	..	@@ -5250,8 +4091,6 @@
5250	4091	uint64_t reserved_8_63:56;
5251	4092	#endif
5252	4093	} s;
5253		- struct cvmx_mio_uart2_iir_s cn52xx;
5254		- struct cvmx_mio_uart2_iir_s cn52xxp1;
5255	4094	};
5256	4095
5257	4096	union cvmx_mio_uart2_lcr {
..	..	@@ -5277,8 +4116,6 @@
5277	4116	uint64_t reserved_8_63:56;
5278	4117	#endif
5279	4118	} s;
5280		- struct cvmx_mio_uart2_lcr_s cn52xx;
5281		- struct cvmx_mio_uart2_lcr_s cn52xxp1;
5282	4119	};
5283	4120
5284	4121	union cvmx_mio_uart2_lsr {
..	..	@@ -5306,8 +4143,6 @@
5306	4143	uint64_t reserved_8_63:56;
5307	4144	#endif
5308	4145	} s;
5309		- struct cvmx_mio_uart2_lsr_s cn52xx;
5310		- struct cvmx_mio_uart2_lsr_s cn52xxp1;
5311	4146	};
5312	4147
5313	4148	union cvmx_mio_uart2_mcr {
..	..	@@ -5331,8 +4166,6 @@
5331	4166	uint64_t reserved_6_63:58;
5332	4167	#endif
5333	4168	} s;
5334		- struct cvmx_mio_uart2_mcr_s cn52xx;
5335		- struct cvmx_mio_uart2_mcr_s cn52xxp1;
5336	4169	};
5337	4170
5338	4171	union cvmx_mio_uart2_msr {
..	..	@@ -5360,8 +4193,6 @@
5360	4193	uint64_t reserved_8_63:56;
5361	4194	#endif
5362	4195	} s;
5363		- struct cvmx_mio_uart2_msr_s cn52xx;
5364		- struct cvmx_mio_uart2_msr_s cn52xxp1;
5365	4196	};
5366	4197
5367	4198	union cvmx_mio_uart2_rbr {
..	..	@@ -5375,8 +4206,6 @@
5375	4206	uint64_t reserved_8_63:56;
5376	4207	#endif
5377	4208	} s;
5378		- struct cvmx_mio_uart2_rbr_s cn52xx;
5379		- struct cvmx_mio_uart2_rbr_s cn52xxp1;
5380	4209	};
5381	4210
5382	4211	union cvmx_mio_uart2_rfl {
..	..	@@ -5390,8 +4219,6 @@
5390	4219	uint64_t reserved_7_63:57;
5391	4220	#endif
5392	4221	} s;
5393		- struct cvmx_mio_uart2_rfl_s cn52xx;
5394		- struct cvmx_mio_uart2_rfl_s cn52xxp1;
5395	4222	};
5396	4223
5397	4224	union cvmx_mio_uart2_rfw {
..	..	@@ -5409,8 +4236,6 @@
5409	4236	uint64_t reserved_10_63:54;
5410	4237	#endif
5411	4238	} s;
5412		- struct cvmx_mio_uart2_rfw_s cn52xx;
5413		- struct cvmx_mio_uart2_rfw_s cn52xxp1;
5414	4239	};
5415	4240
5416	4241	union cvmx_mio_uart2_sbcr {
..	..	@@ -5424,8 +4249,6 @@
5424	4249	uint64_t reserved_1_63:63;
5425	4250	#endif
5426	4251	} s;
5427		- struct cvmx_mio_uart2_sbcr_s cn52xx;
5428		- struct cvmx_mio_uart2_sbcr_s cn52xxp1;
5429	4252	};
5430	4253
5431	4254	union cvmx_mio_uart2_scr {
..	..	@@ -5439,8 +4262,6 @@
5439	4262	uint64_t reserved_8_63:56;
5440	4263	#endif
5441	4264	} s;
5442		- struct cvmx_mio_uart2_scr_s cn52xx;
5443		- struct cvmx_mio_uart2_scr_s cn52xxp1;
5444	4265	};
5445	4266
5446	4267	union cvmx_mio_uart2_sfe {
..	..	@@ -5454,8 +4275,6 @@
5454	4275	uint64_t reserved_1_63:63;
5455	4276	#endif
5456	4277	} s;
5457		- struct cvmx_mio_uart2_sfe_s cn52xx;
5458		- struct cvmx_mio_uart2_sfe_s cn52xxp1;
5459	4278	};
5460	4279
5461	4280	union cvmx_mio_uart2_srr {
..	..	@@ -5473,8 +4292,6 @@
5473	4292	uint64_t reserved_3_63:61;
5474	4293	#endif
5475	4294	} s;
5476		- struct cvmx_mio_uart2_srr_s cn52xx;
5477		- struct cvmx_mio_uart2_srr_s cn52xxp1;
5478	4295	};
5479	4296
5480	4297	union cvmx_mio_uart2_srt {
..	..	@@ -5488,8 +4305,6 @@
5488	4305	uint64_t reserved_2_63:62;
5489	4306	#endif
5490	4307	} s;
5491		- struct cvmx_mio_uart2_srt_s cn52xx;
5492		- struct cvmx_mio_uart2_srt_s cn52xxp1;
5493	4308	};
5494	4309
5495	4310	union cvmx_mio_uart2_srts {
..	..	@@ -5503,8 +4318,6 @@
5503	4318	uint64_t reserved_1_63:63;
5504	4319	#endif
5505	4320	} s;
5506		- struct cvmx_mio_uart2_srts_s cn52xx;
5507		- struct cvmx_mio_uart2_srts_s cn52xxp1;
5508	4321	};
5509	4322
5510	4323	union cvmx_mio_uart2_stt {
..	..	@@ -5518,8 +4331,6 @@
5518	4331	uint64_t reserved_2_63:62;
5519	4332	#endif
5520	4333	} s;
5521		- struct cvmx_mio_uart2_stt_s cn52xx;
5522		- struct cvmx_mio_uart2_stt_s cn52xxp1;
5523	4334	};
5524	4335
5525	4336	union cvmx_mio_uart2_tfl {
..	..	@@ -5533,8 +4344,6 @@
5533	4344	uint64_t reserved_7_63:57;
5534	4345	#endif
5535	4346	} s;
5536		- struct cvmx_mio_uart2_tfl_s cn52xx;
5537		- struct cvmx_mio_uart2_tfl_s cn52xxp1;
5538	4347	};
5539	4348
5540	4349	union cvmx_mio_uart2_tfr {
..	..	@@ -5548,8 +4357,6 @@
5548	4357	uint64_t reserved_8_63:56;
5549	4358	#endif
5550	4359	} s;
5551		- struct cvmx_mio_uart2_tfr_s cn52xx;
5552		- struct cvmx_mio_uart2_tfr_s cn52xxp1;
5553	4360	};
5554	4361
5555	4362	union cvmx_mio_uart2_thr {
..	..	@@ -5563,8 +4370,6 @@
5563	4370	uint64_t reserved_8_63:56;
5564	4371	#endif
5565	4372	} s;
5566		- struct cvmx_mio_uart2_thr_s cn52xx;
5567		- struct cvmx_mio_uart2_thr_s cn52xxp1;
5568	4373	};
5569	4374
5570	4375	union cvmx_mio_uart2_usr {
..	..	@@ -5586,8 +4391,6 @@
5586	4391	uint64_t reserved_5_63:59;
5587	4392	#endif
5588	4393	} s;
5589		- struct cvmx_mio_uart2_usr_s cn52xx;
5590		- struct cvmx_mio_uart2_usr_s cn52xxp1;
5591	4394	};
5592	4395
5593	4396	#endif