target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch

   1 --- a/arch/mips/bcm63xx/dev-flash.c
   2 +++ b/arch/mips/bcm63xx/dev-flash.c
   3 @@ -23,6 +23,8 @@
   4  #include <bcm63xx_regs.h>
   5  #include <bcm63xx_io.h>
   6
   7 +#include "boards/board_common.h"
   8 +
   9  static int flash_type;
  10
  11  static struct mtd_partition mtd_partitions[] = {
  12 @@ -178,6 +180,9 @@ int __init bcm63xx_flash_register(void)
  13
  14         switch (flash_type) {
  15         case BCM63XX_FLASH_TYPE_PARALLEL:
  16 +               /* don't register when already registered through from dtb */
  17 +               if (board_of_device_present("pflash"))
  18 +                       return 0;
  19
  20                 if (!mtd_resources[0].start) {
  21                         /* read base address of boot chip select (0) */