Merge pull request #2302 from codesnake/update_amlogic-3.10_kernel_le90

linux: Update amlogic-3.10 kernel to amlogic-3.10-24a7272

packages/linux-drivers/wetekdvb/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="wetekdvb"
-PKG_VERSION="20170404"
+PKG_VERSION="20171207"
-PKG_SHA256="6fb718425bdd9a3bb68966a5033233cb2c2d5d7b41579309f7f7370ff41aaf40"
+PKG_SHA256="9543e07fc8b8abd94542ea9049a242c9f78b49bef07ca675d86728cf141c3fa2"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.wetek.com/"

packages/linux/package.mk

@@ -31,8 +31,8 @@ PKG_IS_KERNEL_PKG="yes"
 
 case "$LINUX" in
   amlogic-3.10)
-    PKG_VERSION="f016bb1"
+    PKG_VERSION="24a7272"
-    PKG_SHA256="6297c6aa6bbe1ffa794b516b32dd4d6be5cd4d26cd502e4dbd9079b49ad7b403"
+    PKG_SHA256="7219a9d0ba7b3ded590f335671671431b15fff64dc05b83565e2867c4f7b2e60"
     PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*"
     PKG_PATCH_DIRS="amlogic-3.10"

packages/linux/patches/amlogic-3.10/linux-002-compiler-gcc.h.patch

@@ -1,166 +0,0 @@
-From cb984d101b30eb7478d32df56a0023e4603cba7f Mon Sep 17 00:00:00 2001
-From: Joe Perches <joe@perches.com>
-Date: Thu, 25 Jun 2015 15:01:02 -0700
-Subject: compiler-gcc: integrate the various compiler-gcc[345].h files
-
-As gcc major version numbers are going to advance rather rapidly in the
-future, there's no real value in separate files for each compiler
-version.
-
-Deduplicate some of the macros #defined in each file too.
-
-Neaten comments using normal kernel commenting style.
-
-Signed-off-by: Joe Perches <joe@perches.com>
-Cc: Andi Kleen <andi@firstfloor.org>
-Cc: Michal Marek <mmarek@suse.cz>
-Cc: Segher Boessenkool <segher@kernel.crashing.org>
-Cc: Sasha Levin <levinsasha928@gmail.com>
-Cc: Anton Blanchard <anton@samba.org>
-Cc: Alan Modra <amodra@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- include/linux/compiler-gcc.h  | 120 ++++++++++++++++++++++++++++++++++++++++--
- include/linux/compiler-gcc3.h |  23 --------
- include/linux/compiler-gcc4.h |  91 --------------------------------
- include/linux/compiler-gcc5.h |  67 -----------------------
- 4 files changed, 116 insertions(+), 185 deletions(-)
- delete mode 100644 include/linux/compiler-gcc3.h
- delete mode 100644 include/linux/compiler-gcc4.h
- delete mode 100644 include/linux/compiler-gcc5.h
-
-diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
-index 5c2c14e..dfaa7b3 100644
---- a/include/linux/compiler-gcc.h
-+++ b/include/linux/compiler-gcc.h
-@@ -122,10 +122,122 @@
- #define __maybe_unused		__attribute__((unused))
- #define __always_unused		__attribute__((unused))
- 
--#define __gcc_header(x) #x
--#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
--#define gcc_header(x) _gcc_header(x)
--#include gcc_header(__GNUC__)
-+/* gcc version specific checks */
-+
-+#if GCC_VERSION < 30200
-+# error Sorry, your compiler is too old - please upgrade it.
-+#endif
-+
-+#if GCC_VERSION < 30300
-+# define __used			__attribute__((__unused__))
-+#else
-+# define __used			__attribute__((__used__))
-+#endif
-+
-+#ifdef CONFIG_GCOV_KERNEL
-+# if GCC_VERSION < 30400
-+#   error "GCOV profiling support for gcc versions below 3.4 not included"
-+# endif /* __GNUC_MINOR__ */
-+#endif /* CONFIG_GCOV_KERNEL */
-+
-+#if GCC_VERSION >= 30400
-+#define __must_check		__attribute__((warn_unused_result))
-+#endif
-+
-+#if GCC_VERSION >= 40000
-+
-+/* GCC 4.1.[01] miscompiles __weak */
-+#ifdef __KERNEL__
-+# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
-+#  error Your version of gcc miscompiles the __weak directive
-+# endif
-+#endif
-+
-+#define __used			__attribute__((__used__))
-+#define __compiler_offsetof(a, b)					\
-+	__builtin_offsetof(a, b)
-+
-+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
-+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
-+#endif
-+
-+#if GCC_VERSION >= 40300
-+/* Mark functions as cold. gcc will assume any path leading to a call
-+ * to them will be unlikely.  This means a lot of manual unlikely()s
-+ * are unnecessary now for any paths leading to the usual suspects
-+ * like BUG(), printk(), panic() etc. [but let's keep them for now for
-+ * older compilers]
-+ *
-+ * Early snapshots of gcc 4.3 don't support this and we can't detect this
-+ * in the preprocessor, but we can live with this because they're unreleased.
-+ * Maketime probing would be overkill here.
-+ *
-+ * gcc also has a __attribute__((__hot__)) to move hot functions into
-+ * a special section, but I don't see any sense in this right now in
-+ * the kernel context
-+ */
-+#define __cold			__attribute__((__cold__))
-+
-+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-+
-+#ifndef __CHECKER__
-+# define __compiletime_warning(message) __attribute__((warning(message)))
-+# define __compiletime_error(message) __attribute__((error(message)))
-+#endif /* __CHECKER__ */
-+#endif /* GCC_VERSION >= 40300 */
-+
-+#if GCC_VERSION >= 40500
-+/*
-+ * Mark a position in code as unreachable.  This can be used to
-+ * suppress control flow warnings after asm blocks that transfer
-+ * control elsewhere.
-+ *
-+ * Early snapshots of gcc 4.5 don't support this and we can't detect
-+ * this in the preprocessor, but we can live with this because they're
-+ * unreleased.  Really, we need to have autoconf for the kernel.
-+ */
-+#define unreachable() __builtin_unreachable()
-+
-+/* Mark a function definition as prohibited from being cloned. */
-+#define __noclone	__attribute__((__noclone__))
-+
-+#endif /* GCC_VERSION >= 40500 */
-+
-+#if GCC_VERSION >= 40600
-+/*
-+ * Tell the optimizer that something else uses this function or variable.
-+ */
-+#define __visible	__attribute__((externally_visible))
-+#endif
-+
-+/*
-+ * GCC 'asm goto' miscompiles certain code sequences:
-+ *
-+ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-+ *
-+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
-+ *
-+ * (asm goto is automatically volatile - the naming reflects this.)
-+ */
-+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
-+
-+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-+#if GCC_VERSION >= 40400
-+#define __HAVE_BUILTIN_BSWAP32__
-+#define __HAVE_BUILTIN_BSWAP64__
-+#endif
-+#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
-+#define __HAVE_BUILTIN_BSWAP16__
-+#endif
-+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
-+
-+#if GCC_VERSION >= 50000
-+#define KASAN_ABI_VERSION 4
-+#elif GCC_VERSION >= 40902
-+#define KASAN_ABI_VERSION 3
-+#endif
-+
-+#endif	/* gcc version >= 40000 specific checks */
- 
- #if !defined(__noclone)
- #define __noclone	/* not needed */
--- 
-cgit v0.12
-

projects/WeTek_Play/patches/linux/060-wetek-dvb-less-log-spam.patch

@@ -1,175 +0,0 @@
-From 8b7d9e995c6af7ac0a5ae231afcf02790d99b671 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Fri, 7 Aug 2015 15:03:23 +0300
-Subject: [PATCH] wetek/dvb: less log spam
-
----
- drivers/amlogic/wetek/avl6211.c |    8 ++++----
- drivers/amlogic/wetek/cxd2837.c |   18 +++++++++---------
- drivers/amlogic/wetek/mn88436.c |    2 +-
- drivers/amlogic/wetek/mxl603.c  |    4 ++--
- 4 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/amlogic/wetek/avl6211.c b/drivers/amlogic/wetek/avl6211.c
-index 0bb0f23..74eb19f 100644
---- a/drivers/amlogic/wetek/avl6211.c
-+++ b/drivers/amlogic/wetek/avl6211.c
-@@ -628,7 +628,7 @@ static int av2011_lock(struct dvb_frontend* fe)
- 		BW = 40000;
- 	BF = (BW * 127 + 21100/2) / 21100; 
- 	
--	dev_info(&state->i2c->dev, "BF is %d,BW is %d\n", BF, BW);
-+	dev_dbg(&state->i2c->dev, "BF is %d,BW is %d\n", BF, BW);
- 	
- 	reg[5] = (u8)BF;
- 
-@@ -1578,7 +1578,7 @@ static int avl6211_set_frontend(struct dvb_frontend* fe)
- 	
- 	state->locked = 0;
- 
--	dev_info(&state->i2c->dev, 
-+	dev_dbg(&state->i2c->dev, 
- 		"%s: delivery_system=%d frequency=%d symbol_rate=%d\n", 
- 		__func__, c->delivery_system, c->frequency, c->symbol_rate);
- 
-@@ -1611,7 +1611,7 @@ static int avl6211_set_frontend(struct dvb_frontend* fe)
- 		goto err;
- 	}
- 	
--	dev_info(&state->i2c->dev, "Tuner successfully lock!\n");
-+	dev_dbg(&state->i2c->dev, "Tuner successfully lock!\n");
- 
- 	state->flags = (CI_FLAG_IQ_NO_SWAPPED) << CI_FLAG_IQ_BIT;			//Normal IQ
- 	state->flags |= (CI_FLAG_IQ_AUTO_BIT_AUTO) << CI_FLAG_IQ_AUTO_BIT;	//Enable automatic IQ swap detection
-@@ -1644,7 +1644,7 @@ static int avl6211_set_frontend(struct dvb_frontend* fe)
- 		ret = -EAGAIN;
- 		goto err;
- 	}
--	dev_info(&state->i2c->dev, "Service locked!!!\n");
-+	dev_dbg(&state->i2c->dev, "Service locked!!!\n");
- 
- 	ret = avl6211_send_op(OP_RX_RESET_BERPER, state);
- 	if (ret)
-diff --git a/drivers/amlogic/wetek/cxd2837.c b/drivers/amlogic/wetek/cxd2837.c
-index 0638f38..33658d5 100644
---- a/drivers/amlogic/wetek/cxd2837.c
-+++ b/drivers/amlogic/wetek/cxd2837.c
-@@ -795,7 +795,7 @@ static int set_parameters(struct dvb_frontend *fe)
- 		fe_status_t status;
- 		ret = read_status(fe, &status);
- 		if (!ret && status == 0x1F) {
--			dev_info(&state->i2c->dev, "Ignoring tuning to same freq, allready locked!\n");	
-+			dev_dbg(&state->i2c->dev, "Ignoring tuning to same freq, allready locked!\n");	
- 			return 0;
- 		}
- 	}
-@@ -1056,7 +1056,7 @@ static int get_ber_t(struct cxd_state *state, u32 *ber)
- 	unfreeze_regst(state);
- 	
- 	if (!(BERRegs[0] & 0x10)) {
--		dev_info(&state->i2c->dev, "%s: no valid BER data\n", __func__);	
-+		dev_dbg(&state->i2c->dev, "%s: no valid BER data\n", __func__);	
- 		return 0;
- 	}
- 	
-@@ -1093,7 +1093,7 @@ static int get_ber_t2(struct cxd_state *state, u32 *ber)
- 	unfreeze_regst(state);
- 	
- 	if (!(BERRegs[0] & 0x10)) {
--		dev_info(&state->i2c->dev, "%s: no valid BER data\n", __func__);	
-+		dev_dbg(&state->i2c->dev, "%s: no valid BER data\n", __func__);	
- 		return 0;
- 	}
- 	
-@@ -1102,7 +1102,7 @@ static int get_ber_t2(struct cxd_state *state, u32 *ber)
- 	n_ldpc = ((plp & 0x03) == 0 ? 16200 : 64800);
- 			
- 	if (bitError > ((1U << periodExp) * n_ldpc)) {
--		dev_info(&state->i2c->dev, "%s: invalid BER value\n", __func__);	
-+		dev_dbg(&state->i2c->dev, "%s: invalid BER value\n", __func__);	
-         return -EINVAL;
-     }
- 
-@@ -1142,7 +1142,7 @@ static int get_ber_c(struct cxd_state *state, u32 *ber)
- 
- 		
- 	if ((BERRegs[0] & 0x80) == 0) {
--		dev_info(&state->i2c->dev, "%s: no valid BER data\n", __func__);	
-+		dev_dbg(&state->i2c->dev, "%s: no valid BER data\n", __func__);	
- 		return 0;
- 	}
- 	
-@@ -1150,7 +1150,7 @@ static int get_ber_c(struct cxd_state *state, u32 *ber)
- 	periodExp = (Scale & 0x1F);
- 
- 	if ((periodExp <= 11) && (bitError > (1U << periodExp) * 204 * 8)) {
--		dev_info(&state->i2c->dev, "%s: invalid BER value\n", __func__);	
-+		dev_dbg(&state->i2c->dev, "%s: invalid BER value\n", __func__);	
-         return -EINVAL;
-     }
- 	
-@@ -1223,7 +1223,7 @@ static void GetSignalToNoiseT2(struct cxd_state *state, int *SignalToNoise)
- 
- 	reg = ((u32)Data[0] << 8) | (u32)Data[1];
- 	if (reg == 0) {
--		dev_info(&state->i2c->dev, "%s(): reg value out of range\n", __func__);
-+		dev_dbg(&state->i2c->dev, "%s(): reg value out of range\n", __func__);
- 		return;
- 	}
- 	if (reg > 10876)
-@@ -1245,7 +1245,7 @@ static void GetSignalToNoiseT(struct cxd_state *state, int *SignalToNoise)
- 
- 	reg = ((u32)Data[0] << 8) | (u32)Data[1];
- 	if (reg == 0) {
--		dev_info(&state->i2c->dev, "%s(): reg value out of range\n", __func__);
-+		dev_dbg(&state->i2c->dev, "%s(): reg value out of range\n", __func__);
- 		return;
- 	}
- 	if (reg > 4996)
-@@ -1272,7 +1272,7 @@ static void GetSignalToNoiseC(struct cxd_state *state, int *SignalToNoise)
- 
- 	reg = ((u32)(Data[0] & 0x1F) << 8) | ((u32)Data[1]);
- 	if (reg == 0) {
--		dev_info(&state->i2c->dev, "%s(): reg value out of range\n", __func__);
-+		dev_dbg(&state->i2c->dev, "%s(): reg value out of range\n", __func__);
- 		return;
- 	}
- 
-diff --git a/drivers/amlogic/wetek/mn88436.c b/drivers/amlogic/wetek/mn88436.c
-index 7d49d44..2ee5990 100644
---- a/drivers/amlogic/wetek/mn88436.c
-+++ b/drivers/amlogic/wetek/mn88436.c
-@@ -168,7 +168,7 @@ static int mn88436_set_frontend(struct dvb_frontend* fe)
- 		goto err;
- 	}
- 	
--	dev_info(&state->i2c->dev, "Service locked!!!\n");
-+	dev_dbg(&state->i2c->dev, "Service locked!!!\n");
- 	
- 	state->current_frequency = p->frequency;
- 	state->current_modulation = p->modulation;
-diff --git a/drivers/amlogic/wetek/mxl603.c b/drivers/amlogic/wetek/mxl603.c
-index 8f18fb5..2fb2ad3 100644
---- a/drivers/amlogic/wetek/mxl603.c
-+++ b/drivers/amlogic/wetek/mxl603.c
-@@ -798,7 +798,7 @@ static int mxl603_get_status(struct dvb_frontend *fe, u32 *status)
- 	if (ret)
- 		goto err;
- 
--	dev_info(&state->i2c->dev, "%s%s", rf_locked ? "rf locked " : "",
-+	dev_dbg(&state->i2c->dev, "%s%s", rf_locked ? "rf locked " : "",
- 			ref_locked ? "ref locked" : "");
- 
- 	if ((rf_locked) || (ref_locked))
-@@ -827,7 +827,7 @@ static int mxl603_set_params(struct dvb_frontend *fe)
- 	int ret;
- 	u32 freq = c->frequency;
- 	
--	dev_info(&state->i2c->dev, 
-+	dev_dbg(&state->i2c->dev, 
- 		"%s: delivery_system=%d frequency=%d bandwidth_hz=%d\n", 
- 		__func__, c->delivery_system, c->frequency, c->bandwidth_hz);		
- 			
--- 
-1.7.10.4
-