1 files changed, 33 insertions, 6 deletions
diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma2rh/markeins/platform.c
index 0b884a12170d..be13cecfc06f 100644
--- a/arch/mips/emma2rh/markeins/platform.c
+++ b/arch/mips/emma2rh/markeins/platform.c
@@ -44,18 +44,45 @@
 #define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */
 static struct resource i2c_emma_resources_0[] = {
-        { NULL, EMMA2RH_IRQ_PIIC0, EMMA2RH_IRQ_PIIC0, IORESOURCE_IRQ },
+        {
-        { NULL, KSEG1ADDR(EMMA2RH_PIIC0_BASE), KSEG1ADDR(EMMA2RH_PIIC0_BASE + 0x1000), 0 },
+                .name   = NULL,
+                .start  = EMMA2RH_IRQ_PIIC0,
+                .end    = EMMA2RH_IRQ_PIIC0,
+                .flags  = IORESOURCE_IRQ
+        }, {
+                .name   = NULL,
+                .start  = KSEG1ADDR(EMMA2RH_PIIC0_BASE),
+                .end    = KSEG1ADDR(EMMA2RH_PIIC0_BASE + 0x1000),
+                .flags  = 0
+        },
 };
 struct resource i2c_emma_resources_1[] = {
-        { NULL, EMMA2RH_IRQ_PIIC1, EMMA2RH_IRQ_PIIC1, IORESOURCE_IRQ },
+        {
-        { NULL, KSEG1ADDR(EMMA2RH_PIIC1_BASE), KSEG1ADDR(EMMA2RH_PIIC1_BASE + 0x1000), 0 },
+                .name   = NULL,
+                .start  = EMMA2RH_IRQ_PIIC1,
+                .end    = EMMA2RH_IRQ_PIIC1,
+                .flags  = IORESOURCE_IRQ
+        }, {
+                .name   = NULL,
+                .start  = KSEG1ADDR(EMMA2RH_PIIC1_BASE),
+                .end    = KSEG1ADDR(EMMA2RH_PIIC1_BASE + 0x1000),
+                .flags  = 0
+        },
 };
 struct resource i2c_emma_resources_2[] = {
-        { NULL, EMMA2RH_IRQ_PIIC2, EMMA2RH_IRQ_PIIC2, IORESOURCE_IRQ },
+        {
-        { NULL, KSEG1ADDR(EMMA2RH_PIIC2_BASE), KSEG1ADDR(EMMA2RH_PIIC2_BASE + 0x1000), 0 },
+                .name   = NULL,
+                .start  = EMMA2RH_IRQ_PIIC2,
+                .end    = EMMA2RH_IRQ_PIIC2,
+                .flags  = IORESOURCE_IRQ
+        }, {
+                .name   = NULL,
+                .start  = KSEG1ADDR(EMMA2RH_PIIC2_BASE),
+                .end    = KSEG1ADDR(EMMA2RH_PIIC2_BASE + 0x1000),
+                .flags  = 0
+        },
 };
 struct platform_device i2c_emma_devices[] = {

diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma2rh/markeins/platform.c index 0b884a12170d..be13cecfc06f 100644 --- a/arch/mips/emma2rh/markeins/platform.c +++ b/arch/mips/emma2rh/markeins/platform.c
@@ -44,18 +44,45 @@
44	#define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */	44	#define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */
45		45
46	static struct resource i2c_emma_resources_0[] = {	46	static struct resource i2c_emma_resources_0[] = {
47	{ NULL, EMMA2RH_IRQ_PIIC0, EMMA2RH_IRQ_PIIC0, IORESOURCE_IRQ },	47	{
48	{ NULL, KSEG1ADDR(EMMA2RH_PIIC0_BASE), KSEG1ADDR(EMMA2RH_PIIC0_BASE + 0x1000), 0 },	48	.name = NULL,
		49	.start = EMMA2RH_IRQ_PIIC0,
		50	.end = EMMA2RH_IRQ_PIIC0,
		51	.flags = IORESOURCE_IRQ
		52	}, {
		53	.name = NULL,
		54	.start = KSEG1ADDR(EMMA2RH_PIIC0_BASE),
		55	.end = KSEG1ADDR(EMMA2RH_PIIC0_BASE + 0x1000),
		56	.flags = 0
		57	},
49	};	58	};
50		59
51	struct resource i2c_emma_resources_1[] = {	60	struct resource i2c_emma_resources_1[] = {
52	{ NULL, EMMA2RH_IRQ_PIIC1, EMMA2RH_IRQ_PIIC1, IORESOURCE_IRQ },	61	{
53	{ NULL, KSEG1ADDR(EMMA2RH_PIIC1_BASE), KSEG1ADDR(EMMA2RH_PIIC1_BASE + 0x1000), 0 },	62	.name = NULL,
		63	.start = EMMA2RH_IRQ_PIIC1,
		64	.end = EMMA2RH_IRQ_PIIC1,
		65	.flags = IORESOURCE_IRQ
		66	}, {
		67	.name = NULL,
		68	.start = KSEG1ADDR(EMMA2RH_PIIC1_BASE),
		69	.end = KSEG1ADDR(EMMA2RH_PIIC1_BASE + 0x1000),
		70	.flags = 0
		71	},
54	};	72	};
55		73
56	struct resource i2c_emma_resources_2[] = {	74	struct resource i2c_emma_resources_2[] = {
57	{ NULL, EMMA2RH_IRQ_PIIC2, EMMA2RH_IRQ_PIIC2, IORESOURCE_IRQ },	75	{
58	{ NULL, KSEG1ADDR(EMMA2RH_PIIC2_BASE), KSEG1ADDR(EMMA2RH_PIIC2_BASE + 0x1000), 0 },	76	.name = NULL,
		77	.start = EMMA2RH_IRQ_PIIC2,
		78	.end = EMMA2RH_IRQ_PIIC2,
		79	.flags = IORESOURCE_IRQ
		80	}, {
		81	.name = NULL,
		82	.start = KSEG1ADDR(EMMA2RH_PIIC2_BASE),
		83	.end = KSEG1ADDR(EMMA2RH_PIIC2_BASE + 0x1000),
		84	.flags = 0
		85	},
59	};	86	};
60		87
61	struct platform_device i2c_emma_devices[] = {	88	struct platform_device i2c_emma_devices[] = {