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>

arch/mips/bcm63xx/boards/board_bcm963xx.c

@@ -44,12 +44,13 @@ static struct board_info __initdata board_cvg834g = {
 	.name = "CVG834G_E15R3921",
 	.expected_cpu_id = 0x3368,
 
+	.ephy_reset_gpio = 36,
+	.ephy_reset_gpio_flags = GPIOF_INIT_HIGH,
+	.has_pci = 1,
 	.has_uart0 = 1,
 	.has_uart1 = 1,
 
 	.has_enet0 = 1,
-	.has_pci			= 1,
-
 	.enet0 = {
 		.has_phy = 1,
 		.use_internal_phy = 1,
@@ -62,9 +63,6 @@ static struct board_info __initdata board_cvg834g = {
 			.default_trigger= "default-on",
 		},
 	},
-
-	.ephy_reset_gpio		= 36,
-	.ephy_reset_gpio_flags		= GPIOF_INIT_HIGH,
 };
 #endif /* CONFIG_BCM63XX_CPU_3368 */
 
@@ -76,10 +74,10 @@ static struct board_info __initdata board_96328avng = {
 	.name = "96328avng",
 	.expected_cpu_id = 0x6328,
 
-	.has_uart0			= 1,
 	.has_pci = 1,
-	.has_usbd			= 0,
+	.has_uart0 = 1,
 
+	.has_usbd = 0,
 	.usbd = {
 		.use_fullspeed = 0,
 		.port_no = 0,
@@ -124,15 +122,15 @@ static struct board_info __initdata board_96338gw = {
 	.name = "96338GW",
 	.expected_cpu_id = 0x6338,
 
+	.has_ohci0 = 1,
 	.has_uart0 = 1,
+
 	.has_enet0 = 1,
 	.enet0 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
 
-	.has_ohci0			= 1,
-
 	.leds = {
 		{
 			.name = "adsl",
@@ -168,6 +166,7 @@ static struct board_info __initdata board_96338w = {
 	.expected_cpu_id = 0x6338,
 
 	.has_uart0 = 1,
+
 	.has_enet0 = 1,
 	.enet0 = {
 		.force_speed_100 = 1,
@@ -225,10 +224,10 @@ static struct board_info __initdata board_96348r = {
 	.name = "96348R",
 	.expected_cpu_id = 0x6348,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
 	.has_pci = 1,
+	.has_uart0 = 1,
 
+	.has_enet0 = 1,
 	.enet0 = {
 		.has_phy = 1,
 		.use_internal_phy = 1,
@@ -269,23 +268,23 @@ static struct board_info __initdata board_96348gw_10 = {
 	.name = "96348GW-10",
 	.expected_cpu_id = 0x6348,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 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_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
 
-	.has_ohci0			= 1,
-	.has_pccard			= 1,
-
 	.leds = {
 		{
 			.name = "adsl-fail",
@@ -320,24 +319,23 @@ static struct board_info __initdata board_96348gw_11 = {
 	.name = "96348GW-11",
 	.expected_cpu_id = 0x6348,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 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_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
 
-	.has_ohci0 = 1,
-	.has_pccard = 1,
-
 	.leds = {
 		{
 			.name = "adsl-fail",
@@ -372,22 +370,22 @@ static struct board_info __initdata board_96348gw = {
 	.name = "96348GW",
 	.expected_cpu_id = 0x6348,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 1,
+	.has_ohci0 = 1,
 	.has_pci = 1,
+	.has_uart0 = 1,
 
+	.has_enet0 = 1,
 	.enet0 = {
 		.has_phy = 1,
 		.use_internal_phy = 1,
 	},
+
+	.has_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
 
-	.has_ohci0 = 1,
-
 	.leds = {
 		{
 			.name = "adsl-fail",
@@ -422,37 +420,37 @@ static struct board_info __initdata board_FAST2404 = {
 	.name = "F@ST2404",
 	.expected_cpu_id = 0x6348,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 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_enet1 = 1,
 	.enet1 = {
 		.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,
 
-	.has_enet0			= 1,
-	.has_enet1			= 1,
 	.has_pci = 1,
 
+	.has_enet0 = 1,
 	.enet0 = {
 		.has_phy = 1,
 		.use_internal_phy = 1,
 	},
+
+	.has_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
@@ -463,16 +461,17 @@ static struct board_info __initdata board_DV201AMR = {
 	.name = "DV201AMR",
 	.expected_cpu_id = 0x6348,
 
-	.has_uart0			= 1,
-	.has_pci			= 1,
 	.has_ohci0 = 1,
+	.has_pci = 1,
+	.has_uart0 = 1,
 
 	.has_enet0 = 1,
-	.has_enet1			= 1,
 	.enet0 = {
 		.has_phy = 1,
 		.use_internal_phy = 1,
 	},
+
+	.has_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
@@ -483,21 +482,21 @@ static struct board_info __initdata board_96348gw_a = {
 	.name = "96348GW-A",
 	.expected_cpu_id = 0x6348,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 1,
+	.has_ohci0 = 1,
 	.has_pci = 1,
+	.has_uart0 = 1,
 
+	.has_enet0 = 1,
 	.enet0 = {
 		.has_phy = 1,
 		.use_internal_phy = 1,
 	},
+
+	.has_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
-
-	.has_ohci0 = 1,
 };
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 
@@ -509,25 +508,24 @@ static struct board_info __initdata board_96358vw = {
 	.name = "96358VW",
 	.expected_cpu_id = 0x6358,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 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_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
 
-	.has_ohci0 = 1,
-	.has_pccard = 1,
-	.has_ehci0 = 1,
-
 	.leds = {
 		{
 			.name = "adsl-fail",
@@ -560,25 +558,24 @@ static struct board_info __initdata board_96358vw2 = {
 	.name = "96358VW2",
 	.expected_cpu_id = 0x6358,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 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_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
 
-	.has_ohci0 = 1,
-	.has_pccard = 1,
-	.has_ehci0 = 1,
-
 	.leds = {
 		{
 			.name = "adsl",
@@ -607,45 +604,43 @@ static struct board_info __initdata board_AGPFS0 = {
 	.name = "AGPF-S0",
 	.expected_cpu_id = 0x6358,
 
-	.has_uart0			= 1,
-	.has_enet0			= 1,
-	.has_enet1			= 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_enet1 = 1,
 	.enet1 = {
 		.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,
 
-	.has_enet0			= 1,
-	.has_enet1			= 1,
+	.has_ehci0 = 1,
+	.has_ohci0 = 1,
 	.has_pci = 1,
 
+	.has_enet0 = 1,
 	.enet0 = {
 		.has_phy = 1,
 		.use_internal_phy = 1,
 	},
 
+	.has_enet1 = 1,
 	.enet1 = {
 		.force_speed_100 = 1,
 		.force_duplex_full = 1,
 	},
-
-	.has_ohci0			= 1,
-	.has_ehci0			= 1,
 };
 #endif /* CONFIG_BCM63XX_CPU_6358 */