[SPARC64]: Recognize "virtual-console" as input and output console device.

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 15 insertions, 0 deletions

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index ca75f3b26a37..4f253a0755b0 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -405,6 +405,11 @@ static int __init set_preferred_console(void)
                 serial_console = 2;
         } else if (idev == PROMDEV_IRSC && odev == PROMDEV_ORSC) {
                 serial_console = 3;
+        } else if (idev == PROMDEV_IVCONS && odev == PROMDEV_OVCONS) {
+                /* sunhv_console_init() doesn't check the serial_console
+                 * value anyways...
+                 */
+                serial_console = 4;
         } else {
                 prom_printf("Inconsistent console: "
                             "input %d, output %d\n",
diff --git a/arch/sparc64/prom/console.c b/arch/sparc64/prom/console.c
index ac6d035dd150..7c25c54cefdc 100644
--- a/arch/sparc64/prom/console.c
+++ b/arch/sparc64/prom/console.c
@@ -102,6 +102,9 @@ prom_query_input_device(void)
         if (!strncmp (propb, "rsc", 3))
                 return PROMDEV_IRSC;
 
+        if (!strncmp (propb, "virtual-console", 3))
+                return PROMDEV_IVCONS;
+
         if (strncmp (propb, "tty", 3) || !propb[3])
                 return PROMDEV_I_UNK;
 
@@ -143,6 +146,9 @@ prom_query_output_device(void)
         if (!strncmp (propb, "rsc", 3))
                 return PROMDEV_ORSC;
 
+        if (!strncmp (propb, "virtual-console", 3))
+                return PROMDEV_OVCONS;
+
         if (strncmp (propb, "tty", 3) || !propb[3])
                 return PROMDEV_O_UNK;
 
diff --git a/include/asm-sparc/oplib.h b/include/asm-sparc/oplib.h
index d0d76b30eb4c..f283f8aaf6a9 100644
--- a/include/asm-sparc/oplib.h
+++ b/include/asm-sparc/oplib.h
@@ -165,6 +165,7 @@ enum prom_input_device {
         PROMDEV_ITTYA,                  /* input from ttya */
         PROMDEV_ITTYB,                  /* input from ttyb */
         PROMDEV_IRSC,                   /* input from rsc */
+        PROMDEV_IVCONS,                 /* input from virtual-console */
         PROMDEV_I_UNK,
 };
 
@@ -177,6 +178,7 @@ enum prom_output_device {
         PROMDEV_OTTYA,                  /* to ttya */
         PROMDEV_OTTYB,                  /* to ttyb */
         PROMDEV_ORSC,                   /* to rsc */
+        PROMDEV_OVCONS,                 /* to virtual-console */
         PROMDEV_O_UNK,
 };
 
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h
index ce5066ef2dd0..0631d13475f2 100644
--- a/include/asm-sparc64/oplib.h
+++ b/include/asm-sparc64/oplib.h
@@ -167,6 +167,7 @@ enum prom_input_device {
         PROMDEV_ITTYA,                  /* input from ttya */
         PROMDEV_ITTYB,                  /* input from ttyb */
         PROMDEV_IRSC,                   /* input from rsc */
+        PROMDEV_IVCONS,                 /* input from virtual-console */
         PROMDEV_I_UNK,
 };
 
@@ -179,6 +180,7 @@ enum prom_output_device {
         PROMDEV_OTTYA,                  /* to ttya */
         PROMDEV_OTTYB,                  /* to ttyb */
         PROMDEV_ORSC,                   /* to rsc */
+        PROMDEV_OVCONS,                 /* to virtual-console */
         PROMDEV_O_UNK,
 };