[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-3-g34c2270
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-3-g34c2270
|
From: Fabien M <fa...@us...> - 2010-08-02 15:35:39
|
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 34c2270040291acdde86c0d1b5258fccfc6678ac (commit)
via ffb5ea57555fba74f038eb37f33bbc530f9012d2 (commit)
from f20db589db076737da92e8e9fd31bd2d0961626d (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 34c2270040291acdde86c0d1b5258fccfc6678ac
Author: Fabien Marteau <fab...@ar...>
Date: Mon Aug 2 17:31:08 2010 +0200
fix little patch bug
commit ffb5ea57555fba74f038eb37f33bbc530f9012d2
Author: Fabien Marteau <fab...@ar...>
Date: Mon Aug 2 17:11:14 2010 +0200
[linux] use as5011 joystick in low power mode
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 63da72c..101a7f9 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-07-08 10:43:14.000000000 +0200
-@@ -0,0 +1,428 @@
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-08-02 17:22:53.000000000 +0200
+@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
+ *
@@ -298,9 +298,8 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ retval = as5011_i2c_write(plat_dat->i2c_client,
+ AS5011_CTRL1,
+ AS5011_CTRL1_LP_PULSED |
-+ //AS5011_CTRL1_LP_ACTIVE |
-+ //AS5011_CTRL1_INT_ACT_EN|
-+ AS5011_CTRL1_INT_WUP_EN
++ AS5011_CTRL1_LP_ACTIVE |
++ AS5011_CTRL1_INT_ACT_EN
+ );
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
@@ -363,6 +362,8 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ /* to free irq gpio in chip*/
+ as5011_i2c_read(plat_dat->i2c_client, AS5011_X_RES_INT);
+
++ queue_work(plat_dat->workqueue, &plat_dat->update_axes_work);
++
+ return 0;
+
+ /* Error management */
@@ -438,7 +439,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-07-08 10:11:38.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-08-02 15:30:09.000000000 +0200
@@ -254,6 +254,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -458,7 +459,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
Index: linux-2.6.29.6/drivers/input/joystick/Makefile
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-07-08 10:11:38.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-08-02 15:30:09.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -470,7 +471,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Makefile
Index: linux-2.6.29.6/include/linux/as5011.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/as5011.h 2010-07-08 10:11:38.000000000 +0200
++++ linux-2.6.29.6/include/linux/as5011.h 2010-08-02 16:41:21.000000000 +0200
@@ -0,0 +1,72 @@
+#ifndef _AS5011_H
+#define _AS5011_H
hooks/post-receive
--
armadeus
|
