1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index edb1dd2d161..6b7b54116f3 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -557,27 +557,27 @@ static struct kobj_attribute ts78xx_fpga_attr =
 /*****************************************************************************
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode ts78xx_mpp_modes[] __initdata = {
+static unsigned int ts78xx_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
+        MPP0_UNUSED,
-        {  1, MPP_GPIO },               /* JTAG Clock */
+        MPP1_GPIO,              /* JTAG Clock */
-        {  2, MPP_GPIO },               /* JTAG Data In */
+        MPP2_GPIO,              /* JTAG Data In */
-        {  3, MPP_GPIO },               /* Lat ECP2 256 FPGA - PB2B */
+        MPP3_GPIO,              /* Lat ECP2 256 FPGA - PB2B */
-        {  4, MPP_GPIO },               /* JTAG Data Out */
+        MPP4_GPIO,              /* JTAG Data Out */
-        {  5, MPP_GPIO },               /* JTAG TMS */
+        MPP5_GPIO,              /* JTAG TMS */
-        {  6, MPP_GPIO },               /* Lat ECP2 256 FPGA - PB31A_CLK4+ */
+        MPP6_GPIO,              /* Lat ECP2 256 FPGA - PB31A_CLK4+ */
-        {  7, MPP_GPIO },               /* Lat ECP2 256 FPGA - PB22B */
+        MPP7_GPIO,              /* Lat ECP2 256 FPGA - PB22B */
-        {  8, MPP_UNUSED },
+        MPP8_UNUSED,
-        {  9, MPP_UNUSED },
+        MPP9_UNUSED,
-        { 10, MPP_UNUSED },
+        MPP10_UNUSED,
-        { 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_UART },
+        MPP16_UART,
-        { 17, MPP_UART },
+        MPP17_UART,
-        { 18, MPP_UART },
+        MPP18_UART,
-        { 19, MPP_UART },
+        MPP19_UART,
        /*
         * MPP[20] PCI Clock Out 1
         * MPP[21] PCI Clock Out 0
@@ -586,7 +586,7 @@ static struct orion5x_mpp_mode ts78xx_mpp_modes[] __initdata = {
         * MPP[24] Unused
         * MPP[25] Unused
         */
-        { -1 },
+        0,
 };
 static void __init ts78xx_init(void)

diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index edb1dd2d161..6b7b54116f3 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -557,27 +557,27 @@ static struct kobj_attribute ts78xx_fpga_attr =
557	/*****************************************************************************	557	/*****************************************************************************
558	* General Setup	558	* General Setup
559	****************************************************************************/	559	****************************************************************************/
560	static struct orion5x_mpp_mode ts78xx_mpp_modes[] __initdata = {	560	static unsigned int ts78xx_mpp_modes[] __initdata = {
561	{ 0, MPP_UNUSED },	561	MPP0_UNUSED,
562	{ 1, MPP_GPIO }, /* JTAG Clock */	562	MPP1_GPIO, /* JTAG Clock */
563	{ 2, MPP_GPIO }, /* JTAG Data In */	563	MPP2_GPIO, /* JTAG Data In */
564	{ 3, MPP_GPIO }, /* Lat ECP2 256 FPGA - PB2B */	564	MPP3_GPIO, /* Lat ECP2 256 FPGA - PB2B */
565	{ 4, MPP_GPIO }, /* JTAG Data Out */	565	MPP4_GPIO, /* JTAG Data Out */
566	{ 5, MPP_GPIO }, /* JTAG TMS */	566	MPP5_GPIO, /* JTAG TMS */
567	{ 6, MPP_GPIO }, /* Lat ECP2 256 FPGA - PB31A_CLK4+ */	567	MPP6_GPIO, /* Lat ECP2 256 FPGA - PB31A_CLK4+ */
568	{ 7, MPP_GPIO }, /* Lat ECP2 256 FPGA - PB22B */	568	MPP7_GPIO, /* Lat ECP2 256 FPGA - PB22B */
569	{ 8, MPP_UNUSED },	569	MPP8_UNUSED,
570	{ 9, MPP_UNUSED },	570	MPP9_UNUSED,
571	{ 10, MPP_UNUSED },	571	MPP10_UNUSED,
572	{ 11, MPP_UNUSED },	572	MPP11_UNUSED,
573	{ 12, MPP_UNUSED },	573	MPP12_UNUSED,
574	{ 13, MPP_UNUSED },	574	MPP13_UNUSED,
575	{ 14, MPP_UNUSED },	575	MPP14_UNUSED,
576	{ 15, MPP_UNUSED },	576	MPP15_UNUSED,
577	{ 16, MPP_UART },	577	MPP16_UART,
578	{ 17, MPP_UART },	578	MPP17_UART,
579	{ 18, MPP_UART },	579	MPP18_UART,
580	{ 19, MPP_UART },	580	MPP19_UART,
581	/*	581	/*
582	* MPP[20] PCI Clock Out 1	582	* MPP[20] PCI Clock Out 1
583	* MPP[21] PCI Clock Out 0	583	* MPP[21] PCI Clock Out 0
@@ -586,7 +586,7 @@ static struct orion5x_mpp_mode ts78xx_mpp_modes[] __initdata = {
586	* MPP[24] Unused	586	* MPP[24] Unused
587	* MPP[25] Unused	587	* MPP[25] Unused
588	*/	588	*/
589	{ -1 },	589	0,
590	};	590	};
591		591
592	static void __init ts78xx_init(void)	592	static void __init ts78xx_init(void)