diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/input/ti_am335x_tsc.h | 12 | ||||
-rw-r--r-- | include/linux/mfd/ti_am335x_tscadc.h | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/linux/input/ti_am335x_tsc.h b/include/linux/input/ti_am335x_tsc.h index 49269a2aa329..6a66b4d1ac2c 100644 --- a/include/linux/input/ti_am335x_tsc.h +++ b/include/linux/input/ti_am335x_tsc.h | |||
@@ -12,12 +12,24 @@ | |||
12 | * A step configured to read a single | 12 | * A step configured to read a single |
13 | * co-ordinate value, can be applied | 13 | * co-ordinate value, can be applied |
14 | * more number of times for better results. | 14 | * more number of times for better results. |
15 | * @wire_config: Different EVM's could have a different order | ||
16 | * for connecting wires on touchscreen. | ||
17 | * We need to provide an 8 bit number where in | ||
18 | * the 1st four bits represent the analog lines | ||
19 | * and the next 4 bits represent positive/ | ||
20 | * negative terminal on that input line. | ||
21 | * Notations to represent the input lines and | ||
22 | * terminals resoectively is as follows: | ||
23 | * AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7. | ||
24 | * XP = 0, XN = 1, YP = 2, YN = 3. | ||
25 | * | ||
15 | */ | 26 | */ |
16 | 27 | ||
17 | struct tsc_data { | 28 | struct tsc_data { |
18 | int wires; | 29 | int wires; |
19 | int x_plate_resistance; | 30 | int x_plate_resistance; |
20 | int steps_to_configure; | 31 | int steps_to_configure; |
32 | int wire_config[10]; | ||
21 | }; | 33 | }; |
22 | 34 | ||
23 | #endif | 35 | #endif |
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h index 4258627d076a..e36ae4184917 100644 --- a/include/linux/mfd/ti_am335x_tscadc.h +++ b/include/linux/mfd/ti_am335x_tscadc.h | |||
@@ -71,8 +71,6 @@ | |||
71 | #define STEPCONFIG_INM_ADCREFM STEPCONFIG_INM(8) | 71 | #define STEPCONFIG_INM_ADCREFM STEPCONFIG_INM(8) |
72 | #define STEPCONFIG_INP_MASK (0xF << 19) | 72 | #define STEPCONFIG_INP_MASK (0xF << 19) |
73 | #define STEPCONFIG_INP(val) ((val) << 19) | 73 | #define STEPCONFIG_INP(val) ((val) << 19) |
74 | #define STEPCONFIG_INP_AN2 STEPCONFIG_INP(2) | ||
75 | #define STEPCONFIG_INP_AN3 STEPCONFIG_INP(3) | ||
76 | #define STEPCONFIG_INP_AN4 STEPCONFIG_INP(4) | 74 | #define STEPCONFIG_INP_AN4 STEPCONFIG_INP(4) |
77 | #define STEPCONFIG_INP_ADCREFM STEPCONFIG_INP(8) | 75 | #define STEPCONFIG_INP_ADCREFM STEPCONFIG_INP(8) |
78 | #define STEPCONFIG_FIFO1 BIT(26) | 76 | #define STEPCONFIG_FIFO1 BIT(26) |
@@ -94,7 +92,6 @@ | |||
94 | #define STEPCHARGE_INM_AN1 STEPCHARGE_INM(1) | 92 | #define STEPCHARGE_INM_AN1 STEPCHARGE_INM(1) |
95 | #define STEPCHARGE_INP_MASK (0xF << 19) | 93 | #define STEPCHARGE_INP_MASK (0xF << 19) |
96 | #define STEPCHARGE_INP(val) ((val) << 19) | 94 | #define STEPCHARGE_INP(val) ((val) << 19) |
97 | #define STEPCHARGE_INP_AN1 STEPCHARGE_INP(1) | ||
98 | #define STEPCHARGE_RFM_MASK (3 << 23) | 95 | #define STEPCHARGE_RFM_MASK (3 << 23) |
99 | #define STEPCHARGE_RFM(val) ((val) << 23) | 96 | #define STEPCHARGE_RFM(val) ((val) << 23) |
100 | #define STEPCHARGE_RFM_XNUR STEPCHARGE_RFM(1) | 97 | #define STEPCHARGE_RFM_XNUR STEPCHARGE_RFM(1) |