diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
commit | 76d079204df113afa9e382a43abb5e1a2135150d (patch) | |
tree | 8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/brcm63xx/patches-3.18/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch | |
parent | 072937888e133f5e97fd05a7496eaf7eeae04079 (diff) | |
download | upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2 upstream-76d079204df113afa9e382a43abb5e1a2135150d.zip |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45711
Diffstat (limited to 'target/linux/brcm63xx/patches-3.18/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.18/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 a91a29b16c..f5b0e77668 100644 --- 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(); |