1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index b7d4591214e0..f95d3cb01cbf 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -298,28 +298,28 @@ static struct i2c_board_info __initdata db88f5281_i2c_rtc = {
 /*****************************************************************************
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode db88f5281_mpp_modes[] __initdata = {
+static unsigned int db88f5281_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* USB Over Current */
+        MPP0_GPIO,              /* USB Over Current */
-        {  1, MPP_GPIO },               /* USB Vbat input */
+        MPP1_GPIO,              /* USB Vbat input */
-        {  2, MPP_PCI_ARB },            /* PCI_REQn[2] */
+        MPP2_PCI_ARB,           /* PCI_REQn[2] */
-        {  3, MPP_PCI_ARB },            /* PCI_GNTn[2] */
+        MPP3_PCI_ARB,           /* PCI_GNTn[2] */
-        {  4, MPP_PCI_ARB },            /* PCI_REQn[3] */
+        MPP4_PCI_ARB,           /* PCI_REQn[3] */
-        {  5, MPP_PCI_ARB },            /* PCI_GNTn[3] */
+        MPP5_PCI_ARB,           /* PCI_GNTn[3] */
-        {  6, MPP_GPIO },               /* JP0, CON17.2 */
+        MPP6_GPIO,              /* JP0, CON17.2 */
-        {  7, MPP_GPIO },               /* JP1, CON17.1 */
+        MPP7_GPIO,              /* JP1, CON17.1 */
-        {  8, MPP_GPIO },               /* JP2, CON11.2 */
+        MPP8_GPIO,              /* JP2, CON11.2 */
-        {  9, MPP_GPIO },               /* JP3, CON11.3 */
+        MPP9_GPIO,              /* JP3, CON11.3 */
-        { 10, MPP_GPIO },               /* RTC int */
+        MPP10_GPIO,             /* RTC int */
-        { 11, MPP_GPIO },               /* Baud Rate Generator */
+        MPP11_GPIO,             /* Baud Rate Generator */
-        { 12, MPP_GPIO },               /* PCI int 1 */
+        MPP12_GPIO,             /* PCI int 1 */
-        { 13, MPP_GPIO },               /* PCI int 2 */
+        MPP13_GPIO,             /* PCI int 2 */
-        { 14, MPP_NAND },               /* NAND_REn[2] */
+        MPP14_NAND,             /* NAND_REn[2] */
-        { 15, MPP_NAND },               /* NAND_WEn[2] */
+        MPP15_NAND,             /* NAND_WEn[2] */
-        { 16, MPP_UART },               /* UART1_RX */
+        MPP16_UART,             /* UART1_RX */
-        { 17, MPP_UART },               /* UART1_TX */
+        MPP17_UART,             /* UART1_TX */
-        { 18, MPP_UART },               /* UART1_CTSn */
+        MPP18_UART,             /* UART1_CTSn */
-        { 19, MPP_UART },               /* UART1_RTSn */
+        MPP19_UART,             /* UART1_RTSn */
-        { -1 },
+        0,
 };
 static void __init db88f5281_init(void)

diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index b7d4591214e0..f95d3cb01cbf 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -298,28 +298,28 @@ static struct i2c_board_info __initdata db88f5281_i2c_rtc = {
298	/*****************************************************************************	298	/*****************************************************************************
299	* General Setup	299	* General Setup
300	****************************************************************************/	300	****************************************************************************/
301	static struct orion5x_mpp_mode db88f5281_mpp_modes[] __initdata = {	301	static unsigned int db88f5281_mpp_modes[] __initdata = {
302	{ 0, MPP_GPIO }, /* USB Over Current */	302	MPP0_GPIO, /* USB Over Current */
303	{ 1, MPP_GPIO }, /* USB Vbat input */	303	MPP1_GPIO, /* USB Vbat input */
304	{ 2, MPP_PCI_ARB }, /* PCI_REQn[2] */	304	MPP2_PCI_ARB, /* PCI_REQn[2] */
305	{ 3, MPP_PCI_ARB }, /* PCI_GNTn[2] */	305	MPP3_PCI_ARB, /* PCI_GNTn[2] */
306	{ 4, MPP_PCI_ARB }, /* PCI_REQn[3] */	306	MPP4_PCI_ARB, /* PCI_REQn[3] */
307	{ 5, MPP_PCI_ARB }, /* PCI_GNTn[3] */	307	MPP5_PCI_ARB, /* PCI_GNTn[3] */
308	{ 6, MPP_GPIO }, /* JP0, CON17.2 */	308	MPP6_GPIO, /* JP0, CON17.2 */
309	{ 7, MPP_GPIO }, /* JP1, CON17.1 */	309	MPP7_GPIO, /* JP1, CON17.1 */
310	{ 8, MPP_GPIO }, /* JP2, CON11.2 */	310	MPP8_GPIO, /* JP2, CON11.2 */
311	{ 9, MPP_GPIO }, /* JP3, CON11.3 */	311	MPP9_GPIO, /* JP3, CON11.3 */
312	{ 10, MPP_GPIO }, /* RTC int */	312	MPP10_GPIO, /* RTC int */
313	{ 11, MPP_GPIO }, /* Baud Rate Generator */	313	MPP11_GPIO, /* Baud Rate Generator */
314	{ 12, MPP_GPIO }, /* PCI int 1 */	314	MPP12_GPIO, /* PCI int 1 */
315	{ 13, MPP_GPIO }, /* PCI int 2 */	315	MPP13_GPIO, /* PCI int 2 */
316	{ 14, MPP_NAND }, /* NAND_REn[2] */	316	MPP14_NAND, /* NAND_REn[2] */
317	{ 15, MPP_NAND }, /* NAND_WEn[2] */	317	MPP15_NAND, /* NAND_WEn[2] */
318	{ 16, MPP_UART }, /* UART1_RX */	318	MPP16_UART, /* UART1_RX */
319	{ 17, MPP_UART }, /* UART1_TX */	319	MPP17_UART, /* UART1_TX */
320	{ 18, MPP_UART }, /* UART1_CTSn */	320	MPP18_UART, /* UART1_CTSn */
321	{ 19, MPP_UART }, /* UART1_RTSn */	321	MPP19_UART, /* UART1_RTSn */
322	{ -1 },	322	0,
323	};	323	};
324		324
325	static void __init db88f5281_init(void)	325	static void __init db88f5281_init(void)