Skip to content

Commit

Permalink
[ARM] Orion: MV88F5181 support bits
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Herbert Valerio Riedel authored and Russell King committed Jan 26, 2008
1 parent 1e78045 commit c9e3de9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
4 changes: 3 additions & 1 deletion arch/arm/mach-orion/addr-map.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/mach-orion/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-orion/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down
3 changes: 3 additions & 0 deletions include/asm-arm/arch-orion/orion.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c9e3de9

Please sign in to comment.