projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm63xx: 3.10: backport multi-board support
[openwrt.git]
/
target
/
linux
/
brcm63xx
/
patches-3.10
/
501-board-NB4.patch
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
20d398c
..
ca32c79
100644
(file)
--- 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,19
@@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -15,6 +15,8 @@
+@@ -12,6 +12,12 @@
+ #include <linux/string.h>
#include <linux/gpio_keys.h>
#include <linux/input.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/spi_gpio.h>
++#if 0 /* FIXME: 3.14 removed non-DT support */
+#include <linux/spi/74x164.h>
+#include <linux/spi/74x164.h>
++#endif
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -
49,6 +51,12 @@
+@@ -
343,6 +349,12 @@ static struct board_info __initdata boar
#define CFE_OFFSET_64K 0x10000
#define CFE_OFFSET_128K 0x20000
#define CFE_OFFSET_64K 0x10000
#define CFE_OFFSET_128K 0x20000
@@
-19,10
+23,10
@@
+#define NB4_SPI_GPIO_CLK 6
+#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
+
+#define NB4_SPI_GPIO_CLK 6
+#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
+
- static struct board_info board;
- /*
-@@ -755,6 +763,601 @@ static struct board_info __initdata boar
+ .has_ohci0 = 1,
+ .has_pccard = 1,
+@@ -739,6 +751,605 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
.has_ohci0 = 1,
};
@@
-47,11
+51,14
@@
+ &nb4_spi_gpio,
+};
+
+ &nb4_spi_gpio,
+};
+
++#if 0 /* FIXME: 3.14 removed non-DT support */
+const struct gen_74x164_chip_platform_data nb4_74x164_platform_data = {
+ .base = NB4_74X164_GPIO_BASE
+};
+const struct gen_74x164_chip_platform_data nb4_74x164_platform_data = {
+ .base = NB4_74X164_GPIO_BASE
+};
++#endif
+
+static struct spi_board_info nb4_spi_devices[] = {
+
+static struct spi_board_info nb4_spi_devices[] = {
++#if 0 /* FIXME: 3.14 removed non-DT support */
+ {
+ .modalias = "74x164",
+ .max_speed_hz = 781000,
+ {
+ .modalias = "74x164",
+ .max_speed_hz = 781000,
@@
-60,6
+67,7
@@
+ .mode = SPI_MODE_0,
+ .platform_data = &nb4_74x164_platform_data
+ }
+ .mode = SPI_MODE_0,
+ .platform_data = &nb4_74x164_platform_data
+ }
++#endif
+};
+
+static struct board_info __initdata board_nb4_ser_r0 = {
+};
+
+static struct board_info __initdata board_nb4_ser_r0 = {
@@
-624,7
+632,7
@@
#endif
/*
#endif
/*
-@@ -7
91,6 +1394
,11 @@ static const struct board_info __initcon
+@@ -7
75,6 +1386
,11 @@ static const struct board_info __initcon
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
@@
-636,7
+644,7
@@
#endif
};
#endif
};
-@@ -
845,6 +1453
,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -
783,6 +1399
,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();
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();