[ar71xx] change ag71xx platform device registration

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-wp543.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
index f8a2e3d7659489e890ebcc030308667a0a08e3f8..ef2ef05759a2c2b54fef9a8bd6df169f093ab827 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
@@ -10,22 +10,51 @@
  */
 
 #include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#include <linux/input.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
 #include <asm/mach-ar71xx/platform.h>
 
+#define WP543_GPIO_SW6         2
 #define WP543_GPIO_LED_1       3
 #define WP543_GPIO_LED_2       4
 #define WP543_GPIO_LED_WLAN    5
 #define WP543_GPIO_LED_CONN    6
 #define WP543_GPIO_LED_DIAG    7
+#define WP543_GPIO_SW4         8
+
+#define WP543_BUTTONS_POLL_INTERVAL    20
+
+#ifdef CONFIG_MTD_PARTITIONS
+static struct mtd_partition wp543_partitions[] = {
+       {
+               .name   = "myloader",
+               .offset = 0,
+               .size   = 0x20000,
+               .mask_flags = MTD_WRITEABLE,
+       } , {
+               .name   = "kernel",
+               .offset = 0x30000,
+               .size   = 0xd0000,
+       } , {
+               .name   = "rootfs",
+               .offset = 0x100000,
+               .size   = 0x100000,
+       }
+};
+#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct flash_platform_data wp543_flash_data = {
-       /* TODO: add partition map */
+#ifdef CONFIG_MTD_PARTITIONS
+       .parts          = wp543_partitions,
+       .nr_parts       = ARRAY_SIZE(wp543_partitions),
+#endif
 };
 
 static struct spi_board_info wp543_spi_info[] = {
@@ -74,12 +103,31 @@ static struct gpio_led wp543_leds_gpio[] __initdata = {
        }
 };
 
+static struct gpio_button wp543_gpio_buttons[] __initdata = {
+       {
+               .desc           = "sw6",
+               .type           = EV_KEY,
+               .code           = BTN_0,
+               .threshold      = 5,
+               .gpio           = WP543_GPIO_SW6,
+       }, {
+               .desc           = "sw4",
+               .type           = EV_KEY,
+               .code           = BTN_1,
+               .threshold      = 5,
+               .gpio           = WP543_GPIO_SW4,
+       }
+};
+
 static void __init wp543_setup(void)
 {
        ar71xx_add_device_spi(NULL, wp543_spi_info, ARRAY_SIZE(wp543_spi_info));
 
        ar71xx_add_device_mdio(0xfffffff7);
-       ar71xx_add_device_eth(0, PHY_INTERFACE_MODE_MII, 0x00000008);
+
+       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+       ar71xx_eth0_data.phy_mask = 0x00000008;
+       ar71xx_add_device_eth(0);
 
        ar71xx_add_device_usb();
 
@@ -87,6 +135,10 @@ static void __init wp543_setup(void)
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wp543_leds_gpio),
                                        wp543_leds_gpio);
+
+       ar71xx_add_device_gpio_buttons(-1, WP543_BUTTONS_POLL_INTERVAL,
+                                       ARRAY_SIZE(wp543_gpio_buttons),
+                                       wp543_gpio_buttons);
 }
 
 MIPS_MACHINE(MACH_AR71XX_WP543, "Compex WP543", wp543_setup);