summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-07-08 12:27:55 +0000
committerJonas Gorski <jogo@openwrt.org>2014-07-08 12:27:55 +0000
commit8630d101b7db9c19b19c714bb3335042098ed2ee (patch)
treead1832c7312bc629fa5edc5d6448ab17c746ab90 /target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
parenta6c4ef18b7de3d3840729abb2775e8dd5843be0d (diff)
downloadmtk-20170518-8630d101b7db9c19b19c714bb3335042098ed2ee.zip
mtk-20170518-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.gz
mtk-20170518-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.bz2
brcm63xx: fixup patches borked by allowing too much fuzz
Move defines and board_info structs back to their proper locations so (de-)selecting SOC support won't break the build. Reported-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41550
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch17
1 files changed, 6 insertions, 11 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
index cad29a5..1d42dde 100644
--- a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -635,6 +635,13 @@ static struct board_info __initdata boar
+@@ -45,6 +45,12 @@
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
@@ -10,11 +10,10 @@
+#define CT6373_SPI_GPIO_CLK 6
+#define CT6373_74HC64_GPIO(X) (CT6373_74X164_GPIO_BASE + (X))
+
-+
-
- .has_ohci0 = 1,
- .has_pccard = 1,
-@@ -2335,6 +2342,117 @@ static struct board_info __initdata boar
+ /*
+ * known 3368 boards
+ */
+@@ -2329,6 +2335,113 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@@ -38,14 +37,11 @@
+ &ct6373_spi_gpio,
+};
+
-+#if 0 /* FIXME: 3.14 dropped non-DT support */
+const struct gen_74x164_chip_platform_data ct6373_74x164_platform_data = {
+ .base = CT6373_74X164_GPIO_BASE
+};
-+#endif
+
+static struct spi_board_info ct6373_spi_devices[] = {
-+#if 0 /* FIXME: 3.14 dropped non-DT support */
+ {
+ .modalias = "74x164",
+ .max_speed_hz = 781000,
@@ -54,7 +50,6 @@
+ .mode = SPI_MODE_0,
+ .platform_data = &ct6373_74x164_platform_data
+ }
-+#endif
+};
+
+static struct board_info __initdata board_ct6373_1 = {
@@ -132,7 +127,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2679,6 +2797,7 @@ static const struct board_info __initcon
+@@ -2673,6 +2786,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,