1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 34310ab56e29..9eec7c2375e9 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -64,28 +64,28 @@ static struct platform_device rd88f5181l_fxo_nor_boot_flash = {
 /*****************************************************************************
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = {
+static unsigned int rd88f5181l_fxo_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* LED1 CardBus LED (front panel) */
+        MPP0_GPIO,              /* LED1 CardBus LED (front panel) */
-        {  1, MPP_GPIO },               /* PCI_intA */
+        MPP1_GPIO,              /* PCI_intA */
-        {  2, MPP_GPIO },               /* Hard Reset / Factory Init*/
+        MPP2_GPIO,              /* Hard Reset / Factory Init*/
-        {  3, MPP_GPIO },               /* FXS or DAA select */
+        MPP3_GPIO,              /* FXS or DAA select */
-        {  4, MPP_GPIO },               /* LED6 - phone LED (front panel) */
+        MPP4_GPIO,              /* LED6 - phone LED (front panel) */
-        {  5, MPP_GPIO },               /* LED5 - phone LED (front panel) */
+        MPP5_GPIO,              /* LED5 - phone LED (front panel) */
-        {  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 },               /* CardBus reset */
+        MPP8_GPIO,              /* CardBus reset */
-        {  9, MPP_GPIO },               /* GE_RXERR */
+        MPP9_GPIO,              /* GE_RXERR */
-        { 10, MPP_GPIO },               /* LED2 MiniPCI LED (front panel) */
+        MPP10_GPIO,             /* LED2 MiniPCI LED (front panel) */
-        { 11, MPP_GPIO },               /* Lifeline control */
+        MPP11_GPIO,             /* Lifeline control */
-        { 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_fxo_eth_data = {

diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c index 34310ab56e29..9eec7c2375e9 100644 --- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c +++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -64,28 +64,28 @@ static struct platform_device rd88f5181l_fxo_nor_boot_flash = {
64	/*****************************************************************************	64	/*****************************************************************************
65	* General Setup	65	* General Setup
66	****************************************************************************/	66	****************************************************************************/
67	static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = {	67	static unsigned int rd88f5181l_fxo_mpp_modes[] __initdata = {
68	{ 0, MPP_GPIO }, /* LED1 CardBus LED (front panel) */	68	MPP0_GPIO, /* LED1 CardBus LED (front panel) */
69	{ 1, MPP_GPIO }, /* PCI_intA */	69	MPP1_GPIO, /* PCI_intA */
70	{ 2, MPP_GPIO }, /* Hard Reset / Factory Init*/	70	MPP2_GPIO, /* Hard Reset / Factory Init*/
71	{ 3, MPP_GPIO }, /* FXS or DAA select */	71	MPP3_GPIO, /* FXS or DAA select */
72	{ 4, MPP_GPIO }, /* LED6 - phone LED (front panel) */	72	MPP4_GPIO, /* LED6 - phone LED (front panel) */
73	{ 5, MPP_GPIO }, /* LED5 - phone LED (front panel) */	73	MPP5_GPIO, /* LED5 - phone LED (front panel) */
74	{ 6, MPP_PCI_CLK }, /* CPU PCI refclk */	74	MPP6_PCI_CLK, /* CPU PCI refclk */
75	{ 7, MPP_PCI_CLK }, /* PCI/PCIe refclk */	75	MPP7_PCI_CLK, /* PCI/PCIe refclk */
76	{ 8, MPP_GPIO }, /* CardBus reset */	76	MPP8_GPIO, /* CardBus reset */
77	{ 9, MPP_GPIO }, /* GE_RXERR */	77	MPP9_GPIO, /* GE_RXERR */
78	{ 10, MPP_GPIO }, /* LED2 MiniPCI LED (front panel) */	78	MPP10_GPIO, /* LED2 MiniPCI LED (front panel) */
79	{ 11, MPP_GPIO }, /* Lifeline control */	79	MPP11_GPIO, /* Lifeline control */
80	{ 12, MPP_GIGE }, /* GE_TXD[4] */	80	MPP12_GIGE, /* GE_TXD[4] */
81	{ 13, MPP_GIGE }, /* GE_TXD[5] */	81	MPP13_GIGE, /* GE_TXD[5] */
82	{ 14, MPP_GIGE }, /* GE_TXD[6] */	82	MPP14_GIGE, /* GE_TXD[6] */
83	{ 15, MPP_GIGE }, /* GE_TXD[7] */	83	MPP15_GIGE, /* GE_TXD[7] */
84	{ 16, MPP_GIGE }, /* GE_RXD[4] */	84	MPP16_GIGE, /* GE_RXD[4] */
85	{ 17, MPP_GIGE }, /* GE_RXD[5] */	85	MPP17_GIGE, /* GE_RXD[5] */
86	{ 18, MPP_GIGE }, /* GE_RXD[6] */	86	MPP18_GIGE, /* GE_RXD[6] */
87	{ 19, MPP_GIGE }, /* GE_RXD[7] */	87	MPP19_GIGE, /* GE_RXD[7] */
88	{ -1 },	88	0,
89	};	89	};
90		90
91	static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {	91	static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {