diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-19 22:05:39 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-19 22:05:39 -0800 |
commit | 2d9f0d964be94fd51c7303288c6f9c88bf2381fe (patch) | |
tree | 2631c3e82abc145a6e9c8e2c18687833c71de012 /include/linux/bma150.h | |
parent | Input: wacom - fix wacom_set_report retry logic (diff) | |
parent | Input: cyttsp-spi - remove duplicate MODULE_ALIAS() (diff) | |
download | linux-dev-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.tar.xz linux-dev-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.zip |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.9 merge window.
Diffstat (limited to 'include/linux/bma150.h')
-rw-r--r-- | include/linux/bma150.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/linux/bma150.h b/include/linux/bma150.h index 7911fda23bb4..97ade7cdc870 100644 --- a/include/linux/bma150.h +++ b/include/linux/bma150.h @@ -22,6 +22,18 @@ #define BMA150_DRIVER "bma150" +#define BMA150_RANGE_2G 0 +#define BMA150_RANGE_4G 1 +#define BMA150_RANGE_8G 2 + +#define BMA150_BW_25HZ 0 +#define BMA150_BW_50HZ 1 +#define BMA150_BW_100HZ 2 +#define BMA150_BW_190HZ 3 +#define BMA150_BW_375HZ 4 +#define BMA150_BW_750HZ 5 +#define BMA150_BW_1500HZ 6 + struct bma150_cfg { bool any_motion_int; /* Set to enable any-motion interrupt */ bool hg_int; /* Set to enable high-G interrupt */ @@ -34,8 +46,8 @@ struct bma150_cfg { unsigned char lg_hyst; /* Low-G hysterisis */ unsigned char lg_dur; /* Low-G duration */ unsigned char lg_thres; /* Low-G threshold */ - unsigned char range; /* BMA0150_RANGE_xxx (in G) */ - unsigned char bandwidth; /* BMA0150_BW_xxx (in Hz) */ + unsigned char range; /* one of BMA0150_RANGE_xxx */ + unsigned char bandwidth; /* one of BMA0150_BW_xxx */ }; struct bma150_platform_data { |