MIPS: OCTEON: delete redundant register definitions
For most OCTEON SoCs there is a repeated and redundant register definition for almost every hardware register, although the register bit fields would not differ from other SoCs. Since the driver code should use only one definition for simplicity, these other fields are just redundant and can be deleted. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org
This commit is contained in:

committed by
Paul Burton

parent
036d0823ce
commit
4089caa7d0
@@ -64,10 +64,6 @@ union cvmx_stxx_arb_ctl {
|
||||
uint64_t reserved_6_63:58;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_arb_ctl_s cn38xx;
|
||||
struct cvmx_stxx_arb_ctl_s cn38xxp2;
|
||||
struct cvmx_stxx_arb_ctl_s cn58xx;
|
||||
struct cvmx_stxx_arb_ctl_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_bckprs_cnt {
|
||||
@@ -81,10 +77,6 @@ union cvmx_stxx_bckprs_cnt {
|
||||
uint64_t reserved_32_63:32;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_bckprs_cnt_s cn38xx;
|
||||
struct cvmx_stxx_bckprs_cnt_s cn38xxp2;
|
||||
struct cvmx_stxx_bckprs_cnt_s cn58xx;
|
||||
struct cvmx_stxx_bckprs_cnt_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_com_ctl {
|
||||
@@ -102,10 +94,6 @@ union cvmx_stxx_com_ctl {
|
||||
uint64_t reserved_4_63:60;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_com_ctl_s cn38xx;
|
||||
struct cvmx_stxx_com_ctl_s cn38xxp2;
|
||||
struct cvmx_stxx_com_ctl_s cn58xx;
|
||||
struct cvmx_stxx_com_ctl_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_dip_cnt {
|
||||
@@ -121,10 +109,6 @@ union cvmx_stxx_dip_cnt {
|
||||
uint64_t reserved_8_63:56;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_dip_cnt_s cn38xx;
|
||||
struct cvmx_stxx_dip_cnt_s cn38xxp2;
|
||||
struct cvmx_stxx_dip_cnt_s cn58xx;
|
||||
struct cvmx_stxx_dip_cnt_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_ign_cal {
|
||||
@@ -138,10 +122,6 @@ union cvmx_stxx_ign_cal {
|
||||
uint64_t reserved_16_63:48;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_ign_cal_s cn38xx;
|
||||
struct cvmx_stxx_ign_cal_s cn38xxp2;
|
||||
struct cvmx_stxx_ign_cal_s cn58xx;
|
||||
struct cvmx_stxx_ign_cal_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_int_msk {
|
||||
@@ -169,10 +149,6 @@ union cvmx_stxx_int_msk {
|
||||
uint64_t reserved_8_63:56;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_int_msk_s cn38xx;
|
||||
struct cvmx_stxx_int_msk_s cn38xxp2;
|
||||
struct cvmx_stxx_int_msk_s cn58xx;
|
||||
struct cvmx_stxx_int_msk_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_int_reg {
|
||||
@@ -202,10 +178,6 @@ union cvmx_stxx_int_reg {
|
||||
uint64_t reserved_9_63:55;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_int_reg_s cn38xx;
|
||||
struct cvmx_stxx_int_reg_s cn38xxp2;
|
||||
struct cvmx_stxx_int_reg_s cn58xx;
|
||||
struct cvmx_stxx_int_reg_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_int_sync {
|
||||
@@ -233,10 +205,6 @@ union cvmx_stxx_int_sync {
|
||||
uint64_t reserved_8_63:56;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_int_sync_s cn38xx;
|
||||
struct cvmx_stxx_int_sync_s cn38xxp2;
|
||||
struct cvmx_stxx_int_sync_s cn58xx;
|
||||
struct cvmx_stxx_int_sync_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_min_bst {
|
||||
@@ -250,10 +218,6 @@ union cvmx_stxx_min_bst {
|
||||
uint64_t reserved_9_63:55;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_min_bst_s cn38xx;
|
||||
struct cvmx_stxx_min_bst_s cn38xxp2;
|
||||
struct cvmx_stxx_min_bst_s cn58xx;
|
||||
struct cvmx_stxx_min_bst_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_spi4_calx {
|
||||
@@ -275,10 +239,6 @@ union cvmx_stxx_spi4_calx {
|
||||
uint64_t reserved_17_63:47;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_spi4_calx_s cn38xx;
|
||||
struct cvmx_stxx_spi4_calx_s cn38xxp2;
|
||||
struct cvmx_stxx_spi4_calx_s cn58xx;
|
||||
struct cvmx_stxx_spi4_calx_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_spi4_dat {
|
||||
@@ -294,10 +254,6 @@ union cvmx_stxx_spi4_dat {
|
||||
uint64_t reserved_32_63:32;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_spi4_dat_s cn38xx;
|
||||
struct cvmx_stxx_spi4_dat_s cn38xxp2;
|
||||
struct cvmx_stxx_spi4_dat_s cn58xx;
|
||||
struct cvmx_stxx_spi4_dat_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_spi4_stat {
|
||||
@@ -315,10 +271,6 @@ union cvmx_stxx_spi4_stat {
|
||||
uint64_t reserved_16_63:48;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_spi4_stat_s cn38xx;
|
||||
struct cvmx_stxx_spi4_stat_s cn38xxp2;
|
||||
struct cvmx_stxx_spi4_stat_s cn58xx;
|
||||
struct cvmx_stxx_spi4_stat_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_stat_bytes_hi {
|
||||
@@ -332,10 +284,6 @@ union cvmx_stxx_stat_bytes_hi {
|
||||
uint64_t reserved_32_63:32;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_stat_bytes_hi_s cn38xx;
|
||||
struct cvmx_stxx_stat_bytes_hi_s cn38xxp2;
|
||||
struct cvmx_stxx_stat_bytes_hi_s cn58xx;
|
||||
struct cvmx_stxx_stat_bytes_hi_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_stat_bytes_lo {
|
||||
@@ -349,10 +297,6 @@ union cvmx_stxx_stat_bytes_lo {
|
||||
uint64_t reserved_32_63:32;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_stat_bytes_lo_s cn38xx;
|
||||
struct cvmx_stxx_stat_bytes_lo_s cn38xxp2;
|
||||
struct cvmx_stxx_stat_bytes_lo_s cn58xx;
|
||||
struct cvmx_stxx_stat_bytes_lo_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_stat_ctl {
|
||||
@@ -368,10 +312,6 @@ union cvmx_stxx_stat_ctl {
|
||||
uint64_t reserved_5_63:59;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_stat_ctl_s cn38xx;
|
||||
struct cvmx_stxx_stat_ctl_s cn38xxp2;
|
||||
struct cvmx_stxx_stat_ctl_s cn58xx;
|
||||
struct cvmx_stxx_stat_ctl_s cn58xxp1;
|
||||
};
|
||||
|
||||
union cvmx_stxx_stat_pkt_xmt {
|
||||
@@ -385,10 +325,6 @@ union cvmx_stxx_stat_pkt_xmt {
|
||||
uint64_t reserved_32_63:32;
|
||||
#endif
|
||||
} s;
|
||||
struct cvmx_stxx_stat_pkt_xmt_s cn38xx;
|
||||
struct cvmx_stxx_stat_pkt_xmt_s cn38xxp2;
|
||||
struct cvmx_stxx_stat_pkt_xmt_s cn58xx;
|
||||
struct cvmx_stxx_stat_pkt_xmt_s cn58xxp1;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user