aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2018-12-20 00:02:31 +0100
committerJonas Gorski <jonas.gorski@gmail.com>2018-12-30 13:22:13 +0100
commita01568fbd34eefeb7c92da68a55d25000728d7a6 (patch)
tree8358cbe73d27d69c35a99147bbeab3c7aac6e0ed /target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
parentd09561f73d74c467347753a153c509faa48233a1 (diff)
downloadupstream-a01568fbd34eefeb7c92da68a55d25000728d7a6.tar.gz
upstream-a01568fbd34eefeb7c92da68a55d25000728d7a6.tar.bz2
upstream-a01568fbd34eefeb7c92da68a55d25000728d7a6.zip
brcm63xx: remove broken DSP platform device code
There is no driver and it crashes the kernel, so just remove it. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch20
1 files changed, 6 insertions, 14 deletions
diff --git a/target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
index f2b2847e68..90b1640d16 100644
--- a/target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
+++ b/target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
@@ -24,7 +24,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -12,34 +12,21 @@
+@@ -12,33 +12,21 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@ -39,7 +39,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
#include <bcm63xx_nvram.h>
-#include <bcm63xx_dev_pci.h>
-#include <bcm63xx_dev_enet.h>
--#include <bcm63xx_dev_dsp.h>
-#include <bcm63xx_dev_flash.h>
-#include <bcm63xx_dev_hsspi.h>
-#include <bcm63xx_dev_pcmcia.h>
@@ -61,7 +60,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
/*
* known 3368 boards
*/
-@@ -712,52 +699,6 @@ static const struct board_info __initcon
+@@ -695,52 +683,6 @@ static const struct board_info __initcon
};
/*
@@ -114,7 +113,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
* early init callback, read nvram data from flash and checksum it
*/
void __init board_prom_init(void)
-@@ -802,140 +743,15 @@ void __init board_prom_init(void)
+@@ -785,137 +727,15 @@ void __init board_prom_init(void)
if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
continue;
/* copy, board desc array is marked initdata */
@@ -144,7 +143,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- bcm63xx_pci_enabled = 1;
- if (BCMCPU_IS_6348())
- val |= GPIO_MODE_6348_G2_PCI;
-- }
+ }
-#endif
-
- if (board.has_pccard) {
@@ -225,9 +224,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- if (board.has_ohci0)
- bcm63xx_ohci_register();
-
-- if (board.has_dsp)
-- bcm63xx_dsp_register(&board.dsp);
--
- /* Generate MAC address for WLAN and register our SPROM,
- * do this after registering enet devices
- */
@@ -238,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- if (ssb_arch_register_fallback_sprom(
- &bcm63xx_get_fallback_sprom) < 0)
- pr_err("failed to register fallback SPROM\n");
- }
+- }
-#endif
-
- bcm63xx_spi_register();
@@ -260,7 +256,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
}
--- /dev/null
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,214 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
@@ -285,7 +281,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+#include <bcm63xx_gpio.h>
+#include <bcm63xx_dev_pci.h>
+#include <bcm63xx_dev_enet.h>
-+#include <bcm63xx_dev_dsp.h>
+#include <bcm63xx_dev_flash.h>
+#include <bcm63xx_dev_hsspi.h>
+#include <bcm63xx_dev_pcmcia.h>
@@ -446,9 +441,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+ if (board.has_ohci0)
+ bcm63xx_ohci_register();
+
-+ if (board.has_dsp)
-+ bcm63xx_dsp_register(&board.dsp);
-+
+ /* Generate MAC address for WLAN and register our SPROM,
+ * do this after registering enet devices
+ */