mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
[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>
This commit is contained in:
parent
1e78045306
commit
c9e3de941a
4 changed files with 13 additions and 2 deletions
|
@ -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;
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -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) |
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue