1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index c1f79fa014ed..0cc90bbfd326 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -65,28 +65,28 @@ static struct platform_device rd88f5181l_ge_nor_boot_flash = {
 /*****************************************************************************
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = {
+static unsigned int rd88f5181l_ge_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* LED1 */
+        MPP0_GPIO,              /* LED1 */
-        {  1, MPP_GPIO },               /* LED5 */
+        MPP1_GPIO,              /* LED5 */
-        {  2, MPP_GPIO },               /* LED4 */
+        MPP2_GPIO,              /* LED4 */
-        {  3, MPP_GPIO },               /* LED3 */
+        MPP3_GPIO,              /* LED3 */
-        {  4, MPP_GPIO },               /* PCI_intA */
+        MPP4_GPIO,              /* PCI_intA */
-        {  5, MPP_GPIO },               /* RTC interrupt */
+        MPP5_GPIO,              /* RTC interrupt */
-        {  6, MPP_PCI_CLK },            /* CPU PCI refclk */
+        MPP6_PCI_CLK,           /* CPU PCI refclk */
-        {  7, MPP_PCI_CLK },            /* PCI/PCIe refclk */
+        MPP7_PCI_CLK,           /* PCI/PCIe refclk */
-        {  8, MPP_GPIO },               /* 88e6131 interrupt */
+        MPP8_GPIO,              /* 88e6131 interrupt */
-        {  9, MPP_GPIO },               /* GE_RXERR */
+        MPP9_GPIO,              /* GE_RXERR */
-        { 10, MPP_GPIO },               /* PCI_intB */
+        MPP10_GPIO,             /* PCI_intB */
-        { 11, MPP_GPIO },               /* LED2 */
+        MPP11_GPIO,             /* LED2 */
-        { 12, MPP_GIGE },               /* GE_TXD[4] */
+        MPP12_GIGE,             /* GE_TXD[4] */
-        { 13, MPP_GIGE },               /* GE_TXD[5] */
+        MPP13_GIGE,             /* GE_TXD[5] */
-        { 14, MPP_GIGE },               /* GE_TXD[6] */
+        MPP14_GIGE,             /* GE_TXD[6] */
-        { 15, MPP_GIGE },               /* GE_TXD[7] */
+        MPP15_GIGE,             /* GE_TXD[7] */
-        { 16, MPP_GIGE },               /* GE_RXD[4] */
+        MPP16_GIGE,             /* GE_RXD[4] */
-        { 17, MPP_GIGE },               /* GE_RXD[5] */
+        MPP17_GIGE,             /* GE_RXD[5] */
-        { 18, MPP_GIGE },               /* GE_RXD[6] */
+        MPP18_GIGE,             /* GE_RXD[6] */
-        { 19, MPP_GIGE },               /* GE_RXD[7] */
+        MPP19_GIGE,             /* GE_RXD[7] */
-        { -1 },
+        0,
 };
 static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {

diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c index c1f79fa014ed..0cc90bbfd326 100644 --- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c +++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -65,28 +65,28 @@ static struct platform_device rd88f5181l_ge_nor_boot_flash = {
65	/*****************************************************************************	65	/*****************************************************************************
66	* General Setup	66	* General Setup
67	****************************************************************************/	67	****************************************************************************/
68	static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = {	68	static unsigned int rd88f5181l_ge_mpp_modes[] __initdata = {
69	{ 0, MPP_GPIO }, /* LED1 */	69	MPP0_GPIO, /* LED1 */
70	{ 1, MPP_GPIO }, /* LED5 */	70	MPP1_GPIO, /* LED5 */
71	{ 2, MPP_GPIO }, /* LED4 */	71	MPP2_GPIO, /* LED4 */
72	{ 3, MPP_GPIO }, /* LED3 */	72	MPP3_GPIO, /* LED3 */
73	{ 4, MPP_GPIO }, /* PCI_intA */	73	MPP4_GPIO, /* PCI_intA */
74	{ 5, MPP_GPIO }, /* RTC interrupt */	74	MPP5_GPIO, /* RTC interrupt */
75	{ 6, MPP_PCI_CLK }, /* CPU PCI refclk */	75	MPP6_PCI_CLK, /* CPU PCI refclk */
76	{ 7, MPP_PCI_CLK }, /* PCI/PCIe refclk */	76	MPP7_PCI_CLK, /* PCI/PCIe refclk */
77	{ 8, MPP_GPIO }, /* 88e6131 interrupt */	77	MPP8_GPIO, /* 88e6131 interrupt */
78	{ 9, MPP_GPIO }, /* GE_RXERR */	78	MPP9_GPIO, /* GE_RXERR */
79	{ 10, MPP_GPIO }, /* PCI_intB */	79	MPP10_GPIO, /* PCI_intB */
80	{ 11, MPP_GPIO }, /* LED2 */	80	MPP11_GPIO, /* LED2 */
81	{ 12, MPP_GIGE }, /* GE_TXD[4] */	81	MPP12_GIGE, /* GE_TXD[4] */
82	{ 13, MPP_GIGE }, /* GE_TXD[5] */	82	MPP13_GIGE, /* GE_TXD[5] */
83	{ 14, MPP_GIGE }, /* GE_TXD[6] */	83	MPP14_GIGE, /* GE_TXD[6] */
84	{ 15, MPP_GIGE }, /* GE_TXD[7] */	84	MPP15_GIGE, /* GE_TXD[7] */
85	{ 16, MPP_GIGE }, /* GE_RXD[4] */	85	MPP16_GIGE, /* GE_RXD[4] */
86	{ 17, MPP_GIGE }, /* GE_RXD[5] */	86	MPP17_GIGE, /* GE_RXD[5] */
87	{ 18, MPP_GIGE }, /* GE_RXD[6] */	87	MPP18_GIGE, /* GE_RXD[6] */
88	{ 19, MPP_GIGE }, /* GE_RXD[7] */	88	MPP19_GIGE, /* GE_RXD[7] */
89	{ -1 },	89	0,
90	};	90	};
91		91
92	static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {	92	static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {