aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-01-13 12:11:45 +0000
committerJonas Gorski <jogo@openwrt.org>2014-01-13 12:11:45 +0000
commitf08f0cafc24619242853e3fe11e2e5876c498551 (patch)
tree8d78856b36f0108ed23f2c724aff41e6690108dc /target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
parentd0a757147bcfb1813585638b08ee8e6a8d743254 (diff)
downloadupstream-f08f0cafc24619242853e3fe11e2e5876c498551.tar.gz
upstream-f08f0cafc24619242853e3fe11e2e5876c498551.tar.bz2
upstream-f08f0cafc24619242853e3fe11e2e5876c498551.zip
brcm63xx: update HSSPI driver with upstream submission
Update the HSSPI driver with the upstream submitted one that has a workaround for the auto cs down issue. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 39264
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
index 6dfb540b7c..937b9d64f3 100644
--- a/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
#include <board_bcm963xx.h>
#include <uapi/linux/bcm933xx_hcs.h>
@@ -8,7 +8,7 @@
#define PFX "board_bcm963xx: "
-@@ -42,6 +43,9 @@
+@@ -43,6 +44,9 @@
#define BCM963XX_KEYS_POLL_INTERVAL 20
#define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
@@ -18,7 +18,7 @@
static struct board_info board;
/*
-@@ -781,6 +785,30 @@ const char *board_get_name(void)
+@@ -782,6 +786,30 @@ const char *board_get_name(void)
return board.name;
}
@@ -49,7 +49,7 @@
/*
* early init callback, read nvram data from flash and checksum it
*/
-@@ -819,6 +847,10 @@ void __init board_prom_init(void)
+@@ -820,6 +848,10 @@ void __init board_prom_init(void)
hcs = (struct bcm_hcs *)boot_addr;
board_name = hcs->filename;
} else {