Skip to content

Commit c7ec533

Browse files
noglitchehristev
authored andcommitted
Revert "[media] Input: atmel_mxt_ts - handle diagnostic data orientation"
This reverts commit de601f7.
1 parent cef16d9 commit c7ec533

1 file changed

Lines changed: 2 additions & 18 deletions

File tree

drivers/input/touchscreen/atmel_mxt_ts.c

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ struct t9_range {
130130

131131
/* MXT_TOUCH_MULTI_T9 orient */
132132
#define MXT_T9_ORIENT_SWITCH (1 << 0)
133-
#define MXT_T9_ORIENT_INVERTX (1 << 1)
134-
#define MXT_T9_ORIENT_INVERTY (1 << 2)
135133

136134
/* MXT_SPT_COMMSCONFIG_T18 */
137135
#define MXT_COMMS_CTRL 0
@@ -170,8 +168,6 @@ struct t37_debug {
170168
#define MXT_T100_YRANGE 24
171169

172170
#define MXT_T100_CFG_SWITCHXY BIT(5)
173-
#define MXT_T100_CFG_INVERTY BIT(6)
174-
#define MXT_T100_CFG_INVERTX BIT(7)
175171

176172
#define MXT_T100_TCHAUX_VECT BIT(0)
177173
#define MXT_T100_TCHAUX_AMPL BIT(1)
@@ -286,8 +282,6 @@ struct mxt_data {
286282
unsigned int irq;
287283
unsigned int max_x;
288284
unsigned int max_y;
289-
bool invertx;
290-
bool inverty;
291285
bool xy_switch;
292286
u8 xsize;
293287
u8 ysize;
@@ -1873,8 +1867,6 @@ static int mxt_read_t9_resolution(struct mxt_data *data)
18731867
return error;
18741868

18751869
data->xy_switch = orient & MXT_T9_ORIENT_SWITCH;
1876-
data->invertx = orient & MXT_T9_ORIENT_INVERTX;
1877-
data->inverty = orient & MXT_T9_ORIENT_INVERTY;
18781870

18791871
return 0;
18801872
}
@@ -1929,8 +1921,6 @@ static int mxt_read_t100_config(struct mxt_data *data)
19291921
return error;
19301922

19311923
data->xy_switch = cfg & MXT_T100_CFG_SWITCHXY;
1932-
data->invertx = cfg & MXT_T100_CFG_INVERTX;
1933-
data->inverty = cfg & MXT_T100_CFG_INVERTY;
19341924

19351925
/* allocate aux bytes */
19361926
error = __mxt_read_reg(client,
@@ -2356,16 +2346,10 @@ static int mxt_convert_debug_pages(struct mxt_data *data, u16 *outbuf)
23562346
struct mxt_dbg *dbg = &data->dbg;
23572347
unsigned int x = 0;
23582348
unsigned int y = 0;
2359-
unsigned int i, rx, ry;
2349+
unsigned int i;
23602350

23612351
for (i = 0; i < dbg->t37_nodes; i++) {
2362-
/* Handle orientation */
2363-
rx = data->xy_switch ? y : x;
2364-
ry = data->xy_switch ? x : y;
2365-
rx = data->invertx ? (data->xsize - 1 - rx) : rx;
2366-
ry = data->inverty ? (data->ysize - 1 - ry) : ry;
2367-
2368-
outbuf[i] = mxt_get_debug_value(data, rx, ry);
2352+
outbuf[i] = mxt_get_debug_value(data, x, y);
23692353

23702354
/* Next value */
23712355
if (++x >= (data->xy_switch ? data->ysize : data->xsize)) {

0 commit comments

Comments
 (0)