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

Commit a156ba61 authored by Jonas Gorski's avatar Jonas Gorski Committed by Ralf Baechle
Browse files

MIPS: BCM63XX: enable pcie for BCM6362 



The PCIe controller is almost the same as the BCM6328 one, with only
the SERDES register being at a different location.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5011/


Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 08a41d12

arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -1365,7 +1365,8 @@ 
/*************************************************************************

/*************************************************************************

 * _REG relative to RSET_MISC

 * _REG relative to RSET_MISC

 *************************************************************************/

 *************************************************************************/

#define MISC_SERDES_CTRL_REG		0x0

#define MISC_SERDES_CTRL_6328_REG	0x0

#define MISC_SERDES_CTRL_6362_REG	0x4

#define SERDES_PCIE_EN			(1 << 0)

#define SERDES_PCIE_EN			(1 << 0)

#define SERDES_PCIE_EXD_EN		(1 << 15)

#define SERDES_PCIE_EXD_EN		(1 << 15)

arch/mips/pci/pci-bcm63xx.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -121,11 +121,17 @@ void __iomem *pci_iospace_start; 
static void __init bcm63xx_reset_pcie(void)

static void __init bcm63xx_reset_pcie(void)

{

{

	u32 val;

	u32 val;

	u32 reg;





	/* enable SERDES */

	/* enable SERDES */

	val = bcm_misc_readl(MISC_SERDES_CTRL_REG);

	if (BCMCPU_IS_6328())

		reg = MISC_SERDES_CTRL_6328_REG;

	else

		reg = MISC_SERDES_CTRL_6362_REG;



	val = bcm_misc_readl(reg);

	val |= SERDES_PCIE_EN | SERDES_PCIE_EXD_EN;

	val |= SERDES_PCIE_EN | SERDES_PCIE_EXD_EN;

	bcm_misc_writel(val, MISC_SERDES_CTRL_REG);

	bcm_misc_writel(val, reg);





	/* reset the PCIe core */

	/* reset the PCIe core */

	bcm63xx_core_set_reset(BCM63XX_RESET_PCIE, 1);

	bcm63xx_core_set_reset(BCM63XX_RESET_PCIE, 1);
@@ -330,6 +336,7 @@ static int __init bcm63xx_pci_init(void) 




	switch (bcm63xx_get_cpu_id()) {

	switch (bcm63xx_get_cpu_id()) {

	case BCM6328_CPU_ID:

	case BCM6328_CPU_ID:

	case BCM6362_CPU_ID:

		return bcm63xx_register_pcie();

		return bcm63xx_register_pcie();

	case BCM6348_CPU_ID:

	case BCM6348_CPU_ID:

	case BCM6358_CPU_ID:

	case BCM6358_CPU_ID: