Module Name: src
Committed By: skrll
Date: Sun Feb 26 09:29:08 UTC 2017
Modified Files:
src/sys/arch/arm/marvell: armadaxp.c
Log Message:
Use PEX numbers consistently. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/marvell/armadaxp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/marvell/armadaxp.c
diff -u src/sys/arch/arm/marvell/armadaxp.c:1.19 src/sys/arch/arm/marvell/armadaxp.c:1.20
--- src/sys/arch/arm/marvell/armadaxp.c:1.19 Thu Feb 23 22:33:31 2017
+++ src/sys/arch/arm/marvell/armadaxp.c Sun Feb 26 09:29:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp.c,v 1.19 2017/02/23 22:33:31 skrll Exp $ */
+/* $NetBSD: armadaxp.c,v 1.20 2017/02/26 09:29:08 skrll Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
*******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp.c,v 1.19 2017/02/23 22:33:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp.c,v 1.20 2017/02/26 09:29:08 skrll Exp $");
#define _INTR_PRIVATE
@@ -251,7 +251,7 @@ static struct mbus_description {
"PEX0(Lane2, Memory)" },
{ ARMADAXP_UNITID_PEX0, ARMADAXP_ATTR_PEXx3_MEM,
"PEX0(Lane3, Memory)" },
- { ARMADAXP_UNITID_PEX0, ARMADAXP_ATTR_PEX2_MEM,
+ { ARMADAXP_UNITID_PEX2, ARMADAXP_ATTR_PEX2_MEM,
"PEX2(Lane0, Memory)" },
{ ARMADAXP_UNITID_PEX1, ARMADAXP_ATTR_PEXx0_MEM,
"PEX1(Lane0, Memory)" },
@@ -261,7 +261,7 @@ static struct mbus_description {
"PEX1(Lane2, Memory)" },
{ ARMADAXP_UNITID_PEX1, ARMADAXP_ATTR_PEXx3_MEM,
"PEX1(Lane3, Memory)" },
- { ARMADAXP_UNITID_PEX1, ARMADAXP_ATTR_PEX2_MEM,
+ { ARMADAXP_UNITID_PEX3, ARMADAXP_ATTR_PEX3_MEM,
"PEX3(Lane0, Memory)" },
{ ARMADAXP_UNITID_PEX0, ARMADAXP_ATTR_PEXx0_IO,
"PEX0(Lane0, I/O)" },
@@ -271,7 +271,7 @@ static struct mbus_description {
"PEX0(Lane2, I/O)" },
{ ARMADAXP_UNITID_PEX0, ARMADAXP_ATTR_PEXx3_IO,
"PEX0(Lane3, I/O)" },
- { ARMADAXP_UNITID_PEX0, ARMADAXP_ATTR_PEX2_IO,
+ { ARMADAXP_UNITID_PEX2, ARMADAXP_ATTR_PEX2_IO,
"PEX2(Lane0, I/O)" },
{ ARMADAXP_UNITID_PEX1, ARMADAXP_ATTR_PEXx0_IO,
"PEX1(Lane0, I/O)" },
@@ -281,7 +281,7 @@ static struct mbus_description {
"PEX1(Lane2, I/O)" },
{ ARMADAXP_UNITID_PEX1, ARMADAXP_ATTR_PEXx3_IO,
"PEX1(Lane3, I/O)" },
- { ARMADAXP_UNITID_PEX1, ARMADAXP_ATTR_PEX2_IO,
+ { ARMADAXP_UNITID_PEX3, ARMADAXP_ATTR_PEX3_IO,
"PEX3(Lane0, I/O)" },
/* CRYPT */
