summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2007-11-11 12:05:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 15:03:55 +0000
commitc9e3de941a1694aeab60a10bd39eb710c975010d (patch)
tree2170ec347a05253c87bf18017a6c4dc506fb6ac6 /arch/arm/mach-orion
parent1e78045306e9a402b096eef95864ddf313d402d8 (diff)
[ARM] Orion: MV88F5181 support bits
add MV88F5181 support bits required by D-link DNS-323 patch Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org> Acked-by: Tzachi Perelstein <tzachi@marvell.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-orion')
-rw-r--r--arch/arm/mach-orion/addr-map.c4
-rw-r--r--arch/arm/mach-orion/common.c6
-rw-r--r--arch/arm/mach-orion/pci.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-orion/addr-map.c b/arch/arm/mach-orion/addr-map.c
index ff6e010bccb..488da3811a6 100644
--- a/arch/arm/mach-orion/addr-map.c
+++ b/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/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c
index 12736fd6000..ff34827f82a 100644
--- a/arch/arm/mach-orion/common.c
+++ b/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/arch/arm/mach-orion/pci.c b/arch/arm/mach-orion/pci.c
index cf569c64711..0498d7c69b3 100644
--- a/arch/arm/mach-orion/pci.c
+++ b/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) |