X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F560-board_963268gu_p300.patch;h=c25d8ca93e7998bb957b656c092878d3f0cac22d;hb=d8c4cc64ba6cabb2e3be28c7b4539a95115119ce;hp=274b995bec04e4220e79f5d53d68b931d3d58476;hpb=14bfc909feaa71de5080b1c7b9fb4faa3a258d68;p=15.05%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
index 274b995bec..c25d8ca93e 100644
--- a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4565,6 +4565,131 @@ static struct board_info __initdata boar
+@@ -1867,6 +1867,66 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -62,77 +62,12 @@
 +			},
 +		},
 +	},
-+
-+	.leds = {
-+		{
-+			.name		= "963268BU_P300:green:power",
-+			.gpio		= 20,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:red:power",
-+			.gpio		= 21,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:green:internet",
-+			.gpio		= 8,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:red:internet",
-+			.gpio		= 2,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:green:adsl",
-+			.gpio		= 3,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:green:wps",
-+			.gpio		= 7,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:green:voip1",
-+			.gpio		= 4,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:green:voip2",
-+			.gpio		= 5,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "963268BU_P300:green:pots",
-+			.gpio		= 6,
-+			.active_low	= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc		= "reset",
-+			.gpio		= 32,
-+			.type		= EV_KEY,
-+			.code		= KEY_RESTART,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc		= "wps",
-+			.gpio		= 33,
-+			.type		= EV_KEY,
-+			.code		= KEY_WPS_BUTTON,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
 +};
 +
  static struct board_info __initdata board_963269bhr = {
  	.name				= "963269BHR",
  	.expected_cpu_id		= 0x63268,
-@@ -4819,6 +4944,7 @@ static const struct board_info __initcon
+@@ -2117,6 +2177,7 @@ static const struct board_info __initcon
  	&board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -140,3 +75,11 @@
  	&board_963269bhr,
  	&board_vw6339gu,
  #endif
+@@ -2201,6 +2262,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268
++ 	{ .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },
+ #endif
+ #endif /* CONFIG_OF */
+ 	{ },