From 1b23cd803a69cc6045e61f60400db4bd28507a3e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 10 Jan 2020 10:53:41 +0100 Subject: include/soc/fsl: Make struct ccsr_qman v3 specific struct ccsr_qman is ifdeffed for different versions of this structure. CONFIG_SYS_FSL_QMAN_V3 is not defined which means we happen to use the wrong version on LS1046a. Hardcode it to the v3 version to make it work on LS1046a and rename it to ccsr_qman_v3 to make it obvious that it needs a change on non v3 versions. Signed-off-by: Sascha Hauer --- arch/arm/mach-layerscape/icid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') 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, -- cgit v1.2.3