X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.18%2F506-board_gw6200_gw6000.patch;h=144775dbb61302b7191e7e056c3a6bd294ba0b10;hp=26e92bcf6571ea3f40a9e8f2743f2eb0c3eaba95;hb=86a0913dd8dd17dfd1f4014d3e6238efe67ae8b9;hpb=53b58f954ad1677a18632ae63f35ad4e99229460

diff --git a/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch
index 26e92bcf65..144775dbb6 100644
--- a/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -503,6 +503,112 @@ static struct board_info __initdata boar
+@@ -471,6 +471,66 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -31,39 +31,6 @@
 +		.ext_irq		= 2,
 +		.cs			= 2,
 +	},
-+
-+	.leds = {
-+		{
-+			.name		= "GW6200:green:line1",
-+			.gpio		= 4,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "GW6200:green:line2",
-+			.gpio		= 5,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "GW6200:green:line3",
-+			.gpio		= 6,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "GW6200:green:tel",
-+			.gpio		= 7,
-+			.active_low	= 1,
-+		},
-+	},
-+	.buttons = {
-+		{
-+			.desc		= "reset",
-+			.gpio		= 36,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_RESTART,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
 +};
 +
 +static struct board_info __initdata board_gw6000 = {
@@ -93,19 +60,6 @@
 +		.ext_irq		= 2,
 +		.cs			= 2,
 +	},
-+
-+	/* GW6000 has no GPIO-controlled leds */
-+
-+	.buttons = {
-+		{
-+			.desc		= "reset",
-+			.gpio		= 36,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_RESTART,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
 +};
 +
 +
@@ -113,7 +67,7 @@
  static struct board_info __initdata board_FAST2404 = {
  	.name				= "F@ST2404",
  	.expected_cpu_id		= 0x6348,
-@@ -1303,6 +1409,8 @@ static const struct board_info __initcon
+@@ -882,6 +942,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
  	&board_96348gw,
@@ -122,7 +76,7 @@
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
-@@ -1352,6 +1460,8 @@ static struct of_device_id const bcm963x
+@@ -931,6 +993,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
  	{ .compatible = "t-com,spw500v", .data = &board_spw500v, },