ARM: orion5x: Refactor mpp code to use common orion platform mpp.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>

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 = {
-        {  0, MPP_GPIO },               /* USB Over Current */
-        {  1, MPP_GPIO },               /* USB Vbat input */
-        {  2, MPP_PCI_ARB },            /* PCI_REQn[2] */
-        {  3, MPP_PCI_ARB },            /* PCI_GNTn[2] */
-        {  4, MPP_PCI_ARB },            /* PCI_REQn[3] */
-        {  5, MPP_PCI_ARB },            /* PCI_GNTn[3] */
-        {  6, MPP_GPIO },               /* JP0, CON17.2 */
-        {  7, MPP_GPIO },               /* JP1, CON17.1 */
-        {  8, MPP_GPIO },               /* JP2, CON11.2 */
-        {  9, MPP_GPIO },               /* JP3, CON11.3 */
-        { 10, MPP_GPIO },               /* RTC int */
-        { 11, MPP_GPIO },               /* Baud Rate Generator */
-        { 12, MPP_GPIO },               /* PCI int 1 */
-        { 13, MPP_GPIO },               /* PCI int 2 */
-        { 14, MPP_NAND },               /* NAND_REn[2] */
-        { 15, MPP_NAND },               /* NAND_WEn[2] */
-        { 16, MPP_UART },               /* UART1_RX */
-        { 17, MPP_UART },               /* UART1_TX */
-        { 18, MPP_UART },               /* UART1_CTSn */
-        { 19, MPP_UART },               /* UART1_RTSn */
-        { -1 },
+static unsigned int db88f5281_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* USB Over Current */
+        MPP1_GPIO,              /* USB Vbat input */
+        MPP2_PCI_ARB,           /* PCI_REQn[2] */
+        MPP3_PCI_ARB,           /* PCI_GNTn[2] */
+        MPP4_PCI_ARB,           /* PCI_REQn[3] */
+        MPP5_PCI_ARB,           /* PCI_GNTn[3] */
+        MPP6_GPIO,              /* JP0, CON17.2 */
+        MPP7_GPIO,              /* JP1, CON17.1 */
+        MPP8_GPIO,              /* JP2, CON11.2 */
+        MPP9_GPIO,              /* JP3, CON11.3 */
+        MPP10_GPIO,             /* RTC int */
+        MPP11_GPIO,             /* Baud Rate Generator */
+        MPP12_GPIO,             /* PCI int 1 */
+        MPP13_GPIO,             /* PCI int 2 */
+        MPP14_NAND,             /* NAND_REn[2] */
+        MPP15_NAND,             /* NAND_WEn[2] */
+        MPP16_UART,             /* UART1_RX */
+        MPP17_UART,             /* UART1_TX */
+        MPP18_UART,             /* UART1_CTSn */
+        MPP19_UART,             /* UART1_RTSn */
+        0,
 };
 
 static void __init db88f5281_init(void)