Commit c9e3de94 authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel Committed by Russell King
Browse files

[ARM] Orion: MV88F5181 support bits 



add MV88F5181 support bits required by D-link DNS-323 patch

Signed-off-by: default avatarHerbert Valerio Riedel <hvr@gnu.org>
Acked-by: default avatarTzachi Perelstein <tzachi@marvell.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1e780453

arch/arm/mach-orion/addr-map.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-orion/common.c

+6 −0
Original line number Diff line number Diff line
@@ -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";

	}

arch/arm/mach-orion/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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) |

include/asm-arm/arch-orion/orion.h

+3 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE