From 76d079204df113afa9e382a43abb5e1a2135150d Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 May 2015 19:32:46 +0000 Subject: 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 SVN-Revision: 45711 --- ...eon-add-semaphore-to-serialize-bootbus-access.patch | 18 +++++++----------- ...CTEON-Update-octeon-model.h-code-for-new-SoCs.patch | 6 ++---- ...eon-add-host-driver-for-octeon-mmc-controller.patch | 14 ++------------ .../linux/octeon/patches-3.18/160-cmdline-hack.patch | 4 ++-- 4 files changed, 13 insertions(+), 29 deletions(-) (limited to 'target/linux/octeon') diff --git a/target/linux/octeon/patches-3.18/130-MIPS-octeon-add-semaphore-to-serialize-bootbus-access.patch b/target/linux/octeon/patches-3.18/130-MIPS-octeon-add-semaphore-to-serialize-bootbus-access.patch index 6650c5b75d..bfbb4a5fd1 100644 --- a/target/linux/octeon/patches-3.18/130-MIPS-octeon-add-semaphore-to-serialize-bootbus-access.patch +++ b/target/linux/octeon/patches-3.18/130-MIPS-octeon-add-semaphore-to-serialize-bootbus-access.patch @@ -1,25 +1,21 @@ -diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c -index a42110e..01130e9 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c -@@ -51,6 +51,9 @@ extern void pci_console_init(const char *arg); - +@@ -50,6 +50,9 @@ extern void pci_console_init(const char + static unsigned long long MAX_MEMORY = 512ull << 20; - + +DEFINE_SEMAPHORE(octeon_bootbus_sem); +EXPORT_SYMBOL(octeon_bootbus_sem); + struct octeon_boot_descriptor *octeon_boot_desc_ptr; - + struct cvmx_bootinfo *octeon_bootinfo; -diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h -index 0415965..de9f74e 100644 --- a/arch/mips/include/asm/octeon/octeon.h +++ b/arch/mips/include/asm/octeon/octeon.h -@@ -335,4 +335,6 @@ void octeon_irq_set_ip4_handler(octeon_irq_ip4_handler_t); - +@@ -252,4 +252,6 @@ void octeon_irq_set_ip4_handler(octeon_i + extern void octeon_fixup_irqs(void); - + +extern struct semaphore octeon_bootbus_sem; + #endif /* __ASM_OCTEON_OCTEON_H */ diff --git a/target/linux/octeon/patches-3.18/140-MIPS-OCTEON-Update-octeon-model.h-code-for-new-SoCs.patch b/target/linux/octeon/patches-3.18/140-MIPS-OCTEON-Update-octeon-model.h-code-for-new-SoCs.patch index c4d7347e56..d3986c7aa1 100644 --- a/target/linux/octeon/patches-3.18/140-MIPS-OCTEON-Update-octeon-model.h-code-for-new-SoCs.patch +++ b/target/linux/octeon/patches-3.18/140-MIPS-OCTEON-Update-octeon-model.h-code-for-new-SoCs.patch @@ -1,5 +1,3 @@ -diff --git a/arch/mips/include/asm/octeon/octeon-model.h b/arch/mips/include/asm/octeon/octeon-model.h -index e2c122c..35d7cbd 100644 --- a/arch/mips/include/asm/octeon/octeon-model.h +++ b/arch/mips/include/asm/octeon/octeon-model.h @@ -45,6 +45,7 @@ @@ -68,7 +66,7 @@ index e2c122c..35d7cbd 100644 /* These are used to cover entire families of OCTEON processors */ #define OCTEON_FAM_1 (OCTEON_CN3XXX) -@@ -288,9 +333,16 @@ static inline uint64_t cvmx_read_csr(uint64_t csr_addr); +@@ -288,9 +333,16 @@ static inline uint64_t cvmx_read_csr(uin ((((arg_model) & (OM_FLAG_MASK)) == OM_CHECK_SUBMODEL) \ && __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_58XX_MODEL_REV_MASK)) || \ ((((arg_model) & (OM_MATCH_5XXX_FAMILY_MODELS)) == OM_MATCH_5XXX_FAMILY_MODELS) \ @@ -87,7 +85,7 @@ index e2c122c..35d7cbd 100644 ((((arg_model) & (OM_MATCH_PREVIOUS_MODELS)) == OM_MATCH_PREVIOUS_MODELS) \ && (((chip_model) & OCTEON_58XX_MODEL_MASK) < ((arg_model) & OCTEON_58XX_MODEL_MASK))) \ ))) -@@ -326,6 +378,15 @@ static inline int __octeon_is_model_runtime__(uint32_t model) +@@ -326,6 +378,15 @@ static inline int __octeon_is_model_runt #define OCTEON_IS_COMMON_BINARY() 1 #undef OCTEON_MODEL diff --git a/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch b/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch index f2e3b5841c..599d4e2364 100644 --- a/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch +++ b/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch @@ -1,6 +1,3 @@ -diff --git a/Documentation/devicetree/bindings/mmc/octeon-mmc.txt b/Documentation/devicetree/bindings/mmc/octeon-mmc.txt -new file mode 100644 -index 0000000..40dd7f1 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/octeon-mmc.txt @@ -0,0 +1,69 @@ @@ -73,11 +70,9 @@ index 0000000..40dd7f1 + power-gpios = <&gpio 8 0>; + }; + }; -diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 2d6fbdd..5077dfa 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig -@@ -338,6 +338,16 @@ +@@ -405,6 +405,16 @@ config MMC_MXS If unsure, say N. @@ -94,11 +89,9 @@ index 2d6fbdd..5077dfa 100644 config MMC_TIFM_SD tristate "TI Flash Media MMC/SD Interface support" depends on PCI -diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index f7b0a77..448bbc9 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -19,6 +19,7 @@ obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o +@@ -19,6 +19,7 @@ obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o @@ -106,9 +99,6 @@ index f7b0a77..448bbc9 100644 obj-$(CONFIG_MMC_OMAP) += omap.o obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o -diff --git a/drivers/mmc/host/octeon_mmc.c b/drivers/mmc/host/octeon_mmc.c -new file mode 100644 -index 0000000..baba5a0 --- /dev/null +++ b/drivers/mmc/host/octeon_mmc.c @@ -0,0 +1,1518 @@ diff --git a/target/linux/octeon/patches-3.18/160-cmdline-hack.patch b/target/linux/octeon/patches-3.18/160-cmdline-hack.patch index 39b8a99ae5..8ef73a12b2 100644 --- a/target/linux/octeon/patches-3.18/160-cmdline-hack.patch +++ b/target/linux/octeon/patches-3.18/160-cmdline-hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c -@@ -609,6 +609,35 @@ +@@ -609,6 +609,35 @@ void octeon_user_io_init(void) write_c0_derraddr1(0); } @@ -36,7 +36,7 @@ /** * Early entry point for arch setup */ -@@ -798,6 +827,8 @@ +@@ -798,6 +827,8 @@ void __init prom_init(void) } } -- cgit v1.2.3