1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c
index c55d071707f5..63ff10c3c464 100644
--- a/arch/arm/mach-orion5x/mv2120-setup.c
+++ b/arch/arm/mach-orion5x/mv2120-setup.c
@@ -108,28 +108,28 @@ static struct platform_device mv2120_button_device = {
 /****************************************************************************
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode mv2120_mpp_modes[] __initdata = {
+static unsigned int mv2120_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Sys status LED */
+        MPP0_GPIO,              /* Sys status LED */
-        {  1, MPP_GPIO },               /* Sys error LED */
+        MPP1_GPIO,              /* Sys error LED */
-        {  2, MPP_GPIO },               /* OverTemp interrupt */
+        MPP2_GPIO,              /* OverTemp interrupt */
-        {  3, MPP_GPIO },               /* RTC interrupt */
+        MPP3_GPIO,              /* RTC interrupt */
-        {  4, MPP_GPIO },               /* V_LED 5V */
+        MPP4_GPIO,              /* V_LED 5V */
-        {  5, MPP_GPIO },               /* V_LED 3.3V */
+        MPP5_GPIO,              /* V_LED 3.3V */
-        {  6, MPP_UNUSED },
+        MPP6_UNUSED,
-        {  7, MPP_UNUSED },
+        MPP7_UNUSED,
-        {  8, MPP_GPIO },               /* SATA 0 fail LED */
+        MPP8_GPIO,              /* SATA 0 fail LED */
-        {  9, MPP_GPIO },               /* SATA 1 fail LED */
+        MPP9_GPIO,              /* SATA 1 fail LED */
-        { 10, MPP_UNUSED },
+        MPP10_UNUSED,
-        { 11, MPP_UNUSED },
+        MPP11_UNUSED,
-        { 12, MPP_SATA_LED },           /* SATA 0 presence */
+        MPP12_SATA_LED,         /* SATA 0 presence */
-        { 13, MPP_SATA_LED },           /* SATA 1 presence */
+        MPP13_SATA_LED,         /* SATA 1 presence */
-        { 14, MPP_SATA_LED },           /* SATA 0 active */
+        MPP14_SATA_LED,         /* SATA 0 active */
-        { 15, MPP_SATA_LED },           /* SATA 1 active */
+        MPP15_SATA_LED,         /* SATA 1 active */
-        { 16, MPP_UNUSED },
+        MPP16_UNUSED,
-        { 17, MPP_GPIO },               /* Reset button */
+        MPP17_GPIO,             /* Reset button */
-        { 18, MPP_GPIO },               /* Power button */
+        MPP18_GPIO,             /* Power button */
-        { 19, MPP_GPIO },               /* Power off */
+        MPP19_GPIO,             /* Power off */
-        { -1 },
+        0,
 };
 static struct i2c_board_info __initdata mv2120_i2c_rtc = {

diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c index c55d071707f5..63ff10c3c464 100644 --- a/arch/arm/mach-orion5x/mv2120-setup.c +++ b/arch/arm/mach-orion5x/mv2120-setup.c
@@ -108,28 +108,28 @@ static struct platform_device mv2120_button_device = {
108	/****************************************************************************	108	/****************************************************************************
109	* General Setup	109	* General Setup
110	****************************************************************************/	110	****************************************************************************/
111	static struct orion5x_mpp_mode mv2120_mpp_modes[] __initdata = {	111	static unsigned int mv2120_mpp_modes[] __initdata = {
112	{ 0, MPP_GPIO }, /* Sys status LED */	112	MPP0_GPIO, /* Sys status LED */
113	{ 1, MPP_GPIO }, /* Sys error LED */	113	MPP1_GPIO, /* Sys error LED */
114	{ 2, MPP_GPIO }, /* OverTemp interrupt */	114	MPP2_GPIO, /* OverTemp interrupt */
115	{ 3, MPP_GPIO }, /* RTC interrupt */	115	MPP3_GPIO, /* RTC interrupt */
116	{ 4, MPP_GPIO }, /* V_LED 5V */	116	MPP4_GPIO, /* V_LED 5V */
117	{ 5, MPP_GPIO }, /* V_LED 3.3V */	117	MPP5_GPIO, /* V_LED 3.3V */
118	{ 6, MPP_UNUSED },	118	MPP6_UNUSED,
119	{ 7, MPP_UNUSED },	119	MPP7_UNUSED,
120	{ 8, MPP_GPIO }, /* SATA 0 fail LED */	120	MPP8_GPIO, /* SATA 0 fail LED */
121	{ 9, MPP_GPIO }, /* SATA 1 fail LED */	121	MPP9_GPIO, /* SATA 1 fail LED */
122	{ 10, MPP_UNUSED },	122	MPP10_UNUSED,
123	{ 11, MPP_UNUSED },	123	MPP11_UNUSED,
124	{ 12, MPP_SATA_LED }, /* SATA 0 presence */	124	MPP12_SATA_LED, /* SATA 0 presence */
125	{ 13, MPP_SATA_LED }, /* SATA 1 presence */	125	MPP13_SATA_LED, /* SATA 1 presence */
126	{ 14, MPP_SATA_LED }, /* SATA 0 active */	126	MPP14_SATA_LED, /* SATA 0 active */
127	{ 15, MPP_SATA_LED }, /* SATA 1 active */	127	MPP15_SATA_LED, /* SATA 1 active */
128	{ 16, MPP_UNUSED },	128	MPP16_UNUSED,
129	{ 17, MPP_GPIO }, /* Reset button */	129	MPP17_GPIO, /* Reset button */
130	{ 18, MPP_GPIO }, /* Power button */	130	MPP18_GPIO, /* Power button */
131	{ 19, MPP_GPIO }, /* Power off */	131	MPP19_GPIO, /* Power off */
132	{ -1 },	132	0,
133	};	133	};
134		134
135	static struct i2c_board_info __initdata mv2120_i2c_rtc = {	135	static struct i2c_board_info __initdata mv2120_i2c_rtc = {