diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 11:16:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 11:16:37 -0400 |
commit | 13bbd8d90647132fc295d73b122567eb8987d298 (patch) | |
tree | 466ae1f00a5965308ce2e7695d4bfe88d87b9610 /drivers/char | |
parent | 18e6756a6b463e09fd3873592ec6b0579c78103d (diff) | |
parent | 9020fc960b8f5fbca0de6e4d11881ddc827aa61d (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (25 commits)
[POWERPC] Add support for the mpc832x mds board
[POWERPC] Add initial support for the e300c2 core
[POWERPC] Add MPC8360EMDS default dts file
[POWERPC] Add MPC8360EMDS board support
[POWERPC] Add QUICC Engine (QE) infrastructure
[POWERPC] Add QE device tree node definition
[POWERPC] Don't try to just continue if xmon has no input device
[POWERPC] Fix a printk in pseries_mpic_init_IRQ
[POWERPC] Get default baud rate in udbg_scc
[POWERPC] Fix zImage.coff on oldworld PowerMac
[POWERPC] Fix xmon=off and cleanup xmon initialisation
[POWERPC] Cleanup include/asm-powerpc/xmon.h
[POWERPC] Update swim3 printk after blkdev.h change
[POWERPC] Cell interrupt rework
POWERPC: mpc82xx merge: board-specific/platform stuff(resend)
POWERPC: 8272ads merge to powerpc: common stuff
POWERPC: Added devicetree for mpc8272ads board
[POWERPC] iSeries has no legacy I/O
[POWERPC] implement BEGIN/END_FW_FTR_SECTION
[POWERPC] iSeries does not need pcibios_fixup_resources
...
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hvc_iseries.c | 8 | ||||
-rw-r--r-- | drivers/char/hvc_vio.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c index 8b6f197e5f8c..f144a947bd17 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/char/hvc_iseries.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <asm/hvconsole.h> | 29 | #include <asm/hvconsole.h> |
30 | #include <asm/vio.h> | 30 | #include <asm/vio.h> |
31 | #include <asm/prom.h> | 31 | #include <asm/prom.h> |
32 | #include <asm/firmware.h> | ||
32 | #include <asm/iseries/vio.h> | 33 | #include <asm/iseries/vio.h> |
33 | #include <asm/iseries/hv_call.h> | 34 | #include <asm/iseries/hv_call.h> |
34 | #include <asm/iseries/hv_lp_config.h> | 35 | #include <asm/iseries/hv_lp_config.h> |
@@ -488,6 +489,9 @@ static int hvc_vio_init(void) | |||
488 | atomic_t wait_flag; | 489 | atomic_t wait_flag; |
489 | int rc; | 490 | int rc; |
490 | 491 | ||
492 | if (!firmware_has_feature(FW_FEATURE_ISERIES)) | ||
493 | return -EIO; | ||
494 | |||
491 | /* +2 for fudge */ | 495 | /* +2 for fudge */ |
492 | rc = viopath_open(HvLpConfig_getPrimaryLpIndex(), | 496 | rc = viopath_open(HvLpConfig_getPrimaryLpIndex(), |
493 | viomajorsubtype_chario, VIOCHAR_WINDOW + 2); | 497 | viomajorsubtype_chario, VIOCHAR_WINDOW + 2); |
@@ -562,7 +566,7 @@ static int hvc_find_vtys(void) | |||
562 | 566 | ||
563 | for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL; | 567 | for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL; |
564 | vty = of_find_node_by_name(vty, "vty")) { | 568 | vty = of_find_node_by_name(vty, "vty")) { |
565 | uint32_t *vtermno; | 569 | const uint32_t *vtermno; |
566 | 570 | ||
567 | /* We have statically defined space for only a certain number | 571 | /* We have statically defined space for only a certain number |
568 | * of console adapters. | 572 | * of console adapters. |
@@ -571,7 +575,7 @@ static int hvc_find_vtys(void) | |||
571 | (num_found >= VTTY_PORTS)) | 575 | (num_found >= VTTY_PORTS)) |
572 | break; | 576 | break; |
573 | 577 | ||
574 | vtermno = (uint32_t *)get_property(vty, "reg", NULL); | 578 | vtermno = get_property(vty, "reg", NULL); |
575 | if (!vtermno) | 579 | if (!vtermno) |
576 | continue; | 580 | continue; |
577 | 581 | ||
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c index cc95941148fb..f9c00844d2bf 100644 --- a/drivers/char/hvc_vio.c +++ b/drivers/char/hvc_vio.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <asm/hvconsole.h> | 35 | #include <asm/hvconsole.h> |
36 | #include <asm/vio.h> | 36 | #include <asm/vio.h> |
37 | #include <asm/prom.h> | 37 | #include <asm/prom.h> |
38 | #include <asm/firmware.h> | ||
38 | 39 | ||
39 | #include "hvc_console.h" | 40 | #include "hvc_console.h" |
40 | 41 | ||
@@ -120,6 +121,9 @@ static int hvc_vio_init(void) | |||
120 | { | 121 | { |
121 | int rc; | 122 | int rc; |
122 | 123 | ||
124 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | ||
125 | return -EIO; | ||
126 | |||
123 | /* Register as a vio device to receive callbacks */ | 127 | /* Register as a vio device to receive callbacks */ |
124 | rc = vio_register_driver(&hvc_vio_driver); | 128 | rc = vio_register_driver(&hvc_vio_driver); |
125 | 129 | ||