X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/fa2d631359394a31b8cf7e9d1d9ed056706cabd8..de950268134cc6c5ac25a650c1809859a9d99637:/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
index a31fbea39..631313588 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
@@ -1,7 +1,7 @@
 /*
  *  Buffalo WHR-G300N board support
  *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
@@ -13,18 +13,26 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/leds.h>
 
-#include <asm/mips_machine.h>
-#include <asm/mach-ralink/dev_gpio_leds.h>
+#include <asm/mach-ralink/machine.h>
+#include <asm/mach-ralink/dev-gpio-buttons.h>
+#include <asm/mach-ralink/dev-gpio-leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
 
-#include "machine.h"
 #include "devices.h"
 
 #define WHR_G300N_GPIO_LED_DIAG		7
 #define WHR_G300N_GPIO_LED_ROUTER	9
 #define WHR_G300N_GPIO_LED_SECURITY	14
 
+#define WHR_G300N_GPIO_BUTTON_AOSS		0	/* active low */
+#define WHR_G300N_GPIO_BUTTON_RESET		10	/* active low */
+#define WHR_G300N_GPIO_BUTTON_ROUTER_ON		8	/* active low */
+#define WHR_G300N_GPIO_BUTTON_ROUTER_OFF	11	/* active low */
+
+#define WHR_G300N_BUTTONS_POLL_INTERVAL		20
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition whr_g300n_partitions[] = {
 	{
@@ -55,7 +63,7 @@ static struct mtd_partition whr_g300n_partitions[] = {
 		.offset	= 0x3f0000,
 		.size	= 0x010000,
 	}, {
-		.name	= "openwrt",
+		.name	= "firmware",
 		.offset	= 0x050000,
 		.size	= 0x3a0000,
 	}
@@ -85,12 +93,52 @@ static struct gpio_led whr_g300n_leds_gpio[] __initdata = {
 	}
 };
 
+static struct gpio_button whr_g300n_gpio_buttons[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.threshold	= 3,
+		.gpio		= WHR_G300N_GPIO_BUTTON_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "aoss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.threshold	= 3,
+		.gpio		= WHR_G300N_GPIO_BUTTON_AOSS,
+		.active_low	= 1,
+	}, {
+		.desc		= "router-off",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.threshold	= 3,
+		.gpio		= WHR_G300N_GPIO_BUTTON_ROUTER_OFF,
+		.active_low	= 1,
+	}, {
+		.desc		= "router-on",
+		.type		= EV_KEY,
+		.code		= BTN_3,
+		.threshold	= 3,
+		.gpio		= WHR_G300N_GPIO_BUTTON_ROUTER_ON,
+		.active_low	= 1,
+	}
+};
+
 static void __init whr_g300n_init(void)
 {
-	rt305x_register_flash(0, &whr_g300n_flash_data);
+	rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
+	rt305x_register_flash(0, &whr_g300n_flash_data);
+	rt305x_register_ethernet();
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(whr_g300n_leds_gpio),
 				  whr_g300n_leds_gpio);
+	ramips_register_gpio_buttons(-1, WHR_G300N_BUTTONS_POLL_INTERVAL,
+				     ARRAY_SIZE(whr_g300n_gpio_buttons),
+				     whr_g300n_gpio_buttons);
+	rt305x_register_wifi();
+	rt305x_register_wdt();
 }
 
-MIPS_MACHINE(RT305X_MACH_WHR_G300N, "Buffalo WHR-G300N", whr_g300n_init);
+MIPS_MACHINE(RAMIPS_MACH_WHR_G300N, "WHR-G300N", "Buffalo WHR-G300N",
+	     whr_g300n_init);