diff options
| -rw-r--r-- | arch/arm/mach-layerscape/icid.c | 2 | ||||
| -rw-r--r-- | include/soc/fsl/fsl_qbman.h | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-layerscape/icid.c b/arch/arm/mach-layerscape/icid.c index 340ca959ca..62c2d356e2 100644 --- a/arch/arm/mach-layerscape/icid.c +++ b/arch/arm/mach-layerscape/icid.c @@ -83,7 +83,7 @@ struct icid_id_table icid_tbl_ls1046a[] = { .id = DPAA1_SID_START, .reg = DPAA1_SID_START, .compat_addr = LSCH2_QMAN_ADDR, - .reg_addr = offsetof(struct ccsr_qman, liodnr) + LSCH2_QMAN_ADDR, + .reg_addr = offsetof(struct ccsr_qman_v3, liodnr) + LSCH2_QMAN_ADDR, }, { .compat = "fsl,bman", .id = DPAA1_SID_START + 1, diff --git a/include/soc/fsl/fsl_qbman.h b/include/soc/fsl/fsl_qbman.h index 10cbb16833..1caaf4808d 100644 --- a/include/soc/fsl/fsl_qbman.h +++ b/include/soc/fsl/fsl_qbman.h @@ -6,17 +6,8 @@ #ifndef __FSL_QBMAN_H__ #define __FSL_QBMAN_H__ -struct ccsr_qman { -#ifdef CONFIG_SYS_FSL_QMAN_V3 +struct ccsr_qman_v3 { u8 res0[0x200]; -#else - struct { - u32 qcsp_lio_cfg; /* 0x0 - SW Portal n LIO cfg */ - u32 qcsp_io_cfg; /* 0x4 - SW Portal n IO cfg */ - u32 res; - u32 qcsp_dd_cfg; /* 0xc - SW Portal Dynamic Debug cfg */ - } qcsp[32]; -#endif /* Not actually reserved, but irrelevant to u-boot */ u8 res[0xbf8 - 0x200]; u32 ip_rev_1; @@ -41,14 +32,12 @@ struct ccsr_qman { u32 ci_rlm_cfg; /* Initiator Read Latency Monitor Cfg */ u32 ci_rlm_avg; /* Initiator Read Latency Monitor Avg */ u8 res7[0x2e8]; -#ifdef CONFIG_SYS_FSL_QMAN_V3 struct { u32 qcsp_lio_cfg; /* 0x0 - SW Portal n LIO cfg */ u32 qcsp_io_cfg; /* 0x4 - SW Portal n IO cfg */ u32 res; u32 qcsp_dd_cfg; /* 0xc - SW Portal n Dynamic Debug cfg*/ } qcsp[50]; -#endif }; struct ccsr_bman { |