Skip to content

Commit

Permalink
MIPS: Alchemy: remove PB1000 support
Browse files Browse the repository at this point in the history
Noone seems to have test hardware or care anymore.  Drop PB1000 support
and along with it the old Alchemy PCMCIA socket driver.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: linux-pcmcia@lists.infradead.org
Patchwork: https://patchwork.linux-mips.org/patch/2881/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Manuel Lauss authored and Ralf Baechle committed Dec 7, 2011
1 parent 5611cc4 commit 3f72408
Show file tree
Hide file tree
Showing 14 changed files with 2 additions and 1,319 deletions.
9 changes: 0 additions & 9 deletions arch/mips/alchemy/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,6 @@ config MIPS_MIRAGE
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_HAS_EARLY_PRINTK

config MIPS_PB1000
bool "Alchemy PB1000 board"
select ALCHEMY_GPIOINT_AU1000
select DMA_NONCOHERENT
select HW_HAS_PCI
select SWAP_IO_SPACE
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_HAS_EARLY_PRINTK

config MIPS_PB1100
bool "Alchemy PB1100 board"
select ALCHEMY_GPIOINT_AU1000
Expand Down
7 changes: 0 additions & 7 deletions arch/mips/alchemy/Platform
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/common/


#
# AMD Alchemy Pb1000 eval board
#
platform-$(CONFIG_MIPS_PB1000) += alchemy/devboards/
cflags-$(CONFIG_MIPS_PB1000) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
load-$(CONFIG_MIPS_PB1000) += 0xffffffff80100000

#
# AMD Alchemy Pb1100 eval board
#
Expand Down
11 changes: 0 additions & 11 deletions arch/mips/alchemy/common/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
#include <asm/irq_cpu.h>
#include <asm/mipsregs.h>
#include <asm/mach-au1x00/au1000.h>
#ifdef CONFIG_MIPS_PB1000
#include <asm/mach-pb1x00/pb1000.h>
#endif

/* Interrupt Controller register offsets */
#define IC_CFG0RD 0x40
Expand Down Expand Up @@ -265,14 +262,6 @@ static void au1x_ic1_unmask(struct irq_data *d)

__raw_writel(1 << bit, base + IC_MASKSET);
__raw_writel(1 << bit, base + IC_WAKESET);

/* very hacky. does the pb1000 cpld auto-disable this int?
* nowhere in the current kernel sources is it disabled. --mlau
*/
#if defined(CONFIG_MIPS_PB1000)
if (d->irq == AU1000_GPIO15_INT)
__raw_writel(0x4000, (void __iomem *)PB1000_MDR); /* enable int */
#endif
wmb();
}

Expand Down
1 change: 0 additions & 1 deletion arch/mips/alchemy/devboards/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

obj-y += prom.o bcsr.o platform.o
obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_MIPS_PB1000) += pb1000/
obj-$(CONFIG_MIPS_PB1100) += pb1100/
obj-$(CONFIG_MIPS_PB1200) += pb1200/
obj-$(CONFIG_MIPS_PB1500) += pb1500/
Expand Down
8 changes: 0 additions & 8 deletions arch/mips/alchemy/devboards/pb1000/Makefile

This file was deleted.

209 changes: 0 additions & 209 deletions arch/mips/alchemy/devboards/pb1000/board_setup.c

This file was deleted.

2 changes: 1 addition & 1 deletion arch/mips/alchemy/devboards/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <asm/mach-au1x00/au1000.h>
#include <prom.h>

#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_DB1000) || \
#if defined(CONFIG_MIPS_DB1000) || \
defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_DB1100) || \
defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_DB1500) || \
defined(CONFIG_MIPS_BOSPORUS) || defined(CONFIG_MIPS_MIRAGE)
Expand Down
87 changes: 0 additions & 87 deletions arch/mips/include/asm/mach-pb1x00/pb1000.h

This file was deleted.

5 changes: 1 addition & 4 deletions drivers/net/irda/au1k_ir.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/au1000.h>
#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100)
#include <asm/pb1000.h>
#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
#include <asm/db1x00.h>
#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
#include <asm/mach-db1x00/bcsr.h>
#else
#error au1k_ir: unsupported board
Expand Down
Loading

0 comments on commit 3f72408

Please sign in to comment.