Skip to content

Commit f81f335

Browse files
committed
alpha: remove DECpc AXP150 (Jensen) support
This is one of the hackiest Alpha machines, and the only one without PCI support. Removing this allows cleaning up code in eise and tty drivers in addition to the architecture code. Acked-by: Paul E. McKenney <[email protected]> Acked-by: Matt Turner <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 82c525b commit f81f335

File tree

16 files changed

+16
-812
lines changed

16 files changed

+16
-812
lines changed

Documentation/driver-api/eisa.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ eisa_bus.disable_dev
196196
virtual_root.force_probe
197197
Force the probing code to probe EISA slots even when it cannot find an
198198
EISA compliant mainboard (nothing appears on slot 0). Defaults to 0
199-
(don't force), and set to 1 (force probing) when either
200-
CONFIG_ALPHA_JENSEN or CONFIG_EISA_VLB_PRIMING are set.
199+
(don't force), and set to 1 (force probing) when
200+
CONFIG_EISA_VLB_PRIMING is set.
201201

202202
Random notes
203203
============

arch/alpha/Kconfig

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config ALPHA
1010
select ARCH_NO_SG_CHAIN
1111
select ARCH_USE_CMPXCHG_LOCKREF
1212
select DMA_OPS if PCI
13-
select FORCE_PCI if !ALPHA_JENSEN
13+
select FORCE_PCI
1414
select PCI_DOMAINS if PCI
1515
select PCI_SYSCALL if PCI
1616
select HAVE_ASM_MODVERSIONS
@@ -99,7 +99,6 @@ choice
9999
EB64+ EB64+ 21064 evaluation board
100100
EB66 EB66 21066 evaluation board
101101
EB66+ EB66+ 21066 evaluation board
102-
Jensen DECpc 150, DEC 2000 models 300, 500
103102
LX164 AlphaPC164-LX
104103
Lynx AS 2100A
105104
Miata Personal Workstation 433/500/600 a/au
@@ -198,17 +197,6 @@ config ALPHA_EIGER
198197
Apparently an obscure OEM single-board computer based on the
199198
Typhoon/Tsunami chipset family. Information on it is scanty.
200199

201-
config ALPHA_JENSEN
202-
bool "Jensen"
203-
select HAVE_EISA
204-
help
205-
DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one
206-
of the first-generation Alpha systems. A number of these systems
207-
seem to be available on the second- hand market. The Jensen is a
208-
floor-standing tower system which originally used a 150MHz 21064 It
209-
used programmable logic to interface a 486 EISA I/O bridge to the
210-
CPU.
211-
212200
config ALPHA_LX164
213201
bool "LX164"
214202
help
@@ -337,7 +325,7 @@ config ALPHA_NONAME
337325

338326
config ALPHA_EV4
339327
bool
340-
depends on ALPHA_JENSEN || (ALPHA_SABLE && !ALPHA_GAMMA) || ALPHA_LYNX || ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K
328+
depends on (ALPHA_SABLE && !ALPHA_GAMMA) || ALPHA_LYNX || ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K
341329
default y if !ALPHA_LYNX
342330
default y if !ALPHA_EV5
343331

@@ -483,7 +471,7 @@ config ALPHA_QEMU
483471
config ALPHA_SRM
484472
bool "Use SRM as bootloader" if ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_NAUTILUS || ALPHA_NONAME
485473
depends on TTY
486-
default y if ALPHA_JENSEN || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL
474+
default y if ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL
487475
help
488476
There are two different types of booting firmware on Alphas: SRM,
489477
which is command line driven, and ARC, which uses menus and arrow

arch/alpha/include/asm/dma-mapping.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ extern const struct dma_map_ops alpha_pci_ops;
66

77
static inline const struct dma_map_ops *get_arch_dma_ops(void)
88
{
9-
#ifdef CONFIG_ALPHA_JENSEN
10-
return NULL;
11-
#else
129
return &alpha_pci_ops;
13-
#endif
1410
}
1511

1612
#endif /* _ALPHA_DMA_MAPPING_H */

arch/alpha/include/asm/io.h

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ static inline int generic_is_mmio(const volatile void __iomem *a)
209209
# include <asm/core_cia.h>
210210
#elif defined(CONFIG_ALPHA_IRONGATE)
211211
# include <asm/core_irongate.h>
212-
#elif defined(CONFIG_ALPHA_JENSEN)
213-
# include <asm/jensen.h>
214212
#elif defined(CONFIG_ALPHA_LCA)
215213
# include <asm/core_lca.h>
216214
#elif defined(CONFIG_ALPHA_MARVEL)
@@ -631,23 +629,7 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);
631629
#define outsw outsw
632630
#define outsl outsl
633631

634-
/*
635-
* The Alpha Jensen hardware for some rather strange reason puts
636-
* the RTC clock at 0x170 instead of 0x70. Probably due to some
637-
* misguided idea about using 0x70 for NMI stuff.
638-
*
639-
* These defines will override the defaults when doing RTC queries
640-
*/
641-
642-
#ifdef CONFIG_ALPHA_GENERIC
643-
# define RTC_PORT(x) ((x) + alpha_mv.rtc_port)
644-
#else
645-
# ifdef CONFIG_ALPHA_JENSEN
646-
# define RTC_PORT(x) (0x170+(x))
647-
# else
648-
# define RTC_PORT(x) (0x70 + (x))
649-
# endif
650-
#endif
632+
#define RTC_PORT(x) (0x70 + (x))
651633
#define RTC_ALWAYS_BCD 0
652634

653635
/*

0 commit comments

Comments
 (0)