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 | |
| parent | 072937888e133f5e97fd05a7496eaf7eeae04079 (diff) | |
| download | master-31e0f0ae-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz master-31e0f0ae-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2 master-31e0f0ae-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')
3 files changed, 16 insertions, 16 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index 9fde790d65..f3f4c6a3eb 100644 --- a/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -216,7 +216,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 periph_bases[1] += PERF_IRQMASK_6328_REG(1); --- a/arch/mips/bcm63xx/prom.c +++ b/arch/mips/bcm63xx/prom.c -@@ -72,7 +72,7 @@ void __init prom_init(void) +@@ -68,7 +68,7 @@ void __init prom_init(void) if (reg & OTP_6328_REG3_TP1_DISABLED) bmips_smp_enabled = 0; @@ -274,7 +274,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 bcm63xx_reset_bits = bcm6328_reset_bits; --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c -@@ -71,6 +71,9 @@ void bcm63xx_machine_reboot(void) +@@ -72,6 +72,9 @@ void bcm63xx_machine_reboot(void) case BCM3368_CPU_ID: perf_regs[0] = PERF_EXTIRQ_CFG_REG_3368; break; @@ -284,7 +284,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 case BCM6328_CPU_ID: perf_regs[0] = PERF_EXTIRQ_CFG_REG_6328; break; -@@ -110,7 +113,7 @@ void bcm63xx_machine_reboot(void) +@@ -111,7 +114,7 @@ void bcm63xx_machine_reboot(void) bcm6348_a1_reboot(); printk(KERN_INFO "triggering watchdog soft-reset...\n"); 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(); diff --git a/target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch b/target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch index d561e43f8c..baf97b2f50 100644 --- a/target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch +++ b/target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch @@ -7,7 +7,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> --- arch/mips/bcm63xx/boards/board_common.c | 2 + arch/mips/bcm63xx/gpio.c | 147 +++++++------------------------ - arch/mips/bcm63xx/prom.c | 3 - + arch/mips/bcm63xx/setup.c | 3 - 3 files changed, 33 insertions(+), 119 deletions(-) --- a/arch/mips/bcm63xx/boards/board_common.c @@ -202,15 +202,15 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> - return gpiochip_add(&bcm63xx_gpio_chip); } ---- a/arch/mips/bcm63xx/prom.c -+++ b/arch/mips/bcm63xx/prom.c -@@ -54,9 +54,6 @@ void __init prom_init(void) - reg &= ~mask; - bcm_perf_writel(reg, PERF_CKCTL_REG); +--- a/arch/mips/bcm63xx/setup.c ++++ b/arch/mips/bcm63xx/setup.c +@@ -164,9 +164,6 @@ void __init plat_mem_setup(void) + int __init bcm63xx_register_devices(void) + { - /* register gpiochip */ - bcm63xx_gpio_init(); - - /* detect and setup flash access */ - bcm63xx_flash_detect(); + return board_register_devices(); + } |