X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F520-bcm63xx-add-support-for-96368MVWG-board.patch;h=86d29cbda0bc0d746d66ae1858b8e632730db580;hb=d8c4cc64ba6cabb2e3be28c7b4539a95115119ce;hp=7132a509c88597515ab02685a7607a7780c7e84d;hpb=37c5bb66ffbb79036ae454caafa3572b00b6db11;p=15.05%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 7132a509c8..86d29cbda0 100644
--- a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1920,6 +1920,85 @@ static struct board_info __initdata boar
+@@ -1112,6 +1112,59 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -61,32 +61,6 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +		},
 +	},
 +
-+	.leds = {
-+		{
-+			.name		= "96368MVWG:green:adsl",
-+			.gpio		= 2,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "96368MVWG:green:ppp",
-+			.gpio		= 5,
-+		},
-+		{
-+			.name		= "96368MVWG:green:power",
-+			.gpio		= 22,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "96368MVWG:green:wps",
-+			.gpio		= 23,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "96368MVWG:red:ppp-fail",
-+			.gpio		= 31,
-+		},
-+	},
-+
 +	.has_ohci0 = 1,
 +	.has_ehci0 = 1,
 +};
@@ -96,7 +70,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1971,6 +2050,10 @@ static const struct board_info __initcon
+@@ -1163,6 +1216,10 @@ static const struct board_info __initcon
  	&board_HW553,
  	&board_spw303v,
  #endif
@@ -107,14 +81,14 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -2014,6 +2097,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
+@@ -1222,6 +1279,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
- 	{ .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },
+ #endif
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
 @@ -88,12 +88,25 @@ void __init board_early_setup(const stru