1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c
index a5930f83958b..e43b39cc7fe9 100644
--- a/arch/arm/mach-orion5x/net2big-setup.c
+++ b/arch/arm/mach-orion5x/net2big-setup.c
@@ -339,28 +339,28 @@ static struct platform_device net2big_gpio_buttons = {
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode net2big_mpp_modes[] __initdata = {
+static unsigned int net2big_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },       /* Raid mode (bit 0) */
+        MPP0_GPIO,      /* Raid mode (bit 0) */
-        {  1, MPP_GPIO },       /* USB port 2 fuse (0 = Fail, 1 = Ok) */
+        MPP1_GPIO,      /* USB port 2 fuse (0 = Fail, 1 = Ok) */
-        {  2, MPP_GPIO },       /* Raid mode (bit 1) */
+        MPP2_GPIO,      /* Raid mode (bit 1) */
-        {  3, MPP_GPIO },       /* Board ID (bit 0) */
+        MPP3_GPIO,      /* Board ID (bit 0) */
-        {  4, MPP_GPIO },       /* Fan activity (0 = Off, 1 = On) */
+        MPP4_GPIO,      /* Fan activity (0 = Off, 1 = On) */
-        {  5, MPP_GPIO },       /* Fan fail detection */
+        MPP5_GPIO,      /* Fan fail detection */
-        {  6, MPP_GPIO },       /* Red front LED (0 = Off, 1 = On) */
+        MPP6_GPIO,      /* Red front LED (0 = Off, 1 = On) */
-        {  7, MPP_GPIO },       /* Disable initial blinking on front LED */
+        MPP7_GPIO,      /* Disable initial blinking on front LED */
-        {  8, MPP_GPIO },       /* Rear power switch (on|auto) */
+        MPP8_GPIO,      /* Rear power switch (on|auto) */
-        {  9, MPP_GPIO },       /* Rear power switch (auto|off) */
+        MPP9_GPIO,      /* Rear power switch (auto|off) */
-        { 10, MPP_GPIO },       /* SATA 1 red LED (0 = Off, 1 = On) */
+        MPP10_GPIO,     /* SATA 1 red LED (0 = Off, 1 = On) */
-        { 11, MPP_GPIO },       /* SATA 0 red LED (0 = Off, 1 = On) */
+        MPP11_GPIO,     /* SATA 0 red LED (0 = Off, 1 = On) */
-        { 12, MPP_GPIO },       /* Board ID (bit 1) */
+        MPP12_GPIO,     /* Board ID (bit 1) */
-        { 13, MPP_GPIO },       /* SATA 1 blue LED blink control */
+        MPP13_GPIO,     /* SATA 1 blue LED blink control */
-        { 14, MPP_SATA_LED },
+        MPP14_SATA_LED,
-        { 15, MPP_SATA_LED },
+        MPP15_SATA_LED,
-        { 16, MPP_GPIO },       /* Blue front LED control */
+        MPP16_GPIO,     /* Blue front LED control */
-        { 17, MPP_GPIO },       /* SATA 0 blue LED blink control */
+        MPP17_GPIO,     /* SATA 0 blue LED blink control */
-        { 18, MPP_GPIO },       /* Front button (0 = Released, 1 = Pushed ) */
+        MPP18_GPIO,     /* Front button (0 = Released, 1 = Pushed ) */
-        { 19, MPP_GPIO },       /* SATA{0,1} power On/Off request */
+        MPP19_GPIO,     /* SATA{0,1} power On/Off request */
-        { -1 }
+        0,
        /* 22: USB port 1 fuse (0 = Fail, 1 = Ok) */
        /* 23: SATA 0 power status */
        /* 24: Board power off */

diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c index a5930f83958b..e43b39cc7fe9 100644 --- a/arch/arm/mach-orion5x/net2big-setup.c +++ b/arch/arm/mach-orion5x/net2big-setup.c
@@ -339,28 +339,28 @@ static struct platform_device net2big_gpio_buttons = {
339	* General Setup	339	* General Setup
340	****************************************************************************/	340	****************************************************************************/
341		341
342	static struct orion5x_mpp_mode net2big_mpp_modes[] __initdata = {	342	static unsigned int net2big_mpp_modes[] __initdata = {
343	{ 0, MPP_GPIO }, /* Raid mode (bit 0) */	343	MPP0_GPIO, /* Raid mode (bit 0) */
344	{ 1, MPP_GPIO }, /* USB port 2 fuse (0 = Fail, 1 = Ok) */	344	MPP1_GPIO, /* USB port 2 fuse (0 = Fail, 1 = Ok) */
345	{ 2, MPP_GPIO }, /* Raid mode (bit 1) */	345	MPP2_GPIO, /* Raid mode (bit 1) */
346	{ 3, MPP_GPIO }, /* Board ID (bit 0) */	346	MPP3_GPIO, /* Board ID (bit 0) */
347	{ 4, MPP_GPIO }, /* Fan activity (0 = Off, 1 = On) */	347	MPP4_GPIO, /* Fan activity (0 = Off, 1 = On) */
348	{ 5, MPP_GPIO }, /* Fan fail detection */	348	MPP5_GPIO, /* Fan fail detection */
349	{ 6, MPP_GPIO }, /* Red front LED (0 = Off, 1 = On) */	349	MPP6_GPIO, /* Red front LED (0 = Off, 1 = On) */
350	{ 7, MPP_GPIO }, /* Disable initial blinking on front LED */	350	MPP7_GPIO, /* Disable initial blinking on front LED */
351	{ 8, MPP_GPIO }, /* Rear power switch (on\|auto) */	351	MPP8_GPIO, /* Rear power switch (on\|auto) */
352	{ 9, MPP_GPIO }, /* Rear power switch (auto\|off) */	352	MPP9_GPIO, /* Rear power switch (auto\|off) */
353	{ 10, MPP_GPIO }, /* SATA 1 red LED (0 = Off, 1 = On) */	353	MPP10_GPIO, /* SATA 1 red LED (0 = Off, 1 = On) */
354	{ 11, MPP_GPIO }, /* SATA 0 red LED (0 = Off, 1 = On) */	354	MPP11_GPIO, /* SATA 0 red LED (0 = Off, 1 = On) */
355	{ 12, MPP_GPIO }, /* Board ID (bit 1) */	355	MPP12_GPIO, /* Board ID (bit 1) */
356	{ 13, MPP_GPIO }, /* SATA 1 blue LED blink control */	356	MPP13_GPIO, /* SATA 1 blue LED blink control */
357	{ 14, MPP_SATA_LED },	357	MPP14_SATA_LED,
358	{ 15, MPP_SATA_LED },	358	MPP15_SATA_LED,
359	{ 16, MPP_GPIO }, /* Blue front LED control */	359	MPP16_GPIO, /* Blue front LED control */
360	{ 17, MPP_GPIO }, /* SATA 0 blue LED blink control */	360	MPP17_GPIO, /* SATA 0 blue LED blink control */
361	{ 18, MPP_GPIO }, /* Front button (0 = Released, 1 = Pushed ) */	361	MPP18_GPIO, /* Front button (0 = Released, 1 = Pushed ) */
362	{ 19, MPP_GPIO }, /* SATA{0,1} power On/Off request */	362	MPP19_GPIO, /* SATA{0,1} power On/Off request */
363	{ -1 }	363	0,
364	/* 22: USB port 1 fuse (0 = Fail, 1 = Ok) */	364	/* 22: USB port 1 fuse (0 = Fail, 1 = Ok) */
365	/* 23: SATA 0 power status */	365	/* 23: SATA 0 power status */
366	/* 24: Board power off */	366	/* 24: Board power off */