diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2017-10-26 22:45:24 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2017-11-09 23:02:56 +0100 |
| commit | 7a0bb4427024f426668f3ed63542328135282422 (patch) | |
| tree | 337f8080889a9d6f8022ec1ad2a5e2d63d03c524 /arch/m68k/mac/config.c | |
| parent | 0e37a23ebdadc0e34176b816770da6f4ac64043e (diff) | |
| download | op-kernel-dev-7a0bb4427024f426668f3ed63542328135282422.zip op-kernel-dev-7a0bb4427024f426668f3ed63542328135282422.tar.gz | |
m68k/mac: Disentangle VIA and OSS initialization
macintosh_config->via_type is meaningless on Mac IIfx (i.e. the only
model with OSS chip), so skip the via_type switch statement.
Call oss_init() before via_init() because it is more important and
because that is the right place to initialize the oss_present flag.
On this model, bringing forward oss_init() and delaying via_init()
is no problem because those functions are independent.
The only requirement here is that oss_register_interrupts() happens
after via_init(). That is, mac_init_IRQ() happens after config_mac().
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/config.c')
| -rw-r--r-- | arch/m68k/mac/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 22123f7..16cd5ce 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -898,8 +898,8 @@ static void __init mac_identify(void) mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize); iop_init(); - via_init(); oss_init(); + via_init(); psc_init(); baboon_init(); |
