MIPS: BCM63xx: refactor board declarations

Current board declarations are a mess. Let's put some order and make them
follow the same structure.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index ac9570b66f378ae1b0de4282dc62cc6325303cbd..fa0acf003a461580d35e6c5626f16e4095b7cda9 100644 (file)
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -41,30 +41,28 @@ static struct board_info board;
  */
 #ifdef CONFIG_BCM63XX_CPU_3368
 static struct board_info __initdata board_cvg834g = {
-       .name                           = "CVG834G_E15R3921",
-       .expected_cpu_id                = 0x3368,
+       .name = "CVG834G_E15R3921",
+       .expected_cpu_id = 0x3368,
 
-       .has_uart0                      = 1,
-       .has_uart1                      = 1,
-
-       .has_enet0                      = 1,
-       .has_pci                        = 1,
+       .ephy_reset_gpio = 36,
+       .ephy_reset_gpio_flags = GPIOF_INIT_HIGH,
+       .has_pci = 1,
+       .has_uart0 = 1,
+       .has_uart1 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
        .leds = {
                {
-                       .name           = "CVG834G:green:power",
-                       .gpio           = 37,
+                       .name = "CVG834G:green:power",
+                       .gpio = 37,
                        .default_trigger= "default-on",
                },
        },
-
-       .ephy_reset_gpio                = 36,
-       .ephy_reset_gpio_flags          = GPIOF_INIT_HIGH,
 };
 #endif /* CONFIG_BCM63XX_CPU_3368 */
 
@@ -73,44 +71,44 @@ static struct board_info __initdata board_cvg834g = {
  */
 #ifdef CONFIG_BCM63XX_CPU_6328
 static struct board_info __initdata board_96328avng = {
-       .name                           = "96328avng",
-       .expected_cpu_id                = 0x6328,
+       .name = "96328avng",
+       .expected_cpu_id = 0x6328,
 
-       .has_uart0                      = 1,
-       .has_pci                        = 1,
-       .has_usbd                       = 0,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_usbd = 0,
        .usbd = {
-               .use_fullspeed          = 0,
-               .port_no                = 0,
+               .use_fullspeed = 0,
+               .port_no = 0,
        },
 
        .leds = {
                {
-                       .name           = "96328avng::ppp-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
+                       .name = "96328avng::ppp-fail",
+                       .gpio = 2,
+                       .active_low = 1,
                },
                {
-                       .name           = "96328avng::power",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "96328avng::power",
+                       .gpio = 4,
+                       .active_low = 1,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "96328avng::power-fail",
-                       .gpio           = 8,
-                       .active_low     = 1,
+                       .name = "96328avng::power-fail",
+                       .gpio = 8,
+                       .active_low = 1,
                },
                {
-                       .name           = "96328avng::wps",
-                       .gpio           = 9,
-                       .active_low     = 1,
+                       .name = "96328avng::wps",
+                       .gpio = 9,
+                       .active_low = 1,
                },
                {
-                       .name           = "96328avng::ppp",
-                       .gpio           = 11,
-                       .active_low     = 1,
+                       .name = "96328avng::ppp",
+                       .gpio = 11,
+                       .active_low = 1,
                },
        },
 };
@@ -121,85 +119,86 @@ static struct board_info __initdata board_96328avng = {
  */
 #ifdef CONFIG_BCM63XX_CPU_6338
 static struct board_info __initdata board_96338gw = {
-       .name                           = "96338GW",
-       .expected_cpu_id                = 0x6338,
+       .name = "96338GW",
+       .expected_cpu_id = 0x6338,
+
+       .has_ohci0 = 1,
+       .has_uart0 = 1,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
+       .has_enet0 = 1,
        .enet0 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 
-       .has_ohci0                      = 1,
-
        .leds = {
                {
-                       .name           = "adsl",
-                       .gpio           = 3,
-                       .active_low     = 1,
+                       .name = "adsl",
+                       .gpio = 3,
+                       .active_low = 1,
                },
                {
-                       .name           = "ses",
-                       .gpio           = 5,
-                       .active_low     = 1,
+                       .name = "ses",
+                       .gpio = 5,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "ppp-fail",
+                       .gpio = 4,
+                       .active_low = 1,
                },
                {
-                       .name           = "power",
-                       .gpio           = 0,
-                       .active_low     = 1,
+                       .name = "power",
+                       .gpio = 0,
+                       .active_low = 1,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
+                       .name = "stop",
+                       .gpio = 1,
+                       .active_low = 1,
                }
        },
 };
 
 static struct board_info __initdata board_96338w = {
-       .name                           = "96338W",
-       .expected_cpu_id                = 0x6338,
+       .name = "96338W",
+       .expected_cpu_id = 0x6338,
+
+       .has_uart0 = 1,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
+       .has_enet0 = 1,
        .enet0 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 
        .leds = {
                {
-                       .name           = "adsl",
-                       .gpio           = 3,
-                       .active_low     = 1,
+                       .name = "adsl",
+                       .gpio = 3,
+                       .active_low = 1,
                },
                {
-                       .name           = "ses",
-                       .gpio           = 5,
-                       .active_low     = 1,
+                       .name = "ses",
+                       .gpio = 5,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "ppp-fail",
+                       .gpio = 4,
+                       .active_low = 1,
                },
                {
-                       .name           = "power",
-                       .gpio           = 0,
-                       .active_low     = 1,
+                       .name = "power",
+                       .gpio = 0,
+                       .active_low = 1,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
+                       .name = "stop",
+                       .gpio = 1,
+                       .active_low = 1,
                },
        },
 };
@@ -210,10 +209,10 @@ static struct board_info __initdata board_96338w = {
  */
 #ifdef CONFIG_BCM63XX_CPU_6345
 static struct board_info __initdata board_96345gw2 = {
-       .name                           = "96345GW2",
-       .expected_cpu_id                = 0x6345,
+       .name = "96345GW2",
+       .expected_cpu_id = 0x6345,
 
-       .has_uart0                      = 1,
+       .has_uart0 = 1,
 };
 #endif /* CONFIG_BCM63XX_CPU_6345 */
 
@@ -222,282 +221,282 @@ static struct board_info __initdata board_96345gw2 = {
  */
 #ifdef CONFIG_BCM63XX_CPU_6348
 static struct board_info __initdata board_96348r = {
-       .name                           = "96348R",
-       .expected_cpu_id                = 0x6348,
+       .name = "96348R",
+       .expected_cpu_id = 0x6348,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_pci                        = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
        .leds = {
                {
-                       .name           = "adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
+                       .name = "adsl-fail",
+                       .gpio = 2,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
+                       .name = "ppp",
+                       .gpio = 3,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "ppp-fail",
+                       .gpio = 4,
+                       .active_low = 1,
                },
                {
-                       .name           = "power",
-                       .gpio           = 0,
-                       .active_low     = 1,
+                       .name = "power",
+                       .gpio = 0,
+                       .active_low = 1,
                        .default_trigger = "default-on",
 
                },
                {
-                       .name           = "stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
+                       .name = "stop",
+                       .gpio = 1,
+                       .active_low = 1,
                },
        },
 };
 
 static struct board_info __initdata board_96348gw_10 = {
-       .name                           = "96348GW-10",
-       .expected_cpu_id                = 0x6348,
+       .name = "96348GW-10",
+       .expected_cpu_id = 0x6348,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ohci0 = 1,
+       .has_pccard = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
+
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 
-       .has_ohci0                      = 1,
-       .has_pccard                     = 1,
-
        .leds = {
                {
-                       .name           = "adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
+                       .name = "adsl-fail",
+                       .gpio = 2,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
+                       .name = "ppp",
+                       .gpio = 3,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "ppp-fail",
+                       .gpio = 4,
+                       .active_low = 1,
                },
                {
-                       .name           = "power",
-                       .gpio           = 0,
-                       .active_low     = 1,
+                       .name = "power",
+                       .gpio = 0,
+                       .active_low = 1,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
+                       .name = "stop",
+                       .gpio = 1,
+                       .active_low = 1,
                },
        },
 };
 
 static struct board_info __initdata board_96348gw_11 = {
-       .name                           = "96348GW-11",
-       .expected_cpu_id                = 0x6348,
+       .name = "96348GW-11",
+       .expected_cpu_id = 0x6348,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ohci0 = 1,
+       .has_pccard = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 
-       .has_ohci0 = 1,
-       .has_pccard = 1,
-
        .leds = {
                {
-                       .name           = "adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
+                       .name = "adsl-fail",
+                       .gpio = 2,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
+                       .name = "ppp",
+                       .gpio = 3,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "ppp-fail",
+                       .gpio = 4,
+                       .active_low = 1,
                },
                {
-                       .name           = "power",
-                       .gpio           = 0,
-                       .active_low     = 1,
+                       .name = "power",
+                       .gpio = 0,
+                       .active_low = 1,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
+                       .name = "stop",
+                       .gpio = 1,
+                       .active_low = 1,
                },
        },
 };
 
 static struct board_info __initdata board_96348gw = {
-       .name                           = "96348GW",
-       .expected_cpu_id                = 0x6348,
+       .name = "96348GW",
+       .expected_cpu_id = 0x6348,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ohci0 = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
+
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 
-       .has_ohci0 = 1,
-
        .leds = {
                {
-                       .name           = "adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
+                       .name = "adsl-fail",
+                       .gpio = 2,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
+                       .name = "ppp",
+                       .gpio = 3,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "ppp-fail",
+                       .gpio = 4,
+                       .active_low = 1,
                },
                {
-                       .name           = "power",
-                       .gpio           = 0,
-                       .active_low     = 1,
+                       .name = "power",
+                       .gpio = 0,
+                       .active_low = 1,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
+                       .name = "stop",
+                       .gpio = 1,
+                       .active_low = 1,
                },
        },
 };
 
 static struct board_info __initdata board_FAST2404 = {
-       .name                           = "F@ST2404",
-       .expected_cpu_id                = 0x6348,
+       .name = "F@ST2404",
+       .expected_cpu_id = 0x6348,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ohci0 = 1,
+       .has_pccard = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
-
-       .has_ohci0                      = 1,
-       .has_pccard                     = 1,
 };
 
 static struct board_info __initdata board_rta1025w_16 = {
-       .name                           = "RTA1025W_16",
-       .expected_cpu_id                = 0x6348,
+       .name = "RTA1025W_16",
+       .expected_cpu_id = 0x6348,
 
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_pci = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
+
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 };
 
 static struct board_info __initdata board_DV201AMR = {
-       .name                           = "DV201AMR",
-       .expected_cpu_id                = 0x6348,
+       .name = "DV201AMR",
+       .expected_cpu_id = 0x6348,
 
-       .has_uart0                      = 1,
-       .has_pci                        = 1,
-       .has_ohci0                      = 1,
+       .has_ohci0 = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
+
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 };
 
 static struct board_info __initdata board_96348gw_a = {
-       .name                           = "96348GW-A",
-       .expected_cpu_id                = 0x6348,
+       .name = "96348GW-A",
+       .expected_cpu_id = 0x6348,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ohci0 = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
+
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
-
-       .has_ohci0 = 1,
 };
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 
@@ -506,146 +505,142 @@ static struct board_info __initdata board_96348gw_a = {
  */
 #ifdef CONFIG_BCM63XX_CPU_6358
 static struct board_info __initdata board_96358vw = {
-       .name                           = "96358VW",
-       .expected_cpu_id                = 0x6358,
+       .name = "96358VW",
+       .expected_cpu_id = 0x6358,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ehci0 = 1,
+       .has_ohci0 = 1,
+       .has_pccard = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 
-       .has_ohci0 = 1,
-       .has_pccard = 1,
-       .has_ehci0 = 1,
-
        .leds = {
                {
-                       .name           = "adsl-fail",
-                       .gpio           = 15,
-                       .active_low     = 1,
+                       .name = "adsl-fail",
+                       .gpio = 15,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp",
-                       .gpio           = 22,
-                       .active_low     = 1,
+                       .name = "ppp",
+                       .gpio = 22,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 23,
-                       .active_low     = 1,
+                       .name = "ppp-fail",
+                       .gpio = 23,
+                       .active_low = 1,
                },
                {
-                       .name           = "power",
-                       .gpio           = 4,
+                       .name = "power",
+                       .gpio = 4,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "stop",
-                       .gpio           = 5,
+                       .name = "stop",
+                       .gpio = 5,
                },
        },
 };
 
 static struct board_info __initdata board_96358vw2 = {
-       .name                           = "96358VW2",
-       .expected_cpu_id                = 0x6358,
+       .name = "96358VW2",
+       .expected_cpu_id = 0x6358,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ehci0 = 1,
+       .has_ohci0 = 1,
+       .has_pccard = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
 
-       .has_ohci0 = 1,
-       .has_pccard = 1,
-       .has_ehci0 = 1,
-
        .leds = {
                {
-                       .name           = "adsl",
-                       .gpio           = 22,
-                       .active_low     = 1,
+                       .name = "adsl",
+                       .gpio = 22,
+                       .active_low = 1,
                },
                {
-                       .name           = "ppp-fail",
-                       .gpio           = 23,
+                       .name = "ppp-fail",
+                       .gpio = 23,
                },
                {
-                       .name           = "power",
-                       .gpio           = 5,
-                       .active_low     = 1,
+                       .name = "power",
+                       .gpio = 5,
+                       .active_low = 1,
                        .default_trigger = "default-on",
                },
                {
-                       .name           = "stop",
-                       .gpio           = 4,
-                       .active_low     = 1,
+                       .name = "stop",
+                       .gpio = 4,
+                       .active_low = 1,
                },
        },
 };
 
 static struct board_info __initdata board_AGPFS0 = {
-       .name                           = "AGPF-S0",
-       .expected_cpu_id                = 0x6358,
+       .name = "AGPF-S0",
+       .expected_cpu_id = 0x6358,
 
-       .has_uart0                      = 1,
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ehci0 = 1,
+       .has_ohci0 = 1,
+       .has_pci = 1,
+       .has_uart0 = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
-
-       .has_ohci0 = 1,
-       .has_ehci0 = 1,
 };
 
 static struct board_info __initdata board_DWVS0 = {
-       .name                           = "DWV-S0",
-       .expected_cpu_id                = 0x6358,
+       .name = "DWV-S0",
+       .expected_cpu_id = 0x6358,
 
-       .has_enet0                      = 1,
-       .has_enet1                      = 1,
-       .has_pci                        = 1,
+       .has_ehci0 = 1,
+       .has_ohci0 = 1,
+       .has_pci = 1,
 
+       .has_enet0 = 1,
        .enet0 = {
-               .has_phy                = 1,
-               .use_internal_phy       = 1,
+               .has_phy = 1,
+               .use_internal_phy = 1,
        },
 
+       .has_enet1 = 1,
        .enet1 = {
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
+               .force_speed_100 = 1,
+               .force_duplex_full = 1,
        },
-
-       .has_ohci0                      = 1,
-       .has_ehci0                      = 1,
 };
 #endif /* CONFIG_BCM63XX_CPU_6358 */