You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
90 lines
2.4 KiB
90 lines
2.4 KiB
11 years ago
|
From ed6c71de07ad042691ec02e9eb97375ddc91ed01 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Tue, 3 Dec 2013 13:45:22 +0100
|
||
|
|
Subject: [PATCH 6/8] MIPS: BCM63XX: remove !RUNTIME_DETECT usage from enet
|
||
|
|
code
|
||
|
|
|
||
|
|
---
|
||
|
|
arch/mips/bcm63xx/dev-enet.c | 4 --
|
||
|
|
.../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 46 ----------------------
|
||
|
|
2 files changed, 50 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/mips/bcm63xx/dev-enet.c
|
||
|
|
+++ b/arch/mips/bcm63xx/dev-enet.c
|
||
|
|
@@ -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
|
||
|
|
else
|
||
|
|
bcm63xx_regs_enetdmac = bcm6348_regs_enetdmac;
|
||
|
|
}
|
||
|
|
-#else
|
||
|
|
-static __init void bcm63xx_enetdmac_regs_init(void) { }
|
||
|
|
-#endif
|
||
|
|
|
||
|
|
static struct resource shared_res[] = {
|
||
|
|
{
|
||
|
|
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
|
||
|
|
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
|
||
|
|
@@ -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;
|
||
|
|
}
|
||
|
|
|
||
|
|
|