diff --git a/drivers/pcie/endpoint/pcie_ep_bcm_iproc_regs.h b/drivers/pcie/endpoint/pcie_ep_bcm_iproc_regs.h
index 8f5e1b13e6d..fbe207d29b2 100644
--- a/drivers/pcie/endpoint/pcie_ep_bcm_iproc_regs.h
+++ b/drivers/pcie/endpoint/pcie_ep_bcm_iproc_regs.h
@@ -43,6 +43,17 @@ struct iproc_pcie_reg {
 	uint32_t paxb_0_apb_err_en_for_cfg_rd_cmpl;
 	uint32_t paxb_0_apb_err_en_for_cfg_wr_cmpl;
 	uint32_t paxb_0_ur_resp_on_apb_timeout;
+	uint32_t paxb_0_crs_resp_on_flr_in_progress;
+	uint32_t paxb_0_apb_read_data_on_ca;
+	uint32_t paxb_0_apb_read_data_on_crs;
+	uint32_t paxb_0_compare_bus_num_for_pf;
+	uint32_t paxb_0_latch_bus_number_on_cfg_wr;
+	uint32_t paxb_0_issue_slave_error_from_ple_on_ur;
+	uint32_t paxb_0_ep_ple_cfg_register_0;
+	uint32_t paxb_0_ep_ple_cfg_register_1;
+	uint32_t paxb_0_ep_ple_cfg_register_2;
+	uint32_t paxb_0_ep_ple_cfg_register_3;
+	uint32_t paxb_0_ep_ple_cfg_register_4;
 	uint32_t paxb_ordering_cfg;
 	uint32_t paxb_master_cfg;
 	uint32_t paxb_master_axid_seq_num_cfg;
@@ -105,74 +116,9 @@ struct iproc_pcie_reg {
 	uint32_t paxb_default_imap_axim_read_config;
 	struct paxb_imap paxb_func0_imap0[8];
 	struct paxb_imap paxb_func0_imap1[8];
-	uint32_t paxb_func0_imap2;
-	uint32_t paxb_func0_imap2_upper;
-	uint32_t paxb_imap2_axim_write_config;
-	uint32_t paxb_imap2_axim_read_config;
-	uint32_t paxb_func0_imap3_0;
-	uint32_t paxb_func0_imap3_0_upper;
-	uint32_t paxb_imap3_0_axim_write_config;
-	uint32_t paxb_imap3_0_axim_read_config;
-	uint32_t paxb_func0_imap3_1;
-	uint32_t paxb_func0_imap3_1_upper;
-	uint32_t paxb_imap3_1_axim_write_config;
-	uint32_t paxb_imap3_1_axim_read_config;
-	uint32_t paxb_func0_imap3_2;
-	uint32_t paxb_func0_imap3_2_upper;
-	uint32_t paxb_imap3_2_axim_write_config;
-	uint32_t paxb_imap3_2_axim_read_config;
-	uint32_t paxb_func0_imap3_3;
-	uint32_t paxb_func0_imap3_3_upper;
-	uint32_t paxb_imap3_3_axim_write_config;
-	uint32_t paxb_imap3_3_axim_read_config;
-	uint32_t paxb_func0_imap3_4;
-	uint32_t paxb_func0_imap3_4_upper;
-	uint32_t paxb_imap3_4_axim_write_config;
-	uint32_t paxb_imap3_4_axim_read_config;
-	uint32_t paxb_func0_imap3_5;
-	uint32_t paxb_func0_imap3_5_upper;
-	uint32_t paxb_imap3_5_axim_write_config;
-	uint32_t paxb_imap3_5_axim_read_config;
-	uint32_t paxb_func0_imap3_6;
-	uint32_t paxb_func0_imap3_6_upper;
-	uint32_t paxb_imap3_6_axim_write_config;
-	uint32_t paxb_imap3_6_axim_read_config;
-	uint32_t paxb_func0_imap3_7;
-	uint32_t paxb_func0_imap3_7_upper;
-	uint32_t paxb_imap3_7_axim_write_config;
-	uint32_t paxb_imap3_7_axim_read_config;
-	uint32_t paxb_func0_imap4_0;
-	uint32_t paxb_func0_imap4_0_upper;
-	uint32_t paxb_imap4_0_axim_write_config;
-	uint32_t paxb_imap4_0_axim_read_config;
-	uint32_t paxb_func0_imap4_1;
-	uint32_t paxb_func0_imap4_1_upper;
-	uint32_t paxb_imap4_1_axim_write_config;
-	uint32_t paxb_imap4_1_axim_read_config;
-	uint32_t paxb_func0_imap4_2;
-	uint32_t paxb_func0_imap4_2_upper;
-	uint32_t paxb_imap4_2_axim_write_config;
-	uint32_t paxb_imap4_2_axim_read_config;
-	uint32_t paxb_func0_imap4_3;
-	uint32_t paxb_func0_imap4_3_upper;
-	uint32_t paxb_imap4_3_axim_write_config;
-	uint32_t paxb_imap4_3_axim_read_config;
-	uint32_t paxb_func0_imap4_4;
-	uint32_t paxb_func0_imap4_4_upper;
-	uint32_t paxb_imap4_4_axim_write_config;
-	uint32_t paxb_imap4_4_axim_read_config;
-	uint32_t paxb_func0_imap4_5;
-	uint32_t paxb_func0_imap4_5_upper;
-	uint32_t paxb_imap4_5_axim_write_config;
-	uint32_t paxb_imap4_5_axim_read_config;
-	uint32_t paxb_func0_imap4_6;
-	uint32_t paxb_func0_imap4_6_upper;
-	uint32_t paxb_imap4_6_axim_write_config;
-	uint32_t paxb_imap4_6_axim_read_config;
-	uint32_t paxb_func0_imap4_7;
-	uint32_t paxb_func0_imap4_7_upper;
-	uint32_t paxb_imap4_7_axim_write_config;
-	uint32_t paxb_imap4_7_axim_read_config;
+	struct paxb_imap paxb_func0_imap2;
+	struct paxb_imap paxb_func0_imap3[8];
+	struct paxb_imap paxb_func0_imap4[8];
 	struct paxb_64 paxb_iarr[5];
 	uint32_t paxb_override_window0_cfg0;
 	uint32_t paxb_override_window0_cfg1;
@@ -189,17 +135,22 @@ struct iproc_pcie_reg {
 	uint32_t paxb_oarr_func0_msi_page_upper;
 	struct paxb_64 paxb_oarr[2];
 	struct paxb_64 paxb_omap[2];
-	uint32_t paxb_oarr_2;
-	uint32_t paxb_oarr_2_upper;
-	uint32_t paxb_omap_2_lower;
-	uint32_t paxb_omap_2_upper;
-	uint32_t paxb_oarr_3;
-	uint32_t paxb_oarr_3_upper;
-	uint32_t paxb_omap_3_lower;
-	uint32_t paxb_omap_3_upper;
-	uint32_t paxb_oarr_4;
-	uint32_t paxb_oarr_4_upper;
+	struct paxb_64 paxb_oarr_2;
+	struct paxb_64 paxb_omap_2;
+	struct paxb_64 paxb_oarr_3;
+	struct paxb_64 paxb_omap_3;
+	struct paxb_64 paxb_oarr_4;
 	uint32_t paxb_omap_4_upper;
+	struct paxb_64 paxb_oarr_5;
+	struct paxb_64 paxb_omap_5;
+	struct paxb_64 paxb_omap_5_0;
+	struct paxb_64 paxb_omap_5_1;
+	struct paxb_64 paxb_omap_5_2;
+	struct paxb_64 paxb_omap_5_3;
+	struct paxb_64 paxb_omap_5_4;
+	struct paxb_64 paxb_omap_5_5;
+	struct paxb_64 paxb_omap_5_6;
+	struct paxb_64 paxb_omap_5_7;
 	uint32_t paxb_rc_pm_control;
 	uint32_t paxb_rc_pm_status;
 	uint32_t paxb_ep_pm_control;
@@ -231,6 +182,10 @@ struct iproc_pcie_reg {
 	uint32_t paxb_paxb_intr_status;
 	uint32_t paxb_paxb_intr_en;
 	uint32_t paxb_paxb_intr_clear;
+	uint32_t paxb_rc_intr_clear_en;
+	uint32_t paxb_rc_intr_status;
+	uint32_t paxb_rc_intr_mask;
+	uint32_t paxb_rc_intr_clear;
 	uint32_t paxb_pcie_cfg_intr_status;
 	uint32_t paxb_pcie_cfg_intr_mask;
 	uint32_t paxb_pcie_cfg_intr_clear;
@@ -334,10 +289,8 @@ struct iproc_pcie_reg {
 	uint32_t paxb_func0_imap0_upper[8];
 	uint32_t paxb_func1_imap0_upper[8];
 	uint32_t paxb_reserved_16[16];
-	uint32_t paxb_func0_imap2;
-	uint32_t paxb_func0_imap2_upper;
-	uint32_t paxb_func1_imap2;
-	uint32_t paxb_func1_imap2_upper;
+	struct paxb_64 paxb_func0_imap2;
+	struct paxb_64 paxb_func1_imap2;
 	uint32_t paxb_func0_imap0_0123_regs_type;
 	uint32_t paxb_reserved_17[11];
 	struct paxb_64 paxb_iarr[3];
@@ -352,22 +305,16 @@ struct iproc_pcie_reg {
 	uint32_t paxb_oarr_func1_msi_page_upper;
 	uint32_t paxb_reserved_21[1];
 	uint32_t paxb_func1_iarr_2_size;
-	uint32_t paxb_oarr_2;
-	uint32_t paxb_oarr_2_upper;
-	uint32_t paxb_omap_2_lower;
-	uint32_t paxb_omap_2_upper;
+	struct paxb_64 paxb_oarr_2;
+	struct paxb_64 paxb_omap_2;
 	struct paxb_64 paxb_func0_imap1[8];
 	struct paxb_64 paxb_func1_imap1[8];
-	uint32_t paxb_oarr_3;
-	uint32_t paxb_oarr_3_upper;
-	uint32_t paxb_omap_3_lower;
-	uint32_t paxb_omap_3_upper;
-	uint32_t paxb_iarr_3_lower;
-	uint32_t paxb_iarr_3_upper;
+	struct paxb_64 paxb_oarr_3;
+	struct paxb_64 paxb_omap_3;
+	struct paxb_64 paxb_iarr_3;
 	struct paxb_64 paxb_func0_imap3[8];
 	uint32_t paxb_func0_imap3_axuser[8];
-	uint32_t paxb_iarr_4_lower;
-	uint32_t paxb_iarr_4_upper;
+	struct paxb_64 paxb_iarr_4;
 	struct paxb_64 paxb_func0_imap4[8];
 	uint32_t paxb_func0_imap4_axuser[8];
 	uint32_t paxb_default_imap_lower;