Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / spi / ads7846.h

diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index 334d3141162966a4daacc7233d4bdf843b4d4e6a..37c75fbacea2dbf4406779295a17c975d35854bc 100644 (file)
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -14,7 +14,8 @@ enum ads7846_filter {
 struct ads7846_platform_data {
        u16     model;                  /* 7843, 7845, 7846. */
        u16     vref_delay_usecs;       /* 0 for external vref; etc */
-       int     keep_vref_on:1;         /* set to keep vref on for differential
+       u16     vref_mv;                /* external vref value, milliVolts */
+       bool    keep_vref_on;           /* set to keep vref on for differential
                                         * measurements as well */
 
        /* Settling time of the analog signals; a function of Vcc and the
@@ -47,5 +48,10 @@ struct ads7846_platform_data {
                                 void **filter_data);
        int     (*filter)       (void *filter_data, int data_idx, int *val);
        void    (*filter_cleanup)(void *filter_data);
+
+       /* controls enabling/disabling*/
+       int     (*vaux_control)(int vaux_cntrl);
+#define VAUX_ENABLE    1
+#define VAUX_DISABLE   0
 };