Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2456689b authored by Wolfram Sang's avatar Wolfram Sang Committed by Dmitry Torokhov
Browse files

Input: wm97xx - remove redundant define 



Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 5f098ecd

drivers/input/touchscreen/atmel-wm97xx.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static irqreturn_t atmel_wm97xx_channel_b_interrupt(int irq, void *dev_id) 


		data = ac97c_readl(atmel_wm97xx, CBRHR);

		value = data & 0x0fff;

		source = data & WM97XX_ADCSRC_MASK;

		source = data & WM97XX_ADCSEL_MASK;

		pen_down = (data & WM97XX_PEN_DOWN) >> 8;



		if (source == WM97XX_ADCSEL_X)

drivers/input/touchscreen/mainstone-wm97xx.c

+3 −3
Original line number Diff line number Diff line
@@ -157,9 +157,9 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm) 
			x, y, p);



		/* are samples valid */

		if ((x & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_X ||

		    (y & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_Y ||

		    (p & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_PRES)

		if ((x & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_X ||

		    (y & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_Y ||

		    (p & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_PRES)

			goto up;



		/* coordinate is good */

drivers/input/touchscreen/wm9713.c

+2 −2
Original line number Diff line number Diff line
@@ -304,9 +304,9 @@ static int wm9713_poll_sample(struct wm97xx *wm, int adcsel, int *sample) 
		wm->mach_ops->post_sample(adcsel);



	/* check we have correct sample */

	if ((*sample & WM97XX_ADCSRC_MASK) != ffs(adcsel >> 1) << 12) {

	if ((*sample & WM97XX_ADCSEL_MASK) != ffs(adcsel >> 1) << 12) {

		dev_dbg(wm->dev, "adc wrong sample, read %x got %x", adcsel,

			*sample & WM97XX_ADCSRC_MASK);

			*sample & WM97XX_ADCSEL_MASK);

		return RC_PENUP;

	}

drivers/input/touchscreen/zylonite-wm97xx.c

+3 −3
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm) 
			x, y, p);



		/* are samples valid */

		if ((x & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_X ||

		    (y & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_Y ||

		    (p & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_PRES)

		if ((x & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_X ||

		    (y & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_Y ||

		    (p & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_PRES)

			goto up;



		/* coordinate is good */

include/linux/wm97xx.h

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define WM97XX_ADCSEL_X		0x1000	/* x coord measurement */

#define WM97XX_ADCSEL_Y		0x2000	/* y coord measurement */

#define WM97XX_ADCSEL_PRES	0x3000	/* pressure measurement */

#define WM97XX_ADCSEL_MASK	0x7000

#define WM97XX_ADCSEL_MASK	0x7000	/* ADC selection mask */

#define WM97XX_COO		0x0800	/* enable coordinate mode */

#define WM97XX_CTC		0x0400	/* enable continuous mode */

#define WM97XX_CM_RATE_93	0x0000	/* 93.75Hz continuous rate */
@@ -61,7 +61,6 @@ 
#define WM97XX_PRP_DET_DIG	0xc000	/* setect on, digitise on */

#define WM97XX_RPR		0x2000	/* wake up on pen down */

#define WM97XX_PEN_DOWN		0x8000	/* pen is down */

#define WM97XX_ADCSRC_MASK	0x7000	/* ADC source mask */



#define WM97XX_AUX_ID1		0x8001

#define WM97XX_AUX_ID2		0x8002