---

yaml --- r: 77527 b: refs/heads/master c: c9e3de9 h: refs/heads/master i: 77525: 318727a 77523: cfacc0c 77519: 15c2f00 v: v3
git-mirror · Jan 26, 2008 · a5d38a4 · a5d38a4
1 parent 53207bc
commit a5d38a4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e78045306e9a402b096eef95864ddf313d402d8
+refs/heads/master: c9e3de941a1694aeab60a10bd39eb710c975010d
diff --git a/trunk/arch/arm/mach-orion/addr-map.c b/trunk/arch/arm/mach-orion/addr-map.c
@@ -167,7 +167,9 @@ static int __init orion_cpu_win_can_remap(u32 win)
 	u32 dev, rev;
 
 	orion_pcie_id(&dev, &rev);
-	if ((dev == MV88F5281_DEV_ID && win < 4) || (dev == MV88F5182_DEV_ID && win < 2))
+	if ((dev == MV88F5281_DEV_ID && win < 4)
+	    || (dev == MV88F5182_DEV_ID && win < 2)
+	    || (dev == MV88F5181_DEV_ID && win < 2))
 		return 1;
 
 	return 0;

diff --git a/trunk/arch/arm/mach-orion/common.c b/trunk/arch/arm/mach-orion/common.c
@@ -237,6 +237,12 @@ static void orion_id(u32 *dev, u32 *rev, char **dev_name)
 		} else {
 			*dev_name = "MV88F5182-Rev-Unsupported";
 		}
+	} else if (*dev == MV88F5181_DEV_ID) {
+		if (*rev == MV88F5181_REV_B1) {
+			*dev_name = "MV88F5181-Rev-B1";
+		} else {
+			*dev_name = "MV88F5181-Rev-Unsupported";
+		}
 	} else {
 		*dev_name = "Device-Unknown";
 	}

diff --git a/trunk/arch/arm/mach-orion/pci.c b/trunk/arch/arm/mach-orion/pci.c
@@ -154,7 +154,7 @@ static int orion_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
 			PCIE_CONF_REG(where) | PCIE_CONF_ADDR_EN);
 
 	orion_pcie_id(&dev, &rev);
-	if (dev == MV88F5182_DEV_ID) {
+	if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) {
 		/* extended register space */
 		pcie_addr = ORION_PCIE_WA_BASE;
 		pcie_addr |= PCIE_CONF_BUS(bus->number) |

diff --git a/trunk/include/asm-arm/arch-orion/orion.h b/trunk/include/asm-arm/arch-orion/orion.h
@@ -43,6 +43,9 @@
 /*******************************************************************************
  * Supported Devices & Revisions
  ******************************************************************************/
+/* Orion-1 (88F5181) */
+#define MV88F5181_DEV_ID	0x5181
+#define MV88F5181_REV_B1	3
 /* Orion-NAS (88F5182) */
 #define MV88F5182_DEV_ID	0x5182
 #define MV88F5182_REV_A2	2