X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.10%2F501-board-NB4.patch;h=5f16bb5b2a66ff946b7cd6c9504611dc52cd0409;hb=d0ad8c00b6cc0716feae5d12c2ae5b4717c4ac29;hp=94da7ba149e18e23466fd0f2552c7ed3a1649bb7;hpb=7ef37c8e3e5a787f91581fa78b527d78b5e0dc1c;p=oweals%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
index 94da7ba149..5f16bb5b2a 100644
--- a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
@@ -1,15 +1,17 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -15,6 +15,8 @@
+@@ -12,6 +12,10 @@
+ #include <linux/string.h>
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
- #include <linux/spi/spi.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
 +#include <linux/spi/spi_gpio.h>
 +#include <linux/spi/74x164.h>
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -49,6 +51,12 @@
+@@ -35,6 +39,12 @@
  #define CFE_OFFSET_64K			0x10000
  #define CFE_OFFSET_128K			0x20000
  
@@ -19,10 +21,10 @@
 +#define NB4_SPI_GPIO_CLK	6
 +#define NB4_74HC64_GPIO(X)	(NB4_74X164_GPIO_BASE + (X))
 +
- static struct board_info board;
- 
  /*
-@@ -754,6 +762,596 @@ static struct board_info __initdata boar
+  * known 3368 boards
+  */
+@@ -739,6 +749,601 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  };
@@ -87,6 +89,7 @@
 +	.has_ohci0 = 1,
 +	.has_pccard = 1,
 +	.has_ehci0 = 1,
++	.num_usbh_ports			= 2,
 +
 +	.leds = {
 +		{
@@ -200,6 +203,7 @@
 +	.has_ohci0 = 1,
 +	.has_pccard = 1,
 +	.has_ehci0 = 1,
++	.num_usbh_ports			= 2,
 +
 +	.leds = {
 +		{
@@ -313,6 +317,7 @@
 +	.has_ohci0 = 1,
 +	.has_pccard = 1,
 +	.has_ehci0 = 1,
++	.num_usbh_ports			= 2,
 +
 +	.leds = {
 +		{
@@ -426,6 +431,7 @@
 +	.has_ohci0 = 1,
 +	.has_pccard = 1,
 +	.has_ehci0 = 1,
++	.num_usbh_ports			= 2,
 +
 +	.leds = {
 +		{
@@ -534,6 +540,7 @@
 +	.has_ohci0 = 1,
 +	.has_pccard = 1,
 +	.has_ehci0 = 1,
++	.num_usbh_ports			= 2,
 +
 +	.leds = {
 +		{
@@ -619,7 +626,7 @@
  #endif
  
  /*
-@@ -790,6 +1388,11 @@ static const struct board_info __initcon
+@@ -775,6 +1380,11 @@ static const struct board_info __initcon
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
@@ -631,7 +638,7 @@
  #endif
  };
  
-@@ -844,6 +1447,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -783,6 +1393,16 @@ static void __init boardid_fixup(u8 *boo
  	struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
  	char *board_name = (char *)bcm63xx_nvram_get_name();