Changeset 13698

Timestamp:

2008-12-20T08:47:30+01:00 (9 years ago)

Author:

juhosg

Message:

[ar71xx] rb-4xx: setup code cleanup

File:

• trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c (modified) (8 diffs)

trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c

@@ -151 +151 @@
 #endif
 
-static void __init rb411_setup(void)
-{
-        rb4xx_add_device_spi();
-
-        ar71xx_add_device_mdio(0xfffffffe);
-
-        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
-        ar71xx_eth0_data.phy_mask = 0x00000001;
-
-        ar71xx_add_device_eth(0);
-
+static void __init rb4xx_generic_setup(void)
+{
         ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(rb4xx_leds_gpio),
                                         rb4xx_leds_gpio);
@@ -170 +161 @@
 
         platform_device_register(&rb4xx_nand_device);
+}
+
+static void __init rb411_setup(void)
+{
+        rb4xx_generic_setup();
+        rb4xx_add_device_spi();
+
+        ar71xx_add_device_mdio(0xfffffffe);
+
+        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+        ar71xx_eth0_data.phy_mask = 0x00000001;
+
+        ar71xx_add_device_eth(0);
 
         ar71xx_pci_init(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
@@ -178 +182 @@
 static void __init rb433_setup(void)
 {
+        rb4xx_generic_setup();
         rb433_add_device_spi();
 
@@ -193 +198 @@
         ar71xx_add_device_eth(0);
 
-        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(rb4xx_leds_gpio),
-                                        rb4xx_leds_gpio);
-
-        ar71xx_add_device_gpio_buttons(-1, RB4XX_BUTTONS_POLL_INTERVAL,
-                                        ARRAY_SIZE(rb4xx_gpio_buttons),
-                                        rb4xx_gpio_buttons);
-
-        platform_device_register(&rb4xx_nand_device);
-
         ar71xx_pci_init(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
 }
@@ -209 +205 @@
 static void __init rb450_setup(void)
 {
+        rb4xx_generic_setup();
         rb4xx_add_device_spi();
 
@@ -223 +220 @@
         ar71xx_add_device_eth(1);
         ar71xx_add_device_eth(0);
-
-        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(rb4xx_leds_gpio),
-                                        rb4xx_leds_gpio);
-
-        ar71xx_add_device_gpio_buttons(-1, RB4XX_BUTTONS_POLL_INTERVAL,
-                                        ARRAY_SIZE(rb4xx_gpio_buttons),
-                                        rb4xx_gpio_buttons);
-
-        platform_device_register(&rb4xx_nand_device);
 }
 
@@ -238 +226 @@
 static void __init rb493_setup(void)
 {
+        rb4xx_generic_setup();
         rb4xx_add_device_spi();
 
@@ -253 +242 @@
         ar71xx_add_device_eth(1);
 
-        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(rb4xx_leds_gpio),
-                                        rb4xx_leds_gpio);
-
-        ar71xx_add_device_gpio_buttons(-1, RB4XX_BUTTONS_POLL_INTERVAL,
-                                        ARRAY_SIZE(rb4xx_gpio_buttons),
-                                        rb4xx_gpio_buttons);
-
-        platform_device_register(&rb4xx_nand_device);
-
         ar71xx_pci_init(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
 }
 
 MIPS_MACHINE(AR71XX_MACH_RB_493, "MikroTik RouterBOARD 493/AH", rb493_setup);
-