merge of '7393275c6ccce67cadeb49d4afb3459e56edf8a9'
[vuplus_openembedded] / packages / linux / linux-rp-2.6.24 / tosa / 0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch
1 From eba6a504393932764a33aae64021827dd2c5c70c Mon Sep 17 00:00:00 2001
2 From: Mark Brown <broonie@opensource.wolfsonmicro.com>
3 Date: Sat, 26 Jan 2008 21:14:18 +0300
4 Subject: [PATCH 35/64] Build system and MAINTAINERS entry for WM97xx touchscreen drivers
5
6 Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
7 Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
8 ---
9  MAINTAINERS                        |   10 +++++++
10  drivers/input/touchscreen/Kconfig  |   52 ++++++++++++++++++++++++++++++++++++
11  drivers/input/touchscreen/Makefile |    7 +++++
12  3 files changed, 69 insertions(+), 0 deletions(-)
13
14 diff --git a/MAINTAINERS b/MAINTAINERS
15 index 2340cfb..f02851c 100644
16 --- a/MAINTAINERS
17 +++ b/MAINTAINERS
18 @@ -4204,6 +4204,16 @@ L:       linux-wireless@vger.kernel.org
19  W:     http://oops.ghostprotocols.net:81/blog
20  S:     Maintained
21  
22 +WM97XX TOUCHSCREEN DRIVERS
23 +P:     Mark Brown
24 +M:     broonie@opensource.wolfsonmicro.com
25 +P:     Liam Girdwood
26 +M:     liam.girdwood@wolfsonmicro.com
27 +L:     linux-input@vger.kernel.org
28 +T:     git git://opensource.wolfsonmicro.com/linux-2.6-touch
29 +W:     http://opensource.wolfsonmicro.com/node/7
30 +S:     Supported
31 +
32  X.25 NETWORK LAYER
33  P:     Henner Eisen
34  M:     eis@baty.hanse.de
35 diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
36 index 90e8e92..0be05a2 100644
37 --- a/drivers/input/touchscreen/Kconfig
38 +++ b/drivers/input/touchscreen/Kconfig
39 @@ -158,6 +158,58 @@ config TOUCHSCREEN_TOUCHRIGHT
40           To compile this driver as a module, choose M here: the
41           module will be called touchright.
42  
43 +config TOUCHSCREEN_WM97XX
44 +       tristate "Support for WM97xx AC97 touchscreen controllers"
45 +       depends on AC97_BUS
46 +
47 +config TOUCHSCREEN_WM9705
48 +       bool "WM9705 Touchscreen interface support"
49 +       depends on TOUCHSCREEN_WM97XX
50 +       help
51 +         Say Y here if you have a Wolfson Microelectronics WM9705 touchscreen
52 +         controller connected to your system.
53 +
54 +         If unsure, say N.
55 +
56 +         To compile this driver as a module, choose M here: the
57 +         module will be called wm9705.
58 +
59 +config TOUCHSCREEN_WM9712
60 +       bool "WM9712 Touchscreen interface support"
61 +       depends on TOUCHSCREEN_WM97XX
62 +       help
63 +         Say Y here if you have a Wolfson Microelectronics WM9712 touchscreen
64 +         controller connected to your system.
65 +
66 +         If unsure, say N.
67 +
68 +         To compile this driver as a module, choose M here: the
69 +         module will be called wm9712.
70 +
71 +config TOUCHSCREEN_WM9713
72 +       bool "WM9713 Touchscreen interface support"
73 +       depends on TOUCHSCREEN_WM97XX
74 +       help
75 +         Say Y here if you have a Wolfson Microelectronics WM9713 touchscreen
76 +         controller connected to your system.
77 +
78 +         If unsure, say N.
79 +
80 +         To compile this driver as a module, choose M here: the
81 +         module will be called wm9713.
82 +
83 +config TOUCHSCREEN_WM97XX_MAINSTONE
84 +       tristate "WM97xx Mainstone accelerated touch"
85 +       depends on TOUCHSCREEN_WM97XX && ARCH_PXA
86 +       help
87 +         Say Y here for support for streaming mode with WM97xx touchscreens
88 +         on Mainstone systems.
89 +
90 +         If unsure, say N
91 +
92 +         To compile this driver as a module, choose M here: the
93 +         module will be called mainstone-wm97xx
94 +
95  config TOUCHSCREEN_TOUCHWIN
96         tristate "Touchwin serial touchscreen"
97         select SERIO
98 diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
99 index 35d4097..d38156e 100644
100 --- a/drivers/input/touchscreen/Makefile
101 +++ b/drivers/input/touchscreen/Makefile
102 @@ -4,6 +4,8 @@
103  
104  # Each configuration option enables a list of files.
105  
106 +wm97xx-ts-y := wm97xx-core.o
107 +
108  obj-$(CONFIG_TOUCHSCREEN_ADS7846)      += ads7846.o
109  obj-$(CONFIG_TOUCHSCREEN_BITSY)                += h3600_ts_input.o
110  obj-$(CONFIG_TOUCHSCREEN_CORGI)                += corgi_ts.o
111 @@ -19,3 +21,8 @@ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)    += penmount.o
112  obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)     += touchwin.o
113  obj-$(CONFIG_TOUCHSCREEN_UCB1400)      += ucb1400_ts.o
114  obj-$(CONFIG_TOUCHSCREEN_TSC2101)      += tsc2101_ts.o
115 +obj-$(CONFIG_TOUCHSCREEN_WM97XX)       += wm97xx-ts.o
116 +obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)     += mainstone-wm97xx.o
117 +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705)  += wm9705.o
118 +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712)  += wm9712.o
119 +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713)  += wm9713.o
120 -- 
121 1.5.3.8
122