1 files changed, 62 insertions, 14 deletions
diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c
index fc73c8d69df7..da6ae0991199 100644
--- a/arch/mips/ite-boards/generic/it8172_setup.c
+++ b/arch/mips/ite-boards/generic/it8172_setup.c
@@ -72,11 +72,29 @@ struct {
    struct resource flash;
    struct resource boot;
 } it8172_resources = {
-    { "RAM",           0,          0,          IORESOURCE_MEM }, /* to be initted */
+        {
-    { "PCI Mem",       0x10000000, 0x13FFFFFF, IORESOURCE_MEM },
+                .start  = 0,                            /* to be initted */
-    { "PCI I/O",       0x14000000, 0x17FFFFFF                 },
+                .end    = 0,
-    { "Flash",         0x08000000, 0x0CFFFFFF                 },
+                .name   = "RAM",
-    { "Boot ROM",      0x1FC00000, 0x1FFFFFFF                 }
+                .flags  = IORESOURCE_MEM
+        }, {
+                .start  = 0x10000000,
+                .end    = 0x13FFFFFF,
+                .name   = "PCI Mem",
+                .flags  = IORESOURCE_MEM
+        }, {
+                .start  = 0x14000000,
+                .end    = 0x17FFFFFF
+                .name   = "PCI I/O",
+        }, {
+                .start  = 0x08000000,
+                .end    = 0x0CFFFFFF
+                .name   = "Flash",
+        }, {
+                .start  = 0x1FC00000,
+                .end    = 0x1FFFFFFF
+                .name   = "Boot ROM",
+        }
 };
 #else
 struct {
@@ -89,14 +107,44 @@ struct {
    struct resource flash;
    struct resource boot;
 } it8172_resources = {
-    { "RAM",           0,          0,          IORESOURCE_MEM }, /* to be initted */
+        {
-    { "PCI Mem0",      0x0C000000, 0x0FFFFFFF, IORESOURCE_MEM },
+                .start  = 0,                            /* to be initted */
-    { "PCI Mem1",      0x10000000, 0x13FFFFFF, IORESOURCE_MEM },
+                .end    = 0,
-    { "PCI I/O",       0x14000000, 0x17FFFFFF                 },
+                .name   = "RAM",
-    { "PCI Mem2",      0x1A000000, 0x1BFFFFFF, IORESOURCE_MEM },
+                .flags  = IORESOURCE_MEM
-    { "PCI Mem3",      0x1C000000, 0x1FBFFFFF, IORESOURCE_MEM },
+        }, {
-    { "Flash",         0x08000000, 0x0CFFFFFF                 },
+                .start  = 0x0C000000,
-    { "Boot ROM",      0x1FC00000, 0x1FFFFFFF                 }
+                .end    = 0x0FFFFFFF,
+                .name   = "PCI Mem0",
+                .flags  = IORESOURCE_MEM
+         }, {
+                .start  = 0x10000000,
+                .end    = 0x13FFFFFF,
+                .name   = "PCI Mem1",
+                .flags  = IORESOURCE_MEM
+         }, {
+                .start  = 0x14000000,
+                .end    = 0x17FFFFFF
+                .name   = "PCI I/O",
+        }, {
+                .start  = 0x1A000000,
+                .end    = 0x1BFFFFFF,
+                .name   = "PCI Mem2",
+                .flags  = IORESOURCE_MEM
+        }, {
+                .start  = 0x1C000000,
+                .end    = 0x1FBFFFFF,
+                .name   = "PCI Mem3",
+                .flags  = IORESOURCE_MEM
+        }, {
+                .start  = 0x08000000,
+                .end    = 0x0CFFFFFF
+                .name   = "Flash",
+        }, {
+                .start  = 0x1FC00000,
+                .end    = 0x1FFFFFFF
+                .name   = "Boot ROM",
+        }
 };
 #endif
@@ -106,7 +154,7 @@ void __init it8172_init_ram_resource(unsigned long memsize)
        it8172_resources.ram.end = memsize;
 }
-void __init plat_setup(void)
+void __init plat_mem_setup(void)
 {
        unsigned short dsr;
        char *argptr;

diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c index fc73c8d69df7..da6ae0991199 100644 --- a/arch/mips/ite-boards/generic/it8172_setup.c +++ b/arch/mips/ite-boards/generic/it8172_setup.c
@@ -72,11 +72,29 @@ struct {
72	struct resource flash;	72	struct resource flash;
73	struct resource boot;	73	struct resource boot;
74	} it8172_resources = {	74	} it8172_resources = {
75	{ "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */	75	{
76	{ "PCI Mem", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM },	76	.start = 0, /* to be initted */
77	{ "PCI I/O", 0x14000000, 0x17FFFFFF },	77	.end = 0,
78	{ "Flash", 0x08000000, 0x0CFFFFFF },	78	.name = "RAM",
79	{ "Boot ROM", 0x1FC00000, 0x1FFFFFFF }	79	.flags = IORESOURCE_MEM
		80	}, {
		81	.start = 0x10000000,
		82	.end = 0x13FFFFFF,
		83	.name = "PCI Mem",
		84	.flags = IORESOURCE_MEM
		85	}, {
		86	.start = 0x14000000,
		87	.end = 0x17FFFFFF
		88	.name = "PCI I/O",
		89	}, {
		90	.start = 0x08000000,
		91	.end = 0x0CFFFFFF
		92	.name = "Flash",
		93	}, {
		94	.start = 0x1FC00000,
		95	.end = 0x1FFFFFFF
		96	.name = "Boot ROM",
		97	}
80	};	98	};
81	#else	99	#else
82	struct {	100	struct {
@@ -89,14 +107,44 @@ struct {
89	struct resource flash;	107	struct resource flash;
90	struct resource boot;	108	struct resource boot;
91	} it8172_resources = {	109	} it8172_resources = {
92	{ "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */	110	{
93	{ "PCI Mem0", 0x0C000000, 0x0FFFFFFF, IORESOURCE_MEM },	111	.start = 0, /* to be initted */
94	{ "PCI Mem1", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM },	112	.end = 0,
95	{ "PCI I/O", 0x14000000, 0x17FFFFFF },	113	.name = "RAM",
96	{ "PCI Mem2", 0x1A000000, 0x1BFFFFFF, IORESOURCE_MEM },	114	.flags = IORESOURCE_MEM
97	{ "PCI Mem3", 0x1C000000, 0x1FBFFFFF, IORESOURCE_MEM },	115	}, {
98	{ "Flash", 0x08000000, 0x0CFFFFFF },	116	.start = 0x0C000000,
99	{ "Boot ROM", 0x1FC00000, 0x1FFFFFFF }	117	.end = 0x0FFFFFFF,
		118	.name = "PCI Mem0",
		119	.flags = IORESOURCE_MEM
		120	}, {
		121	.start = 0x10000000,
		122	.end = 0x13FFFFFF,
		123	.name = "PCI Mem1",
		124	.flags = IORESOURCE_MEM
		125	}, {
		126	.start = 0x14000000,
		127	.end = 0x17FFFFFF
		128	.name = "PCI I/O",
		129	}, {
		130	.start = 0x1A000000,
		131	.end = 0x1BFFFFFF,
		132	.name = "PCI Mem2",
		133	.flags = IORESOURCE_MEM
		134	}, {
		135	.start = 0x1C000000,
		136	.end = 0x1FBFFFFF,
		137	.name = "PCI Mem3",
		138	.flags = IORESOURCE_MEM
		139	}, {
		140	.start = 0x08000000,
		141	.end = 0x0CFFFFFF
		142	.name = "Flash",
		143	}, {
		144	.start = 0x1FC00000,
		145	.end = 0x1FFFFFFF
		146	.name = "Boot ROM",
		147	}
100	};	148	};
101	#endif	149	#endif
102		150
@@ -106,7 +154,7 @@ void __init it8172_init_ram_resource(unsigned long memsize)
106	it8172_resources.ram.end = memsize;	154	it8172_resources.ram.end = memsize;
107	}	155	}
108		156
109	void __init plat_setup(void)	157	void __init plat_mem_setup(void)
110	{	158	{
111	unsigned short dsr;	159	unsigned short dsr;
112	char *argptr;	160	char *argptr;