kernel: bump 4.14 to 4.14.169

[openwrt/staging/hauke.git] / target / linux / brcm63xx / patches-4.14 / 207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch

diff --git a/target/linux/brcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/brcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
index f2b2847e6839c447dcf9c76093c2d48e2c834817..7831376ffc36b42ce93f7b3fa27cece531d7c61e 100644 (file)
--- a/target/linux/brcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
+++ b/target/linux/brcm63xx/patches-4.14/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();