summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-05-14 19:55:05 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-06-07 14:17:03 -0300
commitf4a6bf145035e2b5f02cd9251275126657650af8 (patch)
tree26a4685879221d861f4301fc894c48a9ea49aede
parent6c85657ac681baa68c58e4c085e5f0d96e2f7cfd (diff)
downloadmeta-fsl-arm-f4a6bf145035e2b5f02cd9251275126657650af8.tar.gz
linux-imx (3.0.35) Update to 3.0.35-4.0.0 BSP version
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 and the perf build fix are fixed in Freescale tree, so we drop these patches on this version. Change-Id: Iaec598dd69a3107c09d20e3e890c46d0922d4e44 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch68
-rw-r--r--recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch33
-rw-r--r--recipes-kernel/linux/linux-imx_3.0.35.bb20
3 files changed, 4 insertions, 117 deletions
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 @@
1From f6b560538edca833481c1d67ecf3cfe2d65c4018 Mon Sep 17 00:00:00 2001
2From: Eric Nelson <eric.nelson@boundarydevices.com>
3Date: Wed, 29 Aug 2012 21:50:30 -0700
4Subject: [PATCH] egalax_ts: Add support for single-touch in Kconfig
5
6Upstream-Status: Pending
7---
8 drivers/input/touchscreen/Kconfig | 10 ++++++++++
9 drivers/input/touchscreen/egalax_ts.c | 7 ++++---
10 2 files changed, 14 insertions(+), 3 deletions(-)
11
12diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
13index c00ab79..311bd4d 100644
14--- a/drivers/input/touchscreen/Kconfig
15+++ b/drivers/input/touchscreen/Kconfig
16@@ -199,6 +199,16 @@ config TOUCHSCREEN_ELAN
17 To compile this driver as a module, choose M here: the
18 module will be called elan-touch.
19
20+config TOUCHSCREEN_EGALAX_SINGLE_TOUCH
21+ bool "EETI eGalax touchscreen as single-touch"
22+ default N
23+ depends on TOUCHSCREEN_EGALAX
24+ help
25+ If you say yes here you get single-touch touchscreen support
26+ on the eGalax I2C controller.
27+ If you say "no", you'll get the normal multi-touch.
28+
29+
30 config TOUCHSCREEN_FUJITSU
31 tristate "Fujitsu serial touchscreen"
32 select SERIO
33diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
34index fff8afe..0b6cde7 100644
35--- a/drivers/input/touchscreen/egalax_ts.c
36+++ b/drivers/input/touchscreen/egalax_ts.c
37@@ -139,7 +139,7 @@ retry:
38 events[id].x = x;
39 events[id].y = y;
40
41-#ifdef FORCE_SINGLE_POINTER_SUPPORT
42+#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH
43 input_report_abs(input_dev, ABS_X, x);
44 input_report_abs(input_dev, ABS_Y, y);
45 input_event(data->input_dev, EV_KEY, BTN_TOUCH, 1);
46@@ -166,7 +166,7 @@ retry:
47 dev_dbg(&client->dev, "release id:%d\n", id);
48 events[id].valid = 0;
49 events[id].status = 0;
50-#ifdef FORCE_SINGLE_POINTER_SUPPORT
51+#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH
52 input_report_key(input_dev, BTN_TOUCH, 0);
53 input_report_abs(input_dev, ABS_PRESSURE, 0);
54 #else
55@@ -256,8 +256,9 @@ static int __devinit egalax_ts_probe(struct i2c_client *client,
56 __set_bit(ABS_PRESSURE, input_dev->absbit);
57 input_set_abs_params(input_dev, ABS_X, 0, 32767, 0, 0);
58 input_set_abs_params(input_dev, ABS_Y, 0, 32767, 0, 0);
59+ input_set_abs_params(input_dev, ABS_PRESSURE, 0, 1, 0, 0);
60
61-#ifndef FORCE_SINGLE_POINTER_SUPPORT
62+#ifndef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH
63 input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, 32767, 0, 0);
64 input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, 32767, 0, 0);
65 input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
66--
671.7.9.5
68
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 @@
1commit 7b78f13603c6fcb64e020a0bbe31a651ea2b657b
2Author: Markus Trippelsdorf <markus@trippelsdorf.de>
3Date: Wed Apr 4 10:45:27 2012 +0200
4
5 perf tools: Fix getrusage() related build failure on glibc trunk
6
7 On a system running glibc trunk perf doesn't build:
8
9 CC builtin-sched.o
10 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]
11 [...]
12
13 Fix it by including sys/resource.h.
14
15 Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
16 Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
17 Link: http://lkml.kernel.org/r/20120404084527.GA294@x4
18 Signed-off-by: Ingo Molnar <mingo@kernel.org>
19
20Upstream-Status: Backport [3.4]
21
22diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
23index fb8b5f8..1cad3af 100644
24--- a/tools/perf/builtin-sched.c
25+++ b/tools/perf/builtin-sched.c
26@@ -17,6 +17,7 @@
27 #include "util/debug.h"
28
29 #include <sys/prctl.h>
30+#include <sys/resource.h>
31
32 #include <semaphore.h>
33 #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 @@
1# Copyright (C) 2011-2012 Freescale Semiconductor 1# Copyright (C) 2011-2013 Freescale Semiconductor
2# Released under the MIT license (see COPYING.MIT for the terms) 2# Released under the MIT license (see COPYING.MIT for the terms)
3 3
4include linux-imx.inc 4include linux-imx.inc
@@ -7,18 +7,6 @@ PR = "${INC_PR}.14"
7 7
8COMPATIBLE_MACHINE = "(mx6)" 8COMPATIBLE_MACHINE = "(mx6)"
9 9
10# Revision of 1.1.0 branch 10# Revision of 4.0.0 branch
11SRCREV = "21304e170e6aa140d189158fcf27d731d3547969" 11SRCREV = "572fd62b7e2d70ef83e2ca8fe9895fe6f1531f8a"
12LOCALVERSION = "-1.1.0+yocto" 12LOCALVERSION = "-4.0.0+yocto"
13
14# Revision of 12.10.02 branch
15SRCREV_mx6sl = "741f7dcf5dd1b5ce82986eda139ddbce69c66e31"
16LOCALVERSION_mx6sl = "-12.10.02+yocto"
17
18# Revision of 3.0.0 branch
19SRCREV_mx6dl = "7e8c89cd4b47c4ac6ec6a91a5f54d450688bde4f"
20LOCALVERSION_mx6dl = "-3.0.0+yocto"
21
22SRC_URI += "file://fix_getrusage_for_perf.patch \
23 file://egalax_ts-Add-support-for-single-touch-in-Kconfig.patch \
24 "