kernel: update 3.18 to 3.18.14

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-3.18 / 344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch

diff --git a/target/linux/brcm63xx/patches-3.18/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch b/target/linux/brcm63xx/patches-3.18/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch
index a91a29b16c03a2e64d970cd5fbaeab10e1e8fa80..f5b0e776681fb50b7f86ceacb9553c065f1edea5 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch
+++ b/target/linux/brcm63xx/patches-3.18/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch
@@ -43,17 +43,17 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                /* read base address of boot chip select (0) */
 --- a/arch/mips/bcm63xx/prom.c
 +++ b/arch/mips/bcm63xx/prom.c
-@@ -18,6 +18,7 @@
+@@ -17,6 +17,7 @@
+ #include <bcm63xx_cpu.h>
  #include <bcm63xx_io.h>
  #include <bcm63xx_regs.h>
- #include <bcm63xx_gpio.h>
 +#include <bcm63xx_dev_flash.h>
  
  void __init prom_init(void)
  {
-@@ -56,6 +57,9 @@ void __init prom_init(void)
-       /* register gpiochip */
-       bcm63xx_gpio_init();
+@@ -52,6 +53,9 @@ void __init prom_init(void)
+       reg &= ~mask;
+       bcm_perf_writel(reg, PERF_CKCTL_REG);
  
 +      /* detect and setup flash access */
 +      bcm63xx_flash_detect();