adm5120: convert to use the new mips multimachine stuff

SVN-Revision: 21680

24 files changed, 55 insertions, 43 deletions

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cas-771.c b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cas-771.c
index 5854f074a1..5033e02469 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cas-771.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cas-771.c
@@ -33,4 +33,5 @@ static void __init cas771_setup(void)
 	adm5120_pci_set_irq_map(ARRAY_SIZE(cas771_pci_irqs), cas771_pci_irqs);
 }
 
-MIPS_MACHINE(MACH_ADM5120_CAS771, "Cellvision CAS-771/771W", cas771_setup);
+MIPS_MACHINE(MACH_ADM5120_CAS771, "CAS-771", "Cellvision CAS-771/771W",
+	     cas771_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cellvision.c b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cellvision.c
index 245a54d50a..eceef1312f 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cellvision.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/cellvision.c
@@ -131,8 +131,10 @@ void __init cas6xx_setup(void)
 	adm5120_add_device_switch(1, NULL);
 }
 
-MIPS_MACHINE(MACH_ADM5120_CAS630, "Cellvision CAS-630/630W", cas6xx_setup);
-MIPS_MACHINE(MACH_ADM5120_CAS670, "Cellvision CAS-670/670W", cas6xx_setup);
+MIPS_MACHINE(MACH_ADM5120_CAS630, "CAS-630", "Cellvision CAS-630/630W",
+	     cas6xx_setup);
+MIPS_MACHINE(MACH_ADM5120_CAS670, "CAS-670", "Cellvision CAS-670/670W",
+	     cas6xx_setup);
 
 void __init cas7xx_setup(void)
 {
@@ -143,8 +145,9 @@ void __init cas7xx_setup(void)
 	adm5120_add_device_switch(1, NULL);
 }
 
-#if 0
-MIPS_MACHINE(MACH_ADM5120_CAS700, "Cellvision CAS-700/700W", cas7xx_setup);
-MIPS_MACHINE(MACH_ADM5120_CAS790, "Cellvision CAS-790", cas7xx_setup);
-MIPS_MACHINE(MACH_ADM5120_CAS861, "Cellvision CAS-861/861W", cas7xx_setup);
-#endif
+MIPS_MACHINE(MACH_ADM5120_CAS700, "CAS-700", "Cellvision CAS-700/700W",
+	     cas7xx_setup);
+MIPS_MACHINE(MACH_ADM5120_CAS790, "CAS-790", "Cellvision CAS-790",
+	     cas7xx_setup);
+MIPS_MACHINE(MACH_ADM5120_CAS861, "CAS-861", "Cellvision CAS-861/861W",
+	     cas7xx_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c
index 022b9f1b24..7d214c0909 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c
@@ -43,4 +43,5 @@ static void __init nfs101_setup(void)
 				nfs101_pci_irqs);
 }
 
-MIPS_MACHINE(MACH_ADM5120_NFS101U, "Cellvision NFS-101U/101WU", nfs101_setup);
+MIPS_MACHINE(MACH_ADM5120_NFS101U, "NFS-101U", "Cellvision NFS-101U/101WU",
+	     nfs101_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c b/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c
index 843a616bbe..41956c8f8c 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c
@@ -107,7 +107,7 @@ static int __init adm5120_board_setup(void)
 {
 	adm5120_gpio_init();
 
-	mips_machine_setup(mips_machtype);
+	mips_machine_setup();
 
 	return 0;
 }
@@ -122,5 +122,5 @@ static void __init adm5120_generic_board_setup(void)
 	adm5120_add_device_switch(6, NULL);
 }
 
-MIPS_MACHINE(MACH_ADM5120_GENERIC, "Generic ADM5120 board",
-		adm5120_generic_board_setup);
+MIPS_MACHINE(MACH_ADM5120_GENERIC, "Generic", "Generic ADM5120 board",
+	     adm5120_generic_board_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/compex/np27g.c b/target/linux/adm5120/files/arch/mips/adm5120/compex/np27g.c
index 8a70bf82ce..82da46d1c7 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/compex/np27g.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/compex/np27g.c
@@ -25,4 +25,4 @@ static void __init np27g_setup(void)
 	/* TODO: add PCI IRQ map */
 }
 
-MIPS_MACHINE(MACH_ADM5120_NP27G, "Compex NetPassage 27G", np27g_setup);
+MIPS_MACHINE(MACH_ADM5120_NP27G, "NP27G", "Compex NetPassage 27G", np27g_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/compex/np28g.c b/target/linux/adm5120/files/arch/mips/adm5120/compex/np28g.c
index f1f54abad0..a541439998 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/compex/np28g.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/compex/np28g.c
@@ -60,4 +60,4 @@ static void __init np28g_setup(void)
 	adm5120_pci_set_irq_map(ARRAY_SIZE(np28g_pci_irqs), np28g_pci_irqs);
 }
 
-MIPS_MACHINE(MACH_ADM5120_NP28G, "Compex NetPassage 28G", np28g_setup);
+MIPS_MACHINE(MACH_ADM5120_NP28G, "NP28G", "Compex NetPassage 28G", np28g_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/compex/wp54.c b/target/linux/adm5120/files/arch/mips/adm5120/compex/wp54.c
index d56656d503..ef71302779 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/compex/wp54.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/compex/wp54.c
@@ -79,7 +79,7 @@ static void __init wp54_setup(void)
 	adm5120_pci_set_irq_map(ARRAY_SIZE(wp54_pci_irqs), wp54_pci_irqs);
 }
 
-MIPS_MACHINE(MACH_ADM5120_WP54, "Compex WP54 family", wp54_setup);
+MIPS_MACHINE(MACH_ADM5120_WP54, "WP54", "Compex WP54 family", wp54_setup);
 
 static void __init wp54_wrt_setup(void)
 {
@@ -91,4 +91,5 @@ static void __init wp54_wrt_setup(void)
 	wp54_setup();
 }
 
-MIPS_MACHINE(MACH_ADM5120_WP54G_WRT, "Compex WP54G-WRT", wp54_wrt_setup);
+MIPS_MACHINE(MACH_ADM5120_WP54G_WRT, "WP54G-WRT", "Compex WP54G-WRT",
+	     wp54_wrt_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104k.c b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104k.c
index e5ede5e55b..8b2b445506 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104k.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104k.c
@@ -32,4 +32,5 @@ static void __init br6104k_setup(void)
 					br6104k_gpio_leds);
 }
 
-MIPS_MACHINE(MACH_ADM5120_BR6104K, "Edimax BR-6104K", br6104k_setup);
+MIPS_MACHINE(MACH_ADM5120_BR6104K, "BR-6104K", "Edimax BR-6104K",
+	     br6104k_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104kp.c b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104kp.c
index f4e9f6c09f..034575d6b2 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104kp.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-6104kp.c
@@ -35,4 +35,5 @@ static void __init br6104kp_setup(void)
 	adm5120_add_device_usb();
 }
 
-MIPS_MACHINE(MACH_ADM5120_BR6104KP, "Edimax BR-6104KP", br6104kp_setup);
+MIPS_MACHINE(MACH_ADM5120_BR6104KP, "BR-6104KP", "Edimax BR-6104KP",
+	     br6104kp_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61x4wg.c b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61x4wg.c
index b9a208b603..5d57507101 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61x4wg.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/edimax/br-61x4wg.c
@@ -39,4 +39,5 @@ static void __init br61x4wg_setup(void)
 					br61x4wg_pci_irqs);
 }
 
-MIPS_MACHINE(MACH_ADM5120_BR61X4WG, "Edimax BR-6104WG/6114WG", br61x4wg_setup);
+MIPS_MACHINE(MACH_ADM5120_BR61X4WG, "BR-6104WG", "Edimax BR-6104WG/6114WG",
+	     br61x4wg_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-rt.c b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-rt.c
index aa01f4e2e6..31eaee7721 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-rt.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-rt.c
@@ -44,6 +44,5 @@ static void __init easy5120_rt_setup(void)
 				easy5120_rt_pci_irqs);
 }
 
-MIPS_MACHINE(MACH_ADM5120_EASY5120RT,
-		"Infineon EASY 5120-RT Reference Board",
-		easy5120_rt_setup);
+MIPS_MACHINE(MACH_ADM5120_EASY5120RT, "EASY5120-RT",
+	     "Infineon EASY 5120-RT Reference Board", easy5120_rt_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-wvoip.c b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-wvoip.c
index bf8e15d37f..0bf404cc26 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-wvoip.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120-wvoip.c
@@ -20,6 +20,5 @@ static void __init easy5120wvoip_setup(void)
 	/* TODO: setup PCI IRQ map */
 }
 
-MIPS_MACHINE(MACH_ADM5120_EASY5120WVOIP,
-		"Infineon EASY 5120-WVoIP Reference Board",
-		easy5120wvoip_setup);
+MIPS_MACHINE(MACH_ADM5120_EASY5120WVOIP, "EASY5120WVoIP",
+	     "Infineon EASY 5120-WVoIP Reference Board", easy5120wvoip_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120p-ata.c b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120p-ata.c
index fa9b0aca3c..fafe0238bd 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120p-ata.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy5120p-ata.c
@@ -18,6 +18,5 @@ static void __init easy5120pata_setup(void)
 	adm5120_add_device_switch(6, NULL);
 }
 
-MIPS_MACHINE(MACH_ADM5120_EASY5120PATA,
-		"Infineon EASY 5120P-ATA Reference Board",
-		easy5120pata_setup);
+MIPS_MACHINE(MACH_ADM5120_EASY5120PATA, "EASY5120P-ATA",
+	     "Infineon EASY 5120P-ATA Reference Board", easy5120pata_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy83000.c b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy83000.c
index 709d0a8230..051b852749 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy83000.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/infineon/easy83000.c
@@ -19,6 +19,5 @@ static void __init easy83000_setup(void)
 	/* TODO: add VINAX device */
 }
 
-MIPS_MACHINE(MACH_ADM5120_EASY83000,
-		"Infineon EASY 83000 Reference Board",
-		easy83000_setup);
+MIPS_MACHINE(MACH_ADM5120_EASY83000, "EASY8300",
+	     "Infineon EASY 83000 Reference Board", easy83000_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c
index b74c2ca0c9..9adf633dfd 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-11x.c
@@ -32,4 +32,5 @@ static void __init rb11x_setup(void)
 					rb11x_gpio_leds);
 }
 
-MIPS_MACHINE(MACH_ADM5120_RB_11X, "Mikrotik RouterBOARD 111/112", rb11x_setup);
+MIPS_MACHINE(MACH_ADM5120_RB_11X, "11x", "Mikrotik RouterBOARD 111/112",
+	     rb11x_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c
index 46fcc24331..5045b2b9d0 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133.c
@@ -37,4 +37,5 @@ static void __init rb133_setup(void)
 					rb133_gpio_leds);
 }
 
-MIPS_MACHINE(MACH_ADM5120_RB_133, "Mikrotik RouterBOARD 133", rb133_setup);
+MIPS_MACHINE(MACH_ADM5120_RB_133, "133", "Mikrotik RouterBOARD 133",
+	     rb133_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c
index 9fcbeb7b9b..b5caa485ca 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-133c.c
@@ -33,4 +33,5 @@ static void __init rb133c_setup(void)
 					rb133c_gpio_leds);
 }
 
-MIPS_MACHINE(MACH_ADM5120_RB_133C, "Mikrotik RouterBOARD 133C", rb133c_setup);
+MIPS_MACHINE(MACH_ADM5120_RB_133C, "133C", "Mikrotik RouterBOARD 133C",
+	     rb133c_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c
index 8c6caf82fe..35d4300d29 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-150.c
@@ -133,4 +133,5 @@ static void __init rb150_setup(void)
 	adm5120_add_device_switch(5, rb150_vlans);
 }
 
-MIPS_MACHINE(MACH_ADM5120_RB_150, "Mikrotik RouterBOARD 150", rb150_setup);
+MIPS_MACHINE(MACH_ADM5120_RB_150, "miniROUTER", "Mikrotik RouterBOARD 150",
+	     rb150_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c
index 3b520470a1..decf98bb27 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-153.c
@@ -71,4 +71,5 @@ static void __init rb153_setup(void)
 	adm5120_add_device_switch(5, rb153_vlans);
 }
 
-MIPS_MACHINE(MACH_ADM5120_RB_153, "Mikrotik RouterBOARD 153", rb153_setup);
+MIPS_MACHINE(MACH_ADM5120_RB_153, "150", "Mikrotik RouterBOARD 153",
+	     rb153_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c
index b9f47d3284..8cf8941b75 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-192.c
@@ -24,4 +24,5 @@ static void __init rb192_setup(void)
 	adm5120_add_device_switch(6, rb192_vlans);
 }
 
-MIPS_MACHINE(MACH_ADM5120_RB_192, "Mikrotik RouterBOARD 192", rb192_setup);
+MIPS_MACHINE(MACH_ADM5120_RB_192, "192", "Mikrotik RouterBOARD 192",
+	     rb192_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/motorola/pmugw.c b/target/linux/adm5120/files/arch/mips/adm5120/motorola/pmugw.c
index d0f1416046..1e82bd8d4d 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/motorola/pmugw.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/motorola/pmugw.c
@@ -96,6 +96,5 @@ void __init pmugw_setup(void)
 	adm5120_add_device_switch(5, pmugw_vlans);
 }
 
-MIPS_MACHINE(MACH_ADM5120_PMUGW,
-		"Motorola Powerline MU Gateway",
-		pmugw_setup);
+MIPS_MACHINE(MACH_ADM5120_PMUGW, "PMUGW", "Motorola Powerline MU Gateway",
+	     pmugw_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/osbridge/5gxi.c b/target/linux/adm5120/files/arch/mips/adm5120/osbridge/5gxi.c
index 94228b371d..0fd449aecf 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/osbridge/5gxi.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/osbridge/5gxi.c
@@ -71,5 +71,5 @@ static void __init osbridge_5gxi_setup(void)
 				osbridge_5gxi_pci_irqs);
 }
 
-MIPS_MACHINE(MACH_ADM5120_5GXI, "OSBRiDGE 5GXi/5XLi board",
+MIPS_MACHINE(MACH_ADM5120_5GXI, "5GXi", "OSBRiDGE 5GXi/5XLi board",
 	     osbridge_5gxi_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-334wt.c b/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-334wt.c
index c08650db97..c4e4dfec1a 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-334wt.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-334wt.c
@@ -30,4 +30,5 @@ static void __init p334wt_setup(void)
 					p334wt_gpio_leds);
 }
 
-MIPS_MACHINE(MACH_ADM5120_P334WT, "ZyXEL Prestige 334WT", p334wt_setup);
+MIPS_MACHINE(MACH_ADM5120_P334WT, "P-334WT" "ZyXEL Prestige 334WT",
+	     p334wt_setup);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-335.c b/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-335.c
index 0b56e1b772..6ac2b09158 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-335.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/zyxel/p-335.c
@@ -17,4 +17,5 @@ static void __init p335_setup(void)
 	adm5120_add_device_usb();
 }
 
-MIPS_MACHINE(MACH_ADM5120_P335, "ZyXEL Prestige 335/335WT", p335_setup);
+MIPS_MACHINE(MACH_ADM5120_P335, "P-335", "ZyXEL Prestige 335/335WT",
+	     p335_setup);