~hc/RK356X_SDK_RELEASE.git

..	..	@@ -189,11 +189,6 @@
189	189	uint64_t reserved_1_63:63;
190	190	#endif
191	191	} s;
192		- struct cvmx_lmcx_bist_ctl_s cn50xx;
193		- struct cvmx_lmcx_bist_ctl_s cn52xx;
194		- struct cvmx_lmcx_bist_ctl_s cn52xxp1;
195		- struct cvmx_lmcx_bist_ctl_s cn56xx;
196		- struct cvmx_lmcx_bist_ctl_s cn56xxp1;
197	192	};
198	193
199	194	union cvmx_lmcx_bist_result {
..	..	@@ -236,10 +231,6 @@
236	231	uint64_t reserved_9_63:55;
237	232	#endif
238	233	} cn50xx;
239		- struct cvmx_lmcx_bist_result_s cn52xx;
240		- struct cvmx_lmcx_bist_result_s cn52xxp1;
241		- struct cvmx_lmcx_bist_result_s cn56xx;
242		- struct cvmx_lmcx_bist_result_s cn56xxp1;
243	234	};
244	235
245	236	union cvmx_lmcx_char_ctl {
..	..	@@ -263,7 +254,6 @@
263	254	uint64_t reserved_44_63:20;
264	255	#endif
265	256	} s;
266		- struct cvmx_lmcx_char_ctl_s cn61xx;
267	257	struct cvmx_lmcx_char_ctl_cn63xx {
268	258	#ifdef __BIG_ENDIAN_BITFIELD
269	259	uint64_t reserved_42_63:22;
..	..	@@ -279,11 +269,6 @@
279	269	uint64_t reserved_42_63:22;
280	270	#endif
281	271	} cn63xx;
282		- struct cvmx_lmcx_char_ctl_cn63xx cn63xxp1;
283		- struct cvmx_lmcx_char_ctl_s cn66xx;
284		- struct cvmx_lmcx_char_ctl_s cn68xx;
285		- struct cvmx_lmcx_char_ctl_cn63xx cn68xxp1;
286		- struct cvmx_lmcx_char_ctl_s cnf71xx;
287	272	};
288	273
289	274	union cvmx_lmcx_char_mask0 {
..	..	@@ -295,13 +280,6 @@
295	280	uint64_t mask:64;
296	281	#endif
297	282	} s;
298		- struct cvmx_lmcx_char_mask0_s cn61xx;
299		- struct cvmx_lmcx_char_mask0_s cn63xx;
300		- struct cvmx_lmcx_char_mask0_s cn63xxp1;
301		- struct cvmx_lmcx_char_mask0_s cn66xx;
302		- struct cvmx_lmcx_char_mask0_s cn68xx;
303		- struct cvmx_lmcx_char_mask0_s cn68xxp1;
304		- struct cvmx_lmcx_char_mask0_s cnf71xx;
305	283	};
306	284
307	285	union cvmx_lmcx_char_mask1 {
..	..	@@ -315,13 +293,6 @@
315	293	uint64_t reserved_8_63:56;
316	294	#endif
317	295	} s;
318		- struct cvmx_lmcx_char_mask1_s cn61xx;
319		- struct cvmx_lmcx_char_mask1_s cn63xx;
320		- struct cvmx_lmcx_char_mask1_s cn63xxp1;
321		- struct cvmx_lmcx_char_mask1_s cn66xx;
322		- struct cvmx_lmcx_char_mask1_s cn68xx;
323		- struct cvmx_lmcx_char_mask1_s cn68xxp1;
324		- struct cvmx_lmcx_char_mask1_s cnf71xx;
325	296	};
326	297
327	298	union cvmx_lmcx_char_mask2 {
..	..	@@ -333,13 +304,6 @@
333	304	uint64_t mask:64;
334	305	#endif
335	306	} s;
336		- struct cvmx_lmcx_char_mask2_s cn61xx;
337		- struct cvmx_lmcx_char_mask2_s cn63xx;
338		- struct cvmx_lmcx_char_mask2_s cn63xxp1;
339		- struct cvmx_lmcx_char_mask2_s cn66xx;
340		- struct cvmx_lmcx_char_mask2_s cn68xx;
341		- struct cvmx_lmcx_char_mask2_s cn68xxp1;
342		- struct cvmx_lmcx_char_mask2_s cnf71xx;
343	307	};
344	308
345	309	union cvmx_lmcx_char_mask3 {
..	..	@@ -353,13 +317,6 @@
353	317	uint64_t reserved_8_63:56;
354	318	#endif
355	319	} s;
356		- struct cvmx_lmcx_char_mask3_s cn61xx;
357		- struct cvmx_lmcx_char_mask3_s cn63xx;
358		- struct cvmx_lmcx_char_mask3_s cn63xxp1;
359		- struct cvmx_lmcx_char_mask3_s cn66xx;
360		- struct cvmx_lmcx_char_mask3_s cn68xx;
361		- struct cvmx_lmcx_char_mask3_s cn68xxp1;
362		- struct cvmx_lmcx_char_mask3_s cnf71xx;
363	320	};
364	321
365	322	union cvmx_lmcx_char_mask4 {
..	..	@@ -393,13 +350,6 @@
393	350	uint64_t reserved_33_63:31;
394	351	#endif
395	352	} s;
396		- struct cvmx_lmcx_char_mask4_s cn61xx;
397		- struct cvmx_lmcx_char_mask4_s cn63xx;
398		- struct cvmx_lmcx_char_mask4_s cn63xxp1;
399		- struct cvmx_lmcx_char_mask4_s cn66xx;
400		- struct cvmx_lmcx_char_mask4_s cn68xx;
401		- struct cvmx_lmcx_char_mask4_s cn68xxp1;
402		- struct cvmx_lmcx_char_mask4_s cnf71xx;
403	353	};
404	354
405	355	union cvmx_lmcx_comp_ctl {
..	..	@@ -448,9 +398,6 @@
448	398	uint64_t reserved_32_63:32;
449	399	#endif
450	400	} cn30xx;
451		- struct cvmx_lmcx_comp_ctl_cn30xx cn31xx;
452		- struct cvmx_lmcx_comp_ctl_cn30xx cn38xx;
453		- struct cvmx_lmcx_comp_ctl_cn30xx cn38xxp2;
454	401	struct cvmx_lmcx_comp_ctl_cn50xx {
455	402	#ifdef __BIG_ENDIAN_BITFIELD
456	403	uint64_t reserved_32_63:32;
..	..	@@ -470,11 +417,6 @@
470	417	uint64_t reserved_32_63:32;
471	418	#endif
472	419	} cn50xx;
473		- struct cvmx_lmcx_comp_ctl_cn50xx cn52xx;
474		- struct cvmx_lmcx_comp_ctl_cn50xx cn52xxp1;
475		- struct cvmx_lmcx_comp_ctl_cn50xx cn56xx;
476		- struct cvmx_lmcx_comp_ctl_cn50xx cn56xxp1;
477		- struct cvmx_lmcx_comp_ctl_cn50xx cn58xx;
478	420	struct cvmx_lmcx_comp_ctl_cn58xxp1 {
479	421	#ifdef __BIG_ENDIAN_BITFIELD
480	422	uint64_t reserved_32_63:32;
..	..	@@ -525,13 +467,6 @@
525	467	uint64_t reserved_34_63:30;
526	468	#endif
527	469	} s;
528		- struct cvmx_lmcx_comp_ctl2_s cn61xx;
529		- struct cvmx_lmcx_comp_ctl2_s cn63xx;
530		- struct cvmx_lmcx_comp_ctl2_s cn63xxp1;
531		- struct cvmx_lmcx_comp_ctl2_s cn66xx;
532		- struct cvmx_lmcx_comp_ctl2_s cn68xx;
533		- struct cvmx_lmcx_comp_ctl2_s cn68xxp1;
534		- struct cvmx_lmcx_comp_ctl2_s cnf71xx;
535	470	};
536	471
537	472	union cvmx_lmcx_config {
..	..	@@ -587,7 +522,6 @@
587	522	uint64_t reserved_61_63:3;
588	523	#endif
589	524	} s;
590		- struct cvmx_lmcx_config_s cn61xx;
591	525	struct cvmx_lmcx_config_cn63xx {
592	526	#ifdef __BIG_ENDIAN_BITFIELD
593	527	uint64_t reserved_59_63:5;
..	..	@@ -723,9 +657,6 @@
723	657	uint64_t reserved_60_63:4;
724	658	#endif
725	659	} cn66xx;
726		- struct cvmx_lmcx_config_cn63xx cn68xx;
727		- struct cvmx_lmcx_config_cn63xx cn68xxp1;
728		- struct cvmx_lmcx_config_s cnf71xx;
729	660	};
730	661
731	662	union cvmx_lmcx_control {
..	..	@@ -787,7 +718,6 @@
787	718	uint64_t scramble_ena:1;
788	719	#endif
789	720	} s;
790		- struct cvmx_lmcx_control_s cn61xx;
791	721	struct cvmx_lmcx_control_cn63xx {
792	722	#ifdef __BIG_ENDIAN_BITFIELD
793	723	uint64_t reserved_24_63:40;
..	..	@@ -833,7 +763,6 @@
833	763	uint64_t reserved_24_63:40;
834	764	#endif
835	765	} cn63xx;
836		- struct cvmx_lmcx_control_cn63xx cn63xxp1;
837	766	struct cvmx_lmcx_control_cn66xx {
838	767	#ifdef __BIG_ENDIAN_BITFIELD
839	768	uint64_t scramble_ena:1;
..	..	@@ -938,8 +867,6 @@
938	867	uint64_t reserved_63_63:1;
939	868	#endif
940	869	} cn68xx;
941		- struct cvmx_lmcx_control_cn68xx cn68xxp1;
942		- struct cvmx_lmcx_control_cn66xx cnf71xx;
943	870	};
944	871
945	872	union cvmx_lmcx_ctl {
..	..	@@ -1032,7 +959,6 @@
1032	959	uint64_t reserved_32_63:32;
1033	960	#endif
1034	961	} cn30xx;
1035		- struct cvmx_lmcx_ctl_cn30xx cn31xx;
1036	962	struct cvmx_lmcx_ctl_cn38xx {
1037	963	#ifdef __BIG_ENDIAN_BITFIELD
1038	964	uint64_t reserved_32_63:32;
..	..	@@ -1076,7 +1002,6 @@
1076	1002	uint64_t reserved_32_63:32;
1077	1003	#endif
1078	1004	} cn38xx;
1079		- struct cvmx_lmcx_ctl_cn38xx cn38xxp2;
1080	1005	struct cvmx_lmcx_ctl_cn50xx {
1081	1006	#ifdef __BIG_ENDIAN_BITFIELD
1082	1007	uint64_t reserved_32_63:32;
..	..	@@ -1165,9 +1090,6 @@
1165	1090	uint64_t reserved_32_63:32;
1166	1091	#endif
1167	1092	} cn52xx;
1168		- struct cvmx_lmcx_ctl_cn52xx cn52xxp1;
1169		- struct cvmx_lmcx_ctl_cn52xx cn56xx;
1170		- struct cvmx_lmcx_ctl_cn52xx cn56xxp1;
1171	1093	struct cvmx_lmcx_ctl_cn58xx {
1172	1094	#ifdef __BIG_ENDIAN_BITFIELD
1173	1095	uint64_t reserved_32_63:32;
..	..	@@ -1211,7 +1133,6 @@
1211	1133	uint64_t reserved_32_63:32;
1212	1134	#endif
1213	1135	} cn58xx;
1214		- struct cvmx_lmcx_ctl_cn58xx cn58xxp1;
1215	1136	};
1216	1137
1217	1138	union cvmx_lmcx_ctl1 {
..	..	@@ -1284,9 +1205,6 @@
1284	1205	uint64_t reserved_21_63:43;
1285	1206	#endif
1286	1207	} cn52xx;
1287		- struct cvmx_lmcx_ctl1_cn52xx cn52xxp1;
1288		- struct cvmx_lmcx_ctl1_cn52xx cn56xx;
1289		- struct cvmx_lmcx_ctl1_cn52xx cn56xxp1;
1290	1208	struct cvmx_lmcx_ctl1_cn58xx {
1291	1209	#ifdef __BIG_ENDIAN_BITFIELD
1292	1210	uint64_t reserved_10_63:54;
..	..	@@ -1300,7 +1218,6 @@
1300	1218	uint64_t reserved_10_63:54;
1301	1219	#endif
1302	1220	} cn58xx;
1303		- struct cvmx_lmcx_ctl1_cn58xx cn58xxp1;
1304	1221	};
1305	1222
1306	1223	union cvmx_lmcx_dclk_cnt {
..	..	@@ -1312,13 +1229,6 @@
1312	1229	uint64_t dclkcnt:64;
1313	1230	#endif
1314	1231	} s;
1315		- struct cvmx_lmcx_dclk_cnt_s cn61xx;
1316		- struct cvmx_lmcx_dclk_cnt_s cn63xx;
1317		- struct cvmx_lmcx_dclk_cnt_s cn63xxp1;
1318		- struct cvmx_lmcx_dclk_cnt_s cn66xx;
1319		- struct cvmx_lmcx_dclk_cnt_s cn68xx;
1320		- struct cvmx_lmcx_dclk_cnt_s cn68xxp1;
1321		- struct cvmx_lmcx_dclk_cnt_s cnf71xx;
1322	1232	};
1323	1233
1324	1234	union cvmx_lmcx_dclk_cnt_hi {
..	..	@@ -1332,17 +1242,6 @@
1332	1242	uint64_t reserved_32_63:32;
1333	1243	#endif
1334	1244	} s;
1335		- struct cvmx_lmcx_dclk_cnt_hi_s cn30xx;
1336		- struct cvmx_lmcx_dclk_cnt_hi_s cn31xx;
1337		- struct cvmx_lmcx_dclk_cnt_hi_s cn38xx;
1338		- struct cvmx_lmcx_dclk_cnt_hi_s cn38xxp2;
1339		- struct cvmx_lmcx_dclk_cnt_hi_s cn50xx;
1340		- struct cvmx_lmcx_dclk_cnt_hi_s cn52xx;
1341		- struct cvmx_lmcx_dclk_cnt_hi_s cn52xxp1;
1342		- struct cvmx_lmcx_dclk_cnt_hi_s cn56xx;
1343		- struct cvmx_lmcx_dclk_cnt_hi_s cn56xxp1;
1344		- struct cvmx_lmcx_dclk_cnt_hi_s cn58xx;
1345		- struct cvmx_lmcx_dclk_cnt_hi_s cn58xxp1;
1346	1245	};
1347	1246
1348	1247	union cvmx_lmcx_dclk_cnt_lo {
..	..	@@ -1356,17 +1255,6 @@
1356	1255	uint64_t reserved_32_63:32;
1357	1256	#endif
1358	1257	} s;
1359		- struct cvmx_lmcx_dclk_cnt_lo_s cn30xx;
1360		- struct cvmx_lmcx_dclk_cnt_lo_s cn31xx;
1361		- struct cvmx_lmcx_dclk_cnt_lo_s cn38xx;
1362		- struct cvmx_lmcx_dclk_cnt_lo_s cn38xxp2;
1363		- struct cvmx_lmcx_dclk_cnt_lo_s cn50xx;
1364		- struct cvmx_lmcx_dclk_cnt_lo_s cn52xx;
1365		- struct cvmx_lmcx_dclk_cnt_lo_s cn52xxp1;
1366		- struct cvmx_lmcx_dclk_cnt_lo_s cn56xx;
1367		- struct cvmx_lmcx_dclk_cnt_lo_s cn56xxp1;
1368		- struct cvmx_lmcx_dclk_cnt_lo_s cn58xx;
1369		- struct cvmx_lmcx_dclk_cnt_lo_s cn58xxp1;
1370	1258	};
1371	1259
1372	1260	union cvmx_lmcx_dclk_ctl {
..	..	@@ -1386,8 +1274,6 @@
1386	1274	uint64_t reserved_8_63:56;
1387	1275	#endif
1388	1276	} s;
1389		- struct cvmx_lmcx_dclk_ctl_s cn56xx;
1390		- struct cvmx_lmcx_dclk_ctl_s cn56xxp1;
1391	1277	};
1392	1278
1393	1279	union cvmx_lmcx_ddr2_ctl {
..	..	@@ -1474,16 +1360,6 @@
1474	1360	uint64_t reserved_32_63:32;
1475	1361	#endif
1476	1362	} cn30xx;
1477		- struct cvmx_lmcx_ddr2_ctl_cn30xx cn31xx;
1478		- struct cvmx_lmcx_ddr2_ctl_s cn38xx;
1479		- struct cvmx_lmcx_ddr2_ctl_s cn38xxp2;
1480		- struct cvmx_lmcx_ddr2_ctl_s cn50xx;
1481		- struct cvmx_lmcx_ddr2_ctl_s cn52xx;
1482		- struct cvmx_lmcx_ddr2_ctl_s cn52xxp1;
1483		- struct cvmx_lmcx_ddr2_ctl_s cn56xx;
1484		- struct cvmx_lmcx_ddr2_ctl_s cn56xxp1;
1485		- struct cvmx_lmcx_ddr2_ctl_s cn58xx;
1486		- struct cvmx_lmcx_ddr2_ctl_s cn58xxp1;
1487	1363	};
1488	1364
1489	1365	union cvmx_lmcx_ddr_pll_ctl {
..	..	@@ -1515,13 +1391,6 @@
1515	1391	uint64_t reserved_27_63:37;
1516	1392	#endif
1517	1393	} s;
1518		- struct cvmx_lmcx_ddr_pll_ctl_s cn61xx;
1519		- struct cvmx_lmcx_ddr_pll_ctl_s cn63xx;
1520		- struct cvmx_lmcx_ddr_pll_ctl_s cn63xxp1;
1521		- struct cvmx_lmcx_ddr_pll_ctl_s cn66xx;
1522		- struct cvmx_lmcx_ddr_pll_ctl_s cn68xx;
1523		- struct cvmx_lmcx_ddr_pll_ctl_s cn68xxp1;
1524		- struct cvmx_lmcx_ddr_pll_ctl_s cnf71xx;
1525	1394	};
1526	1395
1527	1396	union cvmx_lmcx_delay_cfg {
..	..	@@ -1539,7 +1408,6 @@
1539	1408	uint64_t reserved_15_63:49;
1540	1409	#endif
1541	1410	} s;
1542		- struct cvmx_lmcx_delay_cfg_s cn30xx;
1543	1411	struct cvmx_lmcx_delay_cfg_cn38xx {
1544	1412	#ifdef __BIG_ENDIAN_BITFIELD
1545	1413	uint64_t reserved_14_63:50;
..	..	@@ -1557,13 +1425,6 @@
1557	1425	uint64_t reserved_14_63:50;
1558	1426	#endif
1559	1427	} cn38xx;
1560		- struct cvmx_lmcx_delay_cfg_cn38xx cn50xx;
1561		- struct cvmx_lmcx_delay_cfg_cn38xx cn52xx;
1562		- struct cvmx_lmcx_delay_cfg_cn38xx cn52xxp1;
1563		- struct cvmx_lmcx_delay_cfg_cn38xx cn56xx;
1564		- struct cvmx_lmcx_delay_cfg_cn38xx cn56xxp1;
1565		- struct cvmx_lmcx_delay_cfg_cn38xx cn58xx;
1566		- struct cvmx_lmcx_delay_cfg_cn38xx cn58xxp1;
1567	1428	};
1568	1429
1569	1430	union cvmx_lmcx_dimmx_params {
..	..	@@ -1605,13 +1466,6 @@
1605	1466	uint64_t rc15:4;
1606	1467	#endif
1607	1468	} s;
1608		- struct cvmx_lmcx_dimmx_params_s cn61xx;
1609		- struct cvmx_lmcx_dimmx_params_s cn63xx;
1610		- struct cvmx_lmcx_dimmx_params_s cn63xxp1;
1611		- struct cvmx_lmcx_dimmx_params_s cn66xx;
1612		- struct cvmx_lmcx_dimmx_params_s cn68xx;
1613		- struct cvmx_lmcx_dimmx_params_s cn68xxp1;
1614		- struct cvmx_lmcx_dimmx_params_s cnf71xx;
1615	1469	};
1616	1470
1617	1471	union cvmx_lmcx_dimm_ctl {
..	..	@@ -1631,13 +1485,6 @@
1631	1485	uint64_t reserved_46_63:18;
1632	1486	#endif
1633	1487	} s;
1634		- struct cvmx_lmcx_dimm_ctl_s cn61xx;
1635		- struct cvmx_lmcx_dimm_ctl_s cn63xx;
1636		- struct cvmx_lmcx_dimm_ctl_s cn63xxp1;
1637		- struct cvmx_lmcx_dimm_ctl_s cn66xx;
1638		- struct cvmx_lmcx_dimm_ctl_s cn68xx;
1639		- struct cvmx_lmcx_dimm_ctl_s cn68xxp1;
1640		- struct cvmx_lmcx_dimm_ctl_s cnf71xx;
1641	1488	};
1642	1489
1643	1490	union cvmx_lmcx_dll_ctl {
..	..	@@ -1657,10 +1504,6 @@
1657	1504	uint64_t reserved_8_63:56;
1658	1505	#endif
1659	1506	} s;
1660		- struct cvmx_lmcx_dll_ctl_s cn52xx;
1661		- struct cvmx_lmcx_dll_ctl_s cn52xxp1;
1662		- struct cvmx_lmcx_dll_ctl_s cn56xx;
1663		- struct cvmx_lmcx_dll_ctl_s cn56xxp1;
1664	1507	};
1665	1508
1666	1509	union cvmx_lmcx_dll_ctl2 {
..	..	@@ -1684,7 +1527,6 @@
1684	1527	uint64_t reserved_16_63:48;
1685	1528	#endif
1686	1529	} s;
1687		- struct cvmx_lmcx_dll_ctl2_s cn61xx;
1688	1530	struct cvmx_lmcx_dll_ctl2_cn63xx {
1689	1531	#ifdef __BIG_ENDIAN_BITFIELD
1690	1532	uint64_t reserved_15_63:49;
..	..	@@ -1702,11 +1544,6 @@
1702	1544	uint64_t reserved_15_63:49;
1703	1545	#endif
1704	1546	} cn63xx;
1705		- struct cvmx_lmcx_dll_ctl2_cn63xx cn63xxp1;
1706		- struct cvmx_lmcx_dll_ctl2_cn63xx cn66xx;
1707		- struct cvmx_lmcx_dll_ctl2_s cn68xx;
1708		- struct cvmx_lmcx_dll_ctl2_s cn68xxp1;
1709		- struct cvmx_lmcx_dll_ctl2_s cnf71xx;
1710	1547	};
1711	1548
1712	1549	union cvmx_lmcx_dll_ctl3 {
..	..	@@ -1748,7 +1585,6 @@
1748	1585	uint64_t reserved_41_63:23;
1749	1586	#endif
1750	1587	} s;
1751		- struct cvmx_lmcx_dll_ctl3_s cn61xx;
1752	1588	struct cvmx_lmcx_dll_ctl3_cn63xx {
1753	1589	#ifdef __BIG_ENDIAN_BITFIELD
1754	1590	uint64_t reserved_29_63:35;
..	..	@@ -1776,11 +1612,6 @@
1776	1612	uint64_t reserved_29_63:35;
1777	1613	#endif
1778	1614	} cn63xx;
1779		- struct cvmx_lmcx_dll_ctl3_cn63xx cn63xxp1;
1780		- struct cvmx_lmcx_dll_ctl3_cn63xx cn66xx;
1781		- struct cvmx_lmcx_dll_ctl3_s cn68xx;
1782		- struct cvmx_lmcx_dll_ctl3_s cn68xxp1;
1783		- struct cvmx_lmcx_dll_ctl3_s cnf71xx;
1784	1615	};
1785	1616
1786	1617	union cvmx_lmcx_dual_memcfg {
..	..	@@ -1800,13 +1631,6 @@
1800	1631	uint64_t reserved_20_63:44;
1801	1632	#endif
1802	1633	} s;
1803		- struct cvmx_lmcx_dual_memcfg_s cn50xx;
1804		- struct cvmx_lmcx_dual_memcfg_s cn52xx;
1805		- struct cvmx_lmcx_dual_memcfg_s cn52xxp1;
1806		- struct cvmx_lmcx_dual_memcfg_s cn56xx;
1807		- struct cvmx_lmcx_dual_memcfg_s cn56xxp1;
1808		- struct cvmx_lmcx_dual_memcfg_s cn58xx;
1809		- struct cvmx_lmcx_dual_memcfg_s cn58xxp1;
1810	1634	struct cvmx_lmcx_dual_memcfg_cn61xx {
1811	1635	#ifdef __BIG_ENDIAN_BITFIELD
1812	1636	uint64_t reserved_19_63:45;
..	..	@@ -1820,12 +1644,6 @@
1820	1644	uint64_t reserved_19_63:45;
1821	1645	#endif
1822	1646	} cn61xx;
1823		- struct cvmx_lmcx_dual_memcfg_cn61xx cn63xx;
1824		- struct cvmx_lmcx_dual_memcfg_cn61xx cn63xxp1;
1825		- struct cvmx_lmcx_dual_memcfg_cn61xx cn66xx;
1826		- struct cvmx_lmcx_dual_memcfg_cn61xx cn68xx;
1827		- struct cvmx_lmcx_dual_memcfg_cn61xx cn68xxp1;
1828		- struct cvmx_lmcx_dual_memcfg_cn61xx cnf71xx;
1829	1647	};
1830	1648
1831	1649	union cvmx_lmcx_ecc_synd {
..	..	@@ -1845,24 +1663,6 @@
1845	1663	uint64_t reserved_32_63:32;
1846	1664	#endif
1847	1665	} s;
1848		- struct cvmx_lmcx_ecc_synd_s cn30xx;
1849		- struct cvmx_lmcx_ecc_synd_s cn31xx;
1850		- struct cvmx_lmcx_ecc_synd_s cn38xx;
1851		- struct cvmx_lmcx_ecc_synd_s cn38xxp2;
1852		- struct cvmx_lmcx_ecc_synd_s cn50xx;
1853		- struct cvmx_lmcx_ecc_synd_s cn52xx;
1854		- struct cvmx_lmcx_ecc_synd_s cn52xxp1;
1855		- struct cvmx_lmcx_ecc_synd_s cn56xx;
1856		- struct cvmx_lmcx_ecc_synd_s cn56xxp1;
1857		- struct cvmx_lmcx_ecc_synd_s cn58xx;
1858		- struct cvmx_lmcx_ecc_synd_s cn58xxp1;
1859		- struct cvmx_lmcx_ecc_synd_s cn61xx;
1860		- struct cvmx_lmcx_ecc_synd_s cn63xx;
1861		- struct cvmx_lmcx_ecc_synd_s cn63xxp1;
1862		- struct cvmx_lmcx_ecc_synd_s cn66xx;
1863		- struct cvmx_lmcx_ecc_synd_s cn68xx;
1864		- struct cvmx_lmcx_ecc_synd_s cn68xxp1;
1865		- struct cvmx_lmcx_ecc_synd_s cnf71xx;
1866	1666	};
1867	1667
1868	1668	union cvmx_lmcx_fadr {
..	..	@@ -1891,16 +1691,6 @@
1891	1691	uint64_t reserved_32_63:32;
1892	1692	#endif
1893	1693	} cn30xx;
1894		- struct cvmx_lmcx_fadr_cn30xx cn31xx;
1895		- struct cvmx_lmcx_fadr_cn30xx cn38xx;
1896		- struct cvmx_lmcx_fadr_cn30xx cn38xxp2;
1897		- struct cvmx_lmcx_fadr_cn30xx cn50xx;
1898		- struct cvmx_lmcx_fadr_cn30xx cn52xx;
1899		- struct cvmx_lmcx_fadr_cn30xx cn52xxp1;
1900		- struct cvmx_lmcx_fadr_cn30xx cn56xx;
1901		- struct cvmx_lmcx_fadr_cn30xx cn56xxp1;
1902		- struct cvmx_lmcx_fadr_cn30xx cn58xx;
1903		- struct cvmx_lmcx_fadr_cn30xx cn58xxp1;
1904	1694	struct cvmx_lmcx_fadr_cn61xx {
1905	1695	#ifdef __BIG_ENDIAN_BITFIELD
1906	1696	uint64_t reserved_36_63:28;
..	..	@@ -1918,12 +1708,6 @@
1918	1708	uint64_t reserved_36_63:28;
1919	1709	#endif
1920	1710	} cn61xx;
1921		- struct cvmx_lmcx_fadr_cn61xx cn63xx;
1922		- struct cvmx_lmcx_fadr_cn61xx cn63xxp1;
1923		- struct cvmx_lmcx_fadr_cn61xx cn66xx;
1924		- struct cvmx_lmcx_fadr_cn61xx cn68xx;
1925		- struct cvmx_lmcx_fadr_cn61xx cn68xxp1;
1926		- struct cvmx_lmcx_fadr_cn61xx cnf71xx;
1927	1711	};
1928	1712
1929	1713	union cvmx_lmcx_ifb_cnt {
..	..	@@ -1935,13 +1719,6 @@
1935	1719	uint64_t ifbcnt:64;
1936	1720	#endif
1937	1721	} s;
1938		- struct cvmx_lmcx_ifb_cnt_s cn61xx;
1939		- struct cvmx_lmcx_ifb_cnt_s cn63xx;
1940		- struct cvmx_lmcx_ifb_cnt_s cn63xxp1;
1941		- struct cvmx_lmcx_ifb_cnt_s cn66xx;
1942		- struct cvmx_lmcx_ifb_cnt_s cn68xx;
1943		- struct cvmx_lmcx_ifb_cnt_s cn68xxp1;
1944		- struct cvmx_lmcx_ifb_cnt_s cnf71xx;
1945	1722	};
1946	1723
1947	1724	union cvmx_lmcx_ifb_cnt_hi {
..	..	@@ -1955,17 +1732,6 @@
1955	1732	uint64_t reserved_32_63:32;
1956	1733	#endif
1957	1734	} s;
1958		- struct cvmx_lmcx_ifb_cnt_hi_s cn30xx;
1959		- struct cvmx_lmcx_ifb_cnt_hi_s cn31xx;
1960		- struct cvmx_lmcx_ifb_cnt_hi_s cn38xx;
1961		- struct cvmx_lmcx_ifb_cnt_hi_s cn38xxp2;
1962		- struct cvmx_lmcx_ifb_cnt_hi_s cn50xx;
1963		- struct cvmx_lmcx_ifb_cnt_hi_s cn52xx;
1964		- struct cvmx_lmcx_ifb_cnt_hi_s cn52xxp1;
1965		- struct cvmx_lmcx_ifb_cnt_hi_s cn56xx;
1966		- struct cvmx_lmcx_ifb_cnt_hi_s cn56xxp1;
1967		- struct cvmx_lmcx_ifb_cnt_hi_s cn58xx;
1968		- struct cvmx_lmcx_ifb_cnt_hi_s cn58xxp1;
1969	1735	};
1970	1736
1971	1737	union cvmx_lmcx_ifb_cnt_lo {
..	..	@@ -1979,17 +1745,6 @@
1979	1745	uint64_t reserved_32_63:32;
1980	1746	#endif
1981	1747	} s;
1982		- struct cvmx_lmcx_ifb_cnt_lo_s cn30xx;
1983		- struct cvmx_lmcx_ifb_cnt_lo_s cn31xx;
1984		- struct cvmx_lmcx_ifb_cnt_lo_s cn38xx;
1985		- struct cvmx_lmcx_ifb_cnt_lo_s cn38xxp2;
1986		- struct cvmx_lmcx_ifb_cnt_lo_s cn50xx;
1987		- struct cvmx_lmcx_ifb_cnt_lo_s cn52xx;
1988		- struct cvmx_lmcx_ifb_cnt_lo_s cn52xxp1;
1989		- struct cvmx_lmcx_ifb_cnt_lo_s cn56xx;
1990		- struct cvmx_lmcx_ifb_cnt_lo_s cn56xxp1;
1991		- struct cvmx_lmcx_ifb_cnt_lo_s cn58xx;
1992		- struct cvmx_lmcx_ifb_cnt_lo_s cn58xxp1;
1993	1748	};
1994	1749
1995	1750	union cvmx_lmcx_int {
..	..	@@ -2007,13 +1762,6 @@
2007	1762	uint64_t reserved_9_63:55;
2008	1763	#endif
2009	1764	} s;
2010		- struct cvmx_lmcx_int_s cn61xx;
2011		- struct cvmx_lmcx_int_s cn63xx;
2012		- struct cvmx_lmcx_int_s cn63xxp1;
2013		- struct cvmx_lmcx_int_s cn66xx;
2014		- struct cvmx_lmcx_int_s cn68xx;
2015		- struct cvmx_lmcx_int_s cn68xxp1;
2016		- struct cvmx_lmcx_int_s cnf71xx;
2017	1765	};
2018	1766
2019	1767	union cvmx_lmcx_int_en {
..	..	@@ -2031,13 +1779,6 @@
2031	1779	uint64_t reserved_3_63:61;
2032	1780	#endif
2033	1781	} s;
2034		- struct cvmx_lmcx_int_en_s cn61xx;
2035		- struct cvmx_lmcx_int_en_s cn63xx;
2036		- struct cvmx_lmcx_int_en_s cn63xxp1;
2037		- struct cvmx_lmcx_int_en_s cn66xx;
2038		- struct cvmx_lmcx_int_en_s cn68xx;
2039		- struct cvmx_lmcx_int_en_s cn68xxp1;
2040		- struct cvmx_lmcx_int_en_s cnf71xx;
2041	1782	};
2042	1783
2043	1784	union cvmx_lmcx_mem_cfg0 {
..	..	@@ -2075,17 +1816,6 @@
2075	1816	uint64_t reserved_32_63:32;
2076	1817	#endif
2077	1818	} s;
2078		- struct cvmx_lmcx_mem_cfg0_s cn30xx;
2079		- struct cvmx_lmcx_mem_cfg0_s cn31xx;
2080		- struct cvmx_lmcx_mem_cfg0_s cn38xx;
2081		- struct cvmx_lmcx_mem_cfg0_s cn38xxp2;
2082		- struct cvmx_lmcx_mem_cfg0_s cn50xx;
2083		- struct cvmx_lmcx_mem_cfg0_s cn52xx;
2084		- struct cvmx_lmcx_mem_cfg0_s cn52xxp1;
2085		- struct cvmx_lmcx_mem_cfg0_s cn56xx;
2086		- struct cvmx_lmcx_mem_cfg0_s cn56xxp1;
2087		- struct cvmx_lmcx_mem_cfg0_s cn58xx;
2088		- struct cvmx_lmcx_mem_cfg0_s cn58xxp1;
2089	1819	};
2090	1820
2091	1821	union cvmx_lmcx_mem_cfg1 {
..	..	@@ -2115,8 +1845,6 @@
2115	1845	uint64_t reserved_32_63:32;
2116	1846	#endif
2117	1847	} s;
2118		- struct cvmx_lmcx_mem_cfg1_s cn30xx;
2119		- struct cvmx_lmcx_mem_cfg1_s cn31xx;
2120	1848	struct cvmx_lmcx_mem_cfg1_cn38xx {
2121	1849	#ifdef __BIG_ENDIAN_BITFIELD
2122	1850	uint64_t reserved_31_63:33;
..	..	@@ -2140,14 +1868,6 @@
2140	1868	uint64_t reserved_31_63:33;
2141	1869	#endif
2142	1870	} cn38xx;
2143		- struct cvmx_lmcx_mem_cfg1_cn38xx cn38xxp2;
2144		- struct cvmx_lmcx_mem_cfg1_s cn50xx;
2145		- struct cvmx_lmcx_mem_cfg1_cn38xx cn52xx;
2146		- struct cvmx_lmcx_mem_cfg1_cn38xx cn52xxp1;
2147		- struct cvmx_lmcx_mem_cfg1_cn38xx cn56xx;
2148		- struct cvmx_lmcx_mem_cfg1_cn38xx cn56xxp1;
2149		- struct cvmx_lmcx_mem_cfg1_cn38xx cn58xx;
2150		- struct cvmx_lmcx_mem_cfg1_cn38xx cn58xxp1;
2151	1871	};
2152	1872
2153	1873	union cvmx_lmcx_modereg_params0 {
..	..	@@ -2189,13 +1909,6 @@
2189	1909	uint64_t reserved_25_63:39;
2190	1910	#endif
2191	1911	} s;
2192		- struct cvmx_lmcx_modereg_params0_s cn61xx;
2193		- struct cvmx_lmcx_modereg_params0_s cn63xx;
2194		- struct cvmx_lmcx_modereg_params0_s cn63xxp1;
2195		- struct cvmx_lmcx_modereg_params0_s cn66xx;
2196		- struct cvmx_lmcx_modereg_params0_s cn68xx;
2197		- struct cvmx_lmcx_modereg_params0_s cn68xxp1;
2198		- struct cvmx_lmcx_modereg_params0_s cnf71xx;
2199	1912	};
2200	1913
2201	1914	union cvmx_lmcx_modereg_params1 {
..	..	@@ -2255,13 +1968,6 @@
2255	1968	uint64_t reserved_48_63:16;
2256	1969	#endif
2257	1970	} s;
2258		- struct cvmx_lmcx_modereg_params1_s cn61xx;
2259		- struct cvmx_lmcx_modereg_params1_s cn63xx;
2260		- struct cvmx_lmcx_modereg_params1_s cn63xxp1;
2261		- struct cvmx_lmcx_modereg_params1_s cn66xx;
2262		- struct cvmx_lmcx_modereg_params1_s cn68xx;
2263		- struct cvmx_lmcx_modereg_params1_s cn68xxp1;
2264		- struct cvmx_lmcx_modereg_params1_s cnf71xx;
2265	1971	};
2266	1972
2267	1973	union cvmx_lmcx_nxm {
..	..	@@ -2300,15 +2006,6 @@
2300	2006	uint64_t reserved_8_63:56;
2301	2007	#endif
2302	2008	} cn52xx;
2303		- struct cvmx_lmcx_nxm_cn52xx cn56xx;
2304		- struct cvmx_lmcx_nxm_cn52xx cn58xx;
2305		- struct cvmx_lmcx_nxm_s cn61xx;
2306		- struct cvmx_lmcx_nxm_s cn63xx;
2307		- struct cvmx_lmcx_nxm_s cn63xxp1;
2308		- struct cvmx_lmcx_nxm_s cn66xx;
2309		- struct cvmx_lmcx_nxm_s cn68xx;
2310		- struct cvmx_lmcx_nxm_s cn68xxp1;
2311		- struct cvmx_lmcx_nxm_s cnf71xx;
2312	2009	};
2313	2010
2314	2011	union cvmx_lmcx_ops_cnt {
..	..	@@ -2320,13 +2017,6 @@
2320	2017	uint64_t opscnt:64;
2321	2018	#endif
2322	2019	} s;
2323		- struct cvmx_lmcx_ops_cnt_s cn61xx;
2324		- struct cvmx_lmcx_ops_cnt_s cn63xx;
2325		- struct cvmx_lmcx_ops_cnt_s cn63xxp1;
2326		- struct cvmx_lmcx_ops_cnt_s cn66xx;
2327		- struct cvmx_lmcx_ops_cnt_s cn68xx;
2328		- struct cvmx_lmcx_ops_cnt_s cn68xxp1;
2329		- struct cvmx_lmcx_ops_cnt_s cnf71xx;
2330	2020	};
2331	2021
2332	2022	union cvmx_lmcx_ops_cnt_hi {
..	..	@@ -2340,17 +2030,6 @@
2340	2030	uint64_t reserved_32_63:32;
2341	2031	#endif
2342	2032	} s;
2343		- struct cvmx_lmcx_ops_cnt_hi_s cn30xx;
2344		- struct cvmx_lmcx_ops_cnt_hi_s cn31xx;
2345		- struct cvmx_lmcx_ops_cnt_hi_s cn38xx;
2346		- struct cvmx_lmcx_ops_cnt_hi_s cn38xxp2;
2347		- struct cvmx_lmcx_ops_cnt_hi_s cn50xx;
2348		- struct cvmx_lmcx_ops_cnt_hi_s cn52xx;
2349		- struct cvmx_lmcx_ops_cnt_hi_s cn52xxp1;
2350		- struct cvmx_lmcx_ops_cnt_hi_s cn56xx;
2351		- struct cvmx_lmcx_ops_cnt_hi_s cn56xxp1;
2352		- struct cvmx_lmcx_ops_cnt_hi_s cn58xx;
2353		- struct cvmx_lmcx_ops_cnt_hi_s cn58xxp1;
2354	2033	};
2355	2034
2356	2035	union cvmx_lmcx_ops_cnt_lo {
..	..	@@ -2364,17 +2043,6 @@
2364	2043	uint64_t reserved_32_63:32;
2365	2044	#endif
2366	2045	} s;
2367		- struct cvmx_lmcx_ops_cnt_lo_s cn30xx;
2368		- struct cvmx_lmcx_ops_cnt_lo_s cn31xx;
2369		- struct cvmx_lmcx_ops_cnt_lo_s cn38xx;
2370		- struct cvmx_lmcx_ops_cnt_lo_s cn38xxp2;
2371		- struct cvmx_lmcx_ops_cnt_lo_s cn50xx;
2372		- struct cvmx_lmcx_ops_cnt_lo_s cn52xx;
2373		- struct cvmx_lmcx_ops_cnt_lo_s cn52xxp1;
2374		- struct cvmx_lmcx_ops_cnt_lo_s cn56xx;
2375		- struct cvmx_lmcx_ops_cnt_lo_s cn56xxp1;
2376		- struct cvmx_lmcx_ops_cnt_lo_s cn58xx;
2377		- struct cvmx_lmcx_ops_cnt_lo_s cn58xxp1;
2378	2046	};
2379	2047
2380	2048	union cvmx_lmcx_phy_ctl {
..	..	@@ -2404,8 +2072,6 @@
2404	2072	uint64_t reserved_15_63:49;
2405	2073	#endif
2406	2074	} s;
2407		- struct cvmx_lmcx_phy_ctl_s cn61xx;
2408		- struct cvmx_lmcx_phy_ctl_s cn63xx;
2409	2075	struct cvmx_lmcx_phy_ctl_cn63xxp1 {
2410	2076	#ifdef __BIG_ENDIAN_BITFIELD
2411	2077	uint64_t reserved_14_63:50;
..	..	@@ -2429,10 +2095,6 @@
2429	2095	uint64_t reserved_14_63:50;
2430	2096	#endif
2431	2097	} cn63xxp1;
2432		- struct cvmx_lmcx_phy_ctl_s cn66xx;
2433		- struct cvmx_lmcx_phy_ctl_s cn68xx;
2434		- struct cvmx_lmcx_phy_ctl_s cn68xxp1;
2435		- struct cvmx_lmcx_phy_ctl_s cnf71xx;
2436	2098	};
2437	2099
2438	2100	union cvmx_lmcx_pll_bwctl {
..	..	@@ -2448,10 +2110,6 @@
2448	2110	uint64_t reserved_5_63:59;
2449	2111	#endif
2450	2112	} s;
2451		- struct cvmx_lmcx_pll_bwctl_s cn30xx;
2452		- struct cvmx_lmcx_pll_bwctl_s cn31xx;
2453		- struct cvmx_lmcx_pll_bwctl_s cn38xx;
2454		- struct cvmx_lmcx_pll_bwctl_s cn38xxp2;
2455	2113	};
2456	2114
2457	2115	union cvmx_lmcx_pll_ctl {
..	..	@@ -2520,9 +2178,6 @@
2520	2178	uint64_t reserved_29_63:35;
2521	2179	#endif
2522	2180	} cn50xx;
2523		- struct cvmx_lmcx_pll_ctl_s cn52xx;
2524		- struct cvmx_lmcx_pll_ctl_s cn52xxp1;
2525		- struct cvmx_lmcx_pll_ctl_cn50xx cn56xx;
2526	2181	struct cvmx_lmcx_pll_ctl_cn56xxp1 {
2527	2182	#ifdef __BIG_ENDIAN_BITFIELD
2528	2183	uint64_t reserved_28_63:36;
..	..	@@ -2552,8 +2207,6 @@
2552	2207	uint64_t reserved_28_63:36;
2553	2208	#endif
2554	2209	} cn56xxp1;
2555		- struct cvmx_lmcx_pll_ctl_cn56xxp1 cn58xx;
2556		- struct cvmx_lmcx_pll_ctl_cn56xxp1 cn58xxp1;
2557	2210	};
2558	2211
2559	2212	union cvmx_lmcx_pll_status {
..	..	@@ -2575,12 +2228,6 @@
2575	2228	uint64_t reserved_32_63:32;
2576	2229	#endif
2577	2230	} s;
2578		- struct cvmx_lmcx_pll_status_s cn50xx;
2579		- struct cvmx_lmcx_pll_status_s cn52xx;
2580		- struct cvmx_lmcx_pll_status_s cn52xxp1;
2581		- struct cvmx_lmcx_pll_status_s cn56xx;
2582		- struct cvmx_lmcx_pll_status_s cn56xxp1;
2583		- struct cvmx_lmcx_pll_status_s cn58xx;
2584	2231	struct cvmx_lmcx_pll_status_cn58xxp1 {
2585	2232	#ifdef __BIG_ENDIAN_BITFIELD
2586	2233	uint64_t reserved_2_63:62;
..	..	@@ -2615,10 +2262,6 @@
2615	2262	uint64_t reserved_44_63:20;
2616	2263	#endif
2617	2264	} s;
2618		- struct cvmx_lmcx_read_level_ctl_s cn52xx;
2619		- struct cvmx_lmcx_read_level_ctl_s cn52xxp1;
2620		- struct cvmx_lmcx_read_level_ctl_s cn56xx;
2621		- struct cvmx_lmcx_read_level_ctl_s cn56xxp1;
2622	2265	};
2623	2266
2624	2267	union cvmx_lmcx_read_level_dbg {
..	..	@@ -2636,10 +2279,6 @@
2636	2279	uint64_t reserved_32_63:32;
2637	2280	#endif
2638	2281	} s;
2639		- struct cvmx_lmcx_read_level_dbg_s cn52xx;
2640		- struct cvmx_lmcx_read_level_dbg_s cn52xxp1;
2641		- struct cvmx_lmcx_read_level_dbg_s cn56xx;
2642		- struct cvmx_lmcx_read_level_dbg_s cn56xxp1;
2643	2282	};
2644	2283
2645	2284	union cvmx_lmcx_read_level_rankx {
..	..	@@ -2671,10 +2310,6 @@
2671	2310	uint64_t reserved_38_63:26;
2672	2311	#endif
2673	2312	} s;
2674		- struct cvmx_lmcx_read_level_rankx_s cn52xx;
2675		- struct cvmx_lmcx_read_level_rankx_s cn52xxp1;
2676		- struct cvmx_lmcx_read_level_rankx_s cn56xx;
2677		- struct cvmx_lmcx_read_level_rankx_s cn56xxp1;
2678	2313	};
2679	2314
2680	2315	union cvmx_lmcx_reset_ctl {
..	..	@@ -2694,13 +2329,6 @@
2694	2329	uint64_t reserved_4_63:60;
2695	2330	#endif
2696	2331	} s;
2697		- struct cvmx_lmcx_reset_ctl_s cn61xx;
2698		- struct cvmx_lmcx_reset_ctl_s cn63xx;
2699		- struct cvmx_lmcx_reset_ctl_s cn63xxp1;
2700		- struct cvmx_lmcx_reset_ctl_s cn66xx;
2701		- struct cvmx_lmcx_reset_ctl_s cn68xx;
2702		- struct cvmx_lmcx_reset_ctl_s cn68xxp1;
2703		- struct cvmx_lmcx_reset_ctl_s cnf71xx;
2704	2332	};
2705	2333
2706	2334	union cvmx_lmcx_rlevel_ctl {
..	..	@@ -2730,8 +2358,6 @@
2730	2358	uint64_t reserved_22_63:42;
2731	2359	#endif
2732	2360	} s;
2733		- struct cvmx_lmcx_rlevel_ctl_s cn61xx;
2734		- struct cvmx_lmcx_rlevel_ctl_s cn63xx;
2735	2361	struct cvmx_lmcx_rlevel_ctl_cn63xxp1 {
2736	2362	#ifdef __BIG_ENDIAN_BITFIELD
2737	2363	uint64_t reserved_9_63:55;
..	..	@@ -2745,10 +2371,6 @@
2745	2371	uint64_t reserved_9_63:55;
2746	2372	#endif
2747	2373	} cn63xxp1;
2748		- struct cvmx_lmcx_rlevel_ctl_s cn66xx;
2749		- struct cvmx_lmcx_rlevel_ctl_s cn68xx;
2750		- struct cvmx_lmcx_rlevel_ctl_s cn68xxp1;
2751		- struct cvmx_lmcx_rlevel_ctl_s cnf71xx;
2752	2374	};
2753	2375
2754	2376	union cvmx_lmcx_rlevel_dbg {
..	..	@@ -2760,13 +2382,6 @@
2760	2382	uint64_t bitmask:64;
2761	2383	#endif
2762	2384	} s;
2763		- struct cvmx_lmcx_rlevel_dbg_s cn61xx;
2764		- struct cvmx_lmcx_rlevel_dbg_s cn63xx;
2765		- struct cvmx_lmcx_rlevel_dbg_s cn63xxp1;
2766		- struct cvmx_lmcx_rlevel_dbg_s cn66xx;
2767		- struct cvmx_lmcx_rlevel_dbg_s cn68xx;
2768		- struct cvmx_lmcx_rlevel_dbg_s cn68xxp1;
2769		- struct cvmx_lmcx_rlevel_dbg_s cnf71xx;
2770	2385	};
2771	2386
2772	2387	union cvmx_lmcx_rlevel_rankx {
..	..	@@ -2798,13 +2413,6 @@
2798	2413	uint64_t reserved_56_63:8;
2799	2414	#endif
2800	2415	} s;
2801		- struct cvmx_lmcx_rlevel_rankx_s cn61xx;
2802		- struct cvmx_lmcx_rlevel_rankx_s cn63xx;
2803		- struct cvmx_lmcx_rlevel_rankx_s cn63xxp1;
2804		- struct cvmx_lmcx_rlevel_rankx_s cn66xx;
2805		- struct cvmx_lmcx_rlevel_rankx_s cn68xx;
2806		- struct cvmx_lmcx_rlevel_rankx_s cn68xxp1;
2807		- struct cvmx_lmcx_rlevel_rankx_s cnf71xx;
2808	2416	};
2809	2417
2810	2418	union cvmx_lmcx_rodt_comp_ctl {
..	..	@@ -2826,13 +2434,6 @@
2826	2434	uint64_t reserved_17_63:47;
2827	2435	#endif
2828	2436	} s;
2829		- struct cvmx_lmcx_rodt_comp_ctl_s cn50xx;
2830		- struct cvmx_lmcx_rodt_comp_ctl_s cn52xx;
2831		- struct cvmx_lmcx_rodt_comp_ctl_s cn52xxp1;
2832		- struct cvmx_lmcx_rodt_comp_ctl_s cn56xx;
2833		- struct cvmx_lmcx_rodt_comp_ctl_s cn56xxp1;
2834		- struct cvmx_lmcx_rodt_comp_ctl_s cn58xx;
2835		- struct cvmx_lmcx_rodt_comp_ctl_s cn58xxp1;
2836	2437	};
2837	2438
2838	2439	union cvmx_lmcx_rodt_ctl {
..	..	@@ -2860,17 +2461,6 @@
2860	2461	uint64_t reserved_32_63:32;
2861	2462	#endif
2862	2463	} s;
2863		- struct cvmx_lmcx_rodt_ctl_s cn30xx;
2864		- struct cvmx_lmcx_rodt_ctl_s cn31xx;
2865		- struct cvmx_lmcx_rodt_ctl_s cn38xx;
2866		- struct cvmx_lmcx_rodt_ctl_s cn38xxp2;
2867		- struct cvmx_lmcx_rodt_ctl_s cn50xx;
2868		- struct cvmx_lmcx_rodt_ctl_s cn52xx;
2869		- struct cvmx_lmcx_rodt_ctl_s cn52xxp1;
2870		- struct cvmx_lmcx_rodt_ctl_s cn56xx;
2871		- struct cvmx_lmcx_rodt_ctl_s cn56xxp1;
2872		- struct cvmx_lmcx_rodt_ctl_s cn58xx;
2873		- struct cvmx_lmcx_rodt_ctl_s cn58xxp1;
2874	2464	};
2875	2465
2876	2466	union cvmx_lmcx_rodt_mask {
..	..	@@ -2896,13 +2486,6 @@
2896	2486	uint64_t rodt_d3_r1:8;
2897	2487	#endif
2898	2488	} s;
2899		- struct cvmx_lmcx_rodt_mask_s cn61xx;
2900		- struct cvmx_lmcx_rodt_mask_s cn63xx;
2901		- struct cvmx_lmcx_rodt_mask_s cn63xxp1;
2902		- struct cvmx_lmcx_rodt_mask_s cn66xx;
2903		- struct cvmx_lmcx_rodt_mask_s cn68xx;
2904		- struct cvmx_lmcx_rodt_mask_s cn68xxp1;
2905		- struct cvmx_lmcx_rodt_mask_s cnf71xx;
2906	2489	};
2907	2490
2908	2491	union cvmx_lmcx_scramble_cfg0 {
..	..	@@ -2914,9 +2497,6 @@
2914	2497	uint64_t key:64;
2915	2498	#endif
2916	2499	} s;
2917		- struct cvmx_lmcx_scramble_cfg0_s cn61xx;
2918		- struct cvmx_lmcx_scramble_cfg0_s cn66xx;
2919		- struct cvmx_lmcx_scramble_cfg0_s cnf71xx;
2920	2500	};
2921	2501
2922	2502	union cvmx_lmcx_scramble_cfg1 {
..	..	@@ -2928,9 +2508,6 @@
2928	2508	uint64_t key:64;
2929	2509	#endif
2930	2510	} s;
2931		- struct cvmx_lmcx_scramble_cfg1_s cn61xx;
2932		- struct cvmx_lmcx_scramble_cfg1_s cn66xx;
2933		- struct cvmx_lmcx_scramble_cfg1_s cnf71xx;
2934	2511	};
2935	2512
2936	2513	union cvmx_lmcx_scrambled_fadr {
..	..	@@ -2952,9 +2529,6 @@
2952	2529	uint64_t reserved_36_63:28;
2953	2530	#endif
2954	2531	} s;
2955		- struct cvmx_lmcx_scrambled_fadr_s cn61xx;
2956		- struct cvmx_lmcx_scrambled_fadr_s cn66xx;
2957		- struct cvmx_lmcx_scrambled_fadr_s cnf71xx;
2958	2532	};
2959	2533
2960	2534	union cvmx_lmcx_slot_ctl0 {
..	..	@@ -2974,13 +2548,6 @@
2974	2548	uint64_t reserved_24_63:40;
2975	2549	#endif
2976	2550	} s;
2977		- struct cvmx_lmcx_slot_ctl0_s cn61xx;
2978		- struct cvmx_lmcx_slot_ctl0_s cn63xx;
2979		- struct cvmx_lmcx_slot_ctl0_s cn63xxp1;
2980		- struct cvmx_lmcx_slot_ctl0_s cn66xx;
2981		- struct cvmx_lmcx_slot_ctl0_s cn68xx;
2982		- struct cvmx_lmcx_slot_ctl0_s cn68xxp1;
2983		- struct cvmx_lmcx_slot_ctl0_s cnf71xx;
2984	2551	};
2985	2552
2986	2553	union cvmx_lmcx_slot_ctl1 {
..	..	@@ -3000,13 +2567,6 @@
3000	2567	uint64_t reserved_24_63:40;
3001	2568	#endif
3002	2569	} s;
3003		- struct cvmx_lmcx_slot_ctl1_s cn61xx;
3004		- struct cvmx_lmcx_slot_ctl1_s cn63xx;
3005		- struct cvmx_lmcx_slot_ctl1_s cn63xxp1;
3006		- struct cvmx_lmcx_slot_ctl1_s cn66xx;
3007		- struct cvmx_lmcx_slot_ctl1_s cn68xx;
3008		- struct cvmx_lmcx_slot_ctl1_s cn68xxp1;
3009		- struct cvmx_lmcx_slot_ctl1_s cnf71xx;
3010	2570	};
3011	2571
3012	2572	union cvmx_lmcx_slot_ctl2 {
..	..	@@ -3026,13 +2586,6 @@
3026	2586	uint64_t reserved_24_63:40;
3027	2587	#endif
3028	2588	} s;
3029		- struct cvmx_lmcx_slot_ctl2_s cn61xx;
3030		- struct cvmx_lmcx_slot_ctl2_s cn63xx;
3031		- struct cvmx_lmcx_slot_ctl2_s cn63xxp1;
3032		- struct cvmx_lmcx_slot_ctl2_s cn66xx;
3033		- struct cvmx_lmcx_slot_ctl2_s cn68xx;
3034		- struct cvmx_lmcx_slot_ctl2_s cn68xxp1;
3035		- struct cvmx_lmcx_slot_ctl2_s cnf71xx;
3036	2589	};
3037	2590
3038	2591	union cvmx_lmcx_timing_params0 {
..	..	@@ -3095,7 +2648,6 @@
3095	2648	uint64_t reserved_47_63:17;
3096	2649	#endif
3097	2650	} cn61xx;
3098		- struct cvmx_lmcx_timing_params0_cn61xx cn63xx;
3099	2651	struct cvmx_lmcx_timing_params0_cn63xxp1 {
3100	2652	#ifdef __BIG_ENDIAN_BITFIELD
3101	2653	uint64_t reserved_46_63:18;
..	..	@@ -3123,10 +2675,6 @@
3123	2675	uint64_t reserved_46_63:18;
3124	2676	#endif
3125	2677	} cn63xxp1;
3126		- struct cvmx_lmcx_timing_params0_cn61xx cn66xx;
3127		- struct cvmx_lmcx_timing_params0_cn61xx cn68xx;
3128		- struct cvmx_lmcx_timing_params0_cn61xx cn68xxp1;
3129		- struct cvmx_lmcx_timing_params0_cn61xx cnf71xx;
3130	2678	};
3131	2679
3132	2680	union cvmx_lmcx_timing_params1 {
..	..	@@ -3162,8 +2710,6 @@
3162	2710	uint64_t reserved_47_63:17;
3163	2711	#endif
3164	2712	} s;
3165		- struct cvmx_lmcx_timing_params1_s cn61xx;
3166		- struct cvmx_lmcx_timing_params1_s cn63xx;
3167	2713	struct cvmx_lmcx_timing_params1_cn63xxp1 {
3168	2714	#ifdef __BIG_ENDIAN_BITFIELD
3169	2715	uint64_t reserved_46_63:18;
..	..	@@ -3193,10 +2739,6 @@
3193	2739	uint64_t reserved_46_63:18;
3194	2740	#endif
3195	2741	} cn63xxp1;
3196		- struct cvmx_lmcx_timing_params1_s cn66xx;
3197		- struct cvmx_lmcx_timing_params1_s cn68xx;
3198		- struct cvmx_lmcx_timing_params1_s cn68xxp1;
3199		- struct cvmx_lmcx_timing_params1_s cnf71xx;
3200	2742	};
3201	2743
3202	2744	union cvmx_lmcx_tro_ctl {
..	..	@@ -3212,13 +2754,6 @@
3212	2754	uint64_t reserved_33_63:31;
3213	2755	#endif
3214	2756	} s;
3215		- struct cvmx_lmcx_tro_ctl_s cn61xx;
3216		- struct cvmx_lmcx_tro_ctl_s cn63xx;
3217		- struct cvmx_lmcx_tro_ctl_s cn63xxp1;
3218		- struct cvmx_lmcx_tro_ctl_s cn66xx;
3219		- struct cvmx_lmcx_tro_ctl_s cn68xx;
3220		- struct cvmx_lmcx_tro_ctl_s cn68xxp1;
3221		- struct cvmx_lmcx_tro_ctl_s cnf71xx;
3222	2757	};
3223	2758
3224	2759	union cvmx_lmcx_tro_stat {
..	..	@@ -3232,13 +2767,6 @@
3232	2767	uint64_t reserved_32_63:32;
3233	2768	#endif
3234	2769	} s;
3235		- struct cvmx_lmcx_tro_stat_s cn61xx;
3236		- struct cvmx_lmcx_tro_stat_s cn63xx;
3237		- struct cvmx_lmcx_tro_stat_s cn63xxp1;
3238		- struct cvmx_lmcx_tro_stat_s cn66xx;
3239		- struct cvmx_lmcx_tro_stat_s cn68xx;
3240		- struct cvmx_lmcx_tro_stat_s cn68xxp1;
3241		- struct cvmx_lmcx_tro_stat_s cnf71xx;
3242	2770	};
3243	2771
3244	2772	union cvmx_lmcx_wlevel_ctl {
..	..	@@ -3260,8 +2788,6 @@
3260	2788	uint64_t reserved_22_63:42;
3261	2789	#endif
3262	2790	} s;
3263		- struct cvmx_lmcx_wlevel_ctl_s cn61xx;
3264		- struct cvmx_lmcx_wlevel_ctl_s cn63xx;
3265	2791	struct cvmx_lmcx_wlevel_ctl_cn63xxp1 {
3266	2792	#ifdef __BIG_ENDIAN_BITFIELD
3267	2793	uint64_t reserved_10_63:54;
..	..	@@ -3273,10 +2799,6 @@
3273	2799	uint64_t reserved_10_63:54;
3274	2800	#endif
3275	2801	} cn63xxp1;
3276		- struct cvmx_lmcx_wlevel_ctl_s cn66xx;
3277		- struct cvmx_lmcx_wlevel_ctl_s cn68xx;
3278		- struct cvmx_lmcx_wlevel_ctl_s cn68xxp1;
3279		- struct cvmx_lmcx_wlevel_ctl_s cnf71xx;
3280	2802	};
3281	2803
3282	2804	union cvmx_lmcx_wlevel_dbg {
..	..	@@ -3292,13 +2814,6 @@
3292	2814	uint64_t reserved_12_63:52;
3293	2815	#endif
3294	2816	} s;
3295		- struct cvmx_lmcx_wlevel_dbg_s cn61xx;
3296		- struct cvmx_lmcx_wlevel_dbg_s cn63xx;
3297		- struct cvmx_lmcx_wlevel_dbg_s cn63xxp1;
3298		- struct cvmx_lmcx_wlevel_dbg_s cn66xx;
3299		- struct cvmx_lmcx_wlevel_dbg_s cn68xx;
3300		- struct cvmx_lmcx_wlevel_dbg_s cn68xxp1;
3301		- struct cvmx_lmcx_wlevel_dbg_s cnf71xx;
3302	2817	};
3303	2818
3304	2819	union cvmx_lmcx_wlevel_rankx {
..	..	@@ -3330,13 +2845,6 @@
3330	2845	uint64_t reserved_47_63:17;
3331	2846	#endif
3332	2847	} s;
3333		- struct cvmx_lmcx_wlevel_rankx_s cn61xx;
3334		- struct cvmx_lmcx_wlevel_rankx_s cn63xx;
3335		- struct cvmx_lmcx_wlevel_rankx_s cn63xxp1;
3336		- struct cvmx_lmcx_wlevel_rankx_s cn66xx;
3337		- struct cvmx_lmcx_wlevel_rankx_s cn68xx;
3338		- struct cvmx_lmcx_wlevel_rankx_s cn68xxp1;
3339		- struct cvmx_lmcx_wlevel_rankx_s cnf71xx;
3340	2848	};
3341	2849
3342	2850	union cvmx_lmcx_wodt_ctl0 {
..	..	@@ -3363,7 +2871,6 @@
3363	2871	uint64_t reserved_32_63:32;
3364	2872	#endif
3365	2873	} cn30xx;
3366		- struct cvmx_lmcx_wodt_ctl0_cn30xx cn31xx;
3367	2874	struct cvmx_lmcx_wodt_ctl0_cn38xx {
3368	2875	#ifdef __BIG_ENDIAN_BITFIELD
3369	2876	uint64_t reserved_32_63:32;
..	..	@@ -3387,14 +2894,6 @@
3387	2894	uint64_t reserved_32_63:32;
3388	2895	#endif
3389	2896	} cn38xx;
3390		- struct cvmx_lmcx_wodt_ctl0_cn38xx cn38xxp2;
3391		- struct cvmx_lmcx_wodt_ctl0_cn38xx cn50xx;
3392		- struct cvmx_lmcx_wodt_ctl0_cn30xx cn52xx;
3393		- struct cvmx_lmcx_wodt_ctl0_cn30xx cn52xxp1;
3394		- struct cvmx_lmcx_wodt_ctl0_cn30xx cn56xx;
3395		- struct cvmx_lmcx_wodt_ctl0_cn30xx cn56xxp1;
3396		- struct cvmx_lmcx_wodt_ctl0_cn38xx cn58xx;
3397		- struct cvmx_lmcx_wodt_ctl0_cn38xx cn58xxp1;
3398	2897	};
3399	2898
3400	2899	union cvmx_lmcx_wodt_ctl1 {
..	..	@@ -3414,12 +2913,6 @@
3414	2913	uint64_t reserved_32_63:32;
3415	2914	#endif
3416	2915	} s;
3417		- struct cvmx_lmcx_wodt_ctl1_s cn30xx;
3418		- struct cvmx_lmcx_wodt_ctl1_s cn31xx;
3419		- struct cvmx_lmcx_wodt_ctl1_s cn52xx;
3420		- struct cvmx_lmcx_wodt_ctl1_s cn52xxp1;
3421		- struct cvmx_lmcx_wodt_ctl1_s cn56xx;
3422		- struct cvmx_lmcx_wodt_ctl1_s cn56xxp1;
3423	2916	};
3424	2917
3425	2918	union cvmx_lmcx_wodt_mask {
..	..	@@ -3445,13 +2938,6 @@
3445	2938	uint64_t wodt_d3_r1:8;
3446	2939	#endif
3447	2940	} s;
3448		- struct cvmx_lmcx_wodt_mask_s cn61xx;
3449		- struct cvmx_lmcx_wodt_mask_s cn63xx;
3450		- struct cvmx_lmcx_wodt_mask_s cn63xxp1;
3451		- struct cvmx_lmcx_wodt_mask_s cn66xx;
3452		- struct cvmx_lmcx_wodt_mask_s cn68xx;
3453		- struct cvmx_lmcx_wodt_mask_s cn68xxp1;
3454		- struct cvmx_lmcx_wodt_mask_s cnf71xx;
3455	2941	};
3456	2942
3457	2943	#endif