brcm47xx: detect Netgear R6300 V1 & support reset button
It's still far from complete support. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 46880
This commit is contained in:
		@@ -8,7 +8,15 @@
 | 
				
			|||||||
 	{{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
 | 
					 	{{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
 | 
				
			||||||
 	{{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
 | 
					 	{{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
 | 
				
			||||||
 	{{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
 | 
					 	{{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
 | 
				
			||||||
@@ -162,6 +163,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
 | 
					@@ -150,6 +151,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
 | 
				
			||||||
 | 
					 static const
 | 
				
			||||||
 | 
					 struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
 | 
				
			||||||
 | 
					 	{{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
 | 
				
			||||||
 | 
					+	{{BCM47XX_BOARD_NETGEAR_R6300_V1, "Netgear R6300 V1"}, "U12H218T00_NETGEAR"},
 | 
				
			||||||
 | 
					 	{{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
 | 
				
			||||||
 | 
					 	{{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
 | 
				
			||||||
 | 
					 	{{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
 | 
				
			||||||
 | 
					@@ -162,6 +164,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
 | 
				
			||||||
 	{{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
 | 
					 	{{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
 | 
				
			||||||
 	{{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
 | 
					 	{{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
 | 
				
			||||||
 	{{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
 | 
					 	{{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
 | 
				
			||||||
@@ -50,7 +58,19 @@
 | 
				
			|||||||
 bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
 | 
					 bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
 | 
				
			||||||
 	BCM47XX_GPIO_KEY(5, KEY_WIMAX),
 | 
					 	BCM47XX_GPIO_KEY(5, KEY_WIMAX),
 | 
				
			||||||
 	BCM47XX_GPIO_KEY(6, KEY_RESTART),
 | 
					 	BCM47XX_GPIO_KEY(6, KEY_RESTART),
 | 
				
			||||||
@@ -360,6 +378,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
 | 
					@@ -333,6 +351,11 @@ bcm47xx_buttons_motorola_wr850gv2v3[] __
 | 
				
			||||||
 | 
					 /* Netgear */
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 static const struct gpio_keys_button
 | 
				
			||||||
 | 
					+bcm47xx_buttons_netgear_r6300_v1[] __initconst = {
 | 
				
			||||||
 | 
					+	BCM47XX_GPIO_KEY(6, KEY_RESTART),
 | 
				
			||||||
 | 
					+};
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+static const struct gpio_keys_button
 | 
				
			||||||
 | 
					 bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
 | 
				
			||||||
 | 
					 	BCM47XX_GPIO_KEY(4, KEY_RESTART),
 | 
				
			||||||
 | 
					 	BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
 | 
				
			||||||
 | 
					@@ -360,6 +383,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
 | 
				
			||||||
 };
 | 
					 };
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 static const struct gpio_keys_button
 | 
					 static const struct gpio_keys_button
 | 
				
			||||||
@@ -62,7 +82,7 @@
 | 
				
			|||||||
 bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
 | 
					 bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
 | 
				
			||||||
 	BCM47XX_GPIO_KEY(4, KEY_RESTART),
 | 
					 	BCM47XX_GPIO_KEY(4, KEY_RESTART),
 | 
				
			||||||
 	BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
 | 
					 	BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
 | 
				
			||||||
@@ -414,6 +437,9 @@ int __init bcm47xx_buttons_register(void
 | 
					@@ -414,6 +442,9 @@ int __init bcm47xx_buttons_register(void
 | 
				
			||||||
 	int err;
 | 
					 	int err;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 	switch (board) {
 | 
					 	switch (board) {
 | 
				
			||||||
@@ -72,7 +92,7 @@
 | 
				
			|||||||
 	case BCM47XX_BOARD_ASUS_RTN12:
 | 
					 	case BCM47XX_BOARD_ASUS_RTN12:
 | 
				
			||||||
 		err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
 | 
					 		err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
@@ -544,6 +570,12 @@ int __init bcm47xx_buttons_register(void
 | 
					@@ -544,6 +575,12 @@ int __init bcm47xx_buttons_register(void
 | 
				
			||||||
 	case BCM47XX_BOARD_LINKSYS_WRT310NV1:
 | 
					 	case BCM47XX_BOARD_LINKSYS_WRT310NV1:
 | 
				
			||||||
 		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
 | 
					 		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
@@ -85,7 +105,17 @@
 | 
				
			|||||||
 	case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 | 
					 	case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 | 
				
			||||||
 		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
 | 
					 		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
@@ -592,6 +624,9 @@ int __init bcm47xx_buttons_register(void
 | 
					@@ -580,6 +617,9 @@ int __init bcm47xx_buttons_register(void
 | 
				
			||||||
 | 
					 		err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_wr850gv2v3);
 | 
				
			||||||
 | 
					 		break;
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+	case BCM47XX_BOARD_NETGEAR_R6300_V1:
 | 
				
			||||||
 | 
					+		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1);
 | 
				
			||||||
 | 
					+		break;
 | 
				
			||||||
 | 
					 	case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
 | 
				
			||||||
 | 
					 		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
 | 
				
			||||||
 | 
					 		break;
 | 
				
			||||||
 | 
					@@ -592,6 +632,9 @@ int __init bcm47xx_buttons_register(void
 | 
				
			||||||
 	case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
 | 
					 	case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
 | 
				
			||||||
 		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
 | 
					 		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
@@ -105,7 +135,15 @@
 | 
				
			|||||||
 	BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
 | 
					 	BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
 | 
				
			||||||
 	BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
 | 
					 	BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
 | 
				
			||||||
 	BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
 | 
					 	BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
 | 
				
			||||||
@@ -100,6 +101,7 @@ enum bcm47xx_board {
 | 
					@@ -88,6 +89,7 @@ enum bcm47xx_board {
 | 
				
			||||||
 | 
					 	BCM47XX_BOARD_MOTOROLA_WR850GP,
 | 
				
			||||||
 | 
					 	BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+	BCM47XX_BOARD_NETGEAR_R6300_V1,
 | 
				
			||||||
 | 
					 	BCM47XX_BOARD_NETGEAR_WGR614V8,
 | 
				
			||||||
 | 
					 	BCM47XX_BOARD_NETGEAR_WGR614V9,
 | 
				
			||||||
 | 
					 	BCM47XX_BOARD_NETGEAR_WGR614_V10,
 | 
				
			||||||
 | 
					@@ -100,6 +102,7 @@ enum bcm47xx_board {
 | 
				
			||||||
 	BCM47XX_BOARD_NETGEAR_WNDR4000,
 | 
					 	BCM47XX_BOARD_NETGEAR_WNDR4000,
 | 
				
			||||||
 	BCM47XX_BOARD_NETGEAR_WNDR4500V1,
 | 
					 	BCM47XX_BOARD_NETGEAR_WNDR4500V1,
 | 
				
			||||||
 	BCM47XX_BOARD_NETGEAR_WNDR4500V2,
 | 
					 	BCM47XX_BOARD_NETGEAR_WNDR4500V2,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user