[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, stable, updated. upstream/20080808.git43620428-24-gca19d15

[Andy Green]

The following commit has been merged in the stable branch:
commit 163a30f5ffcc4e7af9781bd6695fdc7b27d254f9
Author: Simon Kagstrom <simon.kagstrom at gmail.com>
Date:   Wed Aug 13 11:27:24 2008 +0100

    lis302dl-add-wakeup-defs.patch
    
    Add definitions for the rest of the wakeup defs and also change FFWUSRC1
    to FFWUSRC - there are two of these which are identical.
    
    Signed-off-by: Simon Kagstrom <simon.kagstrom at gmail.com>

diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
index 4d8ded9..e4a44f5 100644
--- a/include/linux/lis302dl.h
+++ b/include/linux/lis302dl.h
@@ -91,14 +91,30 @@ enum lis302dl_reg_status {
 	LIS302DL_STATUS_XYZOR		= 0x80,
 };
 
-enum lis302dl_reg_ffwusrc1 {
-	LIS302DL_FFWUSRC1_XL		= 0x01,
-	LIS302DL_FFWUSRC1_XH		= 0x02,
-	LIS302DL_FFWUSRC1_YL		= 0x04,
-	LIS302DL_FFWUSRC1_YH		= 0x08,
-	LIS302DL_FFWUSRC1_ZL		= 0x10,
-	LIS302DL_FFWUSRC1_ZH		= 0x20,
-	LIS302DL_FFWUSRC1_IA		= 0x40,
+/* Wakeup/freefall interrupt defs */
+enum lis302dl_reg_ffwucfg {
+	LIS302DL_FFWUCFG_XLIE		= 0x01,
+	LIS302DL_FFWUCFG_XHIE		= 0x02,
+	LIS302DL_FFWUCFG_YLIE		= 0x04,
+	LIS302DL_FFWUCFG_YHIE		= 0x08,
+	LIS302DL_FFWUCFG_ZLIE		= 0x10,
+	LIS302DL_FFWUCFG_ZHIE		= 0x20,
+	LIS302DL_FFWUCFG_LIR		= 0x40,
+	LIS302DL_FFWUCFG_AOI		= 0x80,
+};
+
+enum lis302dl_reg_ffwuths {
+	LIS302DL_FFWUTHS_DCRM		= 0x80,
+};
+
+enum lis302dl_reg_ffwusrc {
+	LIS302DL_FFWUSRC_XL		= 0x01,
+	LIS302DL_FFWUSRC_XH		= 0x02,
+	LIS302DL_FFWUSRC_YL		= 0x04,
+	LIS302DL_FFWUSRC_YH		= 0x08,
+	LIS302DL_FFWUSRC_ZL		= 0x10,
+	LIS302DL_FFWUSRC_ZH		= 0x20,
+	LIS302DL_FFWUSRC_IA		= 0x40,
 };
 
 enum lis302dl_reg_cloik_src {

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko