diff options
| author | Morten H. Larsen <m-larsen@post6.tele.dk> | 2010-06-15 13:22:11 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2010-06-15 14:19:08 -0400 |
| commit | 932e0c201d28a728e25d3b641aa95bd28ceb08b4 (patch) | |
| tree | 7212f254ae94954f18d7f37d4970011e123e6cb8 /arch/alpha/kernel/sys_sio.c | |
| parent | 5efa16ff77cb785647a480dcdc70a6b4fc787996 (diff) | |
| download | linux-932e0c201d28a728e25d3b641aa95bd28ceb08b4.tar.gz linux-932e0c201d28a728e25d3b641aa95bd28ceb08b4.tar.bz2 linux-932e0c201d28a728e25d3b641aa95bd28ceb08b4.zip | |
alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19
This patch probes for the Super IO chip and reserves the IO range when
found. It avoids enabling the IDE interface on the Avanti family, since
none has IDE. It enables the Enhanced Parallel Port v1.9 feature.
Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/kernel/sys_sio.c')
| -rw-r--r-- | arch/alpha/kernel/sys_sio.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c index d4327e461c22..85b4aea01ef8 100644 --- a/arch/alpha/kernel/sys_sio.c +++ b/arch/alpha/kernel/sys_sio.c @@ -34,6 +34,7 @@ #include "irq_impl.h" #include "pci_impl.h" #include "machvec_impl.h" +#include "pc873xx.h" #if defined(ALPHA_RESTORE_SRM_SETUP) /* Save LCA configuration data as the console had it set up. */ @@ -208,7 +209,27 @@ noname_init_pci(void) common_init_pci(); sio_pci_route(); sio_fixup_irq_levels(sio_collect_irq_levels()); - ns87312_enable_ide(0x26e); + + if (pc873xx_probe() == -1) { + printk(KERN_ERR "Probing for PC873xx Super IO chip failed.\n"); + } else { + printk(KERN_INFO "Found %s Super IO chip at 0x%x\n", + pc873xx_get_model(), pc873xx_get_base()); + + /* Enabling things in the Super IO chip doesn't actually + * configure and enable things, the legacy drivers still + * need to do the actual configuration and enabling. + * This only unblocks them. + */ + +#if !defined(CONFIG_ALPHA_AVANTI) + /* Don't bother on the Avanti family. + * None of them had on-board IDE. + */ + pc873xx_enable_ide(); +#endif + pc873xx_enable_epp19(); + } } static inline void __init |