3 files changed, 17 insertions, 27 deletions
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 7043f6b9ff3c..0d0f054a02f4 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,15 +76,9 @@ void __init plat_mem_setup(void)
 #ifdef CONFIG_VT
        screen_info = (struct screen_info) {
-                0, 0,           /* orig-x, orig-y */
+                .orig_video_cols        = 160,
-                0,              /* unused */
+                .orig_video_lines       = 64,
-                0,              /* orig_video_page */
+                .orig_video_points      = 16,
-                0,              /* orig_video_mode */
-                160,            /* orig_video_cols */
-                0, 0, 0,        /* unused, ega_bx, unused */
-                64,             /* orig_video_lines */
-                0,              /* orig_video_isVGA */
-                16              /* orig_video_points */
        };
 #endif
diff --git a/arch/mips/loongson/common/setup.c b/arch/mips/loongson/common/setup.c
index 4cd2aa9a342c..27d826bc7103 100644
--- a/arch/mips/loongson/common/setup.c
+++ b/arch/mips/loongson/common/setup.c
@@ -41,15 +41,12 @@ void __init plat_mem_setup(void)
        conswitchp = &vga_con;
        screen_info = (struct screen_info) {
-                0, 25,          /* orig-x, orig-y */
+                .orig_x                 = 0,
-                    0,          /* unused */
+                .orig_y                 = 25,
-                    0,          /* orig-video-page */
+                .orig_video_cols        = 80,
-                    0,          /* orig-video-mode */
+                .orig_video_lines       = 25,
-                    80,         /* orig-video-cols */
+                .orig_video_isVGA       = VIDEO_TYPE_VGAC,
-                    0, 0, 0,    /* ega_ax, ega_bx, ega_cx */
+                .orig_video_points      = 16,
-                    25,         /* orig-video-lines */
-                    VIDEO_TYPE_VGAC,    /* orig-video-isVGA */
-                    16          /* orig-video-points */
        };
 #elif defined(CONFIG_DUMMY_CONSOLE)
        conswitchp = &dummy_con;
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index 5277aac96b0f..c308989fc464 100644
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -145,15 +145,14 @@ void __init plat_mem_setup(void)
 #ifdef CONFIG_VT
        screen_info = (struct screen_info) {
-                0, 0,           /* orig-x, orig-y */
+                .orig_video_page        = 52,
-                0,              /* unused */
+                .orig_video_mode        = 3,
-                52,             /* orig_video_page */
+                .orig_video_cols        = 80,
-                3,              /* orig_video_mode */
+                .flags                  = 12,
-                80,             /* orig_video_cols */
+                .orig_video_ega_bx      = 3,
-                4626, 3, 9,     /* unused, ega_bx, unused */
+                .orig_video_lines       = 25,
-                25,             /* orig_video_lines */
+                .orig_video_isVGA       = 0x22,
-                0x22,           /* orig_video_isVGA */
+                .orig_video_points      = 16,
-                16              /* orig_video_points */
       };
       /* XXXKW for CFE, get lines/cols from environment */
 #endif

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 7043f6b9ff3c..0d0f054a02f4 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c
@@ -76,15 +76,9 @@ void __init plat_mem_setup(void)
76		76
77	#ifdef CONFIG_VT	77	#ifdef CONFIG_VT
78	screen_info = (struct screen_info) {	78	screen_info = (struct screen_info) {
79	0, 0, /* orig-x, orig-y */	79	.orig_video_cols = 160,
80	0, /* unused */	80	.orig_video_lines = 64,
81	0, /* orig_video_page */	81	.orig_video_points = 16,
82	0, /* orig_video_mode */
83	160, /* orig_video_cols */
84	0, 0, 0, /* unused, ega_bx, unused */
85	64, /* orig_video_lines */
86	0, /* orig_video_isVGA */
87	16 /* orig_video_points */
88	};	82	};
89	#endif	83	#endif
90		84


diff --git a/arch/mips/loongson/common/setup.c b/arch/mips/loongson/common/setup.c index 4cd2aa9a342c..27d826bc7103 100644 --- a/arch/mips/loongson/common/setup.c +++ b/arch/mips/loongson/common/setup.c
@@ -41,15 +41,12 @@ void __init plat_mem_setup(void)
41	conswitchp = &vga_con;	41	conswitchp = &vga_con;
42		42
43	screen_info = (struct screen_info) {	43	screen_info = (struct screen_info) {
44	0, 25, /* orig-x, orig-y */	44	.orig_x = 0,
45	0, /* unused */	45	.orig_y = 25,
46	0, /* orig-video-page */	46	.orig_video_cols = 80,
47	0, /* orig-video-mode */	47	.orig_video_lines = 25,
48	80, /* orig-video-cols */	48	.orig_video_isVGA = VIDEO_TYPE_VGAC,
49	0, 0, 0, /* ega_ax, ega_bx, ega_cx */	49	.orig_video_points = 16,
50	25, /* orig-video-lines */
51	VIDEO_TYPE_VGAC, /* orig-video-isVGA */
52	16 /* orig-video-points */
53	};	50	};
54	#elif defined(CONFIG_DUMMY_CONSOLE)	51	#elif defined(CONFIG_DUMMY_CONSOLE)
55	conswitchp = &dummy_con;	52	conswitchp = &dummy_con;


diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 5277aac96b0f..c308989fc464 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c
@@ -145,15 +145,14 @@ void __init plat_mem_setup(void)
145		145
146	#ifdef CONFIG_VT	146	#ifdef CONFIG_VT
147	screen_info = (struct screen_info) {	147	screen_info = (struct screen_info) {
148	0, 0, /* orig-x, orig-y */	148	.orig_video_page = 52,
149	0, /* unused */	149	.orig_video_mode = 3,
150	52, /* orig_video_page */	150	.orig_video_cols = 80,
151	3, /* orig_video_mode */	151	.flags = 12,
152	80, /* orig_video_cols */	152	.orig_video_ega_bx = 3,
153	4626, 3, 9, /* unused, ega_bx, unused */	153	.orig_video_lines = 25,
154	25, /* orig_video_lines */	154	.orig_video_isVGA = 0x22,
155	0x22, /* orig_video_isVGA */	155	.orig_video_points = 16,
156	16 /* orig_video_points */
157	};	156	};
158	/* XXXKW for CFE, get lines/cols from environment */	157	/* XXXKW for CFE, get lines/cols from environment */
159	#endif	158	#endif