The 4.0.0 version supports all i.MX6 variants so we can use a single revision for them all.
The eGalax' support for single touch events has been fixed in Freescale tree, so we drop the patch on this version. Change-Id: Iaec598dd69a3107c09d20e3e890c46d0922d4e44 Signed-off-by: Otavio Salvador <[email protected]> --- ...s-Add-support-for-single-touch-in-Kconfig.patch | 68 ---------------------- .../linux/linux-imx/fix_getrusage_for_perf.patch | 33 ----------- recipes-kernel/linux/linux-imx_3.0.35.bb | 20 ++----- 3 files changed, 4 insertions(+), 117 deletions(-) delete mode 100644 recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch delete mode 100644 recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch diff --git a/recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch b/recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch deleted file mode 100644 index 33a8393..0000000 --- a/recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f6b560538edca833481c1d67ecf3cfe2d65c4018 Mon Sep 17 00:00:00 2001 -From: Eric Nelson <[email protected]> -Date: Wed, 29 Aug 2012 21:50:30 -0700 -Subject: [PATCH] egalax_ts: Add support for single-touch in Kconfig - -Upstream-Status: Pending ---- - drivers/input/touchscreen/Kconfig | 10 ++++++++++ - drivers/input/touchscreen/egalax_ts.c | 7 ++++--- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig -index c00ab79..311bd4d 100644 ---- a/drivers/input/touchscreen/Kconfig -+++ b/drivers/input/touchscreen/Kconfig -@@ -199,6 +199,16 @@ config TOUCHSCREEN_ELAN - To compile this driver as a module, choose M here: the - module will be called elan-touch. - -+config TOUCHSCREEN_EGALAX_SINGLE_TOUCH -+ bool "EETI eGalax touchscreen as single-touch" -+ default N -+ depends on TOUCHSCREEN_EGALAX -+ help -+ If you say yes here you get single-touch touchscreen support -+ on the eGalax I2C controller. -+ If you say "no", you'll get the normal multi-touch. -+ -+ - config TOUCHSCREEN_FUJITSU - tristate "Fujitsu serial touchscreen" - select SERIO -diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c -index fff8afe..0b6cde7 100644 ---- a/drivers/input/touchscreen/egalax_ts.c -+++ b/drivers/input/touchscreen/egalax_ts.c -@@ -139,7 +139,7 @@ retry: - events[id].x = x; - events[id].y = y; - --#ifdef FORCE_SINGLE_POINTER_SUPPORT -+#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH - input_report_abs(input_dev, ABS_X, x); - input_report_abs(input_dev, ABS_Y, y); - input_event(data->input_dev, EV_KEY, BTN_TOUCH, 1); -@@ -166,7 +166,7 @@ retry: - dev_dbg(&client->dev, "release id:%d\n", id); - events[id].valid = 0; - events[id].status = 0; --#ifdef FORCE_SINGLE_POINTER_SUPPORT -+#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH - input_report_key(input_dev, BTN_TOUCH, 0); - input_report_abs(input_dev, ABS_PRESSURE, 0); - #else -@@ -256,8 +256,9 @@ static int __devinit egalax_ts_probe(struct i2c_client *client, - __set_bit(ABS_PRESSURE, input_dev->absbit); - input_set_abs_params(input_dev, ABS_X, 0, 32767, 0, 0); - input_set_abs_params(input_dev, ABS_Y, 0, 32767, 0, 0); -+ input_set_abs_params(input_dev, ABS_PRESSURE, 0, 1, 0, 0); - --#ifndef FORCE_SINGLE_POINTER_SUPPORT -+#ifndef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH - input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, 32767, 0, 0); - input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, 32767, 0, 0); - input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0); --- -1.7.9.5 - diff --git a/recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch b/recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch deleted file mode 100644 index fb6a024..0000000 --- a/recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 7b78f13603c6fcb64e020a0bbe31a651ea2b657b -Author: Markus Trippelsdorf <[email protected]> -Date: Wed Apr 4 10:45:27 2012 +0200 - - perf tools: Fix getrusage() related build failure on glibc trunk - - On a system running glibc trunk perf doesn't build: - - CC builtin-sched.o - builtin-sched.c: In function ‘get_cpu_usage_nsec_parent’: builtin-sched.c:399:16: error: storage size of ‘ru’ isn’t known builtin-sched.c:403:2: error: implicit declaration of function ‘getrusage’ [-Werror=implicit-function-declaration] - [...] - - Fix it by including sys/resource.h. - - Signed-off-by: Markus Trippelsdorf <[email protected]> - Cc: Peter Zijlstra <[email protected]> - Link: http://lkml.kernel.org/r/20120404084527.GA294@x4 - Signed-off-by: Ingo Molnar <[email protected]> - -Upstream-Status: Backport [3.4] - -diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c -index fb8b5f8..1cad3af 100644 ---- a/tools/perf/builtin-sched.c -+++ b/tools/perf/builtin-sched.c -@@ -17,6 +17,7 @@ - #include "util/debug.h" - - #include <sys/prctl.h> -+#include <sys/resource.h> - - #include <semaphore.h> - #include <pthread.h> diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb index 12e75cd..ce4bac3 100644 --- a/recipes-kernel/linux/linux-imx_3.0.35.bb +++ b/recipes-kernel/linux/linux-imx_3.0.35.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 Freescale Semiconductor +# Copyright (C) 2011-2013 Freescale Semiconductor # Released under the MIT license (see COPYING.MIT for the terms) include linux-imx.inc @@ -7,18 +7,6 @@ PR = "${INC_PR}.14" COMPATIBLE_MACHINE = "(mx6)" -# Revision of 1.1.0 branch -SRCREV = "21304e170e6aa140d189158fcf27d731d3547969" -LOCALVERSION = "-1.1.0+yocto" - -# Revision of 12.10.02 branch -SRCREV_mx6sl = "741f7dcf5dd1b5ce82986eda139ddbce69c66e31" -LOCALVERSION_mx6sl = "-12.10.02+yocto" - -# Revision of 3.0.0 branch -SRCREV_mx6dl = "7e8c89cd4b47c4ac6ec6a91a5f54d450688bde4f" -LOCALVERSION_mx6dl = "-3.0.0+yocto" - -SRC_URI += "file://fix_getrusage_for_perf.patch \ - file://egalax_ts-Add-support-for-single-touch-in-Kconfig.patch \ - " +# Revision of 4.0.0 branch +SRCREV = "572fd62b7e2d70ef83e2ca8fe9895fe6f1531f8a" +LOCALVERSION = "-4.0.0+yocto" -- 1.8.1 _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
