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

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

MIPS: BCM63xx: Remove !RUNTIME_DETECT usage from enet code 

Cc: linux-mips@linux-mips.org
Cc: John Crispin <blogic@openwrt.org>
Cc: Maxime Bizon <mbizon@freebox.fr>
Cc: Florian Fainelli <florian@openwrt.org>
Cc: Kevin Cernekee <cernekee@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/7270/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ee685808

arch/mips/bcm63xx/dev-enet.c

+0 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <bcm63xx_io.h>

#include <bcm63xx_regs.h>



#ifdef BCMCPU_RUNTIME_DETECT

static const unsigned long bcm6348_regs_enetdmac[] = {

	[ENETDMAC_CHANCFG]	= ENETDMAC_CHANCFG_REG,

	[ENETDMAC_IR]		= ENETDMAC_IR_REG,
@@ -43,9 +42,6 @@ static __init void bcm63xx_enetdmac_regs_init(void) 
	else

		bcm63xx_regs_enetdmac = bcm6348_regs_enetdmac;

}

#else

static __init void bcm63xx_enetdmac_regs_init(void) { }

#endif



static struct resource shared_res[] = {

	{

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

+0 −46
Original line number Diff line number Diff line
@@ -112,55 +112,9 @@ enum bcm63xx_regs_enetdmac { 


static inline unsigned long bcm63xx_enetdmacreg(enum bcm63xx_regs_enetdmac reg)

{

#ifdef BCMCPU_RUNTIME_DETECT

	extern const unsigned long *bcm63xx_regs_enetdmac;



	return bcm63xx_regs_enetdmac[reg];

#else

#ifdef CONFIG_BCM63XX_CPU_6345

	switch (reg) {

	case ENETDMAC_CHANCFG:

		return ENETDMA_6345_CHANCFG_REG;

	case ENETDMAC_IR:

		return ENETDMA_6345_IR_REG;

	case ENETDMAC_IRMASK:

		return ENETDMA_6345_IRMASK_REG;

	case ENETDMAC_MAXBURST:

		return ENETDMA_6345_MAXBURST_REG;

	case ENETDMAC_BUFALLOC:

		return ENETDMA_6345_BUFALLOC_REG;

	case ENETDMAC_RSTART:

		return ENETDMA_6345_RSTART_REG;

	case ENETDMAC_FC:

		return ENETDMA_6345_FC_REG;

	case ENETDMAC_LEN:

		return ENETDMA_6345_LEN_REG;

	}

#endif

#if defined(CONFIG_BCM63XX_CPU_6328) || \

	defined(CONFIG_BCM63XX_CPU_6338) || \

	defined(CONFIG_BCM63XX_CPU_6348) || \

	defined(CONFIG_BCM63XX_CPU_6358) || \

	defined(CONFIG_BCM63XX_CPU_6362) || \

	defined(CONFIG_BCM63XX_CPU_6368)

	switch (reg) {

	case ENETDMAC_CHANCFG:

		return ENETDMAC_CHANCFG_REG;

	case ENETDMAC_IR:

		return ENETDMAC_IR_REG;

	case ENETDMAC_IRMASK:

		return ENETDMAC_IRMASK_REG;

	case ENETDMAC_MAXBURST:

		return ENETDMAC_MAXBURST_REG;

	case ENETDMAC_BUFALLOC:

	case ENETDMAC_RSTART:

	case ENETDMAC_FC:

	case ENETDMAC_LEN:

		return 0;

	}

#endif

#endif

	return 0;

}