[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-253-gcdd606f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-253-gcdd606f
|
From: Julien B a. A. <ar...@us...> - 2011-01-21 09:40:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via cdd606fc40cf841b6890bf17bcc5b65926fef557 (commit)
via b1e5f15a9b5607ccce5f5546b22e2a452c9ab509 (commit)
from c9da409ef59cc997d6468933139c664b4e2eac0d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cdd606fc40cf841b6890bf17bcc5b65926fef557
Merge: b1e5f15a9b5607ccce5f5546b22e2a452c9ab509 c9da409ef59cc997d6468933139c664b4e2eac0d
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 21 10:39:27 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit b1e5f15a9b5607ccce5f5546b22e2a452c9ab509
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 21 10:29:41 2011 +0100
[LINUX] 2.6.38 Updates wm831x to state of the art (2)
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 15 ++--
...us-wm8311-add_CMOS_IRQ_line_configuration.patch | 18 ----
...-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch | 46 ++++++------
..._configuration_of_IRQ_output_in_CMOS_mode.patch | 51 ++++++++++++
...deus-input-wm831x-makes_touch_driver_work.patch | 84 --------------------
.../417-armadeus-input-wm831x-driver_hacks.patch | 10 +-
6 files changed, 87 insertions(+), 137 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index 121def2..df005d8 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-06 15:53:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-06 19:58:51.000000000 +0100
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-21 09:27:13.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-21 09:58:04.000000000 +0100
@@ -101,4 +101,17 @@
Include support for Genesi Efika MX nettop. This includes specific
configurations for the board and its peripherals.
@@ -23,7 +23,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-06 19:58:51.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-21 09:58:04.000000000 +0100
@@ -6,6 +6,7 @@
obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o
@@ -35,8 +35,8 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-06 18:51:58.000000000 +0100
-@@ -0,0 +1,422 @@
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-21 09:43:53.000000000 +0100
+@@ -0,0 +1,423 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems
@@ -389,6 +389,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+
+static struct wm831x_pdata apf51_wm8311_pdata = {
+ .pre_init = apf51_wm8311_pre_init,
++ .irq_cmos = 1,
+ .irq_base = MXC_BOARD_IRQ_START,
+#if 0
+ .gpio_base = GPIO_BOARD_START,
@@ -462,7 +463,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-21 09:27:13.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -484,7 +485,7 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-21 09:27:13.000000000 +0100
@@ -47,6 +47,8 @@
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch
deleted file mode 100644
index 93f2b6b..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Configure "IRQ" line as CMOS.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.38-alpha/drivers/mfd/wm831x-core.c
-===================================================================
---- linux-2.6.38-alpha.orig/drivers/mfd/wm831x-core.c 2010-12-29 10:33:41.000000000 +0100
-+++ linux-2.6.38-alpha/drivers/mfd/wm831x-core.c 2010-12-29 10:35:59.000000000 +0100
-@@ -1571,6 +1571,9 @@
- }
- }
-
-+ /* Configure "IRQ" line as CMOS */
-+ wm831x_reg_write(wm831x, WM831X_IRQ_CONFIG, 0);
-+
- ret = wm831x_irq_init(wm831x, irq);
- if (ret != 0)
- goto err;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
index eec40f2..a30cb6d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
@@ -1,4 +1,4 @@
->From a449c9de202f2a970a1e1e856da19fb9531f7ded Mon Sep 17 00:00:00 2001
+>From a1ae1fa080f0d352f044c97f9c469e3275235402 Mon Sep 17 00:00:00 2001
From: Mark Brown <br...@op...>
Date: Fri, 14 Jan 2011 15:07:22 +0000
Subject: [PATCH] Input: wm831x - Add driver for Wolfson WM831x PMIC touchscreen controllers
@@ -59,7 +59,7 @@ index 718bcc8..e8dcfab 100644
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
new file mode 100644
-index 0000000..a424a80
+index 0000000..9a58a11
--- /dev/null
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -0,0 +1,399 @@
@@ -164,8 +164,8 @@ index 0000000..a424a80
+ struct wm831x *wm831x;
+ int data_irq;
+ int pd_irq;
-+ int rate;
+ bool pressure;
++ bool pen_down;
+};
+
+static irqreturn_t wm831x_ts_data_irq(int irq, void *irq_data)
@@ -174,7 +174,6 @@ index 0000000..a424a80
+ struct wm831x *wm831x = wm831x_ts->wm831x;
+ static int data_types[] = { ABS_X, ABS_Y, ABS_PRESSURE };
+ u16 data[3];
-+ bool pen_down = true;
+ int count, i, ret;
+
+ wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
@@ -196,25 +195,24 @@ index 0000000..a424a80
+ /* We get a pen down reading on every reading, report pen up if any
+ * individual reading does so.
+ */
++ wm831x_ts->pen_down = true;
+ for (i = 0; i < count; i++) {
+ if (!(data[i] & WM831X_TCH_PD)) {
-+ pen_down = false;
++ wm831x_ts->pen_down = false;
+ continue;
+ }
+ input_report_abs(wm831x_ts->input_dev, data_types[i],
+ data[i] & WM831X_TCH_DATA_MASK);
+ }
+
-+ if (!pen_down) {
++ if (!wm831x_ts->pen_down) {
++ disable_irq_nosync(wm831x_ts->data_irq);
++
+ /* Don't need data any more */
+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+ WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+ WM831X_TCH_Z_ENA, 0);
+
-+ /* Drop the conversion rate while pen is up */
-+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-+ WM831X_TCH_RATE_MASK, 0);
-+
+ if (wm831x_ts->pressure)
+ input_report_abs(wm831x_ts->input_dev,
+ ABS_PRESSURE, 0);
@@ -233,13 +231,9 @@ index 0000000..a424a80
+ struct wm831x *wm831x = wm831x_ts->wm831x;
+ int ena;
+
-+ /* Raise conversion rate to normal rate */
-+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-+ WM831X_TCH_RATE_MASK, wm831x_ts->rate);
-+
+ /* Start collecting data */
+ if (wm831x_ts->pressure)
-+ ena |= WM831X_TCH_Z_ENA;
++ ena = WM831X_TCH_Z_ENA;
+ else
+ ena = 0;
+
@@ -253,6 +247,9 @@ index 0000000..a424a80
+ wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
+ WM831X_TCHPD_EINT, WM831X_TCHPD_EINT);
+
++ wm831x_ts->pen_down = true;
++ enable_irq(wm831x_ts->data_irq);
++
+ return IRQ_HANDLED;
+}
+
@@ -279,6 +276,9 @@ index 0000000..a424a80
+ WM831X_TCH_ENA | WM831X_TCH_CVT_ENA |
+ WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+ WM831X_TCH_Z_ENA, 0);
++
++ if (wm831x_ts->pen_down)
++ disable_irq_nosync(wm831x_ts->pen_down);
+}
+
+static __devinit int wm831x_ts_probe(struct platform_device *pdev)
@@ -307,14 +307,12 @@ index 0000000..a424a80
+ if (pdata && pdata->data_irq)
+ wm831x_ts->data_irq = pdata->data_irq;
+ else
-+ wm831x_ts->data_irq = platform_get_irq_byname(pdev,
-+ "TCHDATA");
++ wm831x_ts->data_irq = platform_get_irq_byname(pdev, "TCHDATA");
+
+ if (pdata && pdata->pd_irq)
+ wm831x_ts->pd_irq = pdata->pd_irq;
+ else
-+ wm831x_ts->data_irq = platform_get_irq_byname(pdev,
-+ "TCHPD");
++ wm831x_ts->pd_irq = platform_get_irq_byname(pdev, "TCHPD");
+
+ if (pdata && pdata->pressure)
+ wm831x_ts->pressure = true;
@@ -355,22 +353,24 @@ index 0000000..a424a80
+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
+ WM831X_TCH_PDONLY, 0);
+
-+ /* Default to 192 samples/sec */
-+ wm831x_ts->rate = 12;
++ /* Default to 96 samples/sec */
++ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
++ WM831X_TCH_RATE_MASK, 6);
+
+ ret = request_threaded_irq(wm831x_ts->data_irq, NULL,
+ wm831x_ts_data_irq,
-+ IRQF_ONESHOT, /* Trigger */
++ IRQF_ONESHOT,
+ "Touchscreen data", wm831x_ts);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Failed to request data IRQ %d: %d\n",
+ wm831x_ts->data_irq, ret);
+ goto err_alloc;
+ }
++ disable_irq(wm831x_ts->data_irq);
+
+ ret = request_threaded_irq(wm831x_ts->pd_irq, NULL,
+ wm831x_ts_pen_down_irq,
-+ IRQF_ONESHOT, /* Trigger */
++ IRQF_SAMPLE_RANDOM | IRQF_ONESHOT,
+ "Touchscreen pen down", wm831x_ts);
+
+ if (ret < 0) {
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
new file mode 100644
index 0000000..fc5c6a8
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
@@ -0,0 +1,51 @@
+>From 25d95db8096f73f3c7d277f44c8daf7642142e2f Mon Sep 17 00:00:00 2001
+From: Mark Brown <br...@op...>
+Date: Thu, 6 Jan 2011 13:08:25 +0000
+Subject: [PATCH] mfd: Support configuration of WM831x /IRQ output in CMOS mode
+
+Provide platform data allowing the system to set the /IRQ pin into
+CMOS mode rather than the default open drain. The default value of
+this platform data reflects the default hardware configuration so
+there should be no change to existing users.
+
+Signed-off-by: Mark Brown <br...@op...>
+---
+ drivers/mfd/wm831x-irq.c | 7 +++++++
+ include/linux/mfd/wm831x/pdata.h | 3 +++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
+index f7192d4..0d3cda4 100644
+--- a/drivers/mfd/wm831x-irq.c
++++ b/drivers/mfd/wm831x-irq.c
+@@ -515,6 +515,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
+ return 0;
+ }
+
++ if (pdata->irq_cmos)
++ i = 0;
++ else
++ i = WM831X_IRQ_OD;
++ wm831x_set_bits(wm831x, WM831X_IRQ_CONFIG,
++ WM831X_IRQ_OD, i);
++
+ wm831x->irq = irq;
+ wm831x->irq_base = pdata->irq_base;
+
+diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
+index fd322ac..1ae8499 100644
+--- a/include/linux/mfd/wm831x/pdata.h
++++ b/include/linux/mfd/wm831x/pdata.h
+@@ -109,6 +109,9 @@ struct wm831x_pdata {
+ /** Called after subdevices are set up */
+ int (*post_init)(struct wm831x *wm831x);
+
++ /** Put the /IRQ line into CMOS mode */
++ bool irq_cmos;
++
+ int irq_base;
+ int gpio_base;
+ struct wm831x_backlight_pdata *backlight;
+--
+1.7.2.3
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch
deleted file mode 100644
index f1ae70a..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
-===================================================================
---- linux-2.6.38-alpha.orig/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:00.000000000 +0100
-+++ linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:10.000000000 +0100
-@@ -101,6 +101,7 @@
- int pd_irq;
- int rate;
- bool pressure;
-+ int pd_detected;
- };
-
- static irqreturn_t wm831x_ts_data_irq(int irq, void *irq_data)
-@@ -140,7 +141,7 @@
- data[i] & WM831X_TCH_DATA_MASK);
- }
-
-- if (!pen_down) {
-+ if ((!pen_down) && (wm831x_ts->pd_detected)) {
- /* Don't need data any more */
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
- WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
-@@ -148,13 +149,14 @@
-
- /* Drop the conversion rate while pen is up */
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-- WM831X_TCH_RATE_MASK, 0);
-+ WM831X_TCH_RATE_MASK, 1);
-
- if (wm831x_ts->pressure)
- input_report_abs(wm831x_ts->input_dev,
- ABS_PRESSURE, 0);
-
- input_report_key(wm831x_ts->input_dev, BTN_TOUCH, 0);
-+ wm831x_ts->pd_detected = 0;
- }
-
- input_sync(wm831x_ts->input_dev);
-@@ -166,7 +168,7 @@
- {
- struct wm831x_ts *wm831x_ts = irq_data;
- struct wm831x *wm831x = wm831x_ts->wm831x;
-- int ena;
-+ int ena = 0;
-
- /* Raise conversion rate to normal rate */
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-@@ -175,8 +177,6 @@
- /* Start collecting data */
- if (wm831x_ts->pressure)
- ena |= WM831X_TCH_Z_ENA;
-- else
-- ena = 0;
-
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
- WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA | WM831X_TCH_Z_ENA,
-@@ -185,6 +185,7 @@
- input_report_key(wm831x_ts->input_dev, BTN_TOUCH, 1);
- input_sync(wm831x_ts->input_dev);
-
-+ wm831x_ts->pd_detected = 1;
- wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
- WM831X_TCHPD_EINT, WM831X_TCHPD_EINT);
-
-@@ -248,7 +249,7 @@
- if (pdata && pdata->pd_irq)
- wm831x_ts->pd_irq = pdata->pd_irq;
- else
-- wm831x_ts->data_irq = platform_get_irq_byname(pdev,
-+ wm831x_ts->pd_irq = platform_get_irq_byname(pdev,
- "TCHPD");
-
- if (pdata && pdata->pressure)
-@@ -290,8 +291,10 @@
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
- WM831X_TCH_PDONLY, 0);
-
-- /* Default to 192 samples/sec */
-+ /* Default to 192 samples/sec when active and 16/sec when inactive */
- wm831x_ts->rate = 12;
-+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-+ WM831X_TCH_RATE_MASK, 1);
-
- ret = request_threaded_irq(wm831x_ts->data_irq, NULL,
- wm831x_ts_data_irq,
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
index cb07d96..0301ead 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
@@ -2,9 +2,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
===================================================================
---- linux-2.6.38-alpha.orig/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:10.000000000 +0100
-+++ linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:22.000000000 +0100
-@@ -226,6 +226,7 @@
+--- linux-2.6.38-alpha.orig/drivers/input/touchscreen/wm831x-ts.c 2011-01-21 09:27:14.000000000 +0100
++++ linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c 2011-01-21 09:27:14.000000000 +0100
+@@ -225,6 +225,7 @@
struct input_dev *input_dev;
int ret;
@@ -12,7 +12,7 @@ Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
wm831x_ts = kzalloc(sizeof(struct wm831x_ts), GFP_KERNEL);
if (!wm831x_ts)
return -ENOMEM;
-@@ -262,7 +263,7 @@
+@@ -259,7 +260,7 @@
wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
WM831X_TCH_5WIRE, WM831X_TCH_5WIRE);
@@ -21,7 +21,7 @@ Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
WARN_ON(pdata->pressure && pdata->fivewire);
wm831x_ts->pressure = false;
} else {
-@@ -319,6 +320,17 @@
+@@ -316,6 +317,17 @@
platform_set_drvdata(pdev, wm831x_ts);
hooks/post-receive
--
armadeus
|
