Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

m68k: remove old mac_esp cruft

Browse source 
Remove the rest of the old mac_esp driver. Also ditch the rest of the
machw mechanism, it needs to be replaced by a fake openfirmware tree.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Finn Thain 2008-05-05 21:26:15 +02:00 committed by Linus Torvalds
parent 3b17f136bf
commit b6d9d267f0
3 changed files with 0 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/kernel-parameters.txt
View file

@ -1094,9 +1094,6 @@ and is between 256 and 4096 characters. It is defined in the file
mac5380= [HW,SCSI] Format: mac5380= [HW,SCSI] Format:
<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
mac53c9x= [HW,SCSI] Format:
<num_esps>,<disconnect>,<nosync>,<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
machvec= [IA64] Force the use of a particular machine-vector machvec= [IA64] Force the use of a particular machine-vector
(machvec) in a generic kernel. (machvec) in a generic kernel.
Example: machvec=hpzx1_swiotlb Example: machvec=hpzx1_swiotlb

24
arch/m68k/mac/config.c
View file

@ -48,9 +48,6 @@
struct mac_booter_data mac_bi_data; struct mac_booter_data mac_bi_data;
int mac_bisize = sizeof mac_bi_data; int mac_bisize = sizeof mac_bi_data;
struct mac_hw_present mac_hw_present;
EXPORT_SYMBOL(mac_hw_present);
/* New m68k bootinfo stuff and videobase */ /* New m68k bootinfo stuff and videobase */
extern int m68k_num_memory; extern int m68k_num_memory;
@ -817,27 +814,6 @@ void __init mac_identify(void)
m68k_ramdisk.addr, m68k_ramdisk.size); m68k_ramdisk.addr, m68k_ramdisk.size);
#endif #endif
/*
* TODO: set the various fields in macintosh_config->hw_present here!
*/
switch (macintosh_config->scsi_type) {
case MAC_SCSI_OLD:
MACHW_SET(MAC_SCSI_80);
break;
case MAC_SCSI_QUADRA:
case MAC_SCSI_QUADRA2:
case MAC_SCSI_QUADRA3:
MACHW_SET(MAC_SCSI_96);
if ((macintosh_config->ident == MAC_MODEL_Q900) ||
(macintosh_config->ident == MAC_MODEL_Q950))
MACHW_SET(MAC_SCSI_96_2);
break;
default:
printk(KERN_WARNING "config.c: wtf: unknown scsi, using 53c80\n");
MACHW_SET(MAC_SCSI_80);
break;
}
iop_init(); iop_init();
via_init(); via_init();
oss_init(); oss_init();

30
include/asm-m68k/machw.h
View file

@ -66,36 +66,6 @@ struct MAC_SCC
# define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS)) # define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS))
#endif #endif
/* hardware stuff */
#define MACHW_DECLARE(name) unsigned name : 1
#define MACHW_SET(name) (mac_hw_present.name = 1)
#define MACHW_PRESENT(name) (mac_hw_present.name)
struct mac_hw_present {
/* video hardware */
/* sound hardware */
/* disk storage interfaces */
MACHW_DECLARE(MAC_SCSI_80); /* Directly mapped NCR5380 */
MACHW_DECLARE(MAC_SCSI_96); /* 53c9[46] */
MACHW_DECLARE(MAC_SCSI_96_2); /* 2nd 53c9[46] Q900 and Q950 */
MACHW_DECLARE(IDE); /* IDE Interface */
/* other I/O hardware */
MACHW_DECLARE(SCC); /* Serial Communications Contr. */
/* DMA */
MACHW_DECLARE(SCSI_DMA); /* DMA for the NCR5380 */
/* real time clocks */
MACHW_DECLARE(RTC_CLK); /* clock chip */
/* supporting hardware */
MACHW_DECLARE(VIA1); /* Versatile Interface Ad. 1 */
MACHW_DECLARE(VIA2); /* Versatile Interface Ad. 2 */
MACHW_DECLARE(RBV); /* Versatile Interface Ad. 2+ */
/* NUBUS */
MACHW_DECLARE(NUBUS); /* NUBUS */
};
extern struct mac_hw_present mac_hw_present;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* linux/machw.h */ #endif /* linux/machw.h */