* [PATCH 2.4] Wolfson AC97 touch screen driver - wm97xx.h
@ 2003-12-17 14:44 Liam Girdwood
0 siblings, 0 replies; only message in thread
From: Liam Girdwood @ 2003-12-17 14:44 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: Linux Kernel
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
This patch moves the wm97xx.h header from include/linux to drivers/sound
as the driver now uses the kernel input event interface.
Patch is against 2.4.24-pre1
Liam
[-- Attachment #2: wm97xx-h.diff --]
[-- Type: text/x-patch, Size: 9276 bytes --]
diff -urN a/drivers/sound/wm97xx.h b/drivers/sound/wm97xx.h
--- a/drivers/sound/wm97xx.h 1970-01-01 01:00:00.000000000 +0100
+++ b/drivers/sound/wm97xx.h 2003-12-17 14:07:32.000000000 +0000
@@ -0,0 +1,96 @@
+
+/*
+ * Register bits for Wolfson WM97xx series of codecs
+ */
+
+#ifndef _WM97XX_H_
+#define _WM97XX_H_
+
+#include <linux/ac97_codec.h> /* AC97 control layer */
+
+/*
+ * WM97xx AC97 Touchscreen registers
+ */
+#define AC97_WM97XX_DIGITISER1 0x76
+#define AC97_WM97XX_DIGITISER2 0x78
+#define AC97_WM97XX_DIGITISER_RD 0x7a
+
+/*
+ * WM97xx register bits
+ */
+#define WM97XX_POLL 0x8000 /* initiate a polling measurement */
+#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_COO 0x0800 /* enable coordinate mode */
+#define WM97XX_CTC 0x0400 /* enable continuous mode */
+#define WM97XX_CM_RATE_93 0x0000 /* 93.75Hz continuous rate */
+#define WM97XX_CM_RATE_187 0x0100 /* 187.5Hz continuous rate */
+#define WM97XX_CM_RATE_375 0x0200 /* 375Hz continuous rate */
+#define WM97XX_CM_RATE_750 0x0300 /* 750Hz continuous rate */
+#define WM97XX_CM_RATE_8K 0x00f0 /* 8kHz continuous rate */
+#define WM97XX_CM_RATE_12K 0x01f0 /* 12kHz continuous rate */
+#define WM97XX_CM_RATE_24K 0x02f0 /* 24kHz continuous rate */
+#define WM97XX_CM_RATE_48K 0x03f0 /* 48kHz continuous rate */
+#define WM97XX_DELAY(i) ((i << 4) & 0x00f0) /* sample delay times */
+#define WM97XX_SLEN 0x0008 /* slot read back enable */
+#define WM97XX_SLT(i) ((i - 5) & 0x7) /* touchpanel slot selection (5-11) */
+#define WM97XX_PRP_DETW 0x4000 /* pen detect on, digitiser off, wake up */
+#define WM97XX_PRP_DET 0x8000 /* pen detect on, digitiser off, no wake up */
+#define WM97XX_PRP_DET_DIG 0xc000 /* pen detect on, digitiser on */
+#define WM97XX_RPR 0x2000 /* wake up on pen down */
+#define WM97XX_PEN_DOWN 0x8000 /* pen is down */
+
+/* WM9712 Bits */
+#define WM9712_45W 0x1000 /* set for 5-wire touchscreen */
+#define WM9712_PDEN 0x0800 /* measure only when pen down */
+#define WM9712_WAIT 0x0200 /* wait until adc is read before next sample */
+#define WM9712_PIL 0x0100 /* current used for pressure measurement. set 400uA else 200uA */
+#define WM9712_MASK_HI 0x0040 /* hi on mask pin (47) stops conversions */
+#define WM9712_MASK_EDGE 0x0080 /* rising/falling edge on pin delays sample */
+#define WM9712_MASK_SYNC 0x00c0 /* rising/falling edge on mask initiates sample */
+#define WM9712_RPU(i) (i&0x3f) /* internal pull up on pen detect (64k / rpu) */
+#define WM9712_ADCSEL_COMP1 0x4000 /* COMP1/AUX1 measurement (pin29) */
+#define WM9712_ADCSEL_COMP2 0x5000 /* COMP2/AUX2 measurement (pin30) */
+#define WM9712_ADCSEL_BMON 0x6000 /* BMON/AUX3 measurement (pin31) */
+#define WM9712_ADCSEL_WIPER 0x7000 /* WIPER/AUX4 measurement (pin12) */
+#define WM9712_PD(i) (0x1 << i) /* power management */
+
+/* WM9712 Registers */
+#define AC97_WM9712_POWER 0x24
+#define AC97_WM9712_REV 0x58
+
+/* WM9705 Bits */
+#define WM9705_PDEN 0x1000 /* measure only when pen is down */
+#define WM9705_PINV 0x0800 /* inverts sense of pen down output */
+#define WM9705_BSEN 0x0400 /* BUSY flag enable, pin47 is 1 when busy */
+#define WM9705_BINV 0x0200 /* invert BUSY (pin47) output */
+#define WM9705_WAIT 0x0100 /* wait until adc is read before next sample */
+#define WM9705_PIL 0x0080 /* current used for pressure measurement. set 400uA else 200uA */
+#define WM9705_PHIZ 0x0040 /* set PHONE and PCBEEP inputs to high impedance */
+#define WM9705_MASK_HI 0x0010 /* hi on mask stops conversions */
+#define WM9705_MASK_EDGE 0x0020 /* rising/falling edge on pin delays sample */
+#define WM9705_MASK_SYNC 0x0030 /* rising/falling edge on mask initiates sample */
+#define WM9705_PDD(i) (i & 0x000f) /* pen detect comparator threshold */
+#define WM9705_ADCSEL_BMON 0x4000 /* BMON measurement */
+#define WM9705_ADCSEL_AUX 0x5000 /* AUX measurement */
+#define WM9705_ADCSEL_PHONE 0x6000 /* PHONE measurement */
+#define WM9705_ADCSEL_PCBEEP 0x7000 /* PCBEEP measurement */
+
+/* AUX ADC ID's */
+#define TS_COMP1 0x0
+#define TS_COMP2 0x1
+#define TS_BMON 0x2
+#define TS_WIPER 0x3
+
+/* ID numbers */
+#define WM97XX_ID1 0x574d
+#define WM9712_ID2 0x4c12
+#define WM9705_ID2 0x4c05
+
+#define AC97_LINK_FRAME 21 /* time in uS for AC97 link frame */
+
+void register_touchscreen_codec(struct ac97_codec *codec);
+void unregister_touchscreen_codec(struct ac97_codec *codec);
+
+#endif
diff -urN a/include/linux/wm97xx.h b/include/linux/wm97xx.h
--- a/include/linux/wm97xx.h 2003-11-28 18:26:21.000000000 +0000
+++ b/include/linux/wm97xx.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,96 +0,0 @@
-
-/*
- * Register bits for Wolfson WM97xx series of codecs
- */
-
-#ifndef _WM97XX_H_
-#define _WM97XX_H_
-
-#include <linux/ac97_codec.h> /* AC97 control layer */
-
-/*
- * WM97xx AC97 Touchscreen registers
- */
-#define AC97_WM97XX_DIGITISER1 0x76
-#define AC97_WM97XX_DIGITISER2 0x78
-#define AC97_WM97XX_DIGITISER_RD 0x7a
-
-/*
- * WM97xx register bits
- */
-#define WM97XX_POLL 0x8000 /* initiate a polling measurement */
-#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_COO 0x0800 /* enable coordinate mode */
-#define WM97XX_CTC 0x0400 /* enable continuous mode */
-#define WM97XX_CM_RATE_93 0x0000 /* 93.75Hz continuous rate */
-#define WM97XX_CM_RATE_187 0x0100 /* 187.5Hz continuous rate */
-#define WM97XX_CM_RATE_375 0x0200 /* 375Hz continuous rate */
-#define WM97XX_CM_RATE_750 0x0300 /* 750Hz continuous rate */
-#define WM97XX_CM_RATE_8K 0x00f0 /* 8kHz continuous rate */
-#define WM97XX_CM_RATE_12K 0x01f0 /* 12kHz continuous rate */
-#define WM97XX_CM_RATE_24K 0x02f0 /* 24kHz continuous rate */
-#define WM97XX_CM_RATE_48K 0x03f0 /* 48kHz continuous rate */
-#define WM97XX_DELAY(i) ((i << 4) & 0x00f0) /* sample delay times */
-#define WM97XX_SLEN 0x0008 /* slot read back enable */
-#define WM97XX_SLT(i) ((i - 5) & 0x7) /* touchpanel slot selection (5-11) */
-#define WM97XX_PRP_DETW 0x4000 /* pen detect on, digitiser off, wake up */
-#define WM97XX_PRP_DET 0x8000 /* pen detect on, digitiser off, no wake up */
-#define WM97XX_PRP_DET_DIG 0xc000 /* pen detect on, digitiser on */
-#define WM97XX_RPR 0x2000 /* wake up on pen down */
-#define WM97XX_PEN_DOWN 0x8000 /* pen is down */
-
-/* WM9712 Bits */
-#define WM9712_45W 0x1000 /* set for 5-wire touchscreen */
-#define WM9712_PDEN 0x0800 /* measure only when pen down */
-#define WM9712_WAIT 0x0200 /* wait until adc is read before next sample */
-#define WM9712_PIL 0x0100 /* current used for pressure measurement. set 400uA else 200uA */
-#define WM9712_MASK_HI 0x0040 /* hi on mask pin (47) stops conversions */
-#define WM9712_MASK_EDGE 0x0080 /* rising/falling edge on pin delays sample */
-#define WM9712_MASK_SYNC 0x00c0 /* rising/falling edge on mask initiates sample */
-#define WM9712_RPU(i) (i&0x3f) /* internal pull up on pen detect (64k / rpu) */
-#define WM9712_ADCSEL_COMP1 0x4000 /* COMP1/AUX1 measurement (pin29) */
-#define WM9712_ADCSEL_COMP2 0x5000 /* COMP2/AUX2 measurement (pin30) */
-#define WM9712_ADCSEL_BMON 0x6000 /* BMON/AUX3 measurement (pin31) */
-#define WM9712_ADCSEL_WIPER 0x7000 /* WIPER/AUX4 measurement (pin12) */
-#define WM9712_PD(i) (0x1 << i) /* power management */
-
-/* WM9712 Registers */
-#define AC97_WM9712_POWER 0x24
-#define AC97_WM9712_REV 0x58
-
-/* WM9705 Bits */
-#define WM9705_PDEN 0x1000 /* measure only when pen is down */
-#define WM9705_PINV 0x0800 /* inverts sense of pen down output */
-#define WM9705_BSEN 0x0400 /* BUSY flag enable, pin47 is 1 when busy */
-#define WM9705_BINV 0x0200 /* invert BUSY (pin47) output */
-#define WM9705_WAIT 0x0100 /* wait until adc is read before next sample */
-#define WM9705_PIL 0x0080 /* current used for pressure measurement. set 400uA else 200uA */
-#define WM9705_PHIZ 0x0040 /* set PHONE and PCBEEP inputs to high impedance */
-#define WM9705_MASK_HI 0x0010 /* hi on mask stops conversions */
-#define WM9705_MASK_EDGE 0x0020 /* rising/falling edge on pin delays sample */
-#define WM9705_MASK_SYNC 0x0030 /* rising/falling edge on mask initiates sample */
-#define WM9705_PDD(i) (i & 0x000f) /* pen detect comparator threshold */
-#define WM9705_ADCSEL_BMON 0x4000 /* BMON measurement */
-#define WM9705_ADCSEL_AUX 0x5000 /* AUX measurement */
-#define WM9705_ADCSEL_PHONE 0x6000 /* PHONE measurement */
-#define WM9705_ADCSEL_PCBEEP 0x7000 /* PCBEEP measurement */
-
-/* AUX ADC ID's */
-#define TS_COMP1 0x0
-#define TS_COMP2 0x1
-#define TS_BMON 0x2
-#define TS_WIPER 0x3
-
-/* ID numbers */
-#define WM97XX_ID1 0x574d
-#define WM9712_ID2 0x4c12
-#define WM9705_ID2 0x4c05
-
-#define AC97_LINK_FRAME 21 /* time in uS for AC97 link frame */
-
-void register_touchscreen_codec(struct ac97_codec *codec);
-void unregister_touchscreen_codec(struct ac97_codec *codec);
-
-#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-12-17 14:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-12-17 14:44 [PATCH 2.4] Wolfson AC97 touch screen driver - wm97xx.h Liam Girdwood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome