X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F520-bcm63xx-add-support-for-96368MVWG-board.patch;h=2d144e5916e50a5e7ad5b42c159768fd3298a63c;hb=b82cb155fced6a99989870c92ebff8248c435fe7;hp=b83d564e21efdda44d788e40980596bd61d1e991;hpb=770ba9d40fc6a0198e0253c6e6eab283b9a22ebd;p=openwrt%2Fstaging%2Fmkresin.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 b83d564e21..2d144e5916 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
-@@ -1934,6 +1934,85 @@ static struct board_info __initdata boar
+@@ -1170,6 +1170,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[] = {
-@@ -1985,6 +2064,10 @@ static const struct board_info __initcon
+@@ -1221,6 +1274,10 @@ static const struct board_info __initcon
  	&board_HW553,
  	&board_spw303v,
  #endif
@@ -106,7 +80,15 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +#endif
  };
  
- /*
+ static struct of_device_id const bcm963xx_boards_dt[] = {
+@@ -1277,6 +1334,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, },
 --- 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