1 files changed, 66 insertions, 66 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 90ab022eabeb..855e0e77d563 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -385,76 +385,76 @@ static struct mv_sata_platform_data dns323_sata_data = {
 /****************************************************************************
 * General Setup
 */
-static struct orion5x_mpp_mode dns323a_mpp_modes[] __initdata = {
+static unsigned int dns323a_mpp_modes[] __initdata = {
-        {  0, MPP_PCIE_RST_OUTn },
+        MPP0_PCIE_RST_OUTn,
-        {  1, MPP_GPIO },               /* right amber LED (sata ch0) */
+        MPP1_GPIO,              /* right amber LED (sata ch0) */
-        {  2, MPP_GPIO },               /* left amber LED (sata ch1) */
+        MPP2_GPIO,              /* left amber LED (sata ch1) */
-        {  3, MPP_UNUSED },
+        MPP3_UNUSED,
-        {  4, MPP_GPIO },               /* power button LED */
+        MPP4_GPIO,              /* power button LED */
-        {  5, MPP_GPIO },               /* power button LED */
+        MPP5_GPIO,              /* power button LED */
-        {  6, MPP_GPIO },               /* GMT G751-2f overtemp */
+        MPP6_GPIO,              /* GMT G751-2f overtemp */
-        {  7, MPP_GPIO },               /* M41T80 nIRQ/OUT/SQW */
+        MPP7_GPIO,              /* M41T80 nIRQ/OUT/SQW */
-        {  8, MPP_GPIO },               /* triggers power off */
+        MPP8_GPIO,              /* triggers power off */
-        {  9, MPP_GPIO },               /* power button switch */
+        MPP9_GPIO,              /* power button switch */
-        { 10, MPP_GPIO },               /* reset button switch */
+        MPP10_GPIO,             /* reset button switch */
-        { 11, MPP_UNUSED },
+        MPP11_UNUSED,
-        { 12, MPP_UNUSED },
+        MPP12_UNUSED,
-        { 13, MPP_UNUSED },
+        MPP13_UNUSED,
-        { 14, MPP_UNUSED },
+        MPP14_UNUSED,
-        { 15, MPP_UNUSED },
+        MPP15_UNUSED,
-        { 16, MPP_UNUSED },
+        MPP16_UNUSED,
-        { 17, MPP_UNUSED },
+        MPP17_UNUSED,
-        { 18, MPP_UNUSED },
+        MPP18_UNUSED,
-        { 19, MPP_UNUSED },
+        MPP19_UNUSED,
-        { -1 },
+        0,
 };
-static struct orion5x_mpp_mode dns323b_mpp_modes[] __initdata = {
+static unsigned int dns323b_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
+        MPP0_UNUSED,
-        {  1, MPP_GPIO },               /* right amber LED (sata ch0) */
+        MPP1_GPIO,              /* right amber LED (sata ch0) */
-        {  2, MPP_GPIO },               /* left amber LED (sata ch1) */
+        MPP2_GPIO,              /* left amber LED (sata ch1) */
-        {  3, MPP_GPIO },               /* system up flag */
+        MPP3_GPIO,              /* system up flag */
-        {  4, MPP_GPIO },               /* power button LED */
+        MPP4_GPIO,              /* power button LED */
-        {  5, MPP_GPIO },               /* power button LED */
+        MPP5_GPIO,              /* power button LED */
-        {  6, MPP_GPIO },               /* GMT G751-2f overtemp */
+        MPP6_GPIO,              /* GMT G751-2f overtemp */
-        {  7, MPP_GPIO },               /* M41T80 nIRQ/OUT/SQW */
+        MPP7_GPIO,              /* M41T80 nIRQ/OUT/SQW */
-        {  8, MPP_GPIO },               /* triggers power off */
+        MPP8_GPIO,              /* triggers power off */
-        {  9, MPP_GPIO },               /* power button switch */
+        MPP9_GPIO,              /* power button switch */
-        { 10, MPP_GPIO },               /* reset button switch */
+        MPP10_GPIO,             /* reset button switch */
-        { 11, MPP_UNUSED },
+        MPP11_UNUSED,
-        { 12, MPP_SATA_LED },
+        MPP12_SATA_LED,
-        { 13, MPP_SATA_LED },
+        MPP13_SATA_LED,
-        { 14, MPP_SATA_LED },
+        MPP14_SATA_LED,
-        { 15, MPP_SATA_LED },
+        MPP15_SATA_LED,
-        { 16, MPP_UNUSED },
+        MPP16_UNUSED,
-        { 17, MPP_UNUSED },
+        MPP17_UNUSED,
-        { 18, MPP_UNUSED },
+        MPP18_UNUSED,
-        { 19, MPP_UNUSED },
+        MPP19_UNUSED,
-        { -1 },
+        0,
 };
-static struct orion5x_mpp_mode dns323c_mpp_modes[] __initdata = {
+static unsigned int dns323c_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* ? input */
+        MPP0_GPIO,              /* ? input */
-        {  1, MPP_GPIO },               /* input power switch (0 = pressed) */
+        MPP1_GPIO,              /* input power switch (0 = pressed) */
-        {  2, MPP_GPIO },               /* output power off */
+        MPP2_GPIO,              /* output power off */
-        {  3, MPP_UNUSED },             /* ? output */
+        MPP3_UNUSED,            /* ? output */
-        {  4, MPP_UNUSED },             /* ? output */
+        MPP4_UNUSED,            /* ? output */
-        {  5, MPP_UNUSED },             /* ? output */
+        MPP5_UNUSED,            /* ? output */
-        {  6, MPP_UNUSED },             /* ? output */
+        MPP6_UNUSED,            /* ? output */
-        {  7, MPP_UNUSED },             /* ? output */
+        MPP7_UNUSED,            /* ? output */
-        {  8, MPP_GPIO },               /* i/o right amber LED */
+        MPP8_GPIO,              /* i/o right amber LED */
-        {  9, MPP_GPIO },               /* i/o left amber LED */
+        MPP9_GPIO,              /* i/o left amber LED */
-        { 10, MPP_GPIO },               /* input */
+        MPP10_GPIO,             /* input */
-        { 11, MPP_UNUSED },
+        MPP11_UNUSED,
-        { 12, MPP_SATA_LED },
+        MPP12_SATA_LED,
-        { 13, MPP_SATA_LED },
+        MPP13_SATA_LED,
-        { 14, MPP_SATA_LED },
+        MPP14_SATA_LED,
-        { 15, MPP_SATA_LED },
+        MPP15_SATA_LED,
-        { 16, MPP_UNUSED },
+        MPP16_UNUSED,
-        { 17, MPP_GPIO },               /* power button LED */
+        MPP17_GPIO,             /* power button LED */
-        { 18, MPP_GPIO },               /* fan speed bit 0 */
+        MPP18_GPIO,             /* fan speed bit 0 */
-        { 19, MPP_GPIO },               /* fan speed bit 1 */
+        MPP19_GPIO,             /* fan speed bit 1 */
-        { -1 },
+        0,
 };
 /* Rev C1 Fan speed notes:

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 90ab022eabeb..855e0e77d563 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -385,76 +385,76 @@ static struct mv_sata_platform_data dns323_sata_data = {
385	/****************************************************************************	385	/****************************************************************************
386	* General Setup	386	* General Setup
387	*/	387	*/
388	static struct orion5x_mpp_mode dns323a_mpp_modes[] __initdata = {	388	static unsigned int dns323a_mpp_modes[] __initdata = {
389	{ 0, MPP_PCIE_RST_OUTn },	389	MPP0_PCIE_RST_OUTn,
390	{ 1, MPP_GPIO }, /* right amber LED (sata ch0) */	390	MPP1_GPIO, /* right amber LED (sata ch0) */
391	{ 2, MPP_GPIO }, /* left amber LED (sata ch1) */	391	MPP2_GPIO, /* left amber LED (sata ch1) */
392	{ 3, MPP_UNUSED },	392	MPP3_UNUSED,
393	{ 4, MPP_GPIO }, /* power button LED */	393	MPP4_GPIO, /* power button LED */
394	{ 5, MPP_GPIO }, /* power button LED */	394	MPP5_GPIO, /* power button LED */
395	{ 6, MPP_GPIO }, /* GMT G751-2f overtemp */	395	MPP6_GPIO, /* GMT G751-2f overtemp */
396	{ 7, MPP_GPIO }, /* M41T80 nIRQ/OUT/SQW */	396	MPP7_GPIO, /* M41T80 nIRQ/OUT/SQW */
397	{ 8, MPP_GPIO }, /* triggers power off */	397	MPP8_GPIO, /* triggers power off */
398	{ 9, MPP_GPIO }, /* power button switch */	398	MPP9_GPIO, /* power button switch */
399	{ 10, MPP_GPIO }, /* reset button switch */	399	MPP10_GPIO, /* reset button switch */
400	{ 11, MPP_UNUSED },	400	MPP11_UNUSED,
401	{ 12, MPP_UNUSED },	401	MPP12_UNUSED,
402	{ 13, MPP_UNUSED },	402	MPP13_UNUSED,
403	{ 14, MPP_UNUSED },	403	MPP14_UNUSED,
404	{ 15, MPP_UNUSED },	404	MPP15_UNUSED,
405	{ 16, MPP_UNUSED },	405	MPP16_UNUSED,
406	{ 17, MPP_UNUSED },	406	MPP17_UNUSED,
407	{ 18, MPP_UNUSED },	407	MPP18_UNUSED,
408	{ 19, MPP_UNUSED },	408	MPP19_UNUSED,
409	{ -1 },	409	0,
410	};	410	};
411		411
412	static struct orion5x_mpp_mode dns323b_mpp_modes[] __initdata = {	412	static unsigned int dns323b_mpp_modes[] __initdata = {
413	{ 0, MPP_UNUSED },	413	MPP0_UNUSED,
414	{ 1, MPP_GPIO }, /* right amber LED (sata ch0) */	414	MPP1_GPIO, /* right amber LED (sata ch0) */
415	{ 2, MPP_GPIO }, /* left amber LED (sata ch1) */	415	MPP2_GPIO, /* left amber LED (sata ch1) */
416	{ 3, MPP_GPIO }, /* system up flag */	416	MPP3_GPIO, /* system up flag */
417	{ 4, MPP_GPIO }, /* power button LED */	417	MPP4_GPIO, /* power button LED */
418	{ 5, MPP_GPIO }, /* power button LED */	418	MPP5_GPIO, /* power button LED */
419	{ 6, MPP_GPIO }, /* GMT G751-2f overtemp */	419	MPP6_GPIO, /* GMT G751-2f overtemp */
420	{ 7, MPP_GPIO }, /* M41T80 nIRQ/OUT/SQW */	420	MPP7_GPIO, /* M41T80 nIRQ/OUT/SQW */
421	{ 8, MPP_GPIO }, /* triggers power off */	421	MPP8_GPIO, /* triggers power off */
422	{ 9, MPP_GPIO }, /* power button switch */	422	MPP9_GPIO, /* power button switch */
423	{ 10, MPP_GPIO }, /* reset button switch */	423	MPP10_GPIO, /* reset button switch */
424	{ 11, MPP_UNUSED },	424	MPP11_UNUSED,
425	{ 12, MPP_SATA_LED },	425	MPP12_SATA_LED,
426	{ 13, MPP_SATA_LED },	426	MPP13_SATA_LED,
427	{ 14, MPP_SATA_LED },	427	MPP14_SATA_LED,
428	{ 15, MPP_SATA_LED },	428	MPP15_SATA_LED,
429	{ 16, MPP_UNUSED },	429	MPP16_UNUSED,
430	{ 17, MPP_UNUSED },	430	MPP17_UNUSED,
431	{ 18, MPP_UNUSED },	431	MPP18_UNUSED,
432	{ 19, MPP_UNUSED },	432	MPP19_UNUSED,
433	{ -1 },	433	0,
434	};	434	};
435		435
436	static struct orion5x_mpp_mode dns323c_mpp_modes[] __initdata = {	436	static unsigned int dns323c_mpp_modes[] __initdata = {
437	{ 0, MPP_GPIO }, /* ? input */	437	MPP0_GPIO, /* ? input */
438	{ 1, MPP_GPIO }, /* input power switch (0 = pressed) */	438	MPP1_GPIO, /* input power switch (0 = pressed) */
439	{ 2, MPP_GPIO }, /* output power off */	439	MPP2_GPIO, /* output power off */
440	{ 3, MPP_UNUSED }, /* ? output */	440	MPP3_UNUSED, /* ? output */
441	{ 4, MPP_UNUSED }, /* ? output */	441	MPP4_UNUSED, /* ? output */
442	{ 5, MPP_UNUSED }, /* ? output */	442	MPP5_UNUSED, /* ? output */
443	{ 6, MPP_UNUSED }, /* ? output */	443	MPP6_UNUSED, /* ? output */
444	{ 7, MPP_UNUSED }, /* ? output */	444	MPP7_UNUSED, /* ? output */
445	{ 8, MPP_GPIO }, /* i/o right amber LED */	445	MPP8_GPIO, /* i/o right amber LED */
446	{ 9, MPP_GPIO }, /* i/o left amber LED */	446	MPP9_GPIO, /* i/o left amber LED */
447	{ 10, MPP_GPIO }, /* input */	447	MPP10_GPIO, /* input */
448	{ 11, MPP_UNUSED },	448	MPP11_UNUSED,
449	{ 12, MPP_SATA_LED },	449	MPP12_SATA_LED,
450	{ 13, MPP_SATA_LED },	450	MPP13_SATA_LED,
451	{ 14, MPP_SATA_LED },	451	MPP14_SATA_LED,
452	{ 15, MPP_SATA_LED },	452	MPP15_SATA_LED,
453	{ 16, MPP_UNUSED },	453	MPP16_UNUSED,
454	{ 17, MPP_GPIO }, /* power button LED */	454	MPP17_GPIO, /* power button LED */
455	{ 18, MPP_GPIO }, /* fan speed bit 0 */	455	MPP18_GPIO, /* fan speed bit 0 */
456	{ 19, MPP_GPIO }, /* fan speed bit 1 */	456	MPP19_GPIO, /* fan speed bit 1 */
457	{ -1 },	457	0,
458	};	458	};
459		459
460	/* Rev C1 Fan speed notes:	460	/* Rev C1 Fan speed notes: