Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9311cfe authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Lennert Buytenhek
Browse files

[ARM] Orion: PCIe x4/x1 detection support 



The Discovery Duo (MV78xx0) has two x4 PCIe ports which can either
be used in x4 mode or in quad x1 mode.  This patch adds an accessor
function to the generic plat-orion PCIe handling code to detect in
which of the two modes we're running (which is determined by strap
pins and/or configured by the bootloader).

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
parent 0a17c7bc

arch/arm/plat-orion/pcie.c

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define PCIE_CONF_DATA_OFF	0x18fc

#define PCIE_MASK_OFF		0x1910

#define PCIE_CTRL_OFF		0x1a00

#define  PCIE_CTRL_X1_MODE		0x0001

#define PCIE_STAT_OFF		0x1a04

#define  PCIE_STAT_DEV_OFFS		20

#define  PCIE_STAT_DEV_MASK		0x1f
@@ -62,6 +63,11 @@ int orion_pcie_link_up(void __iomem *base) 
	return !(readl(base + PCIE_STAT_OFF) & PCIE_STAT_LINK_DOWN);

}



int __init orion_pcie_x4_mode(void __iomem *base)

{

	return !(readl(base + PCIE_CTRL_OFF) & PCIE_CTRL_X1_MODE);

}



int orion_pcie_get_local_bus_nr(void __iomem *base)

{

	u32 stat = readl(base + PCIE_STAT_OFF);

include/asm-arm/plat-orion/pcie.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
u32 orion_pcie_dev_id(void __iomem *base);

u32 orion_pcie_rev(void __iomem *base);

int orion_pcie_link_up(void __iomem *base);

int orion_pcie_x4_mode(void __iomem *base);

int orion_pcie_get_local_bus_nr(void __iomem *base);

void orion_pcie_set_local_bus_nr(void __iomem *base, int nr);

void orion_pcie_setup(void __iomem *base,