summaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2011-11-10 12:06:22 +0000
committerRalf Baechle <ralf@linux-mips.org>2011-12-07 22:02:07 +0000
commitf59c811f8c44e60a59783e3337594da638a48dff (patch)
tree673e070d8affa4703b3c6c686b4a93b366b68a4c /drivers/net/irda
parent6f7c8623db005889ee35a602e0c2564ea06cd3ff (diff)
downloadop-kernel-dev-f59c811f8c44e60a59783e3337594da638a48dff.zip
op-kernel-dev-f59c811f8c44e60a59783e3337594da638a48dff.tar.gz
MIPS: Alchemy: one kernel for DB1000/DB1500/DB1100
These 3 boards are very similar; with this patch a single kernel image which runs on all three can be built. Tested on DB1500 and DB1100. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2872/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r--drivers/net/irda/au1k_ir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index d1a77ef..670bb05 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -32,7 +32,7 @@
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/au1000.h>
-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
+#if defined(CONFIG_MIPS_DB1000)
#include <asm/mach-db1x00/bcsr.h>
#else
#error au1k_ir: unsupported board
@@ -274,7 +274,7 @@ static int au1k_irda_net_init(struct net_device *dev)
aup->tx_db_inuse[i] = pDB;
}
-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
+#if defined(CONFIG_MIPS_DB1000)
/* power on */
bcsr_mod(BCSR_RESETS, BCSR_RESETS_IRDA_MODE_MASK,
BCSR_RESETS_IRDA_MODE_FULL);
@@ -662,7 +662,7 @@ au1k_irda_set_speed(struct net_device *dev, int speed)
u32 control;
int ret = 0, timeout = 10, i;
volatile ring_dest_t *ptxd;
-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
+#if defined(CONFIG_MIPS_DB1000)
unsigned long irda_resets;
#endif
@@ -711,14 +711,14 @@ au1k_irda_set_speed(struct net_device *dev, int speed)
}
if (speed == 4000000) {
-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
+#if defined(CONFIG_MIPS_DB1000)
bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_FIR_SEL);
#else /* Pb1000 and Pb1100 */
writel(1<<13, CPLD_AUX1);
#endif
}
else {
-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
+#if defined(CONFIG_MIPS_DB1000)
bcsr_mod(BCSR_RESETS, BCSR_RESETS_FIR_SEL, 0);
#else /* Pb1000 and Pb1100 */
writel(readl(CPLD_AUX1) & ~(1<<13), CPLD_AUX1);
OpenPOWER on IntegriCloud