Attachment 197471 Details for Bug 308264

[patch] Patch of latest thinkpad-acpi backports from Henirque adjusted for 10.3

thinkpad-acpi-0.19-20080107_v2.6.22.15.patch (text/plain), 233.78 KB, created by Thomas Renninger on 2008-02-27 16:31:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Renninger

Created: 2008-02-27 16:31:53 UTC

Size: 233.78 KB

patch

obsolete

>---
> drivers/misc/thinkpad_acpi.c | 5525 ++++++++++++++++++++++++++++---------------
> drivers/misc/thinkpad_acpi.h |  566 ----
> include/linux/pci_ids.h      |    8 
> 3 files changed, 3676 insertions(+), 2423 deletions(-)
>
>diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
>index 9e6b94f..6c24777 100644
>--- a/Documentation/thinkpad-acpi.txt
>+++ b/Documentation/thinkpad-acpi.txt
>@@ -1,11 +1,11 @@
> 		     ThinkPad ACPI Extras Driver
> 
>-                            Version 0.14
>-                          April 21st, 2007
>+                            Version 0.19
>+                         January 06th, 2008
> 
>                Borislav Deianov <borislav@users.sf.net>
>-	     Henrique de Moraes Holschuh <hmh@hmh.eng.br>
>-		      http://ibm-acpi.sf.net/
>+             Henrique de Moraes Holschuh <hmh@hmh.eng.br>
>+                      http://ibm-acpi.sf.net/
> 
> 
> This is a Linux driver for the IBM and Lenovo ThinkPad laptops. It
>@@ -105,10 +105,15 @@ The version of thinkpad-acpi's sysfs interface is exported by the driver
> as a driver attribute (see below).
> 
> Sysfs driver attributes are on the driver's sysfs attribute space,
>-for 2.6.20 this is /sys/bus/platform/drivers/thinkpad-acpi/.
>+for 2.6.23 this is /sys/bus/platform/drivers/thinkpad_acpi/ and
>+/sys/bus/platform/drivers/thinkpad_hwmon/
> 
>-Sysfs device attributes are on the driver's sysfs attribute space,
>-for 2.6.20 this is /sys/devices/platform/thinkpad-acpi/.
>+Sysfs device attributes are on the thinkpad_acpi device sysfs attribute
>+space, for 2.6.23 this is /sys/devices/platform/thinkpad_acpi/.
>+
>+Sysfs device attributes for the sensors and fan are on the
>+thinkpad_hwmon device's sysfs attribute space, but you should locate it
>+looking for a hwmon device with the name attribute of "thinkpad".
> 
> Driver version
> --------------
>@@ -134,54 +139,70 @@ end of this document.  Changes to the sysfs interface done by the kernel
> subsystems are not documented here, nor are they tracked by this
> attribute.
> 
>+Changes to the thinkpad-acpi sysfs interface are only considered
>+non-experimental when they are submitted to Linux mainline, at which
>+point the changes in this interface are documented and interface_version
>+may be updated.  If you are using any thinkpad-acpi features not yet
>+sent to mainline for merging, you do so on your own risk: these features
>+may disappear, or be implemented in a different and incompatible way by
>+the time they are merged in Linux mainline.
>+
>+Changes that are backwards-compatible by nature (e.g. the addition of
>+attributes that do not change the way the other attributes work) do not
>+always warrant an update of interface_version.  Therefore, one must
>+expect that an attribute might not be there, and deal with it properly
>+(an attribute not being there *is* a valid way to make it clear that a
>+feature is not available in sysfs).
>+
> Hot keys
> --------
> 
> procfs: /proc/acpi/ibm/hotkey
> sysfs device attribute: hotkey_*
> 
>-Without this driver, only the Fn-F4 key (sleep button) generates an
>-ACPI event. With the driver loaded, the hotkey feature enabled and the
>-mask set (see below), the various hot keys generate ACPI events in the
>-following format:
>+In a ThinkPad, the ACPI HKEY handler is responsible for comunicating
>+some important events and also keyboard hot key presses to the operating
>+system.  Enabling the hotkey functionality of thinkpad-acpi signals the
>+firmware that such a driver is present, and modifies how the ThinkPad
>+firmware will behave in many situations.
>+
>+The driver enables the hot key feature automatically when loaded.  The
>+feature can later be disabled and enabled back at runtime.  The driver
>+will also restore the hot key feature to its previous state and mask
>+when it is unloaded.
>+
>+When the hotkey feature is enabled and the hot key mask is set (see
>+below), the driver will report HKEY events in the following format:
> 
> 	ibm/hotkey HKEY 00000080 0000xxxx
> 
>-The last four digits vary depending on the key combination pressed.
>-All labeled Fn-Fx key combinations generate distinct events. In
>-addition, the lid microswitch and some docking station buttons may
>-also generate such events.
>-
>-The bit mask allows some control over which hot keys generate ACPI
>-events. Not all bits in the mask can be modified. Not all bits that
>-can be modified do anything. Not all hot keys can be individually
>-controlled by the mask. Most recent ThinkPad models honor the
>-following bits (assuming the hot keys feature has been enabled):
>-
>-	key	bit	behavior when set	behavior when unset
>-
>-	Fn-F3			always generates ACPI event
>-	Fn-F4			always generates ACPI event
>-	Fn-F5	0010	generate ACPI event	enable/disable Bluetooth
>-	Fn-F7	0040	generate ACPI event	switch LCD and external display
>-	Fn-F8	0080	generate ACPI event	expand screen or none
>-	Fn-F9	0100	generate ACPI event	none
>-	Fn-F12			always generates ACPI event
>-
>-Some models do not support all of the above. For example, the T30 does
>-not support Fn-F5 and Fn-F9. Other models do not support the mask at
>-all. On those models, hot keys cannot be controlled individually.
>-
>-Note that enabling ACPI events for some keys prevents their default
>-behavior. For example, if events for Fn-F5 are enabled, that key will
>-no longer enable/disable Bluetooth by itself. This can still be done
>-from an acpid handler for the ibm/hotkey event.
>-
>-Note also that not all Fn key combinations are supported through
>-ACPI. For example, on the X40, the brightness, volume and "Access IBM"
>-buttons do not generate ACPI events even with this driver. They *can*
>-be used through the "ThinkPad Buttons" utility, see
>-http://www.nongnu.org/tpb/
>+Some of these events refer to hot key presses, but not all.
>+
>+The driver will generate events over the input layer for hot keys and
>+radio switches, and over the ACPI netlink layer for other events.  The
>+input layer support accepts the standard IOCTLs to remap the keycodes
>+assigned to each hot key.
>+
>+The hot key bit mask allows some control over which hot keys generate
>+events.  If a key is "masked" (bit set to 0 in the mask), the firmware
>+will handle it.  If it is "unmasked", it signals the firmware that
>+thinkpad-acpi would prefer to handle it, if the firmware would be so
>+kind to allow it (and it often doesn't!).
>+
>+Not all bits in the mask can be modified.  Not all bits that can be
>+modified do anything.  Not all hot keys can be individually controlled
>+by the mask.  Some models do not support the mask at all, and in those
>+models, hot keys cannot be controlled individually.  The behaviour of
>+the mask is, therefore, higly dependent on the ThinkPad model.
>+
>+Note that unmasking some keys prevents their default behavior.  For
>+example, if Fn+F5 is unmasked, that key will no longer enable/disable
>+Bluetooth by itself.
>+
>+Note also that not all Fn key combinations are supported through ACPI.
>+For example, on the X40, the brightness, volume and "Access IBM" buttons
>+do not generate ACPI events even with this driver.  They *can* be used
>+through the "ThinkPad Buttons" utility, see http://www.nongnu.org/tpb/
> 
> procfs notes:
> 
>@@ -189,11 +210,16 @@ The following commands can be written to the /proc/acpi/ibm/hotkey file:
> 
> 	echo enable > /proc/acpi/ibm/hotkey -- enable the hot keys feature
> 	echo disable > /proc/acpi/ibm/hotkey -- disable the hot keys feature
>-	echo 0xffff > /proc/acpi/ibm/hotkey -- enable all possible hot keys
>-	echo 0x0000 > /proc/acpi/ibm/hotkey -- disable all possible hot keys
>-	... any other 4-hex-digit mask ...
>+	echo 0xffffffff > /proc/acpi/ibm/hotkey -- enable all hot keys
>+	echo 0 > /proc/acpi/ibm/hotkey -- disable all possible hot keys
>+	... any other 8-hex-digit mask ...
> 	echo reset > /proc/acpi/ibm/hotkey -- restore the original mask
> 
>+The procfs interface does not support NVRAM polling control.  So as to
>+maintain maximum bug-to-bug compatibility, it does not report any masks,
>+nor does it allow one to manipulate the hot key mask when the firmware
>+does not support masks at all, even if NVRAM polling is in use.
>+
> sysfs notes:
> 
> 	hotkey_bios_enabled:
>@@ -202,7 +228,7 @@ sysfs notes:
> 		key feature status will be restored to this value.
> 
> 		0: hot keys were disabled
>-		1: hot keys were enabled
>+		1: hot keys were enabled (unusual)
> 
> 	hotkey_bios_mask:
> 		Returns the hot keys mask when thinkpad-acpi was loaded.
>@@ -210,16 +236,326 @@ sysfs notes:
> 		to this value.
> 
> 	hotkey_enable:
>-		Enables/disables the hot keys feature, and reports
>-		current status of the hot keys feature.
>+		Enables/disables the hot keys feature in the ACPI
>+		firmware, and reports current status of the hot keys
>+		feature.  Has no effect on the NVRAM hot key polling
>+		functionality.
> 
> 		0: disables the hot keys feature / feature disabled
> 		1: enables the hot keys feature / feature enabled
> 
> 	hotkey_mask:
>-		bit mask to enable ACPI event generation for each hot
>-		key (see above).  Returns the current status of the hot
>-		keys mask, and allows one to modify it.
>+		bit mask to enable driver-handling (and depending on
>+		the firmware, ACPI event generation) for each hot key
>+		(see above).  Returns the current status of the hot keys
>+		mask, and allows one to modify it.
>+
>+		Note: when NVRAM polling is active, the firmware mask
>+		will be different from the value returned by
>+		hotkey_mask.  The driver will retain enabled bits for
>+		hotkeys that are under NVRAM polling even if the
>+		firmware refuses them, and will not set these bits on
>+		the firmware hot key mask.
>+
>+	hotkey_all_mask:
>+		bit mask that should enable event reporting for all
>+		supported hot keys, when echoed to hotkey_mask above.
>+		Unless you know which events need to be handled
>+		passively (because the firmware *will* handle them
>+		anyway), do *not* use hotkey_all_mask.  Use
>+		hotkey_recommended_mask, instead. You have been warned.
>+
>+	hotkey_recommended_mask:
>+		bit mask that should enable event reporting for all
>+		supported hot keys, except those which are always
>+		handled by the firmware anyway.  Echo it to
>+		hotkey_mask above, to use.
>+
>+	hotkey_source_mask:
>+		bit mask that selects which hot keys will the driver
>+		poll the NVRAM for.  This is auto-detected by the driver
>+		based on the capabilities reported by the ACPI firmware,
>+		but it can be overridden at runtime.
>+
>+		Hot keys whose bits are set in both hotkey_source_mask
>+		and also on hotkey_mask are polled for in NVRAM.  Only a
>+		few hot keys are available through CMOS NVRAM polling.
>+
>+		Warning: when in NVRAM mode, the volume up/down/mute
>+		keys are synthesized according to changes in the mixer,
>+		so you have to use volume up or volume down to unmute,
>+		as per the ThinkPad volume mixer user interface.  When
>+		in ACPI event mode, volume up/down/mute are reported as
>+		separate events, but this behaviour may be corrected in
>+		future releases of this driver, in which case the
>+		ThinkPad volume mixer user interface semanthics will be
>+		enforced.
>+
>+	hotkey_poll_freq:
>+		frequency in Hz for hot key polling. It must be between
>+		0 and 25 Hz.  Polling is only carried out when strictly
>+		needed.
>+
>+		Setting hotkey_poll_freq to zero disables polling, and
>+		will cause hot key presses that require NVRAM polling
>+		to never be reported.
>+
>+		Setting hotkey_poll_freq too low will cause repeated
>+		pressings of the same hot key to be misreported as a
>+		single key press, or to not even be detected at all.
>+		The recommended polling frequency is 10Hz.
>+
>+	hotkey_radio_sw:
>+		if the ThinkPad has a hardware radio switch, this
>+		attribute will read 0 if the switch is in the "radios
>+		disabled" postition, and 1 if the switch is in the
>+		"radios enabled" position.
>+
>+		This attribute has poll()/select() support.
>+
>+	hotkey_report_mode:
>+		Returns the state of the procfs ACPI event report mode
>+		filter for hot keys.  If it is set to 1 (the default),
>+		all hot key presses are reported both through the input
>+		layer and also as ACPI events through procfs (but not
>+		through netlink).  If it is set to 2, hot key presses
>+		are reported only through the input layer.
>+
>+		This attribute is read-only in kernels 2.6.23 or later,
>+		and read-write on earlier kernels.
>+
>+		May return -EPERM (write access locked out by module
>+		parameter) or -EACCES (read-only).
>+
>+	wakeup_reason:
>+		Set to 1 if the system is waking up because the user
>+		requested a bay ejection.  Set to 2 if the system is
>+		waking up because the user requested the system to
>+		undock.  Set to zero for normal wake-ups or wake-ups
>+		due to unknown reasons.
>+
>+		This attribute has poll()/select() support.
>+
>+	wakeup_hotunplug_complete:
>+		Set to 1 if the system was waken up because of an
>+		undock or bay ejection request, and that request
>+		was sucessfully completed.  At this point, it might
>+		be useful to send the system back to sleep, at the
>+		user's choice.  Refer to HKEY events 0x4003 and
>+		0x3003, below.
>+
>+		This attribute has poll()/select() support.
>+
>+input layer notes:
>+
>+A Hot key is mapped to a single input layer EV_KEY event, possibly
>+followed by an EV_MSC MSC_SCAN event that shall contain that key's scan
>+code.  An EV_SYN event will always be generated to mark the end of the
>+event block.
>+
>+Do not use the EV_MSC MSC_SCAN events to process keys.  They are to be
>+used as a helper to remap keys, only.  They are particularly useful when
>+remapping KEY_UNKNOWN keys.
>+
>+The events are available in an input device, with the following id:
>+
>+	Bus:		BUS_HOST
>+	vendor:		0x1014 (PCI_VENDOR_ID_IBM)  or
>+			0x17aa (PCI_VENDOR_ID_LENOVO)
>+	product:	0x5054 ("TP")
>+	version:	0x4101
>+
>+The version will have its LSB incremented if the keymap changes in a
>+backwards-compatible way.  The MSB shall always be 0x41 for this input
>+device.  If the MSB is not 0x41, do not use the device as described in
>+this section, as it is either something else (e.g. another input device
>+exported by a thinkpad driver, such as HDAPS) or its functionality has
>+been changed in a non-backwards compatible way.
>+
>+Adding other event types for other functionalities shall be considered a
>+backwards-compatible change for this input device.
>+
>+Thinkpad-acpi Hot Key event map (version 0x4101):
>+
>+ACPI	Scan
>+event	code	Key		Notes
>+
>+0x1001	0x00	FN+F1		-
>+0x1002	0x01	FN+F2		IBM: battery (rare)
>+				Lenovo: Screen lock
>+
>+0x1003	0x02	FN+F3		Many IBM models always report
>+				this hot key, even with hot keys
>+				disabled or with Fn+F3 masked
>+				off
>+				IBM: screen lock
>+				Lenovo: battery
>+
>+0x1004	0x03	FN+F4		Sleep button (ACPI sleep button
>+				semanthics, i.e. sleep-to-RAM).
>+				It is always generate some kind
>+				of event, either the hot key
>+				event or a ACPI sleep button
>+				event. The firmware may
>+				refuse to generate further FN+F4
>+				key presses until a S3 or S4 ACPI
>+				sleep cycle is performed or some
>+				time passes.
>+
>+0x1005	0x04	FN+F5		Radio.  Enables/disables
>+				the internal BlueTooth hardware
>+				and W-WAN card if left in control
>+				of the firmware.  Does not affect
>+				the WLAN card.
>+				Should be used to turn on/off all
>+				radios (bluetooth+W-WAN+WLAN),
>+				really.
>+
>+0x1006	0x05	FN+F6		-
>+
>+0x1007	0x06	FN+F7		Video output cycle.
>+				Do you feel lucky today?
>+
>+0x1008	0x07	FN+F8		IBM: toggle screen expand
>+				Lenovo: configure ultranav
>+
>+0x1009	0x08	FN+F9		-
>+	..	..		..
>+0x100B	0x0A	FN+F11		-
>+
>+0x100C	0x0B	FN+F12		Sleep to disk.  You are always
>+				supposed to handle it yourself,
>+				either through the ACPI event,
>+				or through a hotkey event.
>+				The firmware may refuse to
>+				generate further FN+F4 key
>+				press events until a S3 or S4
>+				ACPI sleep cycle is performed,
>+				or some time passes.
>+
>+0x100D	0x0C	FN+BACKSPACE	-
>+0x100E	0x0D	FN+INSERT	-
>+0x100F	0x0E	FN+DELETE	-
>+
>+0x1010	0x0F	FN+HOME		Brightness up.  This key is
>+				always handled by the firmware
>+				in IBM ThinkPads, even when
>+				unmasked.  Just leave it alone.
>+				For Lenovo ThinkPads with a new
>+				BIOS, it has to be handled either
>+				by the ACPI OSI, or by userspace.
>+0x1011	0x10	FN+END		Brightness down.  See brightness
>+				up for details.
>+
>+0x1012	0x11	FN+PGUP		Thinklight toggle.  This key is
>+				always handled by the firmware,
>+				even when unmasked.
>+
>+0x1013	0x12	FN+PGDOWN	-
>+
>+0x1014	0x13	FN+SPACE	Zoom key
>+
>+0x1015	0x14	VOLUME UP	Internal mixer volume up. This
>+				key is always handled by the
>+				firmware, even when unmasked.
>+				NOTE: Lenovo seems to be changing
>+				this.
>+0x1016	0x15	VOLUME DOWN	Internal mixer volume up. This
>+				key is always handled by the
>+				firmware, even when unmasked.
>+				NOTE: Lenovo seems to be changing
>+				this.
>+0x1017	0x16	MUTE		Mute internal mixer. This
>+				key is always handled by the
>+				firmware, even when unmasked.
>+
>+0x1018	0x17	THINKPAD	Thinkpad/Access IBM/Lenovo key
>+
>+0x1019	0x18	unknown
>+..	..	..
>+0x1020	0x1F	unknown
>+
>+The ThinkPad firmware does not allow one to differentiate when most hot
>+keys are pressed or released (either that, or we don't know how to, yet).
>+For these keys, the driver generates a set of events for a key press and
>+immediately issues the same set of events for a key release.  It is
>+unknown by the driver if the ThinkPad firmware triggered these events on
>+hot key press or release, but the firmware will do it for either one, not
>+both.
>+
>+If a key is mapped to KEY_RESERVED, it generates no input events at all.
>+If a key is mapped to KEY_UNKNOWN, it generates an input event that
>+includes an scan code.  If a key is mapped to anything else, it will
>+generate input device EV_KEY events.
>+
>+Non hot-key ACPI HKEY event map:
>+0x5001		Lid closed
>+0x5002		Lid opened
>+0x7000		Radio Switch may have changed state
>+
>+The above events are not propagated by the driver, except for legacy
>+compatibility purposes when hotkey_report_mode is set to 1.
>+
>+0x2304		System is waking up from suspend to undock
>+0x2305		System is waking up from suspend to eject bay
>+0x2404		System is waking up from hibernation to undock
>+0x2405		System is waking up from hibernation to eject bay
>+
>+The above events are never propagated by the driver.
>+
>+0x3003		Bay ejection (see 0x2x05) complete, can sleep again
>+0x4003		Undocked (see 0x2x04), can sleep again
>+0x5009		Tablet swivel: switched to tablet mode
>+0x500A		Tablet swivel: switched to normal mode
>+0x500B		Tablet pen insterted into its storage bay
>+0x500C		Tablet pen removed from its storage bay
>+0x5010		Brightness level changed (newer Lenovo BIOSes)
>+
>+The above events are propagated by the driver.
>+
>+Compatibility notes:
>+
>+ibm-acpi and thinkpad-acpi 0.15 (mainline kernels before 2.6.23) never
>+supported the input layer, and sent events over the procfs ACPI event
>+interface.
>+
>+To avoid sending duplicate events over the input layer and the ACPI
>+event interface, thinkpad-acpi 0.16 implements a module parameter
>+(hotkey_report_mode), and also a sysfs device attribute with the same
>+name.
>+
>+Make no mistake here: userspace is expected to switch to using the input
>+layer interface of thinkpad-acpi, together with the ACPI netlink event
>+interface in kernels 2.6.23 and later, or with the ACPI procfs event
>+interface in kernels 2.6.22 and earlier.
>+
>+If no hotkey_report_mode module parameter is specified (or it is set to
>+zero), the driver defaults to mode 1 (see below), and on kernels 2.6.22
>+and earlier, also allows one to change the hotkey_report_mode through
>+sysfs.  In kernels 2.6.23 and later, where the netlink ACPI event
>+interface is available, hotkey_report_mode cannot be changed through
>+sysfs (it is read-only).
>+
>+If the hotkey_report_mode module parameter is set to 1 or 2, it cannot
>+be changed later through sysfs (any writes will return -EPERM to signal
>+that hotkey_report_mode was locked.  On 2.6.23 and later, where
>+hotkey_report_mode cannot be changed at all, writes will return -EACES).
>+
>+hotkey_report_mode set to 1 makes the driver export through the procfs
>+ACPI event interface all hot key presses (which are *also* sent to the
>+input layer).  This is a legacy compatibility behaviour, and it is also
>+the default mode of operation for the driver.
>+
>+hotkey_report_mode set to 2 makes the driver filter out the hot key
>+presses from the procfs ACPI event interface, so these events will only
>+be sent through the input layer.  Userspace that has been updated to use
>+the thinkpad-acpi input layer interface should set hotkey_report_mode to
>+2.
>+
>+Hot key press events are never sent to the ACPI netlink event interface.
>+Really up-to-date userspace under kernel 2.6.23 and later is to use the
>+netlink interface and the input layer interface, and don't bother at all
>+with hotkey_report_mode.
> 
> 
> Bluetooth
>@@ -437,27 +773,34 @@ CMOS control
> procfs: /proc/acpi/ibm/cmos
> sysfs device attribute: cmos_command
> 
>-This feature is used internally by the ACPI firmware to control the
>-ThinkLight on most newer ThinkPad models. It may also control LCD
>-brightness, sounds volume and more, but only on some models.
>+This feature is mostly used internally by the ACPI firmware to keep the legacy
>+CMOS NVRAM bits in sync with the current machine state, and to record this
>+state so that the ThinkPad will retain such settings across reboots.
>+
>+Some of these commands actually perform actions in some ThinkPad models, but
>+this is expected to disappear more and more in newer models.  As an example, in
>+a T43 and in a X40, commands 12 and 13 still control the ThinkLight state for
>+real, but commands 0 to 2 don't control the mixer anymore (they have been
>+phased out) and just update the NVRAM.
> 
> The range of valid cmos command numbers is 0 to 21, but not all have an
> effect and the behavior varies from model to model.  Here is the behavior
> on the X40 (tpb is the ThinkPad Buttons utility):
> 
>-	0 - no effect but tpb reports "Volume down"
>-	1 - no effect but tpb reports "Volume up"
>-	2 - no effect but tpb reports "Mute on"
>-	3 - simulate pressing the "Access IBM" button
>-	4 - LCD brightness up
>-	5 - LCD brightness down
>-	11 - toggle screen expansion
>-	12 - ThinkLight on
>-	13 - ThinkLight off
>-	14 - no effect but tpb reports ThinkLight status change
>+	0 - Related to "Volume down" key press
>+	1 - Related to "Volume up" key press
>+	2 - Related to "Mute on" key press
>+	3 - Related to "Access IBM" key press
>+	4 - Related to "LCD brightness up" key pess
>+	5 - Related to "LCD brightness down" key press
>+	11 - Related to "toggle screen expansion" key press/function
>+	12 - Related to "ThinkLight on"
>+	13 - Related to "ThinkLight off"
>+	14 - Related to "ThinkLight" key press (toggle thinklight)
> 
> The cmos command interface is prone to firmware split-brain problems, as
>-in newer ThinkPads it is just a compatibility layer.
>+in newer ThinkPads it is just a compatibility layer.  Do not use it, it is
>+exported just as a debug tool.
> 
> LED control -- /proc/acpi/ibm/led
> ---------------------------------
>@@ -514,25 +857,17 @@ Temperature sensors
> -------------------
> 
> procfs: /proc/acpi/ibm/thermal
>-sysfs device attributes: (hwmon) temp*_input
>-
>-Most ThinkPads include six or more separate temperature sensors but
>-only expose the CPU temperature through the standard ACPI methods.
>-This feature shows readings from up to eight different sensors on older
>-ThinkPads, and it has experimental support for up to sixteen different
>-sensors on newer ThinkPads.
>+sysfs device attributes: (hwmon "thinkpad") temp*_input
> 
>-EXPERIMENTAL: The 16-sensors feature is marked EXPERIMENTAL because the
>-implementation directly accesses hardware registers and may not work as
>-expected. USE WITH CAUTION! To use this feature, you need to supply the
>-experimental=1 parameter when loading the module.  When EXPERIMENTAL
>-mode is enabled, reading the first 8 sensors on newer ThinkPads will
>-also use an new experimental thermal sensor access mode.
>+Most ThinkPads include six or more separate temperature sensors but only
>+expose the CPU temperature through the standard ACPI methods.  This
>+feature shows readings from up to eight different sensors on older
>+ThinkPads, and up to sixteen different sensors on newer ThinkPads.
> 
> For example, on the X40, a typical output may be:
> temperatures:   42 42 45 41 36 -128 33 -128
> 
>-EXPERIMENTAL: On the T43/p, a typical output may be:
>+On the T43/p, a typical output may be:
> temperatures:   48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128
> 
> The mapping of thermal sensors to physical locations varies depending on
>@@ -562,7 +897,8 @@ http://thinkwiki.org/wiki/Thermal_Sensors#ThinkPad_T43.2C_T43p
> 2:  System board, left side (near PCMCIA slot), reported as HDAPS temp
> 3:  PCMCIA slot
> 9:  MCH (northbridge) to DRAM Bus
>-10: ICH (southbridge), under Mini-PCI card, under touchpad
>+10: Clock-generator, mini-pci card and ICH (southbridge), under Mini-PCI
>+    card, under touchpad
> 11: Power regulator, underside of system board, below F2 key
> 
> The A31 has a very atypical layout for the thermal sensors
>@@ -673,13 +1009,34 @@ sysfs backlight device "thinkpad_screen"
> This feature allows software control of the LCD brightness on ThinkPad
> models which don't have a hardware brightness slider.
> 
>-It has some limitations: the LCD backlight cannot be actually turned on or off
>-by this interface, and in many ThinkPad models, the "dim while on battery"
>-functionality will be enabled by the BIOS when this interface is used, and
>-cannot be controlled.
>-
>-The backlight control has eight levels, ranging from 0 to 7.  Some of the
>-levels may not be distinct.
>+It has some limitations: the LCD backlight cannot be actually turned on or
>+off by this interface, and in many ThinkPad models, the "dim while on
>+battery" functionality will be enabled by the BIOS when this interface is
>+used, and cannot be controlled.
>+
>+On IBM (and some of the earlier Lenovo) ThinkPads, the backlight control
>+has eight brightness levels, ranging from 0 to 7.  Some of the levels
>+may not be distinct.  Later Lenovo models that implement the ACPI
>+display backlight brightness control methods have 16 levels, ranging
>+from 0 to 15.
>+
>+There are two interfaces to the firmware for direct brightness control,
>+EC and CMOS.  To select which one should be used, use the
>+brightness_mode module parameter: brightness_mode=1 selects EC mode,
>+brightness_mode=2 selects CMOS mode, brightness_mode=3 selects both EC
>+and CMOS.  The driver tries to autodetect which interface to use.
>+
>+When display backlight brightness controls are available through the
>+standard ACPI interface, it is best to use it instead of this direct
>+ThinkPad-specific interface.  The driver will disable its native
>+backlight brightness control interface if it detects that the standard
>+ACPI interface is available in the ThinkPad.
>+
>+The brightness_enable module parameter can be used to control whether
>+the LCD brightness control feature will be enabled when available.
>+brightness_enable=0 forces it to be disabled.  brightness_enable=1
>+forces it to be enabled when available, even if the standard ACPI
>+interface is also available.
> 
> Procfs notes:
> 
>@@ -691,11 +1048,11 @@ Procfs notes:
> 
> Sysfs notes:
> 
>-The interface is implemented through the backlight sysfs class, which is poorly
>-documented at this time.
>+The interface is implemented through the backlight sysfs class, which is
>+poorly documented at this time.
> 
>-Locate the thinkpad_screen device under /sys/class/backlight, and inside it
>-there will be the following attributes:
>+Locate the thinkpad_screen device under /sys/class/backlight, and inside
>+it there will be the following attributes:
> 
> 	max_brightness:
> 		Reads the maximum brightness the hardware can be set to.
>@@ -705,17 +1062,19 @@ there will be the following attributes:
> 		Reads what brightness the screen is set to at this instant.
> 
> 	brightness:
>-		Writes request the driver to change brightness to the given
>-		value.  Reads will tell you what brightness the driver is trying
>-		to set the display to when "power" is set to zero and the display
>-		has not been dimmed by a kernel power management event.
>+		Writes request the driver to change brightness to the
>+		given value.  Reads will tell you what brightness the
>+		driver is trying to set the display to when "power" is set
>+		to zero and the display has not been dimmed by a kernel
>+		power management event.
> 
> 	power:
>-		power management mode, where 0 is "display on", and 1 to 3 will
>-		dim the display backlight to brightness level 0 because
>-		thinkpad-acpi cannot really turn the backlight off.  Kernel
>-		power management events can temporarily increase the current
>-		power management level, i.e. they can dim the display.
>+		power management mode, where 0 is "display on", and 1 to 3
>+		will dim the display backlight to brightness level 0
>+		because thinkpad-acpi cannot really turn the backlight
>+		off.  Kernel power management events can temporarily
>+		increase the current power management level, i.e. they can
>+		dim the display.
> 
> 
> Volume control -- /proc/acpi/ibm/volume
>@@ -738,7 +1097,9 @@ Fan control and monitoring: fan speed, fan enable/disable
> ---------------------------------------------------------
> 
> procfs: /proc/acpi/ibm/fan
>-sysfs device attributes: (hwmon) fan_input, pwm1, pwm1_enable
>+sysfs device attributes: (hwmon "thinkpad") fan1_input, pwm1,
>+			  pwm1_enable
>+sysfs hwmon driver attributes: fan_watchdog
> 
> NOTE NOTE NOTE: fan control operations are disabled by default for
> safety reasons.  To enable them, the module parameter "fan_control=1"
>@@ -777,7 +1138,7 @@ enable it if necessary to avoid overheating.
> 
> An enabled fan in level "auto" may stop spinning if the EC decides the
> ThinkPad is cool enough and doesn't need the extra airflow.  This is
>-normal, and the EC will spin the fan up if the varios thermal readings
>+normal, and the EC will spin the fan up if the various thermal readings
> rise too much.
> 
> On the X40, this seems to depend on the CPU and HDD temperatures.
>@@ -880,7 +1241,7 @@ hwmon device attribute fan1_input:
> 	which can take up to two minutes.  May return rubbish on older
> 	ThinkPads.
> 
>-driver attribute fan_watchdog:
>+hwmon driver attribute fan_watchdog:
> 	Fan safety watchdog timer interval, in seconds.  Minimum is
> 	1 second, maximum is 120 seconds.  0 disables the watchdog.
> 
>@@ -945,7 +1306,7 @@ for example:
> Enabling debugging output
> -------------------------
> 
>-The module takes a debug paramater which can be used to selectively
>+The module takes a debug parameter which can be used to selectively
> enable various classes of debugging output, for example:
> 
> 	 modprobe ibm_acpi debug=0xffff
>@@ -976,3 +1337,29 @@ Sysfs interface changelog:
> 
> 0x000100:	Initial sysfs support, as a single platform driver and
> 		device.
>+0x000200:	Hot key support for 32 hot keys, and radio slider switch
>+		support.
>+0x010000:	Hot keys are now handled by default over the input
>+		layer, the radio switch generates input event EV_RADIO,
>+		and the driver enables hot key handling by default in
>+		the firmware.
>+
>+0x020000:	ABI fix: added a separate hwmon platform device and
>+		driver, which must be located by name (thinkpad)
>+		and the hwmon class for libsensors4 (lm-sensors 3)
>+		compatibility.  Moved all hwmon attributes to this
>+		new platform device.
>+
>+0x020100:	Marker for thinkpad-acpi with hot key NVRAM polling
>+		support.  If you must, use it to know you should not
>+		start an userspace NVRAM poller (allows to detect when
>+		NVRAM is compiled out by the user because it is
>+		unneeded/undesired in the first place).
>+0x020101:	Marker for thinkpad-acpi with hot key NVRAM polling
>+		and proper hotkey_mask semanthics (version 8 of the
>+		NVRAM polling patch).  Some development snapshots of
>+		0.18 had an earlier version that did strange things
>+		to hotkey_mask.
>+
>+0x020200:	Add poll()/select() support to the following attributes:
>+		hotkey_radio_sw, wakeup_hotunplug_complete, wakeup_reason
>diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
>index 616eee9..74ec4fb 100644
>--- a/drivers/misc/Kconfig
>+++ b/drivers/misc/Kconfig
>@@ -141,6 +141,7 @@ config THINKPAD_ACPI
> 	depends on X86 && ACPI
> 	select BACKLIGHT_CLASS_DEVICE
> 	select HWMON
>+	select NVRAM
> 	---help---
> 	  This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
> 	  support for Fn-Fx key combinations, Bluetooth control, video
>@@ -148,7 +149,7 @@ config THINKPAD_ACPI
> 	  For more information about this driver see 
> 	  <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> .
> 
>-	  This driver was formely known as ibm-acpi.
>+	  This driver was formerly known as ibm-acpi.
> 
> 	  If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
> 
>@@ -182,10 +183,29 @@ config THINKPAD_ACPI_BAY
> 	default y
> 	---help---
> 	  Allows the thinkpad_acpi driver to handle removable bays.  It will
>-	  eletrically disable the device in the bay, and also generate
>+	  electrically disable the device in the bay, and also generate
> 	  notifications when the bay lever is ejected or inserted.
> 
> 	  If you are not sure, say Y here.
> 
>+config THINKPAD_ACPI_HOTKEY_POLL
>+	bool "Suport NVRAM polling for hot keys"
>+	depends on THINKPAD_ACPI
>+	default y
>+	---help---
>+	  Some thinkpad models benefit from NVRAM polling to detect a few of
>+	  the hot key press events.  If you know your ThinkPad model does not
>+	  need to do NVRAM polling to support any of the hot keys you use,
>+	  unselecting this option will save about 1kB of memory.
>+
>+	  ThinkPads T40 and newer, R52 and newer, and X31 and newer are
>+	  unlikely to need NVRAM polling in their latest BIOS versions.
>+
>+	  NVRAM polling can detect at most the following keys: ThinkPad/Access
>+	  IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
>+	  Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
>+
>+	  If you are not sure, say Y here.  The driver enables polling only if
>+	  it is strictly necessary to do so.
> 
> endmenu
>Index: linux-2.6.22-SL103_BRANCH/drivers/misc/thinkpad_acpi.c
>===================================================================
>--- linux-2.6.22-SL103_BRANCH.orig/drivers/misc/thinkpad_acpi.c
>+++ linux-2.6.22-SL103_BRANCH/drivers/misc/thinkpad_acpi.c
>@@ -3,7 +3,7 @@
>  *
>  *
>  *  Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
>- *  Copyright (C) 2006-2007 Henrique de Moraes Holschuh <hmh@hmh.eng.br>
>+ *  Copyright (C) 2006-2008 Henrique de Moraes Holschuh <hmh@hmh.eng.br>
>  *
>  *  This program is free software; you can redistribute it and/or modify
>  *  it under the terms of the GNU General Public License as published by
>@@ -21,11 +21,13 @@
>  *  02110-1301, USA.
>  */
> 
>-#define IBM_VERSION "0.14"
>-#define TPACPI_SYSFS_VERSION 0x000100
>+#define TPACPI_VERSION "0.19-20080107"
>+#define TPACPI_SYSFS_VERSION 0x020200
> 
> /*
>  *  Changelog:
>+ *  2007-10-20		changelog trimmed down
>+ *
>  *  2007-03-27  0.14	renamed to thinkpad_acpi and moved to
>  *  			drivers/misc.
>  *
>@@ -33,89 +35,229 @@
>  *  			changelog now lives in git commit history, and will
>  *  			not be updated further in-file.
>  *
>- *  2005-08-17  0.12	fix compilation on 2.6.13-rc kernels
>  *  2005-03-17	0.11	support for 600e, 770x
>  *			    thanks to Jamie Lentin <lentinj@dial.pipex.com>
>- *			support for 770e, G41
>- *			G40 and G41 don't have a thinklight
>- *			temperatures no longer experimental
>- *			experimental brightness control
>- *			experimental volume control
>- *			experimental fan enable/disable
>- *  2005-01-16	0.10	fix module loading on R30, R31
>- *  2005-01-16	0.9	support for 570, R30, R31
>- *			ultrabay support on A22p, A3x
>- *			limit arg for cmos, led, beep, drop experimental status
>- *			more capable led control on A21e, A22p, T20-22, X20
>- *			experimental temperatures and fan speed
>- *			experimental embedded controller register dump
>- *			mark more functions as __init, drop incorrect __exit
>- *			use MODULE_VERSION
>+ *
>+ *  2005-01-16	0.9	use MODULE_VERSION
>  *			    thanks to Henrik Brix Andersen <brix@gentoo.org>
>  *			fix parameter passing on module loading
>  *			    thanks to Rusty Russell <rusty@rustcorp.com.au>
>  *			    thanks to Jim Radford <radford@blackbean.org>
>  *  2004-11-08	0.8	fix init error case, don't return from a macro
>  *			    thanks to Chris Wright <chrisw@osdl.org>
>- *  2004-10-23	0.7	fix module loading on A21e, A22p, T20, T21, X20
>- *			fix led control on A21e
>- *  2004-10-19	0.6	use acpi_bus_register_driver() to claim HKEY device
>- *  2004-10-18	0.5	thinklight support on A21e, G40, R32, T20, T21, X20
>- *			proc file format changed
>- *			video_switch command
>- *			experimental cmos control
>- *			experimental led control
>- *			experimental acpi sounds
>- *  2004-09-16	0.4	support for module parameters
>- *			hotkey mask can be prefixed by 0x
>- *			video output switching
>- *			video expansion control
>- *			ultrabay eject support
>- *			removed lcd brightness/on/off control, didn't work
>- *  2004-08-17	0.3	support for R40
>- *			lcd off, brightness control
>- *			thinklight on/off
>- *  2004-08-14	0.2	support for T series, X20
>- *			bluetooth enable/disable
>- *			hotkey events disabled by default
>- *			removed fan control, currently useless
>- *  2004-08-09	0.1	initial release, support for X series
>  */
> 
>-#include "thinkpad_acpi.h"
>+#include <linux/kernel.h>
>+#include <linux/module.h>
>+#include <linux/init.h>
>+#include <linux/types.h>
>+#include <linux/string.h>
>+#include <linux/list.h>
>+#include <linux/mutex.h>
>+#include <linux/kthread.h>
>+#include <linux/freezer.h>
>+#include <linux/delay.h>
>+
>+#include <linux/nvram.h>
>+#include <linux/proc_fs.h>
>+#include <linux/sysfs.h>
>+#include <linux/backlight.h>
>+#include <linux/fb.h>
>+#include <linux/platform_device.h>
>+#include <linux/hwmon.h>
>+#include <linux/hwmon-sysfs.h>
>+#include <linux/input.h>
>+#include <asm/uaccess.h>
>+
>+#include <linux/dmi.h>
>+#include <linux/jiffies.h>
>+#include <linux/workqueue.h>
>+
>+#include <acpi/acpi_drivers.h>
>+#include <acpi/acnamesp.h>
>+
>+#include <linux/pci_ids.h>
>+
>+
>+/* ThinkPad CMOS commands */
>+#define TP_CMOS_VOLUME_DOWN	0
>+#define TP_CMOS_VOLUME_UP	1
>+#define TP_CMOS_VOLUME_MUTE	2
>+#define TP_CMOS_BRIGHTNESS_UP	4
>+#define TP_CMOS_BRIGHTNESS_DOWN	5
>+
>+/* NVRAM Addresses */
>+enum tp_nvram_addr {
>+	TP_NVRAM_ADDR_HK2		= 0x57,
>+	TP_NVRAM_ADDR_THINKLIGHT	= 0x58,
>+	TP_NVRAM_ADDR_VIDEO		= 0x59,
>+	TP_NVRAM_ADDR_BRIGHTNESS	= 0x5e,
>+	TP_NVRAM_ADDR_MIXER		= 0x60,
>+};
> 
>-MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
>-MODULE_DESCRIPTION(IBM_DESC);
>-MODULE_VERSION(IBM_VERSION);
>-MODULE_LICENSE("GPL");
>+/* NVRAM bit masks */
>+enum {
>+	TP_NVRAM_MASK_HKT_THINKPAD	= 0x08,
>+	TP_NVRAM_MASK_HKT_ZOOM		= 0x20,
>+	TP_NVRAM_MASK_HKT_DISPLAY	= 0x40,
>+	TP_NVRAM_MASK_HKT_HIBERNATE	= 0x80,
>+	TP_NVRAM_MASK_THINKLIGHT	= 0x10,
>+	TP_NVRAM_MASK_HKT_DISPEXPND	= 0x30,
>+	TP_NVRAM_MASK_HKT_BRIGHTNESS	= 0x20,
>+	TP_NVRAM_MASK_LEVEL_BRIGHTNESS	= 0x0f,
>+	TP_NVRAM_POS_LEVEL_BRIGHTNESS	= 0,
>+	TP_NVRAM_MASK_MUTE		= 0x40,
>+	TP_NVRAM_MASK_HKT_VOLUME	= 0x80,
>+	TP_NVRAM_MASK_LEVEL_VOLUME	= 0x0f,
>+	TP_NVRAM_POS_LEVEL_VOLUME	= 0,
>+};
> 
>-/* Please remove this in year 2009 */
>-MODULE_ALIAS("ibm_acpi");
>+/* ACPI HIDs */
>+#define TPACPI_ACPI_HKEY_HID		"IBM0068"
> 
>-/*
>- * DMI matching for module autoloading
>- *
>- * See http://thinkwiki.org/wiki/List_of_DMI_IDs
>- * See http://thinkwiki.org/wiki/BIOS_Upgrade_Downloads
>- *
>- * Only models listed in thinkwiki will be supported, so add yours
>- * if it is not there yet.
>+/* Input IDs */
>+#define TPACPI_HKEY_INPUT_PRODUCT	0x5054 /* "TP" */
>+#define TPACPI_HKEY_INPUT_VERSION	0x4101
>+
>+
>+/****************************************************************************
>+ * Main driver
>  */
>-#define IBM_BIOS_MODULE_ALIAS(__type) \
>-	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")
> 
>-/* Non-ancient thinkpads */
>-MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
>-MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
>+#define TPACPI_NAME "thinkpad"
>+#define TPACPI_DESC "ThinkPad ACPI Extras"
>+#define TPACPI_FILE TPACPI_NAME "_acpi"
>+#define TPACPI_URL "http://ibm-acpi.sf.net/"
>+#define TPACPI_MAIL "ibm-acpi-devel@lists.sourceforge.net"
>+
>+#define TPACPI_PROC_DIR "ibm"
>+#define TPACPI_ACPI_EVENT_PREFIX "ibm"
>+#define TPACPI_DRVR_NAME TPACPI_FILE
>+#define TPACPI_HWMON_DRVR_NAME TPACPI_NAME "_hwmon"
>+
>+#define TPACPI_MAX_ACPI_ARGS 3
>+
>+/* Debugging */
>+#define TPACPI_LOG TPACPI_FILE ": "
>+#define TPACPI_ERR	   KERN_ERR    TPACPI_LOG
>+#define TPACPI_NOTICE KERN_NOTICE TPACPI_LOG
>+#define TPACPI_INFO   KERN_INFO   TPACPI_LOG
>+#define TPACPI_DEBUG  KERN_DEBUG  TPACPI_LOG
>+
>+#define TPACPI_DBG_ALL		0xffff
>+#define TPACPI_DBG_ALL		0xffff
>+#define TPACPI_DBG_INIT		0x0001
>+#define TPACPI_DBG_EXIT		0x0002
>+#define dbg_printk(a_dbg_level, format, arg...) \
>+	do { if (dbg_level & a_dbg_level) \
>+		printk(TPACPI_DEBUG "%s: " format, __func__ , ## arg); \
>+	} while (0)
>+#ifdef CONFIG_THINKPAD_ACPI_DEBUG
>+#define vdbg_printk(a_dbg_level, format, arg...) \
>+	dbg_printk(a_dbg_level, format, ## arg)
>+static const char *str_supported(int is_supported);
>+#else
>+#define vdbg_printk(a_dbg_level, format, arg...)
>+#endif
> 
>-/* Ancient thinkpad BIOSes have to be identified by
>- * BIOS type or model number, and there are far less
>- * BIOS types than model numbers... */
>-IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]");
>-IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");
>-IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");
>+#define onoff(status, bit) ((status) & (1 << (bit)) ? "on" : "off")
>+#define enabled(status, bit) ((status) & (1 << (bit)) ? "enabled" : "disabled")
>+#define strlencmp(a, b) (strncmp((a), (b), strlen(b)))
> 
>-#define __unused __attribute__ ((unused))
>+
>+/****************************************************************************
>+ * Driver-wide structs and misc. variables
>+ */
>+
>+struct ibm_struct;
>+
>+struct tp_acpi_drv_struct {
>+	char *hid;
>+	struct acpi_driver *driver;
>+
>+	void (*notify) (struct ibm_struct *, u32);
>+	acpi_handle *handle;
>+	u32 type;
>+	struct acpi_device *device;
>+};
>+
>+struct ibm_struct {
>+	char *name;
>+
>+	int (*read) (char *);
>+	int (*write) (char *);
>+	void (*exit) (void);
>+	void (*resume) (void);
>+	void (*suspend) (pm_message_t state);
>+
>+	struct list_head all_drivers;
>+
>+	struct tp_acpi_drv_struct *acpi;
>+
>+	struct {
>+		u8 acpi_driver_registered:1;
>+		u8 acpi_notify_installed:1;
>+		u8 proc_created:1;
>+		u8 init_called:1;
>+		u8 experimental:1;
>+	} flags;
>+};
>+
>+struct ibm_init_struct {
>+	char param[32];
>+
>+	int (*init) (struct ibm_init_struct *);
>+	struct ibm_struct *data;
>+};
>+
>+static struct {
>+#ifdef CONFIG_THINKPAD_ACPI_BAY
>+	u32 bay_status:1;
>+	u32 bay_eject:1;
>+	u32 bay_status2:1;
>+	u32 bay_eject2:1;
>+#endif
>+	u32 bluetooth:1;
>+	u32 hotkey:1;
>+	u32 hotkey_mask:1;
>+	u32 hotkey_wlsw:1;
>+	u32 light:1;
>+	u32 light_status:1;
>+	u32 bright_16levels:1;
>+	u32 wan:1;
>+	u32 fan_ctrl_status_undef:1;
>+	u32 input_device_registered:1;
>+	u32 hotkey_report_mode_locked:1;
>+	u32 platform_drv_registered:1;
>+	u32 platform_drv_attrs_registered:1;
>+	u32 sensors_pdrv_registered:1;
>+	u32 sensors_pdrv_attrs_registered:1;
>+	u32 sensors_pdev_attrs_registered:1;
>+	u32 hotkey_poll_active:1;
>+} tp_features;
>+
>+struct thinkpad_id_data {
>+	unsigned int vendor;	/* ThinkPad vendor:
>+				 * PCI_VENDOR_ID_IBM/PCI_VENDOR_ID_LENOVO */
>+
>+	char *bios_version_str;	/* Something like 1ZET51WW (1.03z) */
>+	char *ec_version_str;	/* Something like 1ZHT51WW-1.04a */
>+
>+	u16 bios_model;		/* Big Endian, TP-1Y = 0x5931, 0 = unknown */
>+	u16 ec_model;
>+
>+	char *model_str;
>+};
>+static struct thinkpad_id_data thinkpad_id;
>+
>+static enum {
>+	TPACPI_LIFE_INIT = 0,
>+	TPACPI_LIFE_RUNNING,
>+	TPACPI_LIFE_EXITING,
>+} tpacpi_lifecycle;
>+
>+static int experimental;
>+static u32 dbg_level;
> 
> /****************************************************************************
>  ****************************************************************************
>@@ -129,15 +271,15 @@ IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");
>  * ACPI basic handles
>  */
> 
>-static acpi_handle root_handle = NULL;
>+static acpi_handle root_handle;
> 
>-#define IBM_HANDLE(object, parent, paths...)			\
>+#define TPACPI_HANDLE(object, parent, paths...)			\
> 	static acpi_handle  object##_handle;			\
> 	static acpi_handle *object##_parent = &parent##_handle;	\
> 	static char        *object##_path;			\
> 	static char        *object##_paths[] = { paths }
> 
>-IBM_HANDLE(ec, root, "\\_SB.PCI0.ISA.EC0",	/* 240, 240x */
>+TPACPI_HANDLE(ec, root, "\\_SB.PCI0.ISA.EC0",	/* 240, 240x */
> 	   "\\_SB.PCI.ISA.EC",	/* 570 */
> 	   "\\_SB.PCI0.ISA0.EC0",	/* 600e/x, 770e, 770x */
> 	   "\\_SB.PCI0.ISA.EC",	/* A21e, A2xm/p, T20-22, X20-21 */
>@@ -146,20 +288,16 @@ IBM_HANDLE(ec, root, "\\_SB.PCI0.ISA.EC0
> 	   "\\_SB.PCI0.LPC.EC",	/* all others */
> 	   );
> 
>-IBM_HANDLE(ecrd, ec, "ECRD");	/* 570 */
>-IBM_HANDLE(ecwr, ec, "ECWR");	/* 570 */
>-
>+TPACPI_HANDLE(ecrd, ec, "ECRD");	/* 570 */
>+TPACPI_HANDLE(ecwr, ec, "ECWR");	/* 570 */
> 
>-/*************************************************************************
>- * Misc ACPI handles
>- */
>-
>-IBM_HANDLE(cmos, root, "\\UCMS",	/* R50, R50e, R50p, R51, T4x, X31, X40 */
>+TPACPI_HANDLE(cmos, root, "\\UCMS",	/* R50, R50e, R50p, R51, */
>+					/* T4x, X31, X40 */
> 	   "\\CMOS",		/* A3x, G4x, R32, T23, T30, X22-24, X30 */
> 	   "\\CMS",		/* R40, R40e */
> 	   );			/* all others */
> 
>-IBM_HANDLE(hkey, ec, "\\_SB.HKEY",	/* 600e/x, 770e, 770x */
>+TPACPI_HANDLE(hkey, ec, "\\_SB.HKEY",	/* 600e/x, 770e, 770x */
> 	   "^HKEY",		/* R30, R31 */
> 	   "HKEY",		/* all others */
> 	   );			/* 570 */
>@@ -174,7 +312,7 @@ static int acpi_evalf(acpi_handle handle
> {
> 	char *fmt0 = fmt;
> 	struct acpi_object_list params;
>-	union acpi_object in_objs[IBM_MAX_ACPI_ARGS];
>+	union acpi_object in_objs[TPACPI_MAX_ACPI_ARGS];
> 	struct acpi_buffer result, *resultp;
> 	union acpi_object out_obj;
> 	acpi_status status;
>@@ -184,7 +322,7 @@ static int acpi_evalf(acpi_handle handle
> 	int quiet;
> 
> 	if (!*fmt) {
>-		printk(IBM_ERR "acpi_evalf() called with empty format\n");
>+		printk(TPACPI_ERR "acpi_evalf() called with empty format\n");
> 		return 0;
> 	}
> 
>@@ -209,7 +347,7 @@ static int acpi_evalf(acpi_handle handle
> 			break;
> 			/* add more types as needed */
> 		default:
>-			printk(IBM_ERR "acpi_evalf() called "
>+			printk(TPACPI_ERR "acpi_evalf() called "
> 			       "with invalid format character '%c'\n", c);
> 			return 0;
> 		}
>@@ -236,29 +374,19 @@ static int acpi_evalf(acpi_handle handle
> 		break;
> 		/* add more types as needed */
> 	default:
>-		printk(IBM_ERR "acpi_evalf() called "
>+		printk(TPACPI_ERR "acpi_evalf() called "
> 		       "with invalid format character '%c'\n", res_type);
> 		return 0;
> 	}
> 
> 	if (!success && !quiet)
>-		printk(IBM_ERR "acpi_evalf(%s, %s, ...) failed: %d\n",
>+		printk(TPACPI_ERR "acpi_evalf(%s, %s, ...) failed: %d\n",
> 		       method, fmt0, status);
> 
> 	return success;
> }
> 
>-static void __unused acpi_print_int(acpi_handle handle, char *method)
>-{
>-	int i;
>-
>-	if (acpi_evalf(handle, &i, method, "d"))
>-		printk(IBM_INFO "%s = 0x%x\n", method, i);
>-	else
>-		printk(IBM_ERR "error calling %s\n", method);
>-}
>-
>-static int acpi_ec_read(int i, u8 * p)
>+static int acpi_ec_read(int i, u8 *p)
> {
> 	int v;
> 
>@@ -287,6 +415,7 @@ static int acpi_ec_write(int i, u8 v)
> 	return 1;
> }
> 
>+#if defined(CONFIG_THINKPAD_ACPI_DOCK) || defined(CONFIG_THINKPAD_ACPI_BAY)
> static int _sta(acpi_handle handle)
> {
> 	int status;
>@@ -296,6 +425,7 @@ static int _sta(acpi_handle handle)
> 
> 	return status;
> }
>+#endif
> 
> static int issue_thinkpad_cmos_command(int cmos_cmd)
> {
>@@ -312,6 +442,10 @@ static int issue_thinkpad_cmos_command(i
>  * ACPI device model
>  */
> 
>+#define TPACPI_ACPIHANDLE_INIT(object) \
>+	drv_acpi_handle_init(#object, &object##_handle, *object##_parent, \
>+		object##_paths, ARRAY_SIZE(object##_paths), &object##_path)
>+
> static void drv_acpi_handle_init(char *name,
> 			   acpi_handle *handle, acpi_handle parent,
> 			   char **paths, int num_paths, char **path)
>@@ -342,6 +476,9 @@ static void dispatch_acpi_notify(acpi_ha
> {
> 	struct ibm_struct *ibm = data;
> 
>+	if (tpacpi_lifecycle != TPACPI_LIFE_RUNNING)
>+		return;
>+
> 	if (!ibm || !ibm->acpi || !ibm->acpi->notify)
> 		return;
> 
>@@ -363,25 +500,27 @@ static int __init setup_acpi_notify(stru
> 
> 	rc = acpi_bus_get_device(*ibm->acpi->handle, &ibm->acpi->device);
> 	if (rc < 0) {
>-		printk(IBM_ERR "acpi_bus_get_device(%s) failed: %d\n",
>+		printk(TPACPI_ERR "acpi_bus_get_device(%s) failed: %d\n",
> 			ibm->name, rc);
> 		return -ENODEV;
> 	}
> 
> 	acpi_driver_data(ibm->acpi->device) = ibm;
> 	sprintf(acpi_device_class(ibm->acpi->device), "%s/%s",
>-		IBM_ACPI_EVENT_PREFIX,
>+		TPACPI_ACPI_EVENT_PREFIX,
> 		ibm->name);
> 
> 	status = acpi_install_notify_handler(*ibm->acpi->handle,
> 			ibm->acpi->type, dispatch_acpi_notify, ibm);
> 	if (ACPI_FAILURE(status)) {
> 		if (status == AE_ALREADY_EXISTS) {
>-			printk(IBM_NOTICE "another device driver is already handling %s events\n",
>-				ibm->name);
>+			printk(TPACPI_NOTICE
>+			       "another device driver is already "
>+			       "handling %s events\n", ibm->name);
> 		} else {
>-			printk(IBM_ERR "acpi_install_notify_handler(%s) failed: %d\n",
>-				ibm->name, status);
>+			printk(TPACPI_ERR
>+			       "acpi_install_notify_handler(%s) failed: %d\n",
>+			       ibm->name, status);
> 		}
> 		return -ENODEV;
> 	}
>@@ -405,19 +544,18 @@ static int __init register_tpacpi_subdri
> 
> 	ibm->acpi->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL);
> 	if (!ibm->acpi->driver) {
>-		printk(IBM_ERR "kzalloc(ibm->driver) failed\n");
>+		printk(TPACPI_ERR "kzalloc(ibm->driver) failed\n");
> 		return -ENOMEM;
> 	}
> 
>-	sprintf(ibm->acpi->driver->name, "%s_%s", IBM_NAME, ibm->name);
>+	sprintf(ibm->acpi->driver->name, "%s_%s", TPACPI_NAME, ibm->name);
> 	ibm->acpi->driver->ids = ibm->acpi->hid;
>-
> 	ibm->acpi->driver->ops.add = &tpacpi_device_add;
> 
> 	rc = acpi_bus_register_driver(ibm->acpi->driver);
> 	if (rc < 0) {
>-		printk(IBM_ERR "acpi_bus_register_driver(%s) failed: %d\n",
>-		       ibm->name, rc);
>+		printk(TPACPI_ERR "acpi_bus_register_driver(%s) failed: %d\n",
>+		       ibm->acpi->hid, rc);
> 		kfree(ibm->acpi->driver);
> 		ibm->acpi->driver = NULL;
> 	} else if (!rc)
>@@ -461,7 +599,7 @@ static int dispatch_procfs_read(char *pa
> }
> 
> static int dispatch_procfs_write(struct file *file,
>-			const char __user * userbuf,
>+			const char __user *userbuf,
> 			unsigned long count, void *data)
> {
> 	struct ibm_struct *ibm = data;
>@@ -511,110 +649,79 @@ static char *next_cmd(char **cmds)
> /****************************************************************************
>  ****************************************************************************
>  *
>- * Device model: hwmon and platform
>+ * Device model: input, hwmon and platform
>  *
>  ****************************************************************************
>  ****************************************************************************/
> 
>-static struct platform_device *tpacpi_pdev = NULL;
>-static struct class_device *tpacpi_hwmon = NULL;
>-
>-static struct platform_driver tpacpi_pdriver = {
>-	.driver = {
>-		.name = IBM_DRVR_NAME,
>-		.owner = THIS_MODULE,
>-	},
>-};
>-
>-
>-/*************************************************************************
>- * thinkpad-acpi driver attributes
>- */
>-
>-/* interface_version --------------------------------------------------- */
>-static ssize_t tpacpi_driver_interface_version_show(
>-				struct device_driver *drv,
>-				char *buf)
>-{
>-	return snprintf(buf, PAGE_SIZE, "0x%08x\n", TPACPI_SYSFS_VERSION);
>-}
>-
>-static DRIVER_ATTR(interface_version, S_IRUGO,
>-		tpacpi_driver_interface_version_show, NULL);
>-
>-/* debug_level --------------------------------------------------------- */
>-static ssize_t tpacpi_driver_debug_show(struct device_driver *drv,
>-						char *buf)
>-{
>-	return snprintf(buf, PAGE_SIZE, "0x%04x\n", dbg_level);
>-}
>+static struct platform_device *tpacpi_pdev;
>+static struct platform_device *tpacpi_sensors_pdev;
>+static struct class_device *tpacpi_hwmon;
>+static struct input_dev *tpacpi_inputdev;
>+static struct mutex tpacpi_inputdev_send_mutex;
>+static LIST_HEAD(tpacpi_all_drivers);
> 
>-static ssize_t tpacpi_driver_debug_store(struct device_driver *drv,
>-						const char *buf, size_t count)
>+static int tpacpi_suspend_handler(struct platform_device *pdev,
>+				  pm_message_t state)
> {
>-	unsigned long t;
>-
>-	if (parse_strtoul(buf, 0xffff, &t))
>-		return -EINVAL;
>-
>-	dbg_level = t;
>-
>-	return count;
>-}
>+	struct ibm_struct *ibm, *itmp;
> 
>-static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
>-		tpacpi_driver_debug_show, tpacpi_driver_debug_store);
>+	list_for_each_entry_safe(ibm, itmp,
>+				 &tpacpi_all_drivers,
>+				 all_drivers) {
>+		if (ibm->suspend)
>+			(ibm->suspend)(state);
>+	}
> 
>-/* version ------------------------------------------------------------- */
>-static ssize_t tpacpi_driver_version_show(struct device_driver *drv,
>-						char *buf)
>-{
>-	return snprintf(buf, PAGE_SIZE, "%s v%s\n", IBM_DESC, IBM_VERSION);
>+	return 0;
> }
> 
>-static DRIVER_ATTR(version, S_IRUGO,
>-		tpacpi_driver_version_show, NULL);
>-
>-/* --------------------------------------------------------------------- */
>-
>-static struct driver_attribute* tpacpi_driver_attributes[] = {
>-	&driver_attr_debug_level, &driver_attr_version,
>-	&driver_attr_interface_version,
>-};
>-
>-static int __init tpacpi_create_driver_attributes(struct device_driver *drv)
>+static int tpacpi_resume_handler(struct platform_device *pdev)
> {
>-	int i, res;
>+	struct ibm_struct *ibm, *itmp;
> 
>-	i = 0;
>-	res = 0;
>-	while (!res && i < ARRAY_SIZE(tpacpi_driver_attributes)) {
>-		res = driver_create_file(drv, tpacpi_driver_attributes[i]);
>-		i++;
>+	list_for_each_entry_safe(ibm, itmp,
>+				 &tpacpi_all_drivers,
>+				 all_drivers) {
>+		if (ibm->resume)
>+			(ibm->resume)();
> 	}
> 
>-	return res;
>+	return 0;
> }
> 
>-static void tpacpi_remove_driver_attributes(struct device_driver *drv)
>-{
>-	int i;
>+static struct platform_driver tpacpi_pdriver = {
>+	.driver = {
>+		.name = TPACPI_DRVR_NAME,
>+		.owner = THIS_MODULE,
>+	},
>+	.suspend = tpacpi_suspend_handler,
>+	.resume = tpacpi_resume_handler,
>+};
> 
>-	for(i = 0; i < ARRAY_SIZE(tpacpi_driver_attributes); i++)
>-		driver_remove_file(drv, tpacpi_driver_attributes[i]);
>-}
>+static struct platform_driver tpacpi_hwmon_pdriver = {
>+	.driver = {
>+		.name = TPACPI_HWMON_DRVR_NAME,
>+		.owner = THIS_MODULE,
>+	},
>+};
> 
> /*************************************************************************
>  * sysfs support helpers
>  */
> 
>+struct attribute_set {
>+	unsigned int members, max_members;
>+	struct attribute_group group;
>+};
>+
> struct attribute_set_obj {
> 	struct attribute_set s;
> 	struct attribute *a;
> } __attribute__((packed));
> 
> static struct attribute_set *create_attr_set(unsigned int max_members,
>-						const char* name)
>+						const char *name)
> {
> 	struct attribute_set_obj *sobj;
> 
>@@ -634,8 +741,11 @@ static struct attribute_set *create_attr
> 	return &sobj->s;
> }
> 
>+#define destroy_attr_set(_set) \
>+	kfree(_set);
>+
> /* not multi-threaded safe, use it in a single thread per set */
>-static int add_to_attr_set(struct attribute_set* s, struct attribute *attr)
>+static int add_to_attr_set(struct attribute_set *s, struct attribute *attr)
> {
> 	if (!s || !attr)
> 		return -EINVAL;
>@@ -649,7 +759,7 @@ static int add_to_attr_set(struct attrib
> 	return 0;
> }
> 
>-static int add_many_to_attr_set(struct attribute_set* s,
>+static int add_many_to_attr_set(struct attribute_set *s,
> 			struct attribute **attr,
> 			unsigned int count)
> {
>@@ -664,17 +774,22 @@ static int add_many_to_attr_set(struct a
> 	return 0;
> }
> 
>-static void delete_attr_set(struct attribute_set* s, struct kobject *kobj)
>+static void delete_attr_set(struct attribute_set *s, struct kobject *kobj)
> {
> 	sysfs_remove_group(kobj, &s->group);
> 	destroy_attr_set(s);
> }
> 
>+#define register_attr_set_with_sysfs(_attr_set, _kobj) \
>+	sysfs_create_group(_kobj, &_attr_set->group)
>+
> static int parse_strtoul(const char *buf,
> 		unsigned long max, unsigned long *value)
> {
> 	char *endp;
> 
>+	while (*buf && isspace(*buf))
>+		buf++;
> 	*value = simple_strtoul(buf, &endp, 0);
> 	while (*endp && isspace(*endp))
> 		endp++;
>@@ -684,6 +799,84 @@ static int parse_strtoul(const char *buf
> 	return 0;
> }
> 
>+/*************************************************************************
>+ * thinkpad-acpi driver attributes
>+ */
>+
>+/* interface_version --------------------------------------------------- */
>+static ssize_t tpacpi_driver_interface_version_show(
>+				struct device_driver *drv,
>+				char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "0x%08x\n", TPACPI_SYSFS_VERSION);
>+}
>+
>+static DRIVER_ATTR(interface_version, S_IRUGO,
>+		tpacpi_driver_interface_version_show, NULL);
>+
>+/* debug_level --------------------------------------------------------- */
>+static ssize_t tpacpi_driver_debug_show(struct device_driver *drv,
>+						char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "0x%04x\n", dbg_level);
>+}
>+
>+static ssize_t tpacpi_driver_debug_store(struct device_driver *drv,
>+						const char *buf, size_t count)
>+{
>+	unsigned long t;
>+
>+	if (parse_strtoul(buf, 0xffff, &t))
>+		return -EINVAL;
>+
>+	dbg_level = t;
>+
>+	return count;
>+}
>+
>+static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
>+		tpacpi_driver_debug_show, tpacpi_driver_debug_store);
>+
>+/* version ------------------------------------------------------------- */
>+static ssize_t tpacpi_driver_version_show(struct device_driver *drv,
>+						char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "%s v%s\n",
>+			TPACPI_DESC, TPACPI_VERSION);
>+}
>+
>+static DRIVER_ATTR(version, S_IRUGO,
>+		tpacpi_driver_version_show, NULL);
>+
>+/* --------------------------------------------------------------------- */
>+
>+static struct driver_attribute *tpacpi_driver_attributes[] = {
>+	&driver_attr_debug_level, &driver_attr_version,
>+	&driver_attr_interface_version,
>+};
>+
>+static int __init tpacpi_create_driver_attributes(struct device_driver *drv)
>+{
>+	int i, res;
>+
>+	i = 0;
>+	res = 0;
>+	while (!res && i < ARRAY_SIZE(tpacpi_driver_attributes)) {
>+		res = driver_create_file(drv, tpacpi_driver_attributes[i]);
>+		i++;
>+	}
>+
>+	return res;
>+}
>+
>+static void tpacpi_remove_driver_attributes(struct device_driver *drv)
>+{
>+	int i;
>+
>+	for (i = 0; i < ARRAY_SIZE(tpacpi_driver_attributes); i++)
>+		driver_remove_file(drv, tpacpi_driver_attributes[i]);
>+}
>+
> /****************************************************************************
>  ****************************************************************************
>  *
>@@ -698,12 +891,22 @@ static int parse_strtoul(const char *buf
> 
> static int __init thinkpad_acpi_driver_init(struct ibm_init_struct *iibm)
> {
>-	printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
>-	printk(IBM_INFO "%s\n", IBM_URL);
>+	printk(TPACPI_INFO "%s v%s\n", TPACPI_DESC, TPACPI_VERSION);
>+	printk(TPACPI_INFO "%s\n", TPACPI_URL);
> 
>-	if (ibm_thinkpad_ec_found)
>-		printk(IBM_INFO "ThinkPad EC firmware %s\n",
>-		       ibm_thinkpad_ec_found);
>+	printk(TPACPI_INFO "ThinkPad BIOS %s, EC %s\n",
>+		(thinkpad_id.bios_version_str) ?
>+			thinkpad_id.bios_version_str : "unknown",
>+		(thinkpad_id.ec_version_str) ?
>+			thinkpad_id.ec_version_str : "unknown");
>+
>+	if (thinkpad_id.vendor && thinkpad_id.model_str)
>+		printk(TPACPI_INFO "%s %s\n",
>+			(thinkpad_id.vendor == PCI_VENDOR_ID_IBM) ?
>+				"IBM" : ((thinkpad_id.vendor ==
>+						PCI_VENDOR_ID_LENOVO) ?
>+					"Lenovo" : "Unknown vendor"),
>+			thinkpad_id.model_str);
> 
> 	return 0;
> }
>@@ -712,8 +915,8 @@ static int thinkpad_acpi_driver_read(cha
> {
> 	int len = 0;
> 
>-	len += sprintf(p + len, "driver:\t\t%s\n", IBM_DESC);
>-	len += sprintf(p + len, "version:\t%s\n", IBM_VERSION);
>+	len += sprintf(p + len, "driver:\t\t%s\n", TPACPI_DESC);
>+	len += sprintf(p + len, "version:\t%s\n", TPACPI_VERSION);
> 
> 	return len;
> }
>@@ -727,1076 +930,2211 @@ static struct ibm_struct thinkpad_acpi_d
>  * Hotkey subdriver
>  */
> 
>-static int hotkey_orig_status;
>-static int hotkey_orig_mask;
>+enum {	/* hot key scan codes (derived from ACPI DSDT) */
>+	TP_ACPI_HOTKEYSCAN_FNF1		= 0,
>+	TP_ACPI_HOTKEYSCAN_FNF2,
>+	TP_ACPI_HOTKEYSCAN_FNF3,
>+	TP_ACPI_HOTKEYSCAN_FNF4,
>+	TP_ACPI_HOTKEYSCAN_FNF5,
>+	TP_ACPI_HOTKEYSCAN_FNF6,
>+	TP_ACPI_HOTKEYSCAN_FNF7,
>+	TP_ACPI_HOTKEYSCAN_FNF8,
>+	TP_ACPI_HOTKEYSCAN_FNF9,
>+	TP_ACPI_HOTKEYSCAN_FNF10,
>+	TP_ACPI_HOTKEYSCAN_FNF11,
>+	TP_ACPI_HOTKEYSCAN_FNF12,
>+	TP_ACPI_HOTKEYSCAN_FNBACKSPACE,
>+	TP_ACPI_HOTKEYSCAN_FNINSERT,
>+	TP_ACPI_HOTKEYSCAN_FNDELETE,
>+	TP_ACPI_HOTKEYSCAN_FNHOME,
>+	TP_ACPI_HOTKEYSCAN_FNEND,
>+	TP_ACPI_HOTKEYSCAN_FNPAGEUP,
>+	TP_ACPI_HOTKEYSCAN_FNPAGEDOWN,
>+	TP_ACPI_HOTKEYSCAN_FNSPACE,
>+	TP_ACPI_HOTKEYSCAN_VOLUMEUP,
>+	TP_ACPI_HOTKEYSCAN_VOLUMEDOWN,
>+	TP_ACPI_HOTKEYSCAN_MUTE,
>+	TP_ACPI_HOTKEYSCAN_THINKPAD,
>+};
> 
>-static struct attribute_set *hotkey_dev_attributes = NULL;
>+enum {	/* Keys available through NVRAM polling */
>+	TPACPI_HKEY_NVRAM_KNOWN_MASK = 0x00fb88c0U,
>+	TPACPI_HKEY_NVRAM_GOOD_MASK  = 0x00fb8000U,
>+};
> 
>-/* sysfs hotkey enable ------------------------------------------------- */
>-static ssize_t hotkey_enable_show(struct device *dev,
>-			   struct device_attribute *attr,
>-			   char *buf)
>-{
>-	int res, status, mask;
>+enum {	/* Positions of some of the keys in hotkey masks */
>+	TP_ACPI_HKEY_DISPSWTCH_MASK	= 1 << TP_ACPI_HOTKEYSCAN_FNF7,
>+	TP_ACPI_HKEY_DISPXPAND_MASK	= 1 << TP_ACPI_HOTKEYSCAN_FNF8,
>+	TP_ACPI_HKEY_HIBERNATE_MASK	= 1 << TP_ACPI_HOTKEYSCAN_FNF12,
>+	TP_ACPI_HKEY_BRGHTUP_MASK	= 1 << TP_ACPI_HOTKEYSCAN_FNHOME,
>+	TP_ACPI_HKEY_BRGHTDWN_MASK	= 1 << TP_ACPI_HOTKEYSCAN_FNEND,
>+	TP_ACPI_HKEY_THNKLGHT_MASK	= 1 << TP_ACPI_HOTKEYSCAN_FNPAGEUP,
>+	TP_ACPI_HKEY_ZOOM_MASK		= 1 << TP_ACPI_HOTKEYSCAN_FNSPACE,
>+	TP_ACPI_HKEY_VOLUP_MASK		= 1 << TP_ACPI_HOTKEYSCAN_VOLUMEUP,
>+	TP_ACPI_HKEY_VOLDWN_MASK	= 1 << TP_ACPI_HOTKEYSCAN_VOLUMEDOWN,
>+	TP_ACPI_HKEY_MUTE_MASK		= 1 << TP_ACPI_HOTKEYSCAN_MUTE,
>+	TP_ACPI_HKEY_THINKPAD_MASK	= 1 << TP_ACPI_HOTKEYSCAN_THINKPAD,
>+};
> 
>-	res = hotkey_get(&status, &mask);
>-	if (res)
>-		return res;
>+enum {	/* NVRAM to ACPI HKEY group map */
>+	TP_NVRAM_HKEY_GROUP_HK2		= TP_ACPI_HKEY_THINKPAD_MASK |
>+					  TP_ACPI_HKEY_ZOOM_MASK |
>+					  TP_ACPI_HKEY_DISPSWTCH_MASK |
>+					  TP_ACPI_HKEY_HIBERNATE_MASK,
>+	TP_NVRAM_HKEY_GROUP_BRIGHTNESS	= TP_ACPI_HKEY_BRGHTUP_MASK |
>+					  TP_ACPI_HKEY_BRGHTDWN_MASK,
>+	TP_NVRAM_HKEY_GROUP_VOLUME	= TP_ACPI_HKEY_VOLUP_MASK |
>+					  TP_ACPI_HKEY_VOLDWN_MASK |
>+					  TP_ACPI_HKEY_MUTE_MASK,
>+};
> 
>-	return snprintf(buf, PAGE_SIZE, "%d\n", status);
>-}
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+struct tp_nvram_state {
>+       u16 thinkpad_toggle:1;
>+       u16 zoom_toggle:1;
>+       u16 display_toggle:1;
>+       u16 thinklight_toggle:1;
>+       u16 hibernate_toggle:1;
>+       u16 displayexp_toggle:1;
>+       u16 display_state:1;
>+       u16 brightness_toggle:1;
>+       u16 volume_toggle:1;
>+       u16 mute:1;
> 
>-static ssize_t hotkey_enable_store(struct device *dev,
>-			    struct device_attribute *attr,
>-			    const char *buf, size_t count)
>-{
>-	unsigned long t;
>-	int res, status, mask;
>+       u8 brightness_level;
>+       u8 volume_level;
>+};
> 
>-	if (parse_strtoul(buf, 1, &t))
>-		return -EINVAL;
>+static struct task_struct *tpacpi_hotkey_task;
>+static u32 hotkey_source_mask;		/* bit mask 0=ACPI,1=NVRAM */
>+static int hotkey_poll_freq = 10;	/* Hz */
>+static struct mutex hotkey_thread_mutex;
>+static struct mutex hotkey_thread_data_mutex;
>+static unsigned int hotkey_config_change;
> 
>-	res = hotkey_get(&status, &mask);
>-	if (!res)
>-		res = hotkey_set(t, mask);
>+#else /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
> 
>-	return (res) ? res : count;
>-}
>+#define hotkey_source_mask 0U
> 
>-static struct device_attribute dev_attr_hotkey_enable =
>-	__ATTR(hotkey_enable, S_IWUSR | S_IRUGO,
>-		hotkey_enable_show, hotkey_enable_store);
>+#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
> 
>-/* sysfs hotkey mask --------------------------------------------------- */
>-static ssize_t hotkey_mask_show(struct device *dev,
>-			   struct device_attribute *attr,
>-			   char *buf)
>-{
>-	int res, status, mask;
>+static struct mutex hotkey_mutex;
> 
>-	res = hotkey_get(&status, &mask);
>-	if (res)
>-		return res;
>+static enum {	/* Reasons for waking up */
>+	TP_ACPI_WAKEUP_NONE = 0,	/* None or unknown */
>+	TP_ACPI_WAKEUP_BAYEJ,		/* Bay ejection request */
>+	TP_ACPI_WAKEUP_UNDOCK,		/* Undock request */
>+} hotkey_wakeup_reason;
> 
>-	return snprintf(buf, PAGE_SIZE, "0x%04x\n", mask);
>-}
>+static int hotkey_autosleep_ack;
> 
>-static ssize_t hotkey_mask_store(struct device *dev,
>-			    struct device_attribute *attr,
>-			    const char *buf, size_t count)
>+static int hotkey_orig_status;
>+static u32 hotkey_orig_mask;
>+static u32 hotkey_all_mask;
>+static u32 hotkey_reserved_mask;
>+static u32 hotkey_mask;
>+
>+static unsigned int hotkey_report_mode;
>+
>+static u16 *hotkey_keycode_map;
>+
>+static struct attribute_set *hotkey_dev_attributes;
>+
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+#define HOTKEY_CONFIG_CRITICAL_START \
>+	do { \
>+		mutex_lock(&hotkey_thread_data_mutex); \
>+		hotkey_config_change++; \
>+	} while (0);
>+#define HOTKEY_CONFIG_CRITICAL_END \
>+	mutex_unlock(&hotkey_thread_data_mutex);
>+#else
>+#define HOTKEY_CONFIG_CRITICAL_START
>+#define HOTKEY_CONFIG_CRITICAL_END
>+#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
>+
>+static int hotkey_get_wlsw(int *status)
> {
>-	unsigned long t;
>-	int res, status, mask;
>+	if (!acpi_evalf(hkey_handle, status, "WLSW", "d"))
>+		return -EIO;
>+	return 0;
>+}
> 
>-	if (parse_strtoul(buf, 0xffff, &t))
>-		return -EINVAL;
>+/*
>+ * Call with hotkey_mutex held
>+ */
>+static int hotkey_mask_get(void)
>+{
>+	u32 m = 0;
> 
>-	res = hotkey_get(&status, &mask);
>-	if (!res)
>-		hotkey_set(status, t);
>+	if (tp_features.hotkey_mask) {
>+		if (!acpi_evalf(hkey_handle, &m, "DHKN", "d"))
>+			return -EIO;
>+	}
>+	hotkey_mask = m | (hotkey_source_mask & hotkey_mask);
> 
>-	return (res) ? res : count;
>+	return 0;
> }
> 
>-static struct device_attribute dev_attr_hotkey_mask =
>-	__ATTR(hotkey_mask, S_IWUSR | S_IRUGO,
>-		hotkey_mask_show, hotkey_mask_store);
>-
>-/* sysfs hotkey bios_enabled ------------------------------------------- */
>-static ssize_t hotkey_bios_enabled_show(struct device *dev,
>-			   struct device_attribute *attr,
>-			   char *buf)
>+/*
>+ * Call with hotkey_mutex held
>+ */
>+static int hotkey_mask_set(u32 mask)
> {
>-	return snprintf(buf, PAGE_SIZE, "%d\n", hotkey_orig_status);
>-}
>+	int i;
>+	int rc = 0;
> 
>-static struct device_attribute dev_attr_hotkey_bios_enabled =
>-	__ATTR(hotkey_bios_enabled, S_IRUGO, hotkey_bios_enabled_show, NULL);
>+	if (tp_features.hotkey_mask) {
>+		HOTKEY_CONFIG_CRITICAL_START
>+		for (i = 0; i < 32; i++) {
>+			u32 m = 1 << i;
>+			/* enable in firmware mask only keys not in NVRAM
>+			 * mode, but enable the key in the cached hotkey_mask
>+			 * regardless of mode, or the key will end up
>+			 * disabled by hotkey_mask_get() */
>+			if (!acpi_evalf(hkey_handle,
>+					NULL, "MHKM", "vdd", i + 1,
>+					!!((mask & ~hotkey_source_mask) & m))) {
>+				rc = -EIO;
>+				break;
>+			} else {
>+				hotkey_mask = (hotkey_mask & ~m) | (mask & m);
>+			}
>+		}
>+		HOTKEY_CONFIG_CRITICAL_END
> 
>-/* sysfs hotkey bios_mask ---------------------------------------------- */
>-static ssize_t hotkey_bios_mask_show(struct device *dev,
>-			   struct device_attribute *attr,
>-			   char *buf)
>-{
>-	return snprintf(buf, PAGE_SIZE, "0x%04x\n", hotkey_orig_mask);
>+		/* hotkey_mask_get must be called unconditionally below */
>+		if (!hotkey_mask_get() && !rc &&
>+		    (hotkey_mask & ~hotkey_source_mask) !=
>+		     (mask & ~hotkey_source_mask)) {
>+			printk(TPACPI_NOTICE
>+			       "requested hot key mask 0x%08x, but "
>+			       "firmware forced it to 0x%08x\n",
>+			       mask, hotkey_mask);
>+		}
>+	} else {
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+		HOTKEY_CONFIG_CRITICAL_START
>+		hotkey_mask = mask & hotkey_source_mask;
>+		HOTKEY_CONFIG_CRITICAL_END
>+		hotkey_mask_get();
>+		if (hotkey_mask != mask) {
>+			printk(TPACPI_NOTICE
>+			       "requested hot key mask 0x%08x, "
>+			       "forced to 0x%08x (NVRAM poll mask is "
>+			       "0x%08x): no firmware mask support\n",
>+			       mask, hotkey_mask, hotkey_source_mask);
>+		}
>+#else
>+		hotkey_mask_get();
>+		rc = -ENXIO;
>+#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
>+	}
>+
>+	return rc;
> }
> 
>-static struct device_attribute dev_attr_hotkey_bios_mask =
>-	__ATTR(hotkey_bios_mask, S_IRUGO, hotkey_bios_mask_show, NULL);
>+static int hotkey_status_get(int *status)
>+{
>+	if (!acpi_evalf(hkey_handle, status, "DHKC", "d"))
>+		return -EIO;
> 
>-/* --------------------------------------------------------------------- */
>+	return 0;
>+}
> 
>-static struct attribute *hotkey_mask_attributes[] = {
>-	&dev_attr_hotkey_mask.attr,
>-	&dev_attr_hotkey_bios_enabled.attr,
>-	&dev_attr_hotkey_bios_mask.attr,
>-};
>+static int hotkey_status_set(int status)
>+{
>+	if (!acpi_evalf(hkey_handle, NULL, "MHKC", "vd", status))
>+		return -EIO;
> 
>-static int __init hotkey_init(struct ibm_init_struct *iibm)
>+	return 0;
>+}
>+
>+static void tpacpi_input_send_radiosw(void)
> {
>-	int res;
>+	int wlsw;
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "initializing hotkey subdriver\n");
>+	mutex_lock(&tpacpi_inputdev_send_mutex);
> 
>-	IBM_ACPIHANDLE_INIT(hkey);
>-	mutex_init(&hotkey_mutex);
>+	if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw)) {
>+		input_report_switch(tpacpi_inputdev,
>+				    SW_RADIO, !!wlsw);
>+		input_sync(tpacpi_inputdev);
>+	}
> 
>-	/* hotkey not supported on 570 */
>-	tp_features.hotkey = hkey_handle != NULL;
>+	mutex_unlock(&tpacpi_inputdev_send_mutex);
>+}
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "hotkeys are %s\n",
>-		str_supported(tp_features.hotkey));
>+static void tpacpi_input_send_key(unsigned int scancode)
>+{
>+	unsigned int keycode;
> 
>-	if (tp_features.hotkey) {
>-		hotkey_dev_attributes = create_attr_set(4, NULL);
>-		if (!hotkey_dev_attributes)
>-			return -ENOMEM;
>-		res = add_to_attr_set(hotkey_dev_attributes,
>-				&dev_attr_hotkey_enable.attr);
>-		if (res)
>-			return res;
>+	keycode = hotkey_keycode_map[scancode];
> 
>-		/* mask not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
>-		   A30, R30, R31, T20-22, X20-21, X22-24 */
>-		tp_features.hotkey_mask =
>-			acpi_evalf(hkey_handle, NULL, "DHKN", "qv");
>+	if (keycode != KEY_RESERVED) {
>+		mutex_lock(&tpacpi_inputdev_send_mutex);
> 
>-		vdbg_printk(TPACPI_DBG_INIT, "hotkey masks are %s\n",
>-			str_supported(tp_features.hotkey_mask));
>+		input_report_key(tpacpi_inputdev, keycode, 1);
>+		if (keycode == KEY_UNKNOWN)
>+			input_event(tpacpi_inputdev, EV_MSC, MSC_SCAN,
>+				    scancode);
>+		input_sync(tpacpi_inputdev);
> 
>-		res = hotkey_get(&hotkey_orig_status, &hotkey_orig_mask);
>-		if (!res && tp_features.hotkey_mask) {
>-			res = add_many_to_attr_set(hotkey_dev_attributes,
>-				hotkey_mask_attributes,
>-				ARRAY_SIZE(hotkey_mask_attributes));
>-		}
>-		if (!res)
>-			res = register_attr_set_with_sysfs(
>-					hotkey_dev_attributes,
>-					&tpacpi_pdev->dev.kobj);
>+		input_report_key(tpacpi_inputdev, keycode, 0);
>+		if (keycode == KEY_UNKNOWN)
>+			input_event(tpacpi_inputdev, EV_MSC, MSC_SCAN,
>+				    scancode);
>+		input_sync(tpacpi_inputdev);
> 
>-		if (res)
>-			return res;
>+		mutex_unlock(&tpacpi_inputdev_send_mutex);
> 	}
>-
>-	return (tp_features.hotkey)? 0 : 1;
> }
> 
>-static void hotkey_exit(void)
>-{
>-	int res;
>-
>-	if (tp_features.hotkey) {
>-		dbg_printk(TPACPI_DBG_EXIT, "restoring original hotkey mask\n");
>-		res = hotkey_set(hotkey_orig_status, hotkey_orig_mask);
>-		if (res)
>-			printk(IBM_ERR "failed to restore hotkey to BIOS defaults\n");
>-	}
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+static struct tp_acpi_drv_struct ibm_hotkey_acpidriver;
> 
>-	if (hotkey_dev_attributes) {
>-		delete_attr_set(hotkey_dev_attributes, &tpacpi_pdev->dev.kobj);
>-		hotkey_dev_attributes = NULL;
>+static void tpacpi_hotkey_send_key(unsigned int scancode)
>+{
>+	tpacpi_input_send_key(scancode);
>+	if (hotkey_report_mode < 2) {
>+		acpi_bus_generate_event(ibm_hotkey_acpidriver.device,
>+					0x80, 0x1001 + scancode);
> 	}
> }
> 
>-static void hotkey_notify(struct ibm_struct *ibm, u32 event)
>+static void hotkey_read_nvram(struct tp_nvram_state *n, u32 m)
> {
>-	int hkey;
>+	u8 d;
> 
>-	if (acpi_evalf(hkey_handle, &hkey, "MHKP", "d"))
>-		acpi_bus_generate_event(ibm->acpi->device, event, hkey);
>-	else {
>-		printk(IBM_ERR "unknown hotkey event %d\n", event);
>-		acpi_bus_generate_event(ibm->acpi->device, event, 0);
>+	if (m & TP_NVRAM_HKEY_GROUP_HK2) {
>+		d = nvram_read_byte(TP_NVRAM_ADDR_HK2);
>+		n->thinkpad_toggle = !!(d & TP_NVRAM_MASK_HKT_THINKPAD);
>+		n->zoom_toggle = !!(d & TP_NVRAM_MASK_HKT_ZOOM);
>+		n->display_toggle = !!(d & TP_NVRAM_MASK_HKT_DISPLAY);
>+		n->hibernate_toggle = !!(d & TP_NVRAM_MASK_HKT_HIBERNATE);
>+	}
>+	if (m & TP_ACPI_HKEY_THNKLGHT_MASK) {
>+		d = nvram_read_byte(TP_NVRAM_ADDR_THINKLIGHT);
>+		n->thinklight_toggle = !!(d & TP_NVRAM_MASK_THINKLIGHT);
>+	}
>+	if (m & TP_ACPI_HKEY_DISPXPAND_MASK) {
>+		d = nvram_read_byte(TP_NVRAM_ADDR_VIDEO);
>+		n->displayexp_toggle =
>+				!!(d & TP_NVRAM_MASK_HKT_DISPEXPND);
>+	}
>+	if (m & TP_NVRAM_HKEY_GROUP_BRIGHTNESS) {
>+		d = nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
>+		n->brightness_level = (d & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
>+				>> TP_NVRAM_POS_LEVEL_BRIGHTNESS;
>+		n->brightness_toggle =
>+				!!(d & TP_NVRAM_MASK_HKT_BRIGHTNESS);
>+	}
>+	if (m & TP_NVRAM_HKEY_GROUP_VOLUME) {
>+		d = nvram_read_byte(TP_NVRAM_ADDR_MIXER);
>+		n->volume_level = (d & TP_NVRAM_MASK_LEVEL_VOLUME)
>+				>> TP_NVRAM_POS_LEVEL_VOLUME;
>+		n->mute = !!(d & TP_NVRAM_MASK_MUTE);
>+		n->volume_toggle = !!(d & TP_NVRAM_MASK_HKT_VOLUME);
> 	}
> }
> 
>-/*
>- * Call with hotkey_mutex held
>- */
>-static int hotkey_get(int *status, int *mask)
>+#define TPACPI_COMPARE_KEY(__scancode, __member) \
>+	do { \
>+		if ((mask & (1 << __scancode)) && \
>+		    oldn->__member != newn->__member) \
>+		tpacpi_hotkey_send_key(__scancode); \
>+	} while (0)
>+
>+#define TPACPI_MAY_SEND_KEY(__scancode) \
>+	do { if (mask & (1 << __scancode)) \
>+		tpacpi_hotkey_send_key(__scancode); } while (0)
>+
>+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
>+					   struct tp_nvram_state *newn,
>+					   u32 mask)
> {
>-	if (!acpi_evalf(hkey_handle, status, "DHKC", "d"))
>-		return -EIO;
>+	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
>+	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
>+	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
>+	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF12, hibernate_toggle);
> 
>-	if (tp_features.hotkey_mask)
>-		if (!acpi_evalf(hkey_handle, mask, "DHKN", "d"))
>-			return -EIO;
>+	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNPAGEUP, thinklight_toggle);
> 
>-	return 0;
>+	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF8, displayexp_toggle);
>+
>+	/* handle volume */
>+	if (oldn->volume_toggle != newn->volume_toggle) {
>+		if (oldn->mute != newn->mute) {
>+			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
>+		}
>+		if (oldn->volume_level > newn->volume_level) {
>+			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
>+		} else if (oldn->volume_level < newn->volume_level) {
>+			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
>+		} else if (oldn->mute == newn->mute) {
>+			/* repeated key presses that didn't change state */
>+			if (newn->mute) {
>+				TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
>+			} else if (newn->volume_level != 0) {
>+				TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
>+			} else {
>+				TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
>+			}
>+		}
>+	}
>+
>+	/* handle brightness */
>+	if (oldn->brightness_toggle != newn->brightness_toggle) {
>+		if (oldn->brightness_level < newn->brightness_level) {
>+			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
>+		} else if (oldn->brightness_level > newn->brightness_level) {
>+			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
>+		} else {
>+			/* repeated key presses that didn't change state */
>+			if (newn->brightness_level != 0) {
>+				TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
>+			} else {
>+				TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
>+			}
>+		}
>+	}
> }
> 
>-/*
>- * Call with hotkey_mutex held
>- */
>-static int hotkey_set(int status, int mask)
>+#undef TPACPI_COMPARE_KEY
>+#undef TPACPI_MAY_SEND_KEY
>+
>+static int hotkey_kthread(void *data)
> {
>-	int i;
>+	struct tp_nvram_state s[2];
>+	u32 mask;
>+	unsigned int si, so;
>+	unsigned long t;
>+	unsigned int change_detector, must_reset;
> 
>-	if (!acpi_evalf(hkey_handle, NULL, "MHKC", "vd", status))
>-		return -EIO;
>+	mutex_lock(&hotkey_thread_mutex);
> 
>-	if (tp_features.hotkey_mask)
>-		for (i = 0; i < 32; i++) {
>-			int bit = ((1 << i) & mask) != 0;
>-			if (!acpi_evalf(hkey_handle,
>-					NULL, "MHKM", "vdd", i + 1, bit))
>-				return -EIO;
>+	if (tpacpi_lifecycle == TPACPI_LIFE_EXITING)
>+		goto exit;
>+
>+	so = 0;
>+	si = 1;
>+	t = 0;
>+
>+	/* Initial state for compares */
>+	mutex_lock(&hotkey_thread_data_mutex);
>+	change_detector = hotkey_config_change;
>+	mask = hotkey_source_mask & hotkey_mask;
>+	mutex_unlock(&hotkey_thread_data_mutex);
>+	hotkey_read_nvram(&s[so], mask);
>+
>+	while (!kthread_should_stop() && hotkey_poll_freq) {
>+		if (t == 0)
>+			t = 1000/hotkey_poll_freq;
>+		t = msleep_interruptible(t);
>+		if (unlikely(kthread_should_stop()))
>+			break;
>+		must_reset = try_to_freeze();
>+		if (t > 0 && !must_reset)
>+			continue;
>+
>+		mutex_lock(&hotkey_thread_data_mutex);
>+		if (must_reset || hotkey_config_change != change_detector) {
>+			/* forget old state on thaw or config change */
>+			si = so;
>+			t = 0;
>+			change_detector = hotkey_config_change;
>+		}
>+		mask = hotkey_source_mask & hotkey_mask;
>+		mutex_unlock(&hotkey_thread_data_mutex);
>+
>+		if (likely(mask)) {
>+			hotkey_read_nvram(&s[si], mask);
>+			if (likely(si != so)) {
>+				hotkey_compare_and_issue_event(&s[so], &s[si],
>+								mask);
>+			}
> 		}
> 
>+		so = si;
>+		si ^= 1;
>+	}
>+
>+exit:
>+	mutex_unlock(&hotkey_thread_mutex);
> 	return 0;
> }
> 
>-/* procfs -------------------------------------------------------------- */
>-static int hotkey_read(char *p)
>+static void hotkey_poll_stop_sync(void)
> {
>-	int res, status, mask;
>-	int len = 0;
>+	if (tpacpi_hotkey_task) {
>+		if (frozen(tpacpi_hotkey_task) ||
>+		    freezing(tpacpi_hotkey_task))
>+			thaw_process(tpacpi_hotkey_task);
>+
>+		kthread_stop(tpacpi_hotkey_task);
>+		tpacpi_hotkey_task = NULL;
>+		mutex_lock(&hotkey_thread_mutex);
>+		/* at this point, the thread did exit */
>+		mutex_unlock(&hotkey_thread_mutex);
>+	}
>+}
> 
>-	if (!tp_features.hotkey) {
>-		len += sprintf(p + len, "status:\t\tnot supported\n");
>-		return len;
>+/* call with hotkey_mutex held */
>+static void hotkey_poll_setup(int may_warn)
>+{
>+	if ((hotkey_source_mask & hotkey_mask) != 0 &&
>+	    hotkey_poll_freq > 0 &&
>+	    (tpacpi_inputdev->users > 0 || hotkey_report_mode < 2)) {
>+		if (!tpacpi_hotkey_task) {
>+			tpacpi_hotkey_task = kthread_run(hotkey_kthread,
>+							 NULL,
>+							 TPACPI_FILE "d");
>+			if (IS_ERR(tpacpi_hotkey_task)) {
>+				tpacpi_hotkey_task = NULL;
>+				printk(TPACPI_ERR
>+				       "could not create kernel thread "
>+				       "for hotkey polling\n");
>+			}
>+		}
>+	} else {
>+		hotkey_poll_stop_sync();
>+		if (may_warn &&
>+		    hotkey_source_mask != 0 && hotkey_poll_freq == 0) {
>+			printk(TPACPI_NOTICE
>+				"hot keys 0x%08x require polling, "
>+				"which is currently disabled\n",
>+				hotkey_source_mask);
>+		}
> 	}
>+}
> 
>-	res = mutex_lock_interruptible(&hotkey_mutex);
>-	if (res < 0)
>-		return res;
>-	res = hotkey_get(&status, &mask);
>+static void hotkey_poll_setup_safe(int may_warn)
>+{
>+	mutex_lock(&hotkey_mutex);
>+	hotkey_poll_setup(may_warn);
> 	mutex_unlock(&hotkey_mutex);
>-	if (res)
>-		return res;
>+}
> 
>-	len += sprintf(p + len, "status:\t\t%s\n", enabled(status, 0));
>-	if (tp_features.hotkey_mask) {
>-		len += sprintf(p + len, "mask:\t\t0x%04x\n", mask);
>-		len += sprintf(p + len,
>-			       "commands:\tenable, disable, reset, <mask>\n");
>-	} else {
>-		len += sprintf(p + len, "mask:\t\tnot supported\n");
>-		len += sprintf(p + len, "commands:\tenable, disable, reset\n");
>+static int hotkey_inputdev_open(struct input_dev *dev)
>+{
>+	switch (tpacpi_lifecycle) {
>+	case TPACPI_LIFE_INIT:
>+		/*
>+		 * hotkey_init will call hotkey_poll_setup_safe
>+		 * at the appropriate moment
>+		 */
>+		return 0;
>+	case TPACPI_LIFE_EXITING:
>+		return -EBUSY;
>+	case TPACPI_LIFE_RUNNING:
>+		hotkey_poll_setup_safe(0);
>+		return 0;
> 	}
> 
>-	return len;
>+	/* Should only happen if tpacpi_lifecycle is corrupt */
>+	BUG();
>+	return -EBUSY;
> }
> 
>-static int hotkey_write(char *buf)
>+static void hotkey_inputdev_close(struct input_dev *dev)
> {
>-	int res, status, mask;
>-	char *cmd;
>-	int do_cmd = 0;
>+	/* disable hotkey polling when possible */
>+	if (tpacpi_lifecycle == TPACPI_LIFE_RUNNING)
>+		hotkey_poll_setup_safe(0);
>+}
>+#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
> 
>-	if (!tp_features.hotkey)
>-		return -ENODEV;
>+/* sysfs hotkey enable ------------------------------------------------- */
>+static ssize_t hotkey_enable_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	int res, status;
> 
>-	res = mutex_lock_interruptible(&hotkey_mutex);
>-	if (res < 0)
>+	res = hotkey_status_get(&status);
>+	if (res)
> 		return res;
> 
>-	res = hotkey_get(&status, &mask);
>-	if (res)
>-		goto errexit;
>+	return snprintf(buf, PAGE_SIZE, "%d\n", status);
>+}
> 
>-	res = 0;
>-	while ((cmd = next_cmd(&buf))) {
>-		if (strlencmp(cmd, "enable") == 0) {
>-			status = 1;
>-		} else if (strlencmp(cmd, "disable") == 0) {
>-			status = 0;
>-		} else if (strlencmp(cmd, "reset") == 0) {
>-			status = hotkey_orig_status;
>-			mask = hotkey_orig_mask;
>-		} else if (sscanf(cmd, "0x%x", &mask) == 1) {
>-			/* mask set */
>-		} else if (sscanf(cmd, "%x", &mask) == 1) {
>-			/* mask set */
>-		} else {
>-			res = -EINVAL;
>-			goto errexit;
>-		}
>-		do_cmd = 1;
>-	}
>+static ssize_t hotkey_enable_store(struct device *dev,
>+			    struct device_attribute *attr,
>+			    const char *buf, size_t count)
>+{
>+	unsigned long t;
>+	int res;
>+
>+	if (parse_strtoul(buf, 1, &t))
>+		return -EINVAL;
> 
>-	if (do_cmd)
>-		res = hotkey_set(status, mask);
>+	res = hotkey_status_set(t);
> 
>-errexit:
>-	mutex_unlock(&hotkey_mutex);
>-	return res;
>+	return (res) ? res : count;
> }
> 
>-static const struct acpi_device_id ibm_htk_device_ids[] = {
>-	{IBM_HKEY_HID, 0},
>-	{"", 0},
>-};
>-
>-static struct tp_acpi_drv_struct ibm_hotkey_acpidriver = {
>-	.hid = ibm_htk_device_ids,
>-	.notify = hotkey_notify,
>-	.handle = &hkey_handle,
>-	.type = ACPI_DEVICE_NOTIFY,
>-};
>-
>-static struct ibm_struct hotkey_driver_data = {
>-	.name = "hotkey",
>-	.read = hotkey_read,
>-	.write = hotkey_write,
>-	.exit = hotkey_exit,
>-	.acpi = &ibm_hotkey_acpidriver,
>-};
>-
>-/*************************************************************************
>- * Bluetooth subdriver
>- */
>+static struct device_attribute dev_attr_hotkey_enable =
>+	__ATTR(hotkey_enable, S_IWUSR | S_IRUGO,
>+		hotkey_enable_show, hotkey_enable_store);
> 
>-/* sysfs bluetooth enable ---------------------------------------------- */
>-static ssize_t bluetooth_enable_show(struct device *dev,
>+/* sysfs hotkey mask --------------------------------------------------- */
>+static ssize_t hotkey_mask_show(struct device *dev,
> 			   struct device_attribute *attr,
> 			   char *buf)
> {
>-	int status;
>+	int res;
> 
>-	status = bluetooth_get_radiosw();
>-	if (status < 0)
>-		return status;
>+	if (mutex_lock_interruptible(&hotkey_mutex))
>+		return -ERESTARTSYS;
>+	res = hotkey_mask_get();
>+	mutex_unlock(&hotkey_mutex);
> 
>-	return snprintf(buf, PAGE_SIZE, "%d\n", status ? 1 : 0);
>+	return (res)?
>+		res : snprintf(buf, PAGE_SIZE, "0x%08x\n", hotkey_mask);
> }
> 
>-static ssize_t bluetooth_enable_store(struct device *dev,
>+static ssize_t hotkey_mask_store(struct device *dev,
> 			    struct device_attribute *attr,
> 			    const char *buf, size_t count)
> {
> 	unsigned long t;
> 	int res;
> 
>-	if (parse_strtoul(buf, 1, &t))
>+	if (parse_strtoul(buf, 0xffffffffUL, &t))
> 		return -EINVAL;
> 
>-	res = bluetooth_set_radiosw(t);
>+	if (mutex_lock_interruptible(&hotkey_mutex))
>+		return -ERESTARTSYS;
> 
>-	return (res) ? res : count;
>-}
>+	res = hotkey_mask_set(t);
> 
>-static struct device_attribute dev_attr_bluetooth_enable =
>-	__ATTR(bluetooth_enable, S_IWUSR | S_IRUGO,
>-		bluetooth_enable_show, bluetooth_enable_store);
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+	hotkey_poll_setup(1);
>+#endif
> 
>-/* --------------------------------------------------------------------- */
>+	mutex_unlock(&hotkey_mutex);
> 
>-static struct attribute *bluetooth_attributes[] = {
>-	&dev_attr_bluetooth_enable.attr,
>-	NULL
>-};
>+	return (res) ? res : count;
>+}
> 
>-static const struct attribute_group bluetooth_attr_group = {
>-	.attrs = bluetooth_attributes,
>-};
>+static struct device_attribute dev_attr_hotkey_mask =
>+	__ATTR(hotkey_mask, S_IWUSR | S_IRUGO,
>+		hotkey_mask_show, hotkey_mask_store);
> 
>-static int __init bluetooth_init(struct ibm_init_struct *iibm)
>+/* sysfs hotkey bios_enabled ------------------------------------------- */
>+static ssize_t hotkey_bios_enabled_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
> {
>-	int res;
>-	int status = 0;
>+	return snprintf(buf, PAGE_SIZE, "%d\n", hotkey_orig_status);
>+}
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "initializing bluetooth subdriver\n");
>+static struct device_attribute dev_attr_hotkey_bios_enabled =
>+	__ATTR(hotkey_bios_enabled, S_IRUGO, hotkey_bios_enabled_show, NULL);
> 
>-	IBM_ACPIHANDLE_INIT(hkey);
>+/* sysfs hotkey bios_mask ---------------------------------------------- */
>+static ssize_t hotkey_bios_mask_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "0x%08x\n", hotkey_orig_mask);
>+}
> 
>-	/* bluetooth not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
>-	   G4x, R30, R31, R40e, R50e, T20-22, X20-21 */
>-	tp_features.bluetooth = hkey_handle &&
>-	    acpi_evalf(hkey_handle, &status, "GBDC", "qd");
>+static struct device_attribute dev_attr_hotkey_bios_mask =
>+	__ATTR(hotkey_bios_mask, S_IRUGO, hotkey_bios_mask_show, NULL);
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "bluetooth is %s, status 0x%02x\n",
>-		str_supported(tp_features.bluetooth),
>-		status);
>+/* sysfs hotkey all_mask ----------------------------------------------- */
>+static ssize_t hotkey_all_mask_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "0x%08x\n",
>+				hotkey_all_mask | hotkey_source_mask);
>+}
> 
>-	if (tp_features.bluetooth) {
>-		if (!(status & TP_ACPI_BLUETOOTH_HWPRESENT)) {
>-			/* no bluetooth hardware present in system */
>-			tp_features.bluetooth = 0;
>-			dbg_printk(TPACPI_DBG_INIT,
>-				   "bluetooth hardware not installed\n");
>-		} else {
>-			res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
>-					&bluetooth_attr_group);
>-			if (res)
>-				return res;
>-		}
>-	}
>+static struct device_attribute dev_attr_hotkey_all_mask =
>+	__ATTR(hotkey_all_mask, S_IRUGO, hotkey_all_mask_show, NULL);
> 
>-	return (tp_features.bluetooth)? 0 : 1;
>+/* sysfs hotkey recommended_mask --------------------------------------- */
>+static ssize_t hotkey_recommended_mask_show(struct device *dev,
>+					    struct device_attribute *attr,
>+					    char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "0x%08x\n",
>+			(hotkey_all_mask | hotkey_source_mask)
>+			& ~hotkey_reserved_mask);
> }
> 
>-static void bluetooth_exit(void)
>+static struct device_attribute dev_attr_hotkey_recommended_mask =
>+	__ATTR(hotkey_recommended_mask, S_IRUGO,
>+		hotkey_recommended_mask_show, NULL);
>+
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+
>+/* sysfs hotkey hotkey_source_mask ------------------------------------- */
>+static ssize_t hotkey_source_mask_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
> {
>-	sysfs_remove_group(&tpacpi_pdev->dev.kobj,
>-			&bluetooth_attr_group);
>+	return snprintf(buf, PAGE_SIZE, "0x%08x\n", hotkey_source_mask);
> }
> 
>-static int bluetooth_get_radiosw(void)
>+static ssize_t hotkey_source_mask_store(struct device *dev,
>+			    struct device_attribute *attr,
>+			    const char *buf, size_t count)
> {
>-	int status;
>-
>-	if (!tp_features.bluetooth)
>-		return -ENODEV;
>+	unsigned long t;
> 
>-	if (!acpi_evalf(hkey_handle, &status, "GBDC", "d"))
>-		return -EIO;
>+	if (parse_strtoul(buf, 0xffffffffUL, &t) ||
>+		((t & ~TPACPI_HKEY_NVRAM_KNOWN_MASK) != 0))
>+		return -EINVAL;
> 
>-	return ((status & TP_ACPI_BLUETOOTH_RADIOSSW) != 0);
>-}
>+	if (mutex_lock_interruptible(&hotkey_mutex))
>+		return -ERESTARTSYS;
> 
>-static int bluetooth_set_radiosw(int radio_on)
>-{
>-	int status;
>+	HOTKEY_CONFIG_CRITICAL_START
>+	hotkey_source_mask = t;
>+	HOTKEY_CONFIG_CRITICAL_END
> 
>-	if (!tp_features.bluetooth)
>-		return -ENODEV;
>+	hotkey_poll_setup(1);
> 
>-	if (!acpi_evalf(hkey_handle, &status, "GBDC", "d"))
>-		return -EIO;
>-	if (radio_on)
>-		status |= TP_ACPI_BLUETOOTH_RADIOSSW;
>-	else
>-		status &= ~TP_ACPI_BLUETOOTH_RADIOSSW;
>-	if (!acpi_evalf(hkey_handle, NULL, "SBDC", "vd", status))
>-		return -EIO;
>+	mutex_unlock(&hotkey_mutex);
> 
>-	return 0;
>+	return count;
> }
> 
>-/* procfs -------------------------------------------------------------- */
>-static int bluetooth_read(char *p)
>-{
>-	int len = 0;
>-	int status = bluetooth_get_radiosw();
>-
>-	if (!tp_features.bluetooth)
>-		len += sprintf(p + len, "status:\t\tnot supported\n");
>-	else {
>-		len += sprintf(p + len, "status:\t\t%s\n",
>-				(status)? "enabled" : "disabled");
>-		len += sprintf(p + len, "commands:\tenable, disable\n");
>-	}
>+static struct device_attribute dev_attr_hotkey_source_mask =
>+	__ATTR(hotkey_source_mask, S_IWUSR | S_IRUGO,
>+		hotkey_source_mask_show, hotkey_source_mask_store);
> 
>-	return len;
>+/* sysfs hotkey hotkey_poll_freq --------------------------------------- */
>+static ssize_t hotkey_poll_freq_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "%d\n", hotkey_poll_freq);
> }
> 
>-static int bluetooth_write(char *buf)
>+static ssize_t hotkey_poll_freq_store(struct device *dev,
>+			    struct device_attribute *attr,
>+			    const char *buf, size_t count)
> {
>-	char *cmd;
>+	unsigned long t;
> 
>-	if (!tp_features.bluetooth)
>-		return -ENODEV;
>+	if (parse_strtoul(buf, 25, &t))
>+		return -EINVAL;
> 
>-	while ((cmd = next_cmd(&buf))) {
>-		if (strlencmp(cmd, "enable") == 0) {
>-			bluetooth_set_radiosw(1);
>-		} else if (strlencmp(cmd, "disable") == 0) {
>-			bluetooth_set_radiosw(0);
>-		} else
>-			return -EINVAL;
>-	}
>+	if (mutex_lock_interruptible(&hotkey_mutex))
>+		return -ERESTARTSYS;
> 
>-	return 0;
>+	hotkey_poll_freq = t;
>+
>+	hotkey_poll_setup(1);
>+	mutex_unlock(&hotkey_mutex);
>+
>+	return count;
> }
> 
>-static struct ibm_struct bluetooth_driver_data = {
>-	.name = "bluetooth",
>-	.read = bluetooth_read,
>-	.write = bluetooth_write,
>-	.exit = bluetooth_exit,
>-};
>+static struct device_attribute dev_attr_hotkey_poll_freq =
>+	__ATTR(hotkey_poll_freq, S_IWUSR | S_IRUGO,
>+		hotkey_poll_freq_show, hotkey_poll_freq_store);
> 
>-/*************************************************************************
>- * Wan subdriver
>- */
>+#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
> 
>-/* sysfs wan enable ---------------------------------------------------- */
>-static ssize_t wan_enable_show(struct device *dev,
>+/* sysfs hotkey radio_sw (pollable) ------------------------------------ */
>+static ssize_t hotkey_radio_sw_show(struct device *dev,
> 			   struct device_attribute *attr,
> 			   char *buf)
> {
>-	int status;
>+	int res, s;
>+	res = hotkey_get_wlsw(&s);
>+	if (res < 0)
>+		return res;
> 
>-	status = wan_get_radiosw();
>-	if (status < 0)
>-		return status;
>+	return snprintf(buf, PAGE_SIZE, "%d\n", !!s);
>+}
> 
>-	return snprintf(buf, PAGE_SIZE, "%d\n", status ? 1 : 0);
>+static struct device_attribute dev_attr_hotkey_radio_sw =
>+	__ATTR(hotkey_radio_sw, S_IRUGO, hotkey_radio_sw_show, NULL);
>+
>+static void hotkey_radio_sw_notify_change(void)
>+{
>+	if (tp_features.hotkey_wlsw)
>+		sysfs_notify(&tpacpi_pdev->dev.kobj, NULL,
>+			     "hotkey_radio_sw");
> }
> 
>-static ssize_t wan_enable_store(struct device *dev,
>+/* sysfs hotkey report_mode -------------------------------------------- */
>+static ssize_t hotkey_report_mode_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "%d\n",
>+		(hotkey_report_mode != 0) ? hotkey_report_mode : 1);
>+}
>+
>+static ssize_t hotkey_report_mode_store(struct device *dev,
> 			    struct device_attribute *attr,
> 			    const char *buf, size_t count)
> {
> 	unsigned long t;
>-	int res;
>+	int res = 0;
> 
>-	if (parse_strtoul(buf, 1, &t))
>+	if (parse_strtoul(buf, 2, &t) || (t < 1))
> 		return -EINVAL;
> 
>-	res = wan_set_radiosw(t);
>+	if (t != hotkey_report_mode) {
>+		if (tp_features.hotkey_report_mode_locked)
>+			return -EPERM;
>+		hotkey_report_mode = t;
>+		printk(TPACPI_NOTICE "hot key report mode set to %d\n",
>+			hotkey_report_mode);
>+	}
> 
> 	return (res) ? res : count;
> }
> 
>-static struct device_attribute dev_attr_wan_enable =
>-	__ATTR(wwan_enable, S_IWUSR | S_IRUGO,
>-		wan_enable_show, wan_enable_store);
>+static struct device_attribute dev_attr_hotkey_report_mode =
>+	__ATTR(hotkey_report_mode, S_IWUSR | S_IRUGO,
>+		hotkey_report_mode_show, hotkey_report_mode_store);
>+
>+/* sysfs wakeup reason (pollable) -------------------------------------- */
>+static ssize_t hotkey_wakeup_reason_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "%d\n", hotkey_wakeup_reason);
>+}
>+
>+static struct device_attribute dev_attr_hotkey_wakeup_reason =
>+	__ATTR(wakeup_reason, S_IRUGO, hotkey_wakeup_reason_show, NULL);
>+
>+void hotkey_wakeup_reason_notify_change(void)
>+{
>+	if (tp_features.hotkey_mask)
>+		sysfs_notify(&tpacpi_pdev->dev.kobj, NULL,
>+			     "wakeup_reason");
>+}
>+
>+/* sysfs wakeup hotunplug_complete (pollable) -------------------------- */
>+static ssize_t hotkey_wakeup_hotunplug_complete_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "%d\n", hotkey_autosleep_ack);
>+}
>+
>+static struct device_attribute dev_attr_hotkey_wakeup_hotunplug_complete =
>+	__ATTR(wakeup_hotunplug_complete, S_IRUGO,
>+	       hotkey_wakeup_hotunplug_complete_show, NULL);
>+
>+void hotkey_wakeup_hotunplug_complete_notify_change(void)
>+{
>+	if (tp_features.hotkey_mask)
>+		sysfs_notify(&tpacpi_pdev->dev.kobj, NULL,
>+			     "wakeup_hotunplug_complete");
>+}
> 
> /* --------------------------------------------------------------------- */
> 
>-static struct attribute *wan_attributes[] = {
>-	&dev_attr_wan_enable.attr,
>-	NULL
>+static struct attribute *hotkey_attributes[] __initdata = {
>+	&dev_attr_hotkey_enable.attr,
>+	&dev_attr_hotkey_bios_enabled.attr,
>+	&dev_attr_hotkey_report_mode.attr,
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+	&dev_attr_hotkey_mask.attr,
>+	&dev_attr_hotkey_all_mask.attr,
>+	&dev_attr_hotkey_recommended_mask.attr,
>+	&dev_attr_hotkey_source_mask.attr,
>+	&dev_attr_hotkey_poll_freq.attr,
>+#endif
> };
> 
>-static const struct attribute_group wan_attr_group = {
>-	.attrs = wan_attributes,
>+static struct attribute *hotkey_mask_attributes[] __initdata = {
>+	&dev_attr_hotkey_bios_mask.attr,
>+#ifndef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+	&dev_attr_hotkey_mask.attr,
>+	&dev_attr_hotkey_all_mask.attr,
>+	&dev_attr_hotkey_recommended_mask.attr,
>+#endif
>+	&dev_attr_hotkey_wakeup_reason.attr,
>+	&dev_attr_hotkey_wakeup_hotunplug_complete.attr,
> };
> 
>-static int __init wan_init(struct ibm_init_struct *iibm)
>+static int __init hotkey_init(struct ibm_init_struct *iibm)
> {
>-	int res;
>-	int status = 0;
>+	/* Requirements for changing the default keymaps:
>+	 *
>+	 * 1. Many of the keys are mapped to KEY_RESERVED for very
>+	 *    good reasons.  Do not change them unless you have deep
>+	 *    knowledge on the IBM and Lenovo ThinkPad firmware for
>+	 *    the various ThinkPad models.  The driver behaves
>+	 *    differently for KEY_RESERVED: such keys have their
>+	 *    hot key mask *unset* in mask_recommended, and also
>+	 *    in the initial hot key mask programmed into the
>+	 *    firmware at driver load time, which means the firm-
>+	 *    ware may react very differently if you change them to
>+	 *    something else;
>+	 *
>+	 * 2. You must be subscribed to the linux-thinkpad and
>+	 *    ibm-acpi-devel mailing lists, and you should read the
>+	 *    list archives since 2007 if you want to change the
>+	 *    keymaps.  This requirement exists so that you will
>+	 *    know the past history of problems with the thinkpad-
>+	 *    acpi driver keymaps, and also that you will be
>+	 *    listening to any bug reports;
>+	 *
>+	 * 3. Do not send thinkpad-acpi specific patches directly to
>+	 *    for merging, *ever*.  Send them to the linux-acpi
>+	 *    mailinglist for comments.  Merging is to be done only
>+	 *    through acpi-test and the ACPI maintainer.
>+	 *
>+	 * If the above is too much to ask, don't change the keymap.
>+	 * Ask the thinkpad-acpi maintainer to do it, instead.
>+	 */
>+	static u16 ibm_keycode_map[] __initdata = {
>+		/* Scan Codes 0x00 to 0x0B: ACPI HKEY FN+F1..F12 */
>+		KEY_FN_F1,	KEY_FN_F2,	KEY_COFFEE,	KEY_SLEEP,
>+		KEY_WLAN,	KEY_FN_F6, KEY_SWITCHVIDEOMODE, KEY_FN_F8,
>+		KEY_FN_F9,	KEY_FN_F10,	KEY_FN_F11,	KEY_SUSPEND,
>+
>+		/* Scan codes 0x0C to 0x1F: Other ACPI HKEY hot keys */
>+		KEY_UNKNOWN,	/* 0x0C: FN+BACKSPACE */
>+		KEY_UNKNOWN,	/* 0x0D: FN+INSERT */
>+		KEY_UNKNOWN,	/* 0x0E: FN+DELETE */
>+
>+		/* brightness: firmware always reacts to them, unless
>+		 * X.org did some tricks in the radeon BIOS scratch
>+		 * registers of *some* models */
>+		KEY_RESERVED,	/* 0x0F: FN+HOME (brightness up) */
>+		KEY_RESERVED,	/* 0x10: FN+END (brightness down) */
>+
>+		/* Thinklight: firmware always react to it */
>+		KEY_RESERVED,	/* 0x11: FN+PGUP (thinklight toggle) */
>+
>+		KEY_UNKNOWN,	/* 0x12: FN+PGDOWN */
>+		KEY_ZOOM,	/* 0x13: FN+SPACE (zoom) */
>+
>+		/* Volume: firmware always react to it and reprograms
>+		 * the built-in *extra* mixer.  Never map it to control
>+		 * another mixer by default. */
>+		KEY_RESERVED,	/* 0x14: VOLUME UP */
>+		KEY_RESERVED,	/* 0x15: VOLUME DOWN */
>+		KEY_RESERVED,	/* 0x16: MUTE */
>+
>+		KEY_VENDOR,	/* 0x17: Thinkpad/AccessIBM/Lenovo */
>+
>+		/* (assignments unknown, please report if found) */
>+		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
>+		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
>+	};
>+	static u16 lenovo_keycode_map[] __initdata = {
>+		/* Scan Codes 0x00 to 0x0B: ACPI HKEY FN+F1..F12 */
>+		KEY_FN_F1,	KEY_COFFEE,	KEY_BATTERY,	KEY_SLEEP,
>+		KEY_WLAN,	KEY_FN_F6, KEY_SWITCHVIDEOMODE, KEY_FN_F8,
>+		KEY_FN_F9,	KEY_FN_F10,	KEY_FN_F11,	KEY_SUSPEND,
>+
>+		/* Scan codes 0x0C to 0x1F: Other ACPI HKEY hot keys */
>+		KEY_UNKNOWN,	/* 0x0C: FN+BACKSPACE */
>+		KEY_UNKNOWN,	/* 0x0D: FN+INSERT */
>+		KEY_UNKNOWN,	/* 0x0E: FN+DELETE */
>+
>+		KEY_RESERVED,	/* 0x0F: FN+HOME (brightness up) */
>+		KEY_RESERVED,	/* 0x10: FN+END (brightness down) */
>+
>+		KEY_RESERVED,	/* 0x11: FN+PGUP (thinklight toggle) */
>+
>+		KEY_UNKNOWN,	/* 0x12: FN+PGDOWN */
>+		KEY_ZOOM,	/* 0x13: FN+SPACE (zoom) */
>+
>+		/* Volume: z60/z61, T60 (BIOS version?): firmware always
>+		 * react to it and reprograms the built-in *extra* mixer.
>+		 * Never map it to control another mixer by default.
>+		 *
>+		 * T60?, T61, R60?, R61: firmware and EC tries to send
>+		 * these over the regular keyboard, so these are no-ops,
>+		 * but there are still weird bugs re. MUTE, so do not
>+		 * change unless you get test reports from all Lenovo
>+		 * models.  May cause the BIOS to interfere with the
>+		 * HDA mixer.
>+		 */
>+		KEY_RESERVED,	/* 0x14: VOLUME UP */
>+		KEY_RESERVED,	/* 0x15: VOLUME DOWN */
>+		KEY_RESERVED,	/* 0x16: MUTE */
>+
>+		KEY_VENDOR,	/* 0x17: Thinkpad/AccessIBM/Lenovo */
>+
>+		/* (assignments unknown, please report if found) */
>+		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
>+		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
>+	};
>+
>+#define TPACPI_HOTKEY_MAP_LEN		ARRAY_SIZE(ibm_keycode_map)
>+#define TPACPI_HOTKEY_MAP_SIZE		sizeof(ibm_keycode_map)
>+#define TPACPI_HOTKEY_MAP_TYPESIZE	sizeof(ibm_keycode_map[0])
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "initializing wan subdriver\n");
>+	int res, i;
>+	int status;
>+	int hkeyv;
> 
>-	IBM_ACPIHANDLE_INIT(hkey);
>+	vdbg_printk(TPACPI_DBG_INIT, "initializing hotkey subdriver\n");
> 
>-	tp_features.wan = hkey_handle &&
>-	    acpi_evalf(hkey_handle, &status, "GWAN", "qd");
>+	BUG_ON(!tpacpi_inputdev);
>+	BUG_ON(tpacpi_inputdev->open != NULL ||
>+	       tpacpi_inputdev->close != NULL);
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "wan is %s, status 0x%02x\n",
>-		str_supported(tp_features.wan),
>-		status);
>+	TPACPI_ACPIHANDLE_INIT(hkey);
>+	mutex_init(&hotkey_mutex);
> 
>-	if (tp_features.wan) {
>-		if (!(status & TP_ACPI_WANCARD_HWPRESENT)) {
>-			/* no wan hardware present in system */
>-			tp_features.wan = 0;
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+	mutex_init(&hotkey_thread_mutex);
>+	mutex_init(&hotkey_thread_data_mutex);
>+#endif
>+
>+	/* hotkey not supported on 570 */
>+	tp_features.hotkey = hkey_handle != NULL;
>+
>+	vdbg_printk(TPACPI_DBG_INIT, "hotkeys are %s\n",
>+		str_supported(tp_features.hotkey));
>+
>+	if (tp_features.hotkey) {
>+		hotkey_dev_attributes = create_attr_set(12, NULL);
>+		if (!hotkey_dev_attributes)
>+			return -ENOMEM;
>+		res = add_many_to_attr_set(hotkey_dev_attributes,
>+				hotkey_attributes,
>+				ARRAY_SIZE(hotkey_attributes));
>+		if (res)
>+			return res;
>+
>+		/* mask not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
>+		   A30, R30, R31, T20-22, X20-21, X22-24.  Detected by checking
>+		   for HKEY interface version 0x100 */
>+		if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
>+			if ((hkeyv >> 8) != 1) {
>+				printk(TPACPI_ERR "unknown version of the "
>+				       "HKEY interface: 0x%x\n", hkeyv);
>+				printk(TPACPI_ERR "please report this to %s\n",
>+				       TPACPI_MAIL);
>+			} else {
>+				/*
>+				 * MHKV 0x100 in A31, R40, R40e,
>+				 * T4x, X31, and later
>+				 */
>+				tp_features.hotkey_mask = 1;
>+			}
>+		}
>+
>+		vdbg_printk(TPACPI_DBG_INIT, "hotkey masks are %s\n",
>+			str_supported(tp_features.hotkey_mask));
>+
>+		if (tp_features.hotkey_mask) {
>+			if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
>+					"MHKA", "qd")) {
>+				printk(TPACPI_ERR
>+				       "missing MHKA handler, "
>+				       "please report this to %s\n",
>+				       TPACPI_MAIL);
>+				/* FN+F12, FN+F4, FN+F3 */
>+				hotkey_all_mask = 0x080cU;
>+			}
>+		}
>+
>+		/* hotkey_source_mask *must* be zero for
>+		 * the first hotkey_mask_get */
>+		res = hotkey_status_get(&hotkey_orig_status);
>+		if (!res && tp_features.hotkey_mask) {
>+			res = hotkey_mask_get();
>+			hotkey_orig_mask = hotkey_mask;
>+			if (!res) {
>+				res = add_many_to_attr_set(
>+					hotkey_dev_attributes,
>+					hotkey_mask_attributes,
>+					ARRAY_SIZE(hotkey_mask_attributes));
>+			}
>+		}
>+
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+		if (tp_features.hotkey_mask) {
>+			hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK
>+						& ~hotkey_all_mask;
>+		} else {
>+			hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK;
>+		}
>+
>+		vdbg_printk(TPACPI_DBG_INIT,
>+			    "hotkey source mask 0x%08x, polling freq %d\n",
>+			    hotkey_source_mask, hotkey_poll_freq);
>+#endif
>+
>+		/* Not all thinkpads have a hardware radio switch */
>+		if (!res && acpi_evalf(hkey_handle, &status, "WLSW", "qd")) {
>+			tp_features.hotkey_wlsw = 1;
>+			printk(TPACPI_INFO
>+				"radio switch found; radios are %s\n",
>+				enabled(status, 0));
>+			res = add_to_attr_set(hotkey_dev_attributes,
>+					&dev_attr_hotkey_radio_sw.attr);
>+		}
>+
>+		if (!res)
>+			res = register_attr_set_with_sysfs(
>+					hotkey_dev_attributes,
>+					&tpacpi_pdev->dev.kobj);
>+		if (res)
>+			return res;
>+
>+		/* Set up key map */
>+
>+		hotkey_keycode_map = kmalloc(TPACPI_HOTKEY_MAP_SIZE,
>+						GFP_KERNEL);
>+		if (!hotkey_keycode_map) {
>+			printk(TPACPI_ERR
>+				"failed to allocate memory for key map\n");
>+			return -ENOMEM;
>+		}
>+
>+		if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) {
> 			dbg_printk(TPACPI_DBG_INIT,
>-				   "wan hardware not installed\n");
>+				   "using Lenovo default hot key map\n");
>+			memcpy(hotkey_keycode_map, &lenovo_keycode_map,
>+				TPACPI_HOTKEY_MAP_SIZE);
> 		} else {
>-			res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
>-					&wan_attr_group);
>-			if (res)
>-				return res;
>+			dbg_printk(TPACPI_DBG_INIT,
>+				   "using IBM default hot key map\n");
>+			memcpy(hotkey_keycode_map, &ibm_keycode_map,
>+				TPACPI_HOTKEY_MAP_SIZE);
>+		}
>+
>+		set_bit(EV_KEY, tpacpi_inputdev->evbit);
>+		set_bit(EV_MSC, tpacpi_inputdev->evbit);
>+		set_bit(MSC_SCAN, tpacpi_inputdev->mscbit);
>+		tpacpi_inputdev->keycodesize = TPACPI_HOTKEY_MAP_TYPESIZE;
>+		tpacpi_inputdev->keycodemax = TPACPI_HOTKEY_MAP_LEN;
>+		tpacpi_inputdev->keycode = hotkey_keycode_map;
>+		for (i = 0; i < TPACPI_HOTKEY_MAP_LEN; i++) {
>+			if (hotkey_keycode_map[i] != KEY_RESERVED) {
>+				set_bit(hotkey_keycode_map[i],
>+					tpacpi_inputdev->keybit);
>+			} else {
>+				if (i < sizeof(hotkey_reserved_mask)*8)
>+					hotkey_reserved_mask |= 1 << i;
>+			}
>+		}
>+
>+		if (tp_features.hotkey_wlsw) {
>+			set_bit(EV_SW, tpacpi_inputdev->evbit);
>+			set_bit(SW_RADIO, tpacpi_inputdev->swbit);
>+		}
>+
>+		dbg_printk(TPACPI_DBG_INIT,
>+				"enabling hot key handling\n");
>+		res = hotkey_status_set(1);
>+		if (res)
>+			return res;
>+		res = hotkey_mask_set(((hotkey_all_mask | hotkey_source_mask)
>+					& ~hotkey_reserved_mask)
>+					| hotkey_orig_mask);
>+		if (res < 0 && res != -ENXIO)
>+			return res;
>+
>+		if (hotkey_report_mode > 0) {
>+			tp_features.hotkey_report_mode_locked = 1;
>+		} else {
>+			hotkey_report_mode = 1;
>+			vdbg_printk(TPACPI_DBG_INIT,
>+					"hot key reporting mode can be "
>+					"changed at runtime\n");
> 		}
>+
>+		dbg_printk(TPACPI_DBG_INIT,
>+				"legacy hot key reporting over procfs %s\n",
>+				(hotkey_report_mode < 2) ?
>+					"enabled" : "disabled");
>+
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+		tpacpi_inputdev->open = &hotkey_inputdev_open;
>+		tpacpi_inputdev->close = &hotkey_inputdev_close;
>+
>+		hotkey_poll_setup_safe(1);
>+#endif
> 	}
> 
>-	return (tp_features.wan)? 0 : 1;
>+	return (tp_features.hotkey)? 0 : 1;
> }
> 
>-static void wan_exit(void)
>+static void hotkey_exit(void)
> {
>-	sysfs_remove_group(&tpacpi_pdev->dev.kobj,
>-		&wan_attr_group);
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+	hotkey_poll_stop_sync();
>+#endif
>+
>+	if (tp_features.hotkey) {
>+		dbg_printk(TPACPI_DBG_EXIT,
>+			   "restoring original hot key mask\n");
>+		/* no short-circuit boolean operator below! */
>+		if ((hotkey_mask_set(hotkey_orig_mask) |
>+		     hotkey_status_set(hotkey_orig_status)) != 0)
>+			printk(TPACPI_ERR
>+			       "failed to restore hot key mask "
>+			       "to BIOS defaults\n");
>+	}
>+
>+	if (hotkey_dev_attributes) {
>+		delete_attr_set(hotkey_dev_attributes, &tpacpi_pdev->dev.kobj);
>+		hotkey_dev_attributes = NULL;
>+	}
> }
> 
>-static int wan_get_radiosw(void)
>+static void hotkey_notify(struct ibm_struct *ibm, u32 event)
> {
>-	int status;
>-
>-	if (!tp_features.wan)
>-		return -ENODEV;
>+	u32 hkey;
>+	unsigned int scancode;
>+	int send_acpi_ev;
>+	int ignore_acpi_ev;
>+	int unk_ev;
>+
>+	if (event != 0x80) {
>+		printk(TPACPI_ERR
>+		       "unknown HKEY notification event %d\n", event);
>+		/* forward it to userspace, maybe it knows how to handle it */
>+		acpi_bus_generate_event(ibm->acpi->device, event, 0);
> 
>-	if (!acpi_evalf(hkey_handle, &status, "GWAN", "d"))
>-		return -EIO;
>+		return;
>+	}
> 
>-	return ((status & TP_ACPI_WANCARD_RADIOSSW) != 0);
>-}
>+	while (1) {
>+		if (!acpi_evalf(hkey_handle, &hkey, "MHKP", "d")) {
>+			printk(TPACPI_ERR "failed to retrieve HKEY event\n");
>+			return;
>+		}
> 
>-static int wan_set_radiosw(int radio_on)
>-{
>-	int status;
>+		if (hkey == 0) {
>+			/* queue empty */
>+			return;
>+		}
> 
>-	if (!tp_features.wan)
>-		return -ENODEV;
>+		send_acpi_ev = 1;
>+		ignore_acpi_ev = 0;
>+		unk_ev = 0;
>+
>+		switch (hkey >> 12) {
>+		case 1:
>+			/* 0x1000-0x1FFF: key presses */
>+			scancode = hkey & 0xfff;
>+			if (scancode > 0 && scancode < 0x21) {
>+				scancode--;
>+				if (!(hotkey_source_mask & (1 << scancode))) {
>+					tpacpi_input_send_key(scancode);
>+					send_acpi_ev = 0;
>+				} else {
>+					ignore_acpi_ev = 1;
>+				}
>+			} else {
>+				unk_ev = 1;
>+			}
>+			break;
>+		case 2:
>+			/* Wakeup reason */
>+			switch (hkey) {
>+			case 0x2304: /* suspend, undock */
>+			case 0x2404: /* hibernation, undock */
>+				hotkey_wakeup_reason = TP_ACPI_WAKEUP_UNDOCK;
>+				ignore_acpi_ev = 1;
>+				break;
>+			case 0x2305: /* suspend, bay eject */
>+			case 0x2405: /* hibernation, bay eject */
>+				hotkey_wakeup_reason = TP_ACPI_WAKEUP_BAYEJ;
>+				ignore_acpi_ev = 1;
>+				break;
>+			default:
>+				unk_ev = 1;
>+			}
>+			if (hotkey_wakeup_reason != TP_ACPI_WAKEUP_NONE) {
>+				printk(TPACPI_INFO
>+				       "woke up due to a hot-unplug "
>+				       "request...\n");
>+				hotkey_wakeup_reason_notify_change();
>+			}
>+			break;
>+		case 3:
>+			/* bay-related wakeups */
>+			if (hkey == 0x3003) {
>+				hotkey_autosleep_ack = 1;
>+				printk(TPACPI_INFO
>+				       "bay ejected\n");
>+				hotkey_wakeup_hotunplug_complete_notify_change();
>+			} else {
>+				unk_ev = 1;
>+			}
>+			break;
>+		case 4:
>+			/* dock-related wakeups */
>+			if (hkey == 0x4003) {
>+				hotkey_autosleep_ack = 1;
>+				printk(TPACPI_INFO
>+				       "undocked\n");
>+				hotkey_wakeup_hotunplug_complete_notify_change();
>+			} else {
>+				unk_ev = 1;
>+			}
>+			break;
>+		case 5:
>+			/* 0x5000-0x5FFF: human interface helpers */
>+			switch (hkey) {
>+			case 0x5010: /* Lenovo new BIOS: brightness changed */
>+			case 0x5009: /* X61t: swivel up (tablet mode) */
>+			case 0x500a: /* X61t: swivel down (normal mode) */
>+			case 0x500b: /* X61t: tablet pen inserted into bay */
>+			case 0x500c: /* X61t: tablet pen removed from bay */
>+				break;
>+			case 0x5001:
>+			case 0x5002:
>+				/* LID switch events.  Do not propagate */
>+				ignore_acpi_ev = 1;
>+				break;
>+			default:
>+				unk_ev = 1;
>+			}
>+			break;
>+		case 7:
>+			/* 0x7000-0x7FFF: misc */
>+			if (tp_features.hotkey_wlsw && hkey == 0x7000) {
>+				tpacpi_input_send_radiosw();
>+				hotkey_radio_sw_notify_change();
>+				send_acpi_ev = 0;
>+				break;
>+			}
>+			/* fallthrough to default */
>+		default:
>+			unk_ev = 1;
>+		}
>+		if (unk_ev) {
>+			printk(TPACPI_NOTICE
>+			       "unhandled HKEY event 0x%04x\n", hkey);
>+		}
> 
>-	if (!acpi_evalf(hkey_handle, &status, "GWAN", "d"))
>-		return -EIO;
>-	if (radio_on)
>-		status |= TP_ACPI_WANCARD_RADIOSSW;
>-	else
>-		status &= ~TP_ACPI_WANCARD_RADIOSSW;
>-	if (!acpi_evalf(hkey_handle, NULL, "SWAN", "vd", status))
>-		return -EIO;
>+		if (!ignore_acpi_ev &&
>+		    (send_acpi_ev || hotkey_report_mode < 2)) {
>+			acpi_bus_generate_event(ibm->acpi->device, event, hkey);
>+		}
>+	}
>+}
> 
>-	return 0;
>+static void hotkey_suspend(pm_message_t state)
>+{
>+	/* Do these on suspend, we get the events on early resume! */
>+	hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE;
>+	hotkey_autosleep_ack = 0;
>+}
>+
>+static void hotkey_resume(void)
>+{
>+	if (hotkey_mask_get())
>+		printk(TPACPI_ERR
>+		       "error while trying to read hot key mask "
>+		       "from firmware\n");
>+	tpacpi_input_send_radiosw();
>+	hotkey_radio_sw_notify_change();
>+	hotkey_wakeup_reason_notify_change();
>+	hotkey_wakeup_hotunplug_complete_notify_change();
>+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
>+	hotkey_poll_setup_safe(0);
>+#endif
> }
> 
> /* procfs -------------------------------------------------------------- */
>-static int wan_read(char *p)
>+static int hotkey_read(char *p)
> {
>+	int res, status;
> 	int len = 0;
>-	int status = wan_get_radiosw();
> 
>-	if (!tp_features.wan)
>+	if (!tp_features.hotkey) {
> 		len += sprintf(p + len, "status:\t\tnot supported\n");
>-	else {
>-		len += sprintf(p + len, "status:\t\t%s\n",
>-				(status)? "enabled" : "disabled");
>-		len += sprintf(p + len, "commands:\tenable, disable\n");
>+		return len;
>+	}
>+
>+	if (mutex_lock_interruptible(&hotkey_mutex))
>+		return -ERESTARTSYS;
>+	res = hotkey_status_get(&status);
>+	if (!res)
>+		res = hotkey_mask_get();
>+	mutex_unlock(&hotkey_mutex);
>+	if (res)
>+		return res;
>+
>+	len += sprintf(p + len, "status:\t\t%s\n", enabled(status, 0));
>+	if (tp_features.hotkey_mask) {
>+		len += sprintf(p + len, "mask:\t\t0x%08x\n", hotkey_mask);
>+		len += sprintf(p + len,
>+			       "commands:\tenable, disable, reset, <mask>\n");
>+	} else {
>+		len += sprintf(p + len, "mask:\t\tnot supported\n");
>+		len += sprintf(p + len, "commands:\tenable, disable, reset\n");
> 	}
> 
> 	return len;
> }
> 
>-static int wan_write(char *buf)
>+static int hotkey_write(char *buf)
> {
>+	int res, status;
>+	u32 mask;
> 	char *cmd;
> 
>-	if (!tp_features.wan)
>+	if (!tp_features.hotkey)
> 		return -ENODEV;
> 
>+	if (mutex_lock_interruptible(&hotkey_mutex))
>+		return -ERESTARTSYS;
>+
>+	status = -1;
>+	mask = hotkey_mask;
>+
>+	res = 0;
> 	while ((cmd = next_cmd(&buf))) {
> 		if (strlencmp(cmd, "enable") == 0) {
>-			wan_set_radiosw(1);
>+			status = 1;
> 		} else if (strlencmp(cmd, "disable") == 0) {
>-			wan_set_radiosw(0);
>-		} else
>-			return -EINVAL;
>+			status = 0;
>+		} else if (strlencmp(cmd, "reset") == 0) {
>+			status = hotkey_orig_status;
>+			mask = hotkey_orig_mask;
>+		} else if (sscanf(cmd, "0x%x", &mask) == 1) {
>+			/* mask set */
>+		} else if (sscanf(cmd, "%x", &mask) == 1) {
>+			/* mask set */
>+		} else {
>+			res = -EINVAL;
>+			goto errexit;
>+		}
> 	}
>+	if (status != -1)
>+		res = hotkey_status_set(status);
> 
>-	return 0;
>+	if (!res && mask != hotkey_mask)
>+		res = hotkey_mask_set(mask);
>+
>+errexit:
>+	mutex_unlock(&hotkey_mutex);
>+	return res;
> }
> 
>-static struct ibm_struct wan_driver_data = {
>-	.name = "wan",
>-	.read = wan_read,
>-	.write = wan_write,
>-	.exit = wan_exit,
>-	.flags.experimental = 1,
>+static struct tp_acpi_drv_struct ibm_hotkey_acpidriver = {
>+	.hid = TPACPI_ACPI_HKEY_HID,
>+	.notify = hotkey_notify,
>+	.handle = &hkey_handle,
>+	.type = ACPI_DEVICE_NOTIFY,
>+};
>+
>+static struct ibm_struct hotkey_driver_data = {
>+	.name = "hotkey",
>+	.read = hotkey_read,
>+	.write = hotkey_write,
>+	.exit = hotkey_exit,
>+	.resume = hotkey_resume,
>+	.suspend = hotkey_suspend,
>+	.acpi = &ibm_hotkey_acpidriver,
> };
> 
> /*************************************************************************
>- * Video subdriver
>+ * Bluetooth subdriver
>  */
> 
>-static enum video_access_mode video_supported;
>-static int video_orig_autosw;
>-
>-IBM_HANDLE(vid, root, "\\_SB.PCI.AGP.VGA",	/* 570 */
>-	   "\\_SB.PCI0.AGP0.VID0",	/* 600e/x, 770x */
>-	   "\\_SB.PCI0.VID0",	/* 770e */
>-	   "\\_SB.PCI0.VID",	/* A21e, G4x, R50e, X30, X40 */
>-	   "\\_SB.PCI0.AGP.VID",	/* all others */
>-	   );				/* R30, R31 */
>+enum {
>+	/* ACPI GBDC/SBDC bits */
>+	TP_ACPI_BLUETOOTH_HWPRESENT	= 0x01,	/* Bluetooth hw available */
>+	TP_ACPI_BLUETOOTH_RADIOSSW	= 0x02,	/* Bluetooth radio enabled */
>+	TP_ACPI_BLUETOOTH_UNK		= 0x04,	/* unknown function */
>+};
> 
>-IBM_HANDLE(vid2, root, "\\_SB.PCI0.AGPB.VID");	/* G41 */
>+static int bluetooth_get_radiosw(void);
>+static int bluetooth_set_radiosw(int radio_on);
> 
>-static int __init video_init(struct ibm_init_struct *iibm)
>+/* sysfs bluetooth enable ---------------------------------------------- */
>+static ssize_t bluetooth_enable_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
> {
>-	int ivga;
>-
>-	vdbg_printk(TPACPI_DBG_INIT, "initializing video subdriver\n");
>+	int status;
> 
>-	IBM_ACPIHANDLE_INIT(vid);
>-	IBM_ACPIHANDLE_INIT(vid2);
>+	status = bluetooth_get_radiosw();
>+	if (status < 0)
>+		return status;
> 
>-	if (vid2_handle && acpi_evalf(NULL, &ivga, "\\IVGA", "d") && ivga)
>-		/* G41, assume IVGA doesn't change */
>-		vid_handle = vid2_handle;
>+	return snprintf(buf, PAGE_SIZE, "%d\n", status ? 1 : 0);
>+}
> 
>-	if (!vid_handle)
>-		/* video switching not supported on R30, R31 */
>-		video_supported = TPACPI_VIDEO_NONE;
>-	else if (acpi_evalf(vid_handle, &video_orig_autosw, "SWIT", "qd"))
>-		/* 570 */
>-		video_supported = TPACPI_VIDEO_570;
>-	else if (acpi_evalf(vid_handle, &video_orig_autosw, "^VADL", "qd"))
>-		/* 600e/x, 770e, 770x */
>-		video_supported = TPACPI_VIDEO_770;
>-	else
>-		/* all others */
>-		video_supported = TPACPI_VIDEO_NEW;
>+static ssize_t bluetooth_enable_store(struct device *dev,
>+			    struct device_attribute *attr,
>+			    const char *buf, size_t count)
>+{
>+	unsigned long t;
>+	int res;
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "video is %s, mode %d\n",
>-		str_supported(video_supported != TPACPI_VIDEO_NONE),
>-		video_supported);
>+	if (parse_strtoul(buf, 1, &t))
>+		return -EINVAL;
> 
>-	return (video_supported != TPACPI_VIDEO_NONE)? 0 : 1;
>-}
>+	res = bluetooth_set_radiosw(t);
> 
>-static void video_exit(void)
>-{
>-	dbg_printk(TPACPI_DBG_EXIT,
>-		   "restoring original video autoswitch mode\n");
>-	if (video_autosw_set(video_orig_autosw))
>-		printk(IBM_ERR "error while trying to restore original "
>-			"video autoswitch mode\n");
>+	return (res) ? res : count;
> }
> 
>-static int video_outputsw_get(void)
>-{
>-	int status = 0;
>-	int i;
>+static struct device_attribute dev_attr_bluetooth_enable =
>+	__ATTR(bluetooth_enable, S_IWUSR | S_IRUGO,
>+		bluetooth_enable_show, bluetooth_enable_store);
> 
>-	switch (video_supported) {
>-	case TPACPI_VIDEO_570:
>-		if (!acpi_evalf(NULL, &i, "\\_SB.PHS", "dd",
>-				 TP_ACPI_VIDEO_570_PHSCMD))
>-			return -EIO;
>-		status = i & TP_ACPI_VIDEO_570_PHSMASK;
>-		break;
>-	case TPACPI_VIDEO_770:
>-		if (!acpi_evalf(NULL, &i, "\\VCDL", "d"))
>-			return -EIO;
>-		if (i)
>-			status |= TP_ACPI_VIDEO_S_LCD;
>-		if (!acpi_evalf(NULL, &i, "\\VCDC", "d"))
>-			return -EIO;
>-		if (i)
>-			status |= TP_ACPI_VIDEO_S_CRT;
>-		break;
>-	case TPACPI_VIDEO_NEW:
>-		if (!acpi_evalf(NULL, NULL, "\\VUPS", "vd", 1) ||
>-		    !acpi_evalf(NULL, &i, "\\VCDC", "d"))
>-			return -EIO;
>-		if (i)
>-			status |= TP_ACPI_VIDEO_S_CRT;
>+/* --------------------------------------------------------------------- */
> 
>-		if (!acpi_evalf(NULL, NULL, "\\VUPS", "vd", 0) ||
>-		    !acpi_evalf(NULL, &i, "\\VCDL", "d"))
>-			return -EIO;
>-		if (i)
>-			status |= TP_ACPI_VIDEO_S_LCD;
>-		if (!acpi_evalf(NULL, &i, "\\VCDD", "d"))
>-			return -EIO;
>-		if (i)
>-			status |= TP_ACPI_VIDEO_S_DVI;
>-		break;
>-	default:
>-		return -ENOSYS;
>-	}
>+static struct attribute *bluetooth_attributes[] = {
>+	&dev_attr_bluetooth_enable.attr,
>+	NULL
>+};
> 
>-	return status;
>-}
>+static const struct attribute_group bluetooth_attr_group = {
>+	.attrs = bluetooth_attributes,
>+};
> 
>-static int video_outputsw_set(int status)
>+static int __init bluetooth_init(struct ibm_init_struct *iibm)
> {
>-	int autosw;
>-	int res = 0;
>+	int res;
>+	int status = 0;
> 
>-	switch (video_supported) {
>-	case TPACPI_VIDEO_570:
>-		res = acpi_evalf(NULL, NULL,
>-				 "\\_SB.PHS2", "vdd",
>-				 TP_ACPI_VIDEO_570_PHS2CMD,
>-				 status | TP_ACPI_VIDEO_570_PHS2SET);
>-		break;
>-	case TPACPI_VIDEO_770:
>-		autosw = video_autosw_get();
>-		if (autosw < 0)
>-			return autosw;
>+	vdbg_printk(TPACPI_DBG_INIT, "initializing bluetooth subdriver\n");
> 
>-		res = video_autosw_set(1);
>-		if (res)
>-			return res;
>-		res = acpi_evalf(vid_handle, NULL,
>-				 "ASWT", "vdd", status * 0x100, 0);
>-		if (!autosw && video_autosw_set(autosw)) {
>-			printk(IBM_ERR "video auto-switch left enabled due to error\n");
>-			return -EIO;
>-		}
>-		break;
>-	case TPACPI_VIDEO_NEW:
>-		res = acpi_evalf(NULL, NULL, "\\VUPS", "vd", 0x80) &&
>-			acpi_evalf(NULL, NULL, "\\VSDS", "vdd", status, 1);
>-		break;
>-	default:
>-		return -ENOSYS;
>-	}
>+	TPACPI_ACPIHANDLE_INIT(hkey);
> 
>-	return (res)? 0 : -EIO;
>-}
>+	/* bluetooth not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
>+	   G4x, R30, R31, R40e, R50e, T20-22, X20-21 */
>+	tp_features.bluetooth = hkey_handle &&
>+	    acpi_evalf(hkey_handle, &status, "GBDC", "qd");
> 
>-static int video_autosw_get(void)
>-{
>-	int autosw = 0;
>+	vdbg_printk(TPACPI_DBG_INIT, "bluetooth is %s, status 0x%02x\n",
>+		str_supported(tp_features.bluetooth),
>+		status);
> 
>-	switch (video_supported) {
>-	case TPACPI_VIDEO_570:
>-		if (!acpi_evalf(vid_handle, &autosw, "SWIT", "d"))
>-			return -EIO;
>-		break;
>-	case TPACPI_VIDEO_770:
>-	case TPACPI_VIDEO_NEW:
>-		if (!acpi_evalf(vid_handle, &autosw, "^VDEE", "d"))
>-			return -EIO;
>-		break;
>-	default:
>-		return -ENOSYS;
>+	if (tp_features.bluetooth) {
>+		if (!(status & TP_ACPI_BLUETOOTH_HWPRESENT)) {
>+			/* no bluetooth hardware present in system */
>+			tp_features.bluetooth = 0;
>+			dbg_printk(TPACPI_DBG_INIT,
>+				   "bluetooth hardware not installed\n");
>+		} else {
>+			res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
>+					&bluetooth_attr_group);
>+			if (res)
>+				return res;
>+		}
> 	}
> 
>-	return autosw & 1;
>+	return (tp_features.bluetooth)? 0 : 1;
> }
> 
>-static int video_autosw_set(int enable)
>+static void bluetooth_exit(void)
> {
>-	if (!acpi_evalf(vid_handle, NULL, "_DOS", "vd", (enable)? 1 : 0))
>-		return -EIO;
>-	return 0;
>+	sysfs_remove_group(&tpacpi_pdev->dev.kobj,
>+			&bluetooth_attr_group);
> }
> 
>-static int video_outputsw_cycle(void)
>+static int bluetooth_get_radiosw(void)
> {
>-	int autosw = video_autosw_get();
>-	int res;
>+	int status;
> 
>-	if (autosw < 0)
>-		return autosw;
>+	if (!tp_features.bluetooth)
>+		return -ENODEV;
> 
>-	switch (video_supported) {
>-	case TPACPI_VIDEO_570:
>-		res = video_autosw_set(1);
>-		if (res)
>-			return res;
>-		res = acpi_evalf(ec_handle, NULL, "_Q16", "v");
>-		break;
>-	case TPACPI_VIDEO_770:
>-	case TPACPI_VIDEO_NEW:
>-		res = video_autosw_set(1);
>-		if (res)
>-			return res;
>-		res = acpi_evalf(vid_handle, NULL, "VSWT", "v");
>-		break;
>-	default:
>-		return -ENOSYS;
>-	}
>-	if (!autosw && video_autosw_set(autosw)) {
>-		printk(IBM_ERR "video auto-switch left enabled due to error\n");
>+	if (!acpi_evalf(hkey_handle, &status, "GBDC", "d"))
> 		return -EIO;
>-	}
> 
>-	return (res)? 0 : -EIO;
>+	return ((status & TP_ACPI_BLUETOOTH_RADIOSSW) != 0);
> }
> 
>-static int video_expand_toggle(void)
>+static int bluetooth_set_radiosw(int radio_on)
> {
>-	switch (video_supported) {
>-	case TPACPI_VIDEO_570:
>-		return acpi_evalf(ec_handle, NULL, "_Q17", "v")?
>-			0 : -EIO;
>-	case TPACPI_VIDEO_770:
>-		return acpi_evalf(vid_handle, NULL, "VEXP", "v")?
>-			0 : -EIO;
>-	case TPACPI_VIDEO_NEW:
>-		return acpi_evalf(NULL, NULL, "\\VEXP", "v")?
>-			0 : -EIO;
>-	default:
>-		return -ENOSYS;
>-	}
>-	/* not reached */
>+	int status;
>+
>+	if (!tp_features.bluetooth)
>+		return -ENODEV;
>+
>+	if (!acpi_evalf(hkey_handle, &status, "GBDC", "d"))
>+		return -EIO;
>+	if (radio_on)
>+		status |= TP_ACPI_BLUETOOTH_RADIOSSW;
>+	else
>+		status &= ~TP_ACPI_BLUETOOTH_RADIOSSW;
>+	if (!acpi_evalf(hkey_handle, NULL, "SBDC", "vd", status))
>+		return -EIO;
>+
>+	return 0;
> }
> 
>-static int video_read(char *p)
>+/* procfs -------------------------------------------------------------- */
>+static int bluetooth_read(char *p)
> {
>-	int status, autosw;
> 	int len = 0;
>+	int status = bluetooth_get_radiosw();
> 
>-	if (video_supported == TPACPI_VIDEO_NONE) {
>+	if (!tp_features.bluetooth)
> 		len += sprintf(p + len, "status:\t\tnot supported\n");
>-		return len;
>+	else {
>+		len += sprintf(p + len, "status:\t\t%s\n",
>+				(status)? "enabled" : "disabled");
>+		len += sprintf(p + len, "commands:\tenable, disable\n");
> 	}
> 
>-	status = video_outputsw_get();
>-	if (status < 0)
>-		return status;
>+	return len;
>+}
> 
>-	autosw = video_autosw_get();
>-	if (autosw < 0)
>-		return autosw;
>+static int bluetooth_write(char *buf)
>+{
>+	char *cmd;
> 
>-	len += sprintf(p + len, "status:\t\tsupported\n");
>-	len += sprintf(p + len, "lcd:\t\t%s\n", enabled(status, 0));
>-	len += sprintf(p + len, "crt:\t\t%s\n", enabled(status, 1));
>-	if (video_supported == TPACPI_VIDEO_NEW)
>-		len += sprintf(p + len, "dvi:\t\t%s\n", enabled(status, 3));
>-	len += sprintf(p + len, "auto:\t\t%s\n", enabled(autosw, 0));
>-	len += sprintf(p + len, "commands:\tlcd_enable, lcd_disable\n");
>-	len += sprintf(p + len, "commands:\tcrt_enable, crt_disable\n");
>-	if (video_supported == TPACPI_VIDEO_NEW)
>-		len += sprintf(p + len, "commands:\tdvi_enable, dvi_disable\n");
>-	len += sprintf(p + len, "commands:\tauto_enable, auto_disable\n");
>-	len += sprintf(p + len, "commands:\tvideo_switch, expand_toggle\n");
>-
>-	return len;
>-}
>-
>-static int video_write(char *buf)
>-{
>-	char *cmd;
>-	int enable, disable, status;
>-	int res;
>-
>-	if (video_supported == TPACPI_VIDEO_NONE)
>+	if (!tp_features.bluetooth)
> 		return -ENODEV;
> 
>-	enable = 0;
>-	disable = 0;
>-
> 	while ((cmd = next_cmd(&buf))) {
>-		if (strlencmp(cmd, "lcd_enable") == 0) {
>-			enable |= TP_ACPI_VIDEO_S_LCD;
>-		} else if (strlencmp(cmd, "lcd_disable") == 0) {
>-			disable |= TP_ACPI_VIDEO_S_LCD;
>-		} else if (strlencmp(cmd, "crt_enable") == 0) {
>-			enable |= TP_ACPI_VIDEO_S_CRT;
>-		} else if (strlencmp(cmd, "crt_disable") == 0) {
>-			disable |= TP_ACPI_VIDEO_S_CRT;
>-		} else if (video_supported == TPACPI_VIDEO_NEW &&
>-			   strlencmp(cmd, "dvi_enable") == 0) {
>-			enable |= TP_ACPI_VIDEO_S_DVI;
>-		} else if (video_supported == TPACPI_VIDEO_NEW &&
>-			   strlencmp(cmd, "dvi_disable") == 0) {
>-			disable |= TP_ACPI_VIDEO_S_DVI;
>-		} else if (strlencmp(cmd, "auto_enable") == 0) {
>-			res = video_autosw_set(1);
>-			if (res)
>-				return res;
>-		} else if (strlencmp(cmd, "auto_disable") == 0) {
>-			res = video_autosw_set(0);
>-			if (res)
>-				return res;
>-		} else if (strlencmp(cmd, "video_switch") == 0) {
>-			res = video_outputsw_cycle();
>-			if (res)
>-				return res;
>-		} else if (strlencmp(cmd, "expand_toggle") == 0) {
>-			res = video_expand_toggle();
>-			if (res)
>-				return res;
>+		if (strlencmp(cmd, "enable") == 0) {
>+			bluetooth_set_radiosw(1);
>+		} else if (strlencmp(cmd, "disable") == 0) {
>+			bluetooth_set_radiosw(0);
> 		} else
> 			return -EINVAL;
> 	}
> 
>-	if (enable || disable) {
>-		status = video_outputsw_get();
>-		if (status < 0)
>-			return status;
>-		res = video_outputsw_set((status & ~disable) | enable);
>-		if (res)
>-			return res;
>-	}
>-
> 	return 0;
> }
> 
>-static struct ibm_struct video_driver_data = {
>-	.name = "video",
>-	.read = video_read,
>-	.write = video_write,
>-	.exit = video_exit,
>+static struct ibm_struct bluetooth_driver_data = {
>+	.name = "bluetooth",
>+	.read = bluetooth_read,
>+	.write = bluetooth_write,
>+	.exit = bluetooth_exit,
> };
> 
> /*************************************************************************
>- * Light (thinklight) subdriver
>+ * Wan subdriver
>  */
> 
>-IBM_HANDLE(lght, root, "\\LGHT");	/* A21e, A2xm/p, T20-22, X20-21 */
>-IBM_HANDLE(ledb, ec, "LEDB");		/* G4x */
>+enum {
>+	/* ACPI GWAN/SWAN bits */
>+	TP_ACPI_WANCARD_HWPRESENT	= 0x01,	/* Wan hw available */
>+	TP_ACPI_WANCARD_RADIOSSW	= 0x02,	/* Wan radio enabled */
>+	TP_ACPI_WANCARD_UNK		= 0x04,	/* unknown function */
>+};
> 
>-static int __init light_init(struct ibm_init_struct *iibm)
>+static int wan_get_radiosw(void);
>+static int wan_set_radiosw(int radio_on);
>+
>+/* sysfs wan enable ---------------------------------------------------- */
>+static ssize_t wan_enable_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
> {
>-	vdbg_printk(TPACPI_DBG_INIT, "initializing light subdriver\n");
>+	int status;
> 
>-	IBM_ACPIHANDLE_INIT(ledb);
>-	IBM_ACPIHANDLE_INIT(lght);
>-	IBM_ACPIHANDLE_INIT(cmos);
>+	status = wan_get_radiosw();
>+	if (status < 0)
>+		return status;
> 
>-	/* light not supported on 570, 600e/x, 770e, 770x, G4x, R30, R31 */
>-	tp_features.light = (cmos_handle || lght_handle) && !ledb_handle;
>+	return snprintf(buf, PAGE_SIZE, "%d\n", status ? 1 : 0);
>+}
> 
>-	if (tp_features.light)
>-		/* light status not supported on
>-		   570, 600e/x, 770e, 770x, G4x, R30, R31, R32, X20 */
>-		tp_features.light_status =
>-			acpi_evalf(ec_handle, NULL, "KBLT", "qv");
>+static ssize_t wan_enable_store(struct device *dev,
>+			    struct device_attribute *attr,
>+			    const char *buf, size_t count)
>+{
>+	unsigned long t;
>+	int res;
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "light is %s\n",
>-		str_supported(tp_features.light));
>+	if (parse_strtoul(buf, 1, &t))
>+		return -EINVAL;
> 
>-	return (tp_features.light)? 0 : 1;
>+	res = wan_set_radiosw(t);
>+
>+	return (res) ? res : count;
> }
> 
>-static int light_read(char *p)
>+static struct device_attribute dev_attr_wan_enable =
>+	__ATTR(wwan_enable, S_IWUSR | S_IRUGO,
>+		wan_enable_show, wan_enable_store);
>+
>+/* --------------------------------------------------------------------- */
>+
>+static struct attribute *wan_attributes[] = {
>+	&dev_attr_wan_enable.attr,
>+	NULL
>+};
>+
>+static const struct attribute_group wan_attr_group = {
>+	.attrs = wan_attributes,
>+};
>+
>+static int __init wan_init(struct ibm_init_struct *iibm)
> {
>-	int len = 0;
>+	int res;
> 	int status = 0;
> 
>-	if (!tp_features.light) {
>+	vdbg_printk(TPACPI_DBG_INIT, "initializing wan subdriver\n");
>+
>+	TPACPI_ACPIHANDLE_INIT(hkey);
>+
>+	tp_features.wan = hkey_handle &&
>+	    acpi_evalf(hkey_handle, &status, "GWAN", "qd");
>+
>+	vdbg_printk(TPACPI_DBG_INIT, "wan is %s, status 0x%02x\n",
>+		str_supported(tp_features.wan),
>+		status);
>+
>+	if (tp_features.wan) {
>+		if (!(status & TP_ACPI_WANCARD_HWPRESENT)) {
>+			/* no wan hardware present in system */
>+			tp_features.wan = 0;
>+			dbg_printk(TPACPI_DBG_INIT,
>+				   "wan hardware not installed\n");
>+		} else {
>+			res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
>+					&wan_attr_group);
>+			if (res)
>+				return res;
>+		}
>+	}
>+
>+	return (tp_features.wan)? 0 : 1;
>+}
>+
>+static void wan_exit(void)
>+{
>+	sysfs_remove_group(&tpacpi_pdev->dev.kobj,
>+		&wan_attr_group);
>+}
>+
>+static int wan_get_radiosw(void)
>+{
>+	int status;
>+
>+	if (!tp_features.wan)
>+		return -ENODEV;
>+
>+	if (!acpi_evalf(hkey_handle, &status, "GWAN", "d"))
>+		return -EIO;
>+
>+	return ((status & TP_ACPI_WANCARD_RADIOSSW) != 0);
>+}
>+
>+static int wan_set_radiosw(int radio_on)
>+{
>+	int status;
>+
>+	if (!tp_features.wan)
>+		return -ENODEV;
>+
>+	if (!acpi_evalf(hkey_handle, &status, "GWAN", "d"))
>+		return -EIO;
>+	if (radio_on)
>+		status |= TP_ACPI_WANCARD_RADIOSSW;
>+	else
>+		status &= ~TP_ACPI_WANCARD_RADIOSSW;
>+	if (!acpi_evalf(hkey_handle, NULL, "SWAN", "vd", status))
>+		return -EIO;
>+
>+	return 0;
>+}
>+
>+/* procfs -------------------------------------------------------------- */
>+static int wan_read(char *p)
>+{
>+	int len = 0;
>+	int status = wan_get_radiosw();
>+
>+	if (!tp_features.wan)
> 		len += sprintf(p + len, "status:\t\tnot supported\n");
>-	} else if (!tp_features.light_status) {
>-		len += sprintf(p + len, "status:\t\tunknown\n");
>-		len += sprintf(p + len, "commands:\ton, off\n");
>-	} else {
>-		if (!acpi_evalf(ec_handle, &status, "KBLT", "d"))
>-			return -EIO;
>-		len += sprintf(p + len, "status:\t\t%s\n", onoff(status, 0));
>-		len += sprintf(p + len, "commands:\ton, off\n");
>+	else {
>+		len += sprintf(p + len, "status:\t\t%s\n",
>+				(status)? "enabled" : "disabled");
>+		len += sprintf(p + len, "commands:\tenable, disable\n");
> 	}
> 
> 	return len;
> }
> 
>-static int light_write(char *buf)
>+static int wan_write(char *buf)
> {
>-	int cmos_cmd, lght_cmd;
> 	char *cmd;
>-	int success;
> 
>-	if (!tp_features.light)
>+	if (!tp_features.wan)
> 		return -ENODEV;
> 
> 	while ((cmd = next_cmd(&buf))) {
>-		if (strlencmp(cmd, "on") == 0) {
>-			cmos_cmd = 0x0c;
>-			lght_cmd = 1;
>-		} else if (strlencmp(cmd, "off") == 0) {
>-			cmos_cmd = 0x0d;
>-			lght_cmd = 0;
>+		if (strlencmp(cmd, "enable") == 0) {
>+			wan_set_radiosw(1);
>+		} else if (strlencmp(cmd, "disable") == 0) {
>+			wan_set_radiosw(0);
> 		} else
> 			return -EINVAL;
>-
>-		success = cmos_handle ?
>-		    acpi_evalf(cmos_handle, NULL, NULL, "vd", cmos_cmd) :
>-		    acpi_evalf(lght_handle, NULL, NULL, "vd", lght_cmd);
>-		if (!success)
>-			return -EIO;
> 	}
> 
> 	return 0;
> }
> 
>-static struct ibm_struct light_driver_data = {
>-	.name = "light",
>-	.read = light_read,
>-	.write = light_write,
>+static struct ibm_struct wan_driver_data = {
>+	.name = "wan",
>+	.read = wan_read,
>+	.write = wan_write,
>+	.exit = wan_exit,
>+	.flags.experimental = 1,
> };
> 
> /*************************************************************************
>- * Dock subdriver
>+ * Video subdriver
>  */
> 
>-#ifdef CONFIG_THINKPAD_ACPI_DOCK
>-
>-IBM_HANDLE(dock, root, "\\_SB.GDCK",	/* X30, X31, X40 */
>-	   "\\_SB.PCI0.DOCK",	/* 600e/x,770e,770x,A2xm/p,T20-22,X20-21 */
>-	   "\\_SB.PCI0.PCI1.DOCK",	/* all others */
>-	   "\\_SB.PCI.ISA.SLCE",	/* 570 */
>-    );				/* A21e,G4x,R30,R31,R32,R40,R40e,R50e */
>+enum video_access_mode {
>+	TPACPI_VIDEO_NONE = 0,
>+	TPACPI_VIDEO_570,	/* 570 */
>+	TPACPI_VIDEO_770,	/* 600e/x, 770e, 770x */
>+	TPACPI_VIDEO_NEW,	/* all others */
>+};
> 
>-/* don't list other alternatives as we install a notify handler on the 570 */
>-IBM_HANDLE(pci, root, "\\_SB.PCI");	/* 570 */
>+enum {	/* video status flags, based on VIDEO_570 */
>+	TP_ACPI_VIDEO_S_LCD = 0x01,	/* LCD output enabled */
>+	TP_ACPI_VIDEO_S_CRT = 0x02,	/* CRT output enabled */
>+	TP_ACPI_VIDEO_S_DVI = 0x08,	/* DVI output enabled */
>+};
> 
>-static const struct acpi_device_id ibm_pci_device_ids[] = {
>-	{IBM_PCI_HID, 0},
>-	{"", 0},
>+enum {  /* TPACPI_VIDEO_570 constants */
>+	TP_ACPI_VIDEO_570_PHSCMD = 0x87,	/* unknown magic constant :( */
>+	TP_ACPI_VIDEO_570_PHSMASK = 0x03,	/* PHS bits that map to
>+						 * video_status_flags */
>+	TP_ACPI_VIDEO_570_PHS2CMD = 0x8b,	/* unknown magic constant :( */
>+	TP_ACPI_VIDEO_570_PHS2SET = 0x80,	/* unknown magic constant :( */
> };
> 
>+static enum video_access_mode video_supported;
>+static int video_orig_autosw;
>+
>+static int video_autosw_get(void);
>+static int video_autosw_set(int enable);
>+
>+TPACPI_HANDLE(vid, root, "\\_SB.PCI.AGP.VGA",	/* 570 */
>+	   "\\_SB.PCI0.AGP0.VID0",	/* 600e/x, 770x */
>+	   "\\_SB.PCI0.VID0",	/* 770e */
>+	   "\\_SB.PCI0.VID",	/* A21e, G4x, R50e, X30, X40 */
>+	   "\\_SB.PCI0.AGP.VID",	/* all others */
>+	   );				/* R30, R31 */
>+
>+TPACPI_HANDLE(vid2, root, "\\_SB.PCI0.AGPB.VID");	/* G41 */
>+
>+static int __init video_init(struct ibm_init_struct *iibm)
>+{
>+	int ivga;
>+
>+	vdbg_printk(TPACPI_DBG_INIT, "initializing video subdriver\n");
>+
>+	TPACPI_ACPIHANDLE_INIT(vid);
>+	TPACPI_ACPIHANDLE_INIT(vid2);
>+
>+	if (vid2_handle && acpi_evalf(NULL, &ivga, "\\IVGA", "d") && ivga)
>+		/* G41, assume IVGA doesn't change */
>+		vid_handle = vid2_handle;
>+
>+	if (!vid_handle)
>+		/* video switching not supported on R30, R31 */
>+		video_supported = TPACPI_VIDEO_NONE;
>+	else if (acpi_evalf(vid_handle, &video_orig_autosw, "SWIT", "qd"))
>+		/* 570 */
>+		video_supported = TPACPI_VIDEO_570;
>+	else if (acpi_evalf(vid_handle, &video_orig_autosw, "^VADL", "qd"))
>+		/* 600e/x, 770e, 770x */
>+		video_supported = TPACPI_VIDEO_770;
>+	else
>+		/* all others */
>+		video_supported = TPACPI_VIDEO_NEW;
>+
>+	vdbg_printk(TPACPI_DBG_INIT, "video is %s, mode %d\n",
>+		str_supported(video_supported != TPACPI_VIDEO_NONE),
>+		video_supported);
>+
>+	return (video_supported != TPACPI_VIDEO_NONE)? 0 : 1;
>+}
>+
>+static void video_exit(void)
>+{
>+	dbg_printk(TPACPI_DBG_EXIT,
>+		   "restoring original video autoswitch mode\n");
>+	if (video_autosw_set(video_orig_autosw))
>+		printk(TPACPI_ERR "error while trying to restore original "
>+			"video autoswitch mode\n");
>+}
>+
>+static int video_outputsw_get(void)
>+{
>+	int status = 0;
>+	int i;
>+
>+	switch (video_supported) {
>+	case TPACPI_VIDEO_570:
>+		if (!acpi_evalf(NULL, &i, "\\_SB.PHS", "dd",
>+				 TP_ACPI_VIDEO_570_PHSCMD))
>+			return -EIO;
>+		status = i & TP_ACPI_VIDEO_570_PHSMASK;
>+		break;
>+	case TPACPI_VIDEO_770:
>+		if (!acpi_evalf(NULL, &i, "\\VCDL", "d"))
>+			return -EIO;
>+		if (i)
>+			status |= TP_ACPI_VIDEO_S_LCD;
>+		if (!acpi_evalf(NULL, &i, "\\VCDC", "d"))
>+			return -EIO;
>+		if (i)
>+			status |= TP_ACPI_VIDEO_S_CRT;
>+		break;
>+	case TPACPI_VIDEO_NEW:
>+		if (!acpi_evalf(NULL, NULL, "\\VUPS", "vd", 1) ||
>+		    !acpi_evalf(NULL, &i, "\\VCDC", "d"))
>+			return -EIO;
>+		if (i)
>+			status |= TP_ACPI_VIDEO_S_CRT;
>+
>+		if (!acpi_evalf(NULL, NULL, "\\VUPS", "vd", 0) ||
>+		    !acpi_evalf(NULL, &i, "\\VCDL", "d"))
>+			return -EIO;
>+		if (i)
>+			status |= TP_ACPI_VIDEO_S_LCD;
>+		if (!acpi_evalf(NULL, &i, "\\VCDD", "d"))
>+			return -EIO;
>+		if (i)
>+			status |= TP_ACPI_VIDEO_S_DVI;
>+		break;
>+	default:
>+		return -ENOSYS;
>+	}
>+
>+	return status;
>+}
>+
>+static int video_outputsw_set(int status)
>+{
>+	int autosw;
>+	int res = 0;
>+
>+	switch (video_supported) {
>+	case TPACPI_VIDEO_570:
>+		res = acpi_evalf(NULL, NULL,
>+				 "\\_SB.PHS2", "vdd",
>+				 TP_ACPI_VIDEO_570_PHS2CMD,
>+				 status | TP_ACPI_VIDEO_570_PHS2SET);
>+		break;
>+	case TPACPI_VIDEO_770:
>+		autosw = video_autosw_get();
>+		if (autosw < 0)
>+			return autosw;
>+
>+		res = video_autosw_set(1);
>+		if (res)
>+			return res;
>+		res = acpi_evalf(vid_handle, NULL,
>+				 "ASWT", "vdd", status * 0x100, 0);
>+		if (!autosw && video_autosw_set(autosw)) {
>+			printk(TPACPI_ERR
>+			       "video auto-switch left enabled due to error\n");
>+			return -EIO;
>+		}
>+		break;
>+	case TPACPI_VIDEO_NEW:
>+		res = acpi_evalf(NULL, NULL, "\\VUPS", "vd", 0x80) &&
>+		      acpi_evalf(NULL, NULL, "\\VSDS", "vdd", status, 1);
>+		break;
>+	default:
>+		return -ENOSYS;
>+	}
>+
>+	return (res)? 0 : -EIO;
>+}
>+
>+static int video_autosw_get(void)
>+{
>+	int autosw = 0;
>+
>+	switch (video_supported) {
>+	case TPACPI_VIDEO_570:
>+		if (!acpi_evalf(vid_handle, &autosw, "SWIT", "d"))
>+			return -EIO;
>+		break;
>+	case TPACPI_VIDEO_770:
>+	case TPACPI_VIDEO_NEW:
>+		if (!acpi_evalf(vid_handle, &autosw, "^VDEE", "d"))
>+			return -EIO;
>+		break;
>+	default:
>+		return -ENOSYS;
>+	}
>+
>+	return autosw & 1;
>+}
>+
>+static int video_autosw_set(int enable)
>+{
>+	if (!acpi_evalf(vid_handle, NULL, "_DOS", "vd", (enable)? 1 : 0))
>+		return -EIO;
>+	return 0;
>+}
>+
>+static int video_outputsw_cycle(void)
>+{
>+	int autosw = video_autosw_get();
>+	int res;
>+
>+	if (autosw < 0)
>+		return autosw;
>+
>+	switch (video_supported) {
>+	case TPACPI_VIDEO_570:
>+		res = video_autosw_set(1);
>+		if (res)
>+			return res;
>+		res = acpi_evalf(ec_handle, NULL, "_Q16", "v");
>+		break;
>+	case TPACPI_VIDEO_770:
>+	case TPACPI_VIDEO_NEW:
>+		res = video_autosw_set(1);
>+		if (res)
>+			return res;
>+		res = acpi_evalf(vid_handle, NULL, "VSWT", "v");
>+		break;
>+	default:
>+		return -ENOSYS;
>+	}
>+	if (!autosw && video_autosw_set(autosw)) {
>+		printk(TPACPI_ERR
>+		       "video auto-switch left enabled due to error\n");
>+		return -EIO;
>+	}
>+
>+	return (res)? 0 : -EIO;
>+}
>+
>+static int video_expand_toggle(void)
>+{
>+	switch (video_supported) {
>+	case TPACPI_VIDEO_570:
>+		return acpi_evalf(ec_handle, NULL, "_Q17", "v")?
>+			0 : -EIO;
>+	case TPACPI_VIDEO_770:
>+		return acpi_evalf(vid_handle, NULL, "VEXP", "v")?
>+			0 : -EIO;
>+	case TPACPI_VIDEO_NEW:
>+		return acpi_evalf(NULL, NULL, "\\VEXP", "v")?
>+			0 : -EIO;
>+	default:
>+		return -ENOSYS;
>+	}
>+	/* not reached */
>+}
>+
>+static int video_read(char *p)
>+{
>+	int status, autosw;
>+	int len = 0;
>+
>+	if (video_supported == TPACPI_VIDEO_NONE) {
>+		len += sprintf(p + len, "status:\t\tnot supported\n");
>+		return len;
>+	}
>+
>+	status = video_outputsw_get();
>+	if (status < 0)
>+		return status;
>+
>+	autosw = video_autosw_get();
>+	if (autosw < 0)
>+		return autosw;
>+
>+	len += sprintf(p + len, "status:\t\tsupported\n");
>+	len += sprintf(p + len, "lcd:\t\t%s\n", enabled(status, 0));
>+	len += sprintf(p + len, "crt:\t\t%s\n", enabled(status, 1));
>+	if (video_supported == TPACPI_VIDEO_NEW)
>+		len += sprintf(p + len, "dvi:\t\t%s\n", enabled(status, 3));
>+	len += sprintf(p + len, "auto:\t\t%s\n", enabled(autosw, 0));
>+	len += sprintf(p + len, "commands:\tlcd_enable, lcd_disable\n");
>+	len += sprintf(p + len, "commands:\tcrt_enable, crt_disable\n");
>+	if (video_supported == TPACPI_VIDEO_NEW)
>+		len += sprintf(p + len, "commands:\tdvi_enable, dvi_disable\n");
>+	len += sprintf(p + len, "commands:\tauto_enable, auto_disable\n");
>+	len += sprintf(p + len, "commands:\tvideo_switch, expand_toggle\n");
>+
>+	return len;
>+}
>+
>+static int video_write(char *buf)
>+{
>+	char *cmd;
>+	int enable, disable, status;
>+	int res;
>+
>+	if (video_supported == TPACPI_VIDEO_NONE)
>+		return -ENODEV;
>+
>+	enable = 0;
>+	disable = 0;
>+
>+	while ((cmd = next_cmd(&buf))) {
>+		if (strlencmp(cmd, "lcd_enable") == 0) {
>+			enable |= TP_ACPI_VIDEO_S_LCD;
>+		} else if (strlencmp(cmd, "lcd_disable") == 0) {
>+			disable |= TP_ACPI_VIDEO_S_LCD;
>+		} else if (strlencmp(cmd, "crt_enable") == 0) {
>+			enable |= TP_ACPI_VIDEO_S_CRT;
>+		} else if (strlencmp(cmd, "crt_disable") == 0) {
>+			disable |= TP_ACPI_VIDEO_S_CRT;
>+		} else if (video_supported == TPACPI_VIDEO_NEW &&
>+			   strlencmp(cmd, "dvi_enable") == 0) {
>+			enable |= TP_ACPI_VIDEO_S_DVI;
>+		} else if (video_supported == TPACPI_VIDEO_NEW &&
>+			   strlencmp(cmd, "dvi_disable") == 0) {
>+			disable |= TP_ACPI_VIDEO_S_DVI;
>+		} else if (strlencmp(cmd, "auto_enable") == 0) {
>+			res = video_autosw_set(1);
>+			if (res)
>+				return res;
>+		} else if (strlencmp(cmd, "auto_disable") == 0) {
>+			res = video_autosw_set(0);
>+			if (res)
>+				return res;
>+		} else if (strlencmp(cmd, "video_switch") == 0) {
>+			res = video_outputsw_cycle();
>+			if (res)
>+				return res;
>+		} else if (strlencmp(cmd, "expand_toggle") == 0) {
>+			res = video_expand_toggle();
>+			if (res)
>+				return res;
>+		} else
>+			return -EINVAL;
>+	}
>+
>+	if (enable || disable) {
>+		status = video_outputsw_get();
>+		if (status < 0)
>+			return status;
>+		res = video_outputsw_set((status & ~disable) | enable);
>+		if (res)
>+			return res;
>+	}
>+
>+	return 0;
>+}
>+
>+static struct ibm_struct video_driver_data = {
>+	.name = "video",
>+	.read = video_read,
>+	.write = video_write,
>+	.exit = video_exit,
>+};
>+
>+/*************************************************************************
>+ * Light (thinklight) subdriver
>+ */
>+
>+TPACPI_HANDLE(lght, root, "\\LGHT");	/* A21e, A2xm/p, T20-22, X20-21 */
>+TPACPI_HANDLE(ledb, ec, "LEDB");		/* G4x */
>+
>+static int __init light_init(struct ibm_init_struct *iibm)
>+{
>+	vdbg_printk(TPACPI_DBG_INIT, "initializing light subdriver\n");
>+
>+	TPACPI_ACPIHANDLE_INIT(ledb);
>+	TPACPI_ACPIHANDLE_INIT(lght);
>+	TPACPI_ACPIHANDLE_INIT(cmos);
>+
>+	/* light not supported on 570, 600e/x, 770e, 770x, G4x, R30, R31 */
>+	tp_features.light = (cmos_handle || lght_handle) && !ledb_handle;
>+
>+	if (tp_features.light)
>+		/* light status not supported on
>+		   570, 600e/x, 770e, 770x, G4x, R30, R31, R32, X20 */
>+		tp_features.light_status =
>+			acpi_evalf(ec_handle, NULL, "KBLT", "qv");
>+
>+	vdbg_printk(TPACPI_DBG_INIT, "light is %s\n",
>+		str_supported(tp_features.light));
>+
>+	return (tp_features.light)? 0 : 1;
>+}
>+
>+static int light_read(char *p)
>+{
>+	int len = 0;
>+	int status = 0;
>+
>+	if (!tp_features.light) {
>+		len += sprintf(p + len, "status:\t\tnot supported\n");
>+	} else if (!tp_features.light_status) {
>+		len += sprintf(p + len, "status:\t\tunknown\n");
>+		len += sprintf(p + len, "commands:\ton, off\n");
>+	} else {
>+		if (!acpi_evalf(ec_handle, &status, "KBLT", "d"))
>+			return -EIO;
>+		len += sprintf(p + len, "status:\t\t%s\n", onoff(status, 0));
>+		len += sprintf(p + len, "commands:\ton, off\n");
>+	}
>+
>+	return len;
>+}
>+
>+static int light_write(char *buf)
>+{
>+	int cmos_cmd, lght_cmd;
>+	char *cmd;
>+	int success;
>+
>+	if (!tp_features.light)
>+		return -ENODEV;
>+
>+	while ((cmd = next_cmd(&buf))) {
>+		if (strlencmp(cmd, "on") == 0) {
>+			cmos_cmd = 0x0c;
>+			lght_cmd = 1;
>+		} else if (strlencmp(cmd, "off") == 0) {
>+			cmos_cmd = 0x0d;
>+			lght_cmd = 0;
>+		} else
>+			return -EINVAL;
>+
>+		success = cmos_handle ?
>+		    acpi_evalf(cmos_handle, NULL, NULL, "vd", cmos_cmd) :
>+		    acpi_evalf(lght_handle, NULL, NULL, "vd", lght_cmd);
>+		if (!success)
>+			return -EIO;
>+	}
>+
>+	return 0;
>+}
>+
>+static struct ibm_struct light_driver_data = {
>+	.name = "light",
>+	.read = light_read,
>+	.write = light_write,
>+};
>+
>+/*************************************************************************
>+ * Dock subdriver
>+ */
>+
>+#ifdef CONFIG_THINKPAD_ACPI_DOCK
>+
>+static void dock_notify(struct ibm_struct *ibm, u32 event);
>+static int dock_read(char *p);
>+static int dock_write(char *buf);
>+
>+TPACPI_HANDLE(dock, root, "\\_SB.GDCK",	/* X30, X31, X40 */
>+	   "\\_SB.PCI0.DOCK",	/* 600e/x,770e,770x,A2xm/p,T20-22,X20-21 */
>+	   "\\_SB.PCI0.PCI1.DOCK",	/* all others */
>+	   "\\_SB.PCI.ISA.SLCE",	/* 570 */
>+    );				/* A21e,G4x,R30,R31,R32,R40,R40e,R50e */
>+
>+/* don't list other alternatives as we install a notify handler on the 570 */
>+TPACPI_HANDLE(pci, root, "\\_SB.PCI");	/* 570 */
>+
> static struct tp_acpi_drv_struct ibm_dock_acpidriver[2] = {
> 	{
> 	 .notify = dock_notify,
>@@ -1804,7 +3142,10 @@ static struct tp_acpi_drv_struct ibm_doc
> 	 .type = ACPI_SYSTEM_NOTIFY,
> 	},
> 	{
>-	 .hid = ibm_pci_device_ids,
>+	/* THIS ONE MUST NEVER BE USED FOR DRIVER AUTOLOADING.
>+	 * We just use it to get notifications of dock hotplug
>+	 * in very old thinkpads */
>+	 .hid = PCI_ROOT_HID_STRING,
> 	 .notify = dock_notify,
> 	 .handle = &pci_handle,
> 	 .type = ACPI_SYSTEM_NOTIFY,
>@@ -1830,7 +3171,7 @@ static int __init dock_init(struct ibm_i
> {
> 	vdbg_printk(TPACPI_DBG_INIT, "initializing dock subdriver\n");
> 
>-	IBM_ACPIHANDLE_INIT(dock);
>+	TPACPI_ACPIHANDLE_INIT(dock);
> 
> 	vdbg_printk(TPACPI_DBG_INIT, "dock is %s\n",
> 		str_supported(dock_handle != NULL));
>@@ -1846,7 +3187,7 @@ static int __init dock_init2(struct ibm_
> 
> 	if (dock_driver_data[0].flags.acpi_driver_registered &&
> 	    dock_driver_data[0].flags.acpi_notify_installed) {
>-		IBM_ACPIHANDLE_INIT(pci);
>+		TPACPI_ACPIHANDLE_INIT(pci);
> 		dock2_needed = (pci_handle != NULL);
> 		vdbg_printk(TPACPI_DBG_INIT,
> 			    "dock PCI handler for the TP 570 is %s\n",
>@@ -1863,8 +3204,7 @@ static int __init dock_init2(struct ibm_
> static void dock_notify(struct ibm_struct *ibm, u32 event)
> {
> 	int docked = dock_docked();
>-	int pci = ibm->acpi->hid && ibm->acpi->device &&
>-		acpi_match_device_ids(ibm->acpi->device, ibm_pci_device_ids);
>+	int pci = ibm->acpi->hid && strstr(ibm->acpi->hid, PCI_ROOT_HID_STRING);
> 
> 	if (event == 1 && !pci)	/* 570 */
> 		acpi_bus_generate_event(ibm->acpi->device, event, 1);	/* button */
>@@ -1877,7 +3217,7 @@ static void dock_notify(struct ibm_struc
> 	else if (event == 0 && docked)
> 		acpi_bus_generate_event(ibm->acpi->device, event, 3);	/* dock */
> 	else {
>-		printk(IBM_ERR "unknown dock event %d, status %d\n",
>+		printk(TPACPI_ERR "unknown dock event %d, status %d\n",
> 		       event, _sta(dock_handle));
> 		acpi_bus_generate_event(ibm->acpi->device, event, 0);	/* unknown */
> 	}
>@@ -1929,18 +3269,19 @@ static int dock_write(char *buf)
>  */
> 
> #ifdef CONFIG_THINKPAD_ACPI_BAY
>-IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST",	/* 570 */
>+
>+TPACPI_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST",	/* 570 */
> 	   "\\_SB.PCI0.IDE0.IDES.IDSM",	/* 600e/x, 770e, 770x */
> 	   "\\_SB.PCI0.SATA.SCND.MSTR",	/* T60, X60, Z60 */
> 	   "\\_SB.PCI0.IDE0.SCND.MSTR",	/* all others */
> 	   );				/* A21e, R30, R31 */
>-IBM_HANDLE(bay_ej, bay, "_EJ3",	/* 600e/x, A2xm/p, A3x */
>+TPACPI_HANDLE(bay_ej, bay, "_EJ3",	/* 600e/x, A2xm/p, A3x */
> 	   "_EJ0",		/* all others */
> 	   );			/* 570,A21e,G4x,R30,R31,R32,R40e,R50e */
>-IBM_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV",	/* A3x, R32 */
>+TPACPI_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV",	/* A3x, R32 */
> 	   "\\_SB.PCI0.IDE0.IDEP.IDPS",	/* 600e/x, 770e, 770x */
> 	   );				/* all others */
>-IBM_HANDLE(bay2_ej, bay2, "_EJ3",	/* 600e/x, 770e, A3x */
>+TPACPI_HANDLE(bay2_ej, bay2, "_EJ3",	/* 600e/x, 770e, A3x */
> 	   "_EJ0",			/* 770x */
> 	   );				/* all others */
> 
>@@ -1948,12 +3289,12 @@ static int __init bay_init(struct ibm_in
> {
> 	vdbg_printk(TPACPI_DBG_INIT, "initializing bay subdriver\n");
> 
>-	IBM_ACPIHANDLE_INIT(bay);
>+	TPACPI_ACPIHANDLE_INIT(bay);
> 	if (bay_handle)
>-		IBM_ACPIHANDLE_INIT(bay_ej);
>-	IBM_ACPIHANDLE_INIT(bay2);
>+		TPACPI_ACPIHANDLE_INIT(bay_ej);
>+	TPACPI_ACPIHANDLE_INIT(bay2);
> 	if (bay2_handle)
>-		IBM_ACPIHANDLE_INIT(bay2_ej);
>+		TPACPI_ACPIHANDLE_INIT(bay2_ej);
> 
> 	tp_features.bay_status = bay_handle &&
> 		acpi_evalf(bay_handle, NULL, "_STA", "qv");
>@@ -2079,7 +3420,7 @@ static int __init cmos_init(struct ibm_i
> 	vdbg_printk(TPACPI_DBG_INIT,
> 		"initializing cmos commands subdriver\n");
> 
>-	IBM_ACPIHANDLE_INIT(cmos);
>+	TPACPI_ACPIHANDLE_INIT(cmos);
> 
> 	vdbg_printk(TPACPI_DBG_INIT, "cmos commands are %s\n",
> 		str_supported(cmos_handle != NULL));
>@@ -2143,10 +3484,24 @@ static struct ibm_struct cmos_driver_dat
>  * LED subdriver
>  */
> 
>+enum led_access_mode {
>+	TPACPI_LED_NONE = 0,
>+	TPACPI_LED_570,	/* 570 */
>+	TPACPI_LED_OLD,	/* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
>+	TPACPI_LED_NEW,	/* all others */
>+};
>+
>+enum {	/* For TPACPI_LED_OLD */
>+	TPACPI_LED_EC_HLCL = 0x0c,	/* EC reg to get led to power on */
>+	TPACPI_LED_EC_HLBL = 0x0d,	/* EC reg to blink a lit led */
>+	TPACPI_LED_EC_HLMS = 0x0e,	/* EC reg to select led to command */
>+};
>+
> static enum led_access_mode led_supported;
> 
>-IBM_HANDLE(led, ec, "SLED",	/* 570 */
>-	   "SYSL",		/* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
>+TPACPI_HANDLE(led, ec, "SLED",	/* 570 */
>+	   "SYSL",		/* 600e/x, 770e, 770x, A21e, A2xm/p, */
>+				/* T20-22, X20-21 */
> 	   "LED",		/* all others */
> 	   );			/* R30, R31 */
> 
>@@ -2154,7 +3509,7 @@ static int __init led_init(struct ibm_in
> {
> 	vdbg_printk(TPACPI_DBG_INIT, "initializing LED subdriver\n");
> 
>-	IBM_ACPIHANDLE_INIT(led);
>+	TPACPI_ACPIHANDLE_INIT(led);
> 
> 	if (!led_handle)
> 		/* led not supported on R30, R31 */
>@@ -2243,13 +3598,11 @@ static int led_write(char *buf)
> 			led = 1 << led;
> 			ret = ec_write(TPACPI_LED_EC_HLMS, led);
> 			if (ret >= 0)
>-				ret =
>-				    ec_write(TPACPI_LED_EC_HLBL,
>-				    	     led * led_exp_hlbl[ind]);
>+				ret = ec_write(TPACPI_LED_EC_HLBL,
>+						led * led_exp_hlbl[ind]);
> 			if (ret >= 0)
>-				ret =
>-				    ec_write(TPACPI_LED_EC_HLCL,
>-				    	     led * led_exp_hlcl[ind]);
>+				ret = ec_write(TPACPI_LED_EC_HLCL,
>+						led * led_exp_hlcl[ind]);
> 			if (ret < 0)
> 				return ret;
> 		} else {
>@@ -2273,13 +3626,13 @@ static struct ibm_struct led_driver_data
>  * Beep subdriver
>  */
> 
>-IBM_HANDLE(beep, ec, "BEEP");	/* all except R30, R31 */
>+TPACPI_HANDLE(beep, ec, "BEEP");	/* all except R30, R31 */
> 
> static int __init beep_init(struct ibm_init_struct *iibm)
> {
> 	vdbg_printk(TPACPI_DBG_INIT, "initializing beep subdriver\n");
> 
>-	IBM_ACPIHANDLE_INIT(beep);
>+	TPACPI_ACPIHANDLE_INIT(beep);
> 
> 	vdbg_printk(TPACPI_DBG_INIT, "beep is %s\n",
> 		str_supported(beep_handle != NULL));
>@@ -2287,52 +3640,153 @@ static int __init beep_init(struct ibm_i
> 	return (beep_handle)? 0 : 1;
> }
> 
>-static int beep_read(char *p)
>-{
>-	int len = 0;
>+static int beep_read(char *p)
>+{
>+	int len = 0;
>+
>+	if (!beep_handle)
>+		len += sprintf(p + len, "status:\t\tnot supported\n");
>+	else {
>+		len += sprintf(p + len, "status:\t\tsupported\n");
>+		len += sprintf(p + len, "commands:\t<cmd> (<cmd> is 0-17)\n");
>+	}
>+
>+	return len;
>+}
>+
>+static int beep_write(char *buf)
>+{
>+	char *cmd;
>+	int beep_cmd;
>+
>+	if (!beep_handle)
>+		return -ENODEV;
>+
>+	while ((cmd = next_cmd(&buf))) {
>+		if (sscanf(cmd, "%u", &beep_cmd) == 1 &&
>+		    beep_cmd >= 0 && beep_cmd <= 17) {
>+			/* beep_cmd set */
>+		} else
>+			return -EINVAL;
>+		if (!acpi_evalf(beep_handle, NULL, NULL, "vdd", beep_cmd, 0))
>+			return -EIO;
>+	}
>+
>+	return 0;
>+}
>+
>+static struct ibm_struct beep_driver_data = {
>+	.name = "beep",
>+	.read = beep_read,
>+	.write = beep_write,
>+};
>+
>+/*************************************************************************
>+ * Thermal subdriver
>+ */
>+
>+enum thermal_access_mode {
>+	TPACPI_THERMAL_NONE = 0,	/* No thermal support */
>+	TPACPI_THERMAL_ACPI_TMP07,	/* Use ACPI TMP0-7 */
>+	TPACPI_THERMAL_ACPI_UPDT,	/* Use ACPI TMP0-7 with UPDT */
>+	TPACPI_THERMAL_TPEC_8,		/* Use ACPI EC regs, 8 sensors */
>+	TPACPI_THERMAL_TPEC_16,		/* Use ACPI EC regs, 16 sensors */
>+};
>+
>+enum { /* TPACPI_THERMAL_TPEC_* */
>+	TP_EC_THERMAL_TMP0 = 0x78,	/* ACPI EC regs TMP 0..7 */
>+	TP_EC_THERMAL_TMP8 = 0xC0,	/* ACPI EC regs TMP 8..15 */
>+	TP_EC_THERMAL_TMP_NA = -128,	/* ACPI EC sensor not available */
>+};
>+
>+#define TPACPI_MAX_THERMAL_SENSORS 16	/* Max thermal sensors supported */
>+struct ibm_thermal_sensors_struct {
>+	s32 temp[TPACPI_MAX_THERMAL_SENSORS];
>+};
>+
>+static enum thermal_access_mode thermal_read_mode;
>+
>+/* idx is zero-based */
>+static int thermal_get_sensor(int idx, s32 *value)
>+{
>+	int t;
>+	s8 tmp;
>+	char tmpi[5];
>+
>+	t = TP_EC_THERMAL_TMP0;
>+
>+	switch (thermal_read_mode) {
>+#if TPACPI_MAX_THERMAL_SENSORS >= 16
>+	case TPACPI_THERMAL_TPEC_16:
>+		if (idx >= 8 && idx <= 15) {
>+			t = TP_EC_THERMAL_TMP8;
>+			idx -= 8;
>+		}
>+		/* fallthrough */
>+#endif
>+	case TPACPI_THERMAL_TPEC_8:
>+		if (idx <= 7) {
>+			if (!acpi_ec_read(t + idx, &tmp))
>+				return -EIO;
>+			*value = tmp * 1000;
>+			return 0;
>+		}
>+		break;
>+
>+	case TPACPI_THERMAL_ACPI_UPDT:
>+		if (idx <= 7) {
>+			snprintf(tmpi, sizeof(tmpi), "TMP%c", '0' + idx);
>+			if (!acpi_evalf(ec_handle, NULL, "UPDT", "v"))
>+				return -EIO;
>+			if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
>+				return -EIO;
>+			*value = (t - 2732) * 100;
>+			return 0;
>+		}
>+		break;
>+
>+	case TPACPI_THERMAL_ACPI_TMP07:
>+		if (idx <= 7) {
>+			snprintf(tmpi, sizeof(tmpi), "TMP%c", '0' + idx);
>+			if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
>+				return -EIO;
>+			if (t > 127 || t < -127)
>+				t = TP_EC_THERMAL_TMP_NA;
>+			*value = t * 1000;
>+			return 0;
>+		}
>+		break;
> 
>-	if (!beep_handle)
>-		len += sprintf(p + len, "status:\t\tnot supported\n");
>-	else {
>-		len += sprintf(p + len, "status:\t\tsupported\n");
>-		len += sprintf(p + len, "commands:\t<cmd> (<cmd> is 0-17)\n");
>+	case TPACPI_THERMAL_NONE:
>+	default:
>+		return -ENOSYS;
> 	}
> 
>-	return len;
>+	return -EINVAL;
> }
> 
>-static int beep_write(char *buf)
>+static int thermal_get_sensors(struct ibm_thermal_sensors_struct *s)
> {
>-	char *cmd;
>-	int beep_cmd;
>-
>-	if (!beep_handle)
>-		return -ENODEV;
>+	int res, i;
>+	int n;
> 
>-	while ((cmd = next_cmd(&buf))) {
>-		if (sscanf(cmd, "%u", &beep_cmd) == 1 &&
>-		    beep_cmd >= 0 && beep_cmd <= 17) {
>-			/* beep_cmd set */
>-		} else
>-			return -EINVAL;
>-		if (!acpi_evalf(beep_handle, NULL, NULL, "vdd", beep_cmd, 0))
>-			return -EIO;
>-	}
>+	n = 8;
>+	i = 0;
> 
>-	return 0;
>-}
>+	if (!s)
>+		return -EINVAL;
> 
>-static struct ibm_struct beep_driver_data = {
>-	.name = "beep",
>-	.read = beep_read,
>-	.write = beep_write,
>-};
>+	if (thermal_read_mode == TPACPI_THERMAL_TPEC_16)
>+		n = 16;
> 
>-/*************************************************************************
>- * Thermal subdriver
>- */
>+	for (i = 0 ; i < n; i++) {
>+		res = thermal_get_sensor(i, &s->temp[i]);
>+		if (res)
>+			return res;
>+	}
> 
>-static enum thermal_access_mode thermal_read_mode;
>+	return n;
>+}
> 
> /* sysfs temp##_input -------------------------------------------------- */
> 
>@@ -2356,7 +3810,8 @@ static ssize_t thermal_temp_input_show(s
> }
> 
> #define THERMAL_SENSOR_ATTR_TEMP(_idxA, _idxB) \
>-	 SENSOR_ATTR(temp##_idxA##_input, S_IRUGO, thermal_temp_input_show, NULL, _idxB)
>+	 SENSOR_ATTR(temp##_idxA##_input, S_IRUGO, \
>+		     thermal_temp_input_show, NULL, _idxB)
> 
> static struct sensor_device_attribute sensor_dev_attr_thermal_temp_input[] = {
> 	THERMAL_SENSOR_ATTR_TEMP(1, 0),
>@@ -2424,7 +3879,7 @@ static int __init thermal_init(struct ib
> 
> 	acpi_tmp7 = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
> 
>-	if (ibm_thinkpad_ec_found && experimental) {
>+	if (thinkpad_id.ec_model) {
> 		/*
> 		 * Direct EC access mode: sensors at registers
> 		 * 0x78-0x7F, 0xC0-0xC7.  Registers return 0x00 for
>@@ -2450,12 +3905,13 @@ static int __init thermal_init(struct ib
> 		if (ta1 == 0) {
> 			/* This is sheer paranoia, but we handle it anyway */
> 			if (acpi_tmp7) {
>-				printk(IBM_ERR
>+				printk(TPACPI_ERR
> 				       "ThinkPad ACPI EC access misbehaving, "
>-				       "falling back to ACPI TMPx access mode\n");
>+				       "falling back to ACPI TMPx access "
>+				       "mode\n");
> 				thermal_read_mode = TPACPI_THERMAL_ACPI_TMP07;
> 			} else {
>-				printk(IBM_ERR
>+				printk(TPACPI_ERR
> 				       "ThinkPad ACPI EC access misbehaving, "
> 				       "disabling thermal sensors access\n");
> 				thermal_read_mode = TPACPI_THERMAL_NONE;
>@@ -2482,9 +3938,9 @@ static int __init thermal_init(struct ib
> 		str_supported(thermal_read_mode != TPACPI_THERMAL_NONE),
> 		thermal_read_mode);
> 
>-	switch(thermal_read_mode) {
>+	switch (thermal_read_mode) {
> 	case TPACPI_THERMAL_TPEC_16:
>-		res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
>+		res = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj,
> 				&thermal_temp_input16_group);
> 		if (res)
> 			return res;
>@@ -2492,7 +3948,7 @@ static int __init thermal_init(struct ib
> 	case TPACPI_THERMAL_TPEC_8:
> 	case TPACPI_THERMAL_ACPI_TMP07:
> 	case TPACPI_THERMAL_ACPI_UPDT:
>-		res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
>+		res = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj,
> 				&thermal_temp_input8_group);
> 		if (res)
> 			return res;
>@@ -2507,15 +3963,15 @@ static int __init thermal_init(struct ib
> 
> static void thermal_exit(void)
> {
>-	switch(thermal_read_mode) {
>+	switch (thermal_read_mode) {
> 	case TPACPI_THERMAL_TPEC_16:
>-		sysfs_remove_group(&tpacpi_pdev->dev.kobj,
>+		sysfs_remove_group(&tpacpi_sensors_pdev->dev.kobj,
> 				   &thermal_temp_input16_group);
> 		break;
> 	case TPACPI_THERMAL_TPEC_8:
> 	case TPACPI_THERMAL_ACPI_TMP07:
> 	case TPACPI_THERMAL_ACPI_UPDT:
>-		sysfs_remove_group(&tpacpi_pdev->dev.kobj,
>+		sysfs_remove_group(&tpacpi_sensors_pdev->dev.kobj,
> 				   &thermal_temp_input16_group);
> 		break;
> 	case TPACPI_THERMAL_NONE:
>@@ -2524,86 +3980,6 @@ static void thermal_exit(void)
> 	}
> }
> 
>-/* idx is zero-based */
>-static int thermal_get_sensor(int idx, s32 *value)
>-{
>-	int t;
>-	s8 tmp;
>-	char tmpi[5];
>-
>-	t = TP_EC_THERMAL_TMP0;
>-
>-	switch (thermal_read_mode) {
>-#if TPACPI_MAX_THERMAL_SENSORS >= 16
>-	case TPACPI_THERMAL_TPEC_16:
>-		if (idx >= 8 && idx <= 15) {
>-			t = TP_EC_THERMAL_TMP8;
>-			idx -= 8;
>-		}
>-		/* fallthrough */
>-#endif
>-	case TPACPI_THERMAL_TPEC_8:
>-		if (idx <= 7) {
>-			if (!acpi_ec_read(t + idx, &tmp))
>-				return -EIO;
>-			*value = tmp * 1000;
>-			return 0;
>-		}
>-		break;
>-
>-	case TPACPI_THERMAL_ACPI_UPDT:
>-		if (idx <= 7) {
>-			snprintf(tmpi, sizeof(tmpi), "TMP%c", '0' + idx);
>-			if (!acpi_evalf(ec_handle, NULL, "UPDT", "v"))
>-				return -EIO;
>-			if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
>-				return -EIO;
>-			*value = (t - 2732) * 100;
>-			return 0;
>-		}
>-		break;
>-
>-	case TPACPI_THERMAL_ACPI_TMP07:
>-		if (idx <= 7) {
>-			snprintf(tmpi, sizeof(tmpi), "TMP%c", '0' + idx);
>-			if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
>-				return -EIO;
>-			*value = t * 1000;
>-			return 0;
>-		}
>-		break;
>-
>-	case TPACPI_THERMAL_NONE:
>-	default:
>-		return -ENOSYS;
>-	}
>-
>-	return -EINVAL;
>-}
>-
>-static int thermal_get_sensors(struct ibm_thermal_sensors_struct *s)
>-{
>-	int res, i;
>-	int n;
>-
>-	n = 8;
>-	i = 0;
>-
>-	if (!s)
>-		return -EINVAL;
>-
>-	if (thermal_read_mode == TPACPI_THERMAL_TPEC_16)
>-		n = 16;
>-
>-	for(i = 0 ; i < n; i++) {
>-		res = thermal_get_sensor(i, &s->temp[i]);
>-		if (res)
>-			return res;
>-	}
>-
>-	return n;
>-}
>-
> static int thermal_read(char *p)
> {
> 	int len = 0;
>@@ -2658,60 +4034,252 @@ static int ecdump_read(char *p)
> 				len += sprintf(p + len, "  %02x", v);
> 			ecdump_regs[i + j] = v;
> 		}
>-		len += sprintf(p + len, "\n");
>-		if (j != 16)
>-			break;
>+		len += sprintf(p + len, "\n");
>+		if (j != 16)
>+			break;
>+	}
>+
>+	/* These are way too dangerous to advertise openly... */
>+#if 0
>+	len += sprintf(p + len, "commands:\t0x<offset> 0x<value>"
>+		       " (<offset> is 00-ff, <value> is 00-ff)\n");
>+	len += sprintf(p + len, "commands:\t0x<offset> <value>  "
>+		       " (<offset> is 00-ff, <value> is 0-255)\n");
>+#endif
>+	return len;
>+}
>+
>+static int ecdump_write(char *buf)
>+{
>+	char *cmd;
>+	int i, v;
>+
>+	while ((cmd = next_cmd(&buf))) {
>+		if (sscanf(cmd, "0x%x 0x%x", &i, &v) == 2) {
>+			/* i and v set */
>+		} else if (sscanf(cmd, "0x%x %u", &i, &v) == 2) {
>+			/* i and v set */
>+		} else
>+			return -EINVAL;
>+		if (i >= 0 && i < 256 && v >= 0 && v < 256) {
>+			if (!acpi_ec_write(i, v))
>+				return -EIO;
>+		} else
>+			return -EINVAL;
>+	}
>+
>+	return 0;
>+}
>+
>+static struct ibm_struct ecdump_driver_data = {
>+	.name = "ecdump",
>+	.read = ecdump_read,
>+	.write = ecdump_write,
>+	.flags.experimental = 1,
>+};
>+
>+/*************************************************************************
>+ * Backlight/brightness subdriver
>+ */
>+
>+#define TPACPI_BACKLIGHT_DEV_NAME "thinkpad_screen"
>+
>+static struct backlight_device *ibm_backlight_device;
>+static int brightness_offset = 0x31;
>+static int brightness_mode;
>+static unsigned int brightness_enable = 2; /* 2 = auto, 0 = no, 1 = yes */
>+
>+static struct mutex brightness_mutex;
>+
>+/*
>+ * ThinkPads can read brightness from two places: EC 0x31, or
>+ * CMOS NVRAM byte 0x5E, bits 0-3.
>+ */
>+static int brightness_get(struct backlight_device *bd)
>+{
>+	u8 lec = 0, lcmos = 0, level = 0;
>+
>+	if (brightness_mode & 1) {
>+		if (!acpi_ec_read(brightness_offset, &lec))
>+			return -EIO;
>+		lec &= (tp_features.bright_16levels)? 0x0f : 0x07;
>+		level = lec;
>+	};
>+	if (brightness_mode & 2) {
>+		lcmos = (nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS)
>+			 & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
>+			>> TP_NVRAM_POS_LEVEL_BRIGHTNESS;
>+		lcmos &= (tp_features.bright_16levels)? 0x0f : 0x07;
>+		level = lcmos;
>+	}
>+
>+	if (brightness_mode == 3 && lec != lcmos) {
>+		printk(TPACPI_ERR
>+			"CMOS NVRAM (%u) and EC (%u) do not agree "
>+			"on display brightness level\n",
>+			(unsigned int) lcmos,
>+			(unsigned int) lec);
>+		return -EIO;
>+	}
>+
>+	return level;
>+}
>+
>+/* May return EINTR which can always be mapped to ERESTARTSYS */
>+static int brightness_set(int value)
>+{
>+	int cmos_cmd, inc, i, res;
>+	int current_value;
>+
>+	if (value > ((tp_features.bright_16levels)? 15 : 7))
>+		return -EINVAL;
>+
>+	res = mutex_lock_interruptible(&brightness_mutex);
>+	if (res < 0)
>+		return res;
>+
>+	current_value = brightness_get(NULL);
>+	if (current_value < 0) {
>+		res = current_value;
>+		goto errout;
>+	}
>+
>+	cmos_cmd = value > current_value ?
>+			TP_CMOS_BRIGHTNESS_UP :
>+			TP_CMOS_BRIGHTNESS_DOWN;
>+	inc = (value > current_value)? 1 : -1;
>+
>+	res = 0;
>+	for (i = current_value; i != value; i += inc) {
>+		if ((brightness_mode & 2) &&
>+		    issue_thinkpad_cmos_command(cmos_cmd)) {
>+			res = -EIO;
>+			goto errout;
>+		}
>+		if ((brightness_mode & 1) &&
>+		    !acpi_ec_write(brightness_offset, i + inc)) {
>+			res = -EIO;
>+			goto errout;;
>+		}
>+	}
>+
>+errout:
>+	mutex_unlock(&brightness_mutex);
>+	return res;
>+}
>+
>+/* sysfs backlight class ----------------------------------------------- */
>+
>+static int brightness_update_status(struct backlight_device *bd)
>+{
>+	/* it is the backlight class's job (caller) to handle
>+	 * EINTR and other errors properly */
>+	return brightness_set(
>+		(bd->props.fb_blank == FB_BLANK_UNBLANK &&
>+		 bd->props.power == FB_BLANK_UNBLANK) ?
>+				bd->props.brightness : 0);
>+}
>+
>+static struct backlight_ops ibm_backlight_data = {
>+	.get_brightness = brightness_get,
>+	.update_status  = brightness_update_status,
>+};
>+
>+/* --------------------------------------------------------------------- */
>+
>+static int __init tpacpi_query_bcll_levels(acpi_handle handle)
>+{
>+	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
>+	union acpi_object *obj;
>+	int rc;
>+
>+	if (ACPI_SUCCESS(acpi_evaluate_object(handle, NULL, NULL, &buffer))) {
>+		obj = (union acpi_object *)buffer.pointer;
>+		if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
>+			printk(TPACPI_ERR "Unknown BCLL data, "
>+			       "please report this to %s\n", TPACPI_MAIL);
>+			rc = 0;
>+		} else {
>+			rc = obj->package.count;
>+		}
>+	} else {
>+		return 0;
>+	}
>+
>+	kfree(buffer.pointer);
>+	return rc;
>+}
>+
>+static acpi_status __init brightness_find_bcll(acpi_handle handle, u32 lvl,
>+					void *context, void **rv)
>+{
>+	char name[ACPI_PATH_SEGMENT_LENGTH];
>+	struct acpi_buffer buffer = { sizeof(name), &name };
>+
>+	if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer)) &&
>+	    !strncmp("BCLL", name, sizeof(name) - 1)) {
>+		if (tpacpi_query_bcll_levels(handle) == 16) {
>+			*rv = handle;
>+			return AE_CTRL_TERMINATE;
>+		} else {
>+			return AE_OK;
>+		}
>+	} else {
>+		return AE_OK;
> 	}
>-
>-	/* These are way too dangerous to advertise openly... */
>-#if 0
>-	len += sprintf(p + len, "commands:\t0x<offset> 0x<value>"
>-		       " (<offset> is 00-ff, <value> is 00-ff)\n");
>-	len += sprintf(p + len, "commands:\t0x<offset> <value>  "
>-		       " (<offset> is 00-ff, <value> is 0-255)\n");
>-#endif
>-	return len;
> }
> 
>-static int ecdump_write(char *buf)
>+static int __init brightness_check_levels(void)
> {
>-	char *cmd;
>-	int i, v;
>+	int status;
>+	void *found_node = NULL;
> 
>-	while ((cmd = next_cmd(&buf))) {
>-		if (sscanf(cmd, "0x%x 0x%x", &i, &v) == 2) {
>-			/* i and v set */
>-		} else if (sscanf(cmd, "0x%x %u", &i, &v) == 2) {
>-			/* i and v set */
>-		} else
>-			return -EINVAL;
>-		if (i >= 0 && i < 256 && v >= 0 && v < 256) {
>-			if (!acpi_ec_write(i, v))
>-				return -EIO;
>-		} else
>-			return -EINVAL;
>+	if (!vid_handle) {
>+		TPACPI_ACPIHANDLE_INIT(vid);
> 	}
>+	if (!vid_handle)
>+		return 0;
> 
>-	return 0;
>+	/* Search for a BCLL package with 16 levels */
>+	status = acpi_walk_namespace(ACPI_TYPE_PACKAGE, vid_handle, 3,
>+					brightness_find_bcll, NULL,
>+					&found_node);
>+
>+	return (ACPI_SUCCESS(status) && found_node != NULL);
> }
> 
>-static struct ibm_struct ecdump_driver_data = {
>-	.name = "ecdump",
>-	.read = ecdump_read,
>-	.write = ecdump_write,
>-	.flags.experimental = 1,
>-};
>+static acpi_status __init brightness_find_bcl(acpi_handle handle, u32 lvl,
>+					void *context, void **rv)
>+{
>+	char name[ACPI_PATH_SEGMENT_LENGTH];
>+	struct acpi_buffer buffer = { sizeof(name), &name };
> 
>-/*************************************************************************
>- * Backlight/brightness subdriver
>- */
>+	if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer)) &&
>+	    !strncmp("_BCL", name, sizeof(name) - 1)) {
>+		*rv = handle;
>+		return AE_CTRL_TERMINATE;
>+	} else {
>+		return AE_OK;
>+	}
>+}
> 
>-static struct backlight_device *ibm_backlight_device = NULL;
>+static int __init brightness_check_std_acpi_support(void)
>+{
>+	int status;
>+	void *found_node = NULL;
> 
>-static struct backlight_ops ibm_backlight_data = {
>-        .get_brightness = brightness_get,
>-        .update_status  = brightness_update_status,
>-};
>+	if (!vid_handle) {
>+		TPACPI_ACPIHANDLE_INIT(vid);
>+	}
>+	if (!vid_handle)
>+		return 0;
>+
>+	/* Search for a _BCL method, but don't execute it */
>+	status = acpi_walk_namespace(ACPI_TYPE_METHOD, vid_handle, 3,
>+				     brightness_find_bcl, NULL, &found_node);
>+
>+	return (ACPI_SUCCESS(status) && found_node != NULL);
>+}
> 
> static int __init brightness_init(struct ibm_init_struct *iibm)
> {
>@@ -2719,20 +4287,58 @@ static int __init brightness_init(struct
> 
> 	vdbg_printk(TPACPI_DBG_INIT, "initializing brightness subdriver\n");
> 
>+	mutex_init(&brightness_mutex);
>+
>+	if (!brightness_enable) {
>+		dbg_printk(TPACPI_DBG_INIT,
>+			   "brightness support disabled by "
>+			   "module parameter\n");
>+		return 1;
>+	} else if (brightness_enable > 1) {
>+		if (brightness_check_std_acpi_support()) {
>+			printk(TPACPI_NOTICE
>+			       "standard ACPI backlight interface "
>+			       "available, not loading native one...\n");
>+			return 1;
>+		}
>+	}
>+
>+	if (!brightness_mode) {
>+		if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO)
>+			brightness_mode = 2;
>+		else
>+			brightness_mode = 3;
>+
>+		dbg_printk(TPACPI_DBG_INIT, "selected brightness_mode=%d\n",
>+			brightness_mode);
>+	}
>+
>+	if (brightness_mode > 3)
>+		return -EINVAL;
>+
>+	tp_features.bright_16levels =
>+			thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO &&
>+			brightness_check_levels();
>+
> 	b = brightness_get(NULL);
> 	if (b < 0)
>-		return b;
>+		return 1;
>+
>+	if (tp_features.bright_16levels)
>+		printk(TPACPI_INFO
>+		       "detected a 16-level brightness capable ThinkPad\n");
> 
> 	ibm_backlight_device = backlight_device_register(
> 					TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL,
> 					&ibm_backlight_data);
> 	if (IS_ERR(ibm_backlight_device)) {
>-		printk(IBM_ERR "Could not register backlight device\n");
>+		printk(TPACPI_ERR "Could not register backlight device\n");
> 		return PTR_ERR(ibm_backlight_device);
> 	}
> 	vdbg_printk(TPACPI_DBG_INIT, "brightness is supported\n");
> 
>-	ibm_backlight_device->props.max_brightness = 7;
>+	ibm_backlight_device->props.max_brightness =
>+				(tp_features.bright_16levels)? 15 : 7;
> 	ibm_backlight_device->props.brightness = b;
> 	backlight_update_status(ibm_backlight_device);
> 
>@@ -2749,56 +4355,20 @@ static void brightness_exit(void)
> 	}
> }
> 
>-static int brightness_update_status(struct backlight_device *bd)
>-{
>-	return brightness_set(
>-		(bd->props.fb_blank == FB_BLANK_UNBLANK &&
>-		 bd->props.power == FB_BLANK_UNBLANK) ?
>-				bd->props.brightness : 0);
>-}
>-
>-static int brightness_get(struct backlight_device *bd)
>-{
>-	u8 level;
>-	if (!acpi_ec_read(brightness_offset, &level))
>-		return -EIO;
>-
>-	level &= 0x7;
>-
>-	return level;
>-}
>-
>-static int brightness_set(int value)
>-{
>-	int cmos_cmd, inc, i;
>-	int current_value = brightness_get(NULL);
>-
>-	value &= 7;
>-
>-	cmos_cmd = value > current_value ? TP_CMOS_BRIGHTNESS_UP : TP_CMOS_BRIGHTNESS_DOWN;
>-	inc = value > current_value ? 1 : -1;
>-	for (i = current_value; i != value; i += inc) {
>-		if (issue_thinkpad_cmos_command(cmos_cmd))
>-			return -EIO;
>-		if (!acpi_ec_write(brightness_offset, i + inc))
>-			return -EIO;
>-	}
>-
>-	return 0;
>-}
>-
> static int brightness_read(char *p)
> {
> 	int len = 0;
> 	int level;
> 
>-	if ((level = brightness_get(NULL)) < 0) {
>+	level = brightness_get(NULL);
>+	if (level < 0) {
> 		len += sprintf(p + len, "level:\t\tunreadable\n");
> 	} else {
>-		len += sprintf(p + len, "level:\t\t%d\n", level & 0x7);
>+		len += sprintf(p + len, "level:\t\t%d\n", level);
> 		len += sprintf(p + len, "commands:\tup, down\n");
> 		len += sprintf(p + len, "commands:\tlevel <level>"
>-			       " (<level> is 0-7)\n");
>+			       " (<level> is 0-%d)\n",
>+			       (tp_features.bright_16levels) ? 15 : 7);
> 	}
> 
> 	return len;
>@@ -2807,28 +4377,34 @@ static int brightness_read(char *p)
> static int brightness_write(char *buf)
> {
> 	int level;
>-	int new_level;
>+	int rc;
> 	char *cmd;
>+	int max_level = (tp_features.bright_16levels) ? 15 : 7;
> 
>-	while ((cmd = next_cmd(&buf))) {
>-		if ((level = brightness_get(NULL)) < 0)
>-			return level;
>-		level &= 7;
>+	level = brightness_get(NULL);
>+	if (level < 0)
>+		return level;
> 
>+	while ((cmd = next_cmd(&buf))) {
> 		if (strlencmp(cmd, "up") == 0) {
>-			new_level = level == 7 ? 7 : level + 1;
>+			if (level < max_level)
>+				level++;
> 		} else if (strlencmp(cmd, "down") == 0) {
>-			new_level = level == 0 ? 0 : level - 1;
>-		} else if (sscanf(cmd, "level %d", &new_level) == 1 &&
>-			   new_level >= 0 && new_level <= 7) {
>-			/* new_level set */
>+			if (level > 0)
>+				level--;
>+		} else if (sscanf(cmd, "level %d", &level) == 1 &&
>+			   level >= 0 && level <= max_level) {
>+			/* new level set */
> 		} else
> 			return -EINVAL;
>-
>-		brightness_set(new_level);
> 	}
> 
>-	return 0;
>+	/*
>+	 * Now we know what the final level should be, so we try to set it.
>+	 * Doing it this way makes the syscall restartable in case of EINTR
>+	 */
>+	rc = brightness_set(level);
>+	return (rc == -EINTR)? ERESTARTSYS : rc;
> }
> 
> static struct ibm_struct brightness_driver_data = {
>@@ -2842,6 +4418,8 @@ static struct ibm_struct brightness_driv
>  * Volume subdriver
>  */
> 
>+static int volume_offset = 0x30;
>+
> static int volume_read(char *p)
> {
> 	int len = 0;
>@@ -2891,8 +4469,11 @@ static int volume_write(char *buf)
> 		} else
> 			return -EINVAL;
> 
>-		if (new_level != level) {	/* mute doesn't change */
>-			cmos_cmd = new_level > level ? TP_CMOS_VOLUME_UP : TP_CMOS_VOLUME_DOWN;
>+		if (new_level != level) {
>+			/* mute doesn't change */
>+
>+			cmos_cmd = (new_level > level) ?
>+					TP_CMOS_VOLUME_UP : TP_CMOS_VOLUME_DOWN;
> 			inc = new_level > level ? 1 : -1;
> 
> 			if (mute && (issue_thinkpad_cmos_command(cmos_cmd) ||
>@@ -2904,14 +4485,18 @@ static int volume_write(char *buf)
> 				    !acpi_ec_write(volume_offset, i + inc))
> 					return -EIO;
> 
>-			if (mute && (issue_thinkpad_cmos_command(TP_CMOS_VOLUME_MUTE) ||
>-				     !acpi_ec_write(volume_offset,
>-						    new_level + mute)))
>+			if (mute &&
>+			    (issue_thinkpad_cmos_command(TP_CMOS_VOLUME_MUTE) ||
>+			     !acpi_ec_write(volume_offset, new_level + mute))) {
> 				return -EIO;
>+			}
> 		}
> 
>-		if (new_mute != mute) {	/* level doesn't change */
>-			cmos_cmd = new_mute ? TP_CMOS_VOLUME_MUTE : TP_CMOS_VOLUME_UP;
>+		if (new_mute != mute) {
>+			/* level doesn't change */
>+
>+			cmos_cmd = (new_mute) ?
>+				   TP_CMOS_VOLUME_MUTE : TP_CMOS_VOLUME_UP;
> 
> 			if (issue_thinkpad_cmos_command(cmos_cmd) ||
> 			    !acpi_ec_write(volume_offset, level + new_mute))
>@@ -3033,483 +4618,338 @@ static struct ibm_struct volume_driver_d
>  * 	but the ACPI tables just mention level 7.
>  */
> 
>+enum {					/* Fan control constants */
>+	fan_status_offset = 0x2f,	/* EC register 0x2f */
>+	fan_rpm_offset = 0x84,		/* EC register 0x84: LSB, 0x85 MSB (RPM)
>+					 * 0x84 must be read before 0x85 */
>+
>+	TP_EC_FAN_FULLSPEED = 0x40,	/* EC fan mode: full speed */
>+	TP_EC_FAN_AUTO	    = 0x80,	/* EC fan mode: auto fan control */
>+
>+	TPACPI_FAN_LAST_LEVEL = 0x100,	/* Use cached last-seen fan level */
>+};
>+
>+enum fan_status_access_mode {
>+	TPACPI_FAN_NONE = 0,		/* No fan status or control */
>+	TPACPI_FAN_RD_ACPI_GFAN,	/* Use ACPI GFAN */
>+	TPACPI_FAN_RD_TPEC,		/* Use ACPI EC regs 0x2f, 0x84-0x85 */
>+};
>+
>+enum fan_control_access_mode {
>+	TPACPI_FAN_WR_NONE = 0,		/* No fan control */
>+	TPACPI_FAN_WR_ACPI_SFAN,	/* Use ACPI SFAN */
>+	TPACPI_FAN_WR_TPEC,		/* Use ACPI EC reg 0x2f */
>+	TPACPI_FAN_WR_ACPI_FANS,	/* Use ACPI FANS and EC reg 0x2f */
>+};
>+
>+enum fan_control_commands {
>+	TPACPI_FAN_CMD_SPEED 	= 0x0001,	/* speed command */
>+	TPACPI_FAN_CMD_LEVEL 	= 0x0002,	/* level command  */
>+	TPACPI_FAN_CMD_ENABLE	= 0x0004,	/* enable/disable cmd,
>+						 * and also watchdog cmd */
>+};
>+
>+static int fan_control_allowed;
>+
> static enum fan_status_access_mode fan_status_access_mode;
> static enum fan_control_access_mode fan_control_access_mode;
> static enum fan_control_commands fan_control_commands;
> 
> static u8 fan_control_initial_status;
> static u8 fan_control_desired_level;
>+static int fan_watchdog_maxinterval;
>+
>+static struct mutex fan_mutex;
> 
> static void fan_watchdog_fire(struct work_struct *ignored);
>-static int fan_watchdog_maxinterval;
> static DECLARE_DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire);
> 
>-IBM_HANDLE(fans, ec, "FANS");	/* X31, X40, X41 */
>-IBM_HANDLE(gfan, ec, "GFAN",	/* 570 */
>+TPACPI_HANDLE(fans, ec, "FANS");	/* X31, X40, X41 */
>+TPACPI_HANDLE(gfan, ec, "GFAN",	/* 570 */
> 	   "\\FSPD",		/* 600e/x, 770e, 770x */
> 	   );			/* all others */
>-IBM_HANDLE(sfan, ec, "SFAN",	/* 570 */
>+TPACPI_HANDLE(sfan, ec, "SFAN",	/* 570 */
> 	   "JFNS",		/* 770x-JL */
> 	   );			/* all others */
> 
> /*
>- * SYSFS fan layout: hwmon compatible (device)
>- *
>- * pwm*_enable:
>- * 	0: "disengaged" mode
>- * 	1: manual mode
>- * 	2: native EC "auto" mode (recommended, hardware default)
>- *
>- * pwm*: set speed in manual mode, ignored otherwise.
>- * 	0 is level 0; 255 is level 7. Intermediate points done with linear
>- * 	interpolation.
>- *
>- * fan*_input: tachometer reading, RPM
>- *
>- *
>- * SYSFS fan layout: extensions
>- *
>- * fan_watchdog (driver):
>- * 	fan watchdog interval in seconds, 0 disables (default), max 120
>+ * Call with fan_mutex held
>  */
>-
>-/* sysfs fan pwm1_enable ----------------------------------------------- */
>-static ssize_t fan_pwm1_enable_show(struct device *dev,
>-				    struct device_attribute *attr,
>-				    char *buf)
>-{
>-	int res, mode;
>-	u8 status;
>-
>-	res = fan_get_status_safe(&status);
>-	if (res)
>-		return res;
>-
>-	if (unlikely(tp_features.fan_ctrl_status_undef)) {
>-		if (status != fan_control_initial_status) {
>-			tp_features.fan_ctrl_status_undef = 0;
>-		} else {
>-			/* Return most likely status. In fact, it
>-			 * might be the only possible status */
>-			status = TP_EC_FAN_AUTO;
>-		}
>-	}
>-
>-	if (status & TP_EC_FAN_FULLSPEED) {
>-		mode = 0;
>-	} else if (status & TP_EC_FAN_AUTO) {
>-		mode = 2;
>-	} else
>-		mode = 1;
>-
>-	return snprintf(buf, PAGE_SIZE, "%d\n", mode);
>-}
>-
>-static ssize_t fan_pwm1_enable_store(struct device *dev,
>-				     struct device_attribute *attr,
>-				     const char *buf, size_t count)
>+static void fan_update_desired_level(u8 status)
> {
>-	unsigned long t;
>-	int res, level;
>-
>-	if (parse_strtoul(buf, 2, &t))
>-		return -EINVAL;
>-
>-	switch (t) {
>-	case 0:
>-		level = TP_EC_FAN_FULLSPEED;
>-		break;
>-	case 1:
>-		level = TPACPI_FAN_LAST_LEVEL;
>-		break;
>-	case 2:
>-		level = TP_EC_FAN_AUTO;
>-		break;
>-	case 3:
>-		/* reserved for software-controlled auto mode */
>-		return -ENOSYS;
>-	default:
>-		return -EINVAL;
>+	if ((status &
>+	     (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) {
>+		if (status > 7)
>+			fan_control_desired_level = 7;
>+		else
>+			fan_control_desired_level = status;
> 	}
>-
>-	res = fan_set_level_safe(level);
>-	if (res == -ENXIO)
>-		return -EINVAL;
>-	else if (res < 0)
>-		return res;
>-
>-	fan_watchdog_reset();
>-
>-	return count;
> }
> 
>-static struct device_attribute dev_attr_fan_pwm1_enable =
>-	__ATTR(pwm1_enable, S_IWUSR | S_IRUGO,
>-		fan_pwm1_enable_show, fan_pwm1_enable_store);
>-
>-/* sysfs fan pwm1 ------------------------------------------------------ */
>-static ssize_t fan_pwm1_show(struct device *dev,
>-			     struct device_attribute *attr,
>-			     char *buf)
>+static int fan_get_status(u8 *status)
> {
>-	int res;
>-	u8 status;
>-
>-	res = fan_get_status_safe(&status);
>-	if (res)
>-		return res;
>+	u8 s;
> 
>-	if (unlikely(tp_features.fan_ctrl_status_undef)) {
>-		if (status != fan_control_initial_status) {
>-			tp_features.fan_ctrl_status_undef = 0;
>-		} else {
>-			status = TP_EC_FAN_AUTO;
>-		}
>-	}
>+	/* TODO:
>+	 * Add TPACPI_FAN_RD_ACPI_FANS ? */
> 
>-	if ((status &
>-	     (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) != 0)
>-		status = fan_control_desired_level;
>+	switch (fan_status_access_mode) {
>+	case TPACPI_FAN_RD_ACPI_GFAN:
>+		/* 570, 600e/x, 770e, 770x */
> 
>-	if (status > 7)
>-		status = 7;
>+		if (unlikely(!acpi_evalf(gfan_handle, &s, NULL, "d")))
>+			return -EIO;
> 
>-	return snprintf(buf, PAGE_SIZE, "%u\n", (status * 255) / 7);
>-}
>+		if (likely(status))
>+			*status = s & 0x07;
> 
>-static ssize_t fan_pwm1_store(struct device *dev,
>-			      struct device_attribute *attr,
>-			      const char *buf, size_t count)
>-{
>-	unsigned long s;
>-	int rc;
>-	u8 status, newlevel;
>+		break;
> 
>-	if (parse_strtoul(buf, 255, &s))
>-		return -EINVAL;
>+	case TPACPI_FAN_RD_TPEC:
>+		/* all except 570, 600e/x, 770e, 770x */
>+		if (unlikely(!acpi_ec_read(fan_status_offset, &s)))
>+			return -EIO;
> 
>-	/* scale down from 0-255 to 0-7 */
>-	newlevel = (s >> 5) & 0x07;
>+		if (likely(status))
>+			*status = s;
> 
>-	rc = mutex_lock_interruptible(&fan_mutex);
>-	if (rc < 0)
>-		return rc;
>+		break;
> 
>-	rc = fan_get_status(&status);
>-	if (!rc && (status &
>-		    (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) {
>-		rc = fan_set_level(newlevel);
>-		if (rc == -ENXIO)
>-			rc = -EINVAL;
>-		else if (!rc) {
>-			fan_update_desired_level(newlevel);
>-			fan_watchdog_reset();
>-		}
>+	default:
>+		return -ENXIO;
> 	}
> 
>-	mutex_unlock(&fan_mutex);
>-	return (rc)? rc : count;
>+	return 0;
> }
> 
>-static struct device_attribute dev_attr_fan_pwm1 =
>-	__ATTR(pwm1, S_IWUSR | S_IRUGO,
>-		fan_pwm1_show, fan_pwm1_store);
>-
>-/* sysfs fan fan1_input ------------------------------------------------ */
>-static ssize_t fan_fan1_input_show(struct device *dev,
>-			   struct device_attribute *attr,
>-			   char *buf)
>+static int fan_get_status_safe(u8 *status)
> {
>-	int res;
>-	unsigned int speed;
>-
>-	res = fan_get_speed(&speed);
>-	if (res < 0)
>-		return res;
>+	int rc;
>+	u8 s;
> 
>-	return snprintf(buf, PAGE_SIZE, "%u\n", speed);
>-}
>+	if (mutex_lock_interruptible(&fan_mutex))
>+		return -ERESTARTSYS;
>+	rc = fan_get_status(&s);
>+	if (!rc)
>+		fan_update_desired_level(s);
>+	mutex_unlock(&fan_mutex);
> 
>-static struct device_attribute dev_attr_fan_fan1_input =
>-	__ATTR(fan1_input, S_IRUGO,
>-		fan_fan1_input_show, NULL);
>+	if (status)
>+		*status = s;
> 
>-/* sysfs fan fan_watchdog (driver) ------------------------------------- */
>-static ssize_t fan_fan_watchdog_show(struct device_driver *drv,
>-				     char *buf)
>-{
>-	return snprintf(buf, PAGE_SIZE, "%u\n", fan_watchdog_maxinterval);
>+	return rc;
> }
> 
>-static ssize_t fan_fan_watchdog_store(struct device_driver *drv,
>-				      const char *buf, size_t count)
>+static int fan_get_speed(unsigned int *speed)
> {
>-	unsigned long t;
>-
>-	if (parse_strtoul(buf, 120, &t))
>-		return -EINVAL;
>-
>-	if (!fan_control_allowed)
>-		return -EPERM;
>+	u8 hi, lo;
> 
>-	fan_watchdog_maxinterval = t;
>-	fan_watchdog_reset();
>+	switch (fan_status_access_mode) {
>+	case TPACPI_FAN_RD_TPEC:
>+		/* all except 570, 600e/x, 770e, 770x */
>+		if (unlikely(!acpi_ec_read(fan_rpm_offset, &lo) ||
>+			     !acpi_ec_read(fan_rpm_offset + 1, &hi)))
>+			return -EIO;
> 
>-	return count;
>-}
>+		if (likely(speed))
>+			*speed = (hi << 8) | lo;
> 
>-static DRIVER_ATTR(fan_watchdog, S_IWUSR | S_IRUGO,
>-		fan_fan_watchdog_show, fan_fan_watchdog_store);
>+		break;
> 
>-/* --------------------------------------------------------------------- */
>-static struct attribute *fan_attributes[] = {
>-	&dev_attr_fan_pwm1_enable.attr, &dev_attr_fan_pwm1.attr,
>-	&dev_attr_fan_fan1_input.attr,
>-	NULL
>-};
>+	default:
>+		return -ENXIO;
>+	}
> 
>-static const struct attribute_group fan_attr_group = {
>-	.attrs = fan_attributes,
>-};
>+	return 0;
>+}
> 
>-static int __init fan_init(struct ibm_init_struct *iibm)
>+static int fan_set_level(int level)
> {
>-	int rc;
>+	if (!fan_control_allowed)
>+		return -EPERM;
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "initializing fan subdriver\n");
>+	switch (fan_control_access_mode) {
>+	case TPACPI_FAN_WR_ACPI_SFAN:
>+		if (level >= 0 && level <= 7) {
>+			if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", level))
>+				return -EIO;
>+		} else
>+			return -EINVAL;
>+		break;
> 
>-	mutex_init(&fan_mutex);
>-	fan_status_access_mode = TPACPI_FAN_NONE;
>-	fan_control_access_mode = TPACPI_FAN_WR_NONE;
>-	fan_control_commands = 0;
>-	fan_watchdog_maxinterval = 0;
>-	tp_features.fan_ctrl_status_undef = 0;
>-	fan_control_desired_level = 7;
>+	case TPACPI_FAN_WR_ACPI_FANS:
>+	case TPACPI_FAN_WR_TPEC:
>+		if ((level != TP_EC_FAN_AUTO) &&
>+		    (level != TP_EC_FAN_FULLSPEED) &&
>+		    ((level < 0) || (level > 7)))
>+			return -EINVAL;
> 
>-	IBM_ACPIHANDLE_INIT(fans);
>-	IBM_ACPIHANDLE_INIT(gfan);
>-	IBM_ACPIHANDLE_INIT(sfan);
>+		/* safety net should the EC not support AUTO
>+		 * or FULLSPEED mode bits and just ignore them */
>+		if (level & TP_EC_FAN_FULLSPEED)
>+			level |= 7;	/* safety min speed 7 */
>+		else if (level & TP_EC_FAN_FULLSPEED)
>+			level |= 4;	/* safety min speed 4 */
> 
>-	if (gfan_handle) {
>-		/* 570, 600e/x, 770e, 770x */
>-		fan_status_access_mode = TPACPI_FAN_RD_ACPI_GFAN;
>-	} else {
>-		/* all other ThinkPads: note that even old-style
>-		 * ThinkPad ECs supports the fan control register */
>-		if (likely(acpi_ec_read(fan_status_offset,
>-					&fan_control_initial_status))) {
>-			fan_status_access_mode = TPACPI_FAN_RD_TPEC;
>+		if (!acpi_ec_write(fan_status_offset, level))
>+			return -EIO;
>+		else
>+			tp_features.fan_ctrl_status_undef = 0;
>+		break;
> 
>-			/* In some ThinkPads, neither the EC nor the ACPI
>-			 * DSDT initialize the fan status, and it ends up
>-			 * being set to 0x07 when it *could* be either
>-			 * 0x07 or 0x80.
>-			 *
>-			 * Enable for TP-1Y (T43), TP-78 (R51e),
>-			 * TP-76 (R52), TP-70 (T43, R52), which are known
>-			 * to be buggy. */
>-			if (fan_control_initial_status == 0x07 &&
>-			    ibm_thinkpad_ec_found &&
>-			    ((ibm_thinkpad_ec_found[0] == '1' &&
>-			      ibm_thinkpad_ec_found[1] == 'Y') ||
>-			     (ibm_thinkpad_ec_found[0] == '7' &&
>-			      (ibm_thinkpad_ec_found[1] == '6' ||
>-			       ibm_thinkpad_ec_found[1] == '8' ||
>-			       ibm_thinkpad_ec_found[1] == '0'))
>-			    )) {
>-				printk(IBM_NOTICE
>-				       "fan_init: initial fan status is "
>-				       "unknown, assuming it is in auto "
>-				       "mode\n");
>-				tp_features.fan_ctrl_status_undef = 1;
>-			}
>-		} else {
>-			printk(IBM_ERR
>-			       "ThinkPad ACPI EC access misbehaving, "
>-			       "fan status and control unavailable\n");
>-			return 1;
>-		}
>+	default:
>+		return -ENXIO;
> 	}
>+	return 0;
>+}
> 
>-	if (sfan_handle) {
>-		/* 570, 770x-JL */
>-		fan_control_access_mode = TPACPI_FAN_WR_ACPI_SFAN;
>-		fan_control_commands |=
>-		    TPACPI_FAN_CMD_LEVEL | TPACPI_FAN_CMD_ENABLE;
>-	} else {
>-		if (!gfan_handle) {
>-			/* gfan without sfan means no fan control */
>-			/* all other models implement TP EC 0x2f control */
>-
>-			if (fans_handle) {
>-				/* X31, X40, X41 */
>-				fan_control_access_mode =
>-				    TPACPI_FAN_WR_ACPI_FANS;
>-				fan_control_commands |=
>-				    TPACPI_FAN_CMD_SPEED |
>-				    TPACPI_FAN_CMD_LEVEL |
>-				    TPACPI_FAN_CMD_ENABLE;
>-			} else {
>-				fan_control_access_mode = TPACPI_FAN_WR_TPEC;
>-				fan_control_commands |=
>-				    TPACPI_FAN_CMD_LEVEL |
>-				    TPACPI_FAN_CMD_ENABLE;
>-			}
>-		}
>-	}
>+static int fan_set_level_safe(int level)
>+{
>+	int rc;
> 
>-	vdbg_printk(TPACPI_DBG_INIT, "fan is %s, modes %d, %d\n",
>-		str_supported(fan_status_access_mode != TPACPI_FAN_NONE ||
>-		  fan_control_access_mode != TPACPI_FAN_WR_NONE),
>-		fan_status_access_mode, fan_control_access_mode);
>+	if (!fan_control_allowed)
>+		return -EPERM;
> 
>-	/* fan control master switch */
>-	if (!fan_control_allowed) {
>-		fan_control_access_mode = TPACPI_FAN_WR_NONE;
>-		fan_control_commands = 0;
>-		dbg_printk(TPACPI_DBG_INIT,
>-			   "fan control features disabled by parameter\n");
>-	}
>+	if (mutex_lock_interruptible(&fan_mutex))
>+		return -ERESTARTSYS;
> 
>-	/* update fan_control_desired_level */
>-	if (fan_status_access_mode != TPACPI_FAN_NONE)
>-		fan_get_status_safe(NULL);
>+	if (level == TPACPI_FAN_LAST_LEVEL)
>+		level = fan_control_desired_level;
> 
>-	if (fan_status_access_mode != TPACPI_FAN_NONE ||
>-	    fan_control_access_mode != TPACPI_FAN_WR_NONE) {
>-		rc = sysfs_create_group(&tpacpi_pdev->dev.kobj,
>-					 &fan_attr_group);
>-		if (!(rc < 0))
>-			rc = driver_create_file(&tpacpi_pdriver.driver,
>-					&driver_attr_fan_watchdog);
>-		if (rc < 0)
>-			return rc;
>-		return 0;
>-	} else
>-		return 1;
>-}
>+	rc = fan_set_level(level);
>+	if (!rc)
>+		fan_update_desired_level(level);
> 
>-/*
>- * Call with fan_mutex held
>- */
>-static void fan_update_desired_level(u8 status)
>-{
>-	if ((status &
>-	     (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) {
>-		if (status > 7)
>-			fan_control_desired_level = 7;
>-		else
>-			fan_control_desired_level = status;
>-	}
>+	mutex_unlock(&fan_mutex);
>+	return rc;
> }
> 
>-static int fan_get_status(u8 *status)
>+static int fan_set_enable(void)
> {
> 	u8 s;
>+	int rc;
> 
>-	/* TODO:
>-	 * Add TPACPI_FAN_RD_ACPI_FANS ? */
>+	if (!fan_control_allowed)
>+		return -EPERM;
> 
>-	switch (fan_status_access_mode) {
>-	case TPACPI_FAN_RD_ACPI_GFAN:
>-		/* 570, 600e/x, 770e, 770x */
>+	if (mutex_lock_interruptible(&fan_mutex))
>+		return -ERESTARTSYS;
> 
>-		if (unlikely(!acpi_evalf(gfan_handle, &s, NULL, "d")))
>-			return -EIO;
>+	switch (fan_control_access_mode) {
>+	case TPACPI_FAN_WR_ACPI_FANS:
>+	case TPACPI_FAN_WR_TPEC:
>+		rc = fan_get_status(&s);
>+		if (rc < 0)
>+			break;
> 
>-		if (likely(status))
>-			*status = s & 0x07;
>+		/* Don't go out of emergency fan mode */
>+		if (s != 7) {
>+			s &= 0x07;
>+			s |= TP_EC_FAN_AUTO | 4; /* min fan speed 4 */
>+		}
> 
>+		if (!acpi_ec_write(fan_status_offset, s))
>+			rc = -EIO;
>+		else {
>+			tp_features.fan_ctrl_status_undef = 0;
>+			rc = 0;
>+		}
> 		break;
> 
>-	case TPACPI_FAN_RD_TPEC:
>-		/* all except 570, 600e/x, 770e, 770x */
>-		if (unlikely(!acpi_ec_read(fan_status_offset, &s)))
>-			return -EIO;
>+	case TPACPI_FAN_WR_ACPI_SFAN:
>+		rc = fan_get_status(&s);
>+		if (rc < 0)
>+			break;
> 
>-		if (likely(status))
>-			*status = s;
>+		s &= 0x07;
>+
>+		/* Set fan to at least level 4 */
>+		s |= 4;
> 
>+		if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", s))
>+			rc = -EIO;
>+		else
>+			rc = 0;
> 		break;
> 
> 	default:
>-		return -ENXIO;
>+		rc = -ENXIO;
> 	}
> 
>-	return 0;
>+	mutex_unlock(&fan_mutex);
>+	return rc;
> }
> 
>-static int fan_get_status_safe(u8 *status)
>+static int fan_set_disable(void)
> {
> 	int rc;
>-	u8 s;
> 
>-	rc = mutex_lock_interruptible(&fan_mutex);
>-	if (rc < 0)
>-		return rc;
>-	rc = fan_get_status(&s);
>-	if (!rc)
>-		fan_update_desired_level(s);
>-	mutex_unlock(&fan_mutex);
>+	if (!fan_control_allowed)
>+		return -EPERM;
> 
>-	if (status)
>-		*status = s;
>+	if (mutex_lock_interruptible(&fan_mutex))
>+		return -ERESTARTSYS;
> 
>-	return rc;
>-}
>+	rc = 0;
>+	switch (fan_control_access_mode) {
>+	case TPACPI_FAN_WR_ACPI_FANS:
>+	case TPACPI_FAN_WR_TPEC:
>+		if (!acpi_ec_write(fan_status_offset, 0x00))
>+			rc = -EIO;
>+		else {
>+			fan_control_desired_level = 0;
>+			tp_features.fan_ctrl_status_undef = 0;
>+		}
>+		break;
> 
>-static void fan_exit(void)
>-{
>-	vdbg_printk(TPACPI_DBG_EXIT, "cancelling any pending fan watchdog tasks\n");
>+	case TPACPI_FAN_WR_ACPI_SFAN:
>+		if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", 0x00))
>+			rc = -EIO;
>+		else
>+			fan_control_desired_level = 0;
>+		break;
> 
>-	/* FIXME: can we really do this unconditionally? */
>-	sysfs_remove_group(&tpacpi_pdev->dev.kobj, &fan_attr_group);
>-	driver_remove_file(&tpacpi_pdriver.driver, &driver_attr_fan_watchdog);
>+	default:
>+		rc = -ENXIO;
>+	}
> 
>-	cancel_delayed_work(&fan_watchdog_task);
>-	flush_scheduled_work();
>+
>+	mutex_unlock(&fan_mutex);
>+	return rc;
> }
> 
>-static int fan_get_speed(unsigned int *speed)
>+static int fan_set_speed(int speed)
> {
>-	u8 hi, lo;
>+	int rc;
> 
>-	switch (fan_status_access_mode) {
>-	case TPACPI_FAN_RD_TPEC:
>-		/* all except 570, 600e/x, 770e, 770x */
>-		if (unlikely(!acpi_ec_read(fan_rpm_offset, &lo) ||
>-			     !acpi_ec_read(fan_rpm_offset + 1, &hi)))
>-			return -EIO;
>+	if (!fan_control_allowed)
>+		return -EPERM;
> 
>-		if (likely(speed))
>-			*speed = (hi << 8) | lo;
>+	if (mutex_lock_interruptible(&fan_mutex))
>+		return -ERESTARTSYS;
> 
>+	rc = 0;
>+	switch (fan_control_access_mode) {
>+	case TPACPI_FAN_WR_ACPI_FANS:
>+		if (speed >= 0 && speed <= 65535) {
>+			if (!acpi_evalf(fans_handle, NULL, NULL, "vddd",
>+					speed, speed, speed))
>+				rc = -EIO;
>+		} else
>+			rc = -EINVAL;
> 		break;
> 
> 	default:
>-		return -ENXIO;
>+		rc = -ENXIO;
> 	}
> 
>-	return 0;
>-}
>-
>-static void fan_watchdog_fire(struct work_struct *ignored)
>-{
>-	int rc;
>-
>-	printk(IBM_NOTICE "fan watchdog: enabling fan\n");
>-	rc = fan_set_enable();
>-	if (rc < 0) {
>-		printk(IBM_ERR "fan watchdog: error %d while enabling fan, "
>-			"will try again later...\n", -rc);
>-		/* reschedule for later */
>-		fan_watchdog_reset();
>-	}
>+	mutex_unlock(&fan_mutex);
>+	return rc;
> }
> 
> static void fan_watchdog_reset(void)
> {
>-	static int fan_watchdog_active = 0;
>+	static int fan_watchdog_active;
> 
> 	if (fan_control_access_mode == TPACPI_FAN_WR_NONE)
> 		return;
>@@ -3517,204 +4957,384 @@ static void fan_watchdog_reset(void)
> 	if (fan_watchdog_active)
> 		cancel_delayed_work(&fan_watchdog_task);
> 
>-	if (fan_watchdog_maxinterval > 0) {
>+	if (fan_watchdog_maxinterval > 0 &&
>+	    tpacpi_lifecycle != TPACPI_LIFE_EXITING) {
> 		fan_watchdog_active = 1;
> 		if (!schedule_delayed_work(&fan_watchdog_task,
> 				msecs_to_jiffies(fan_watchdog_maxinterval
> 						 * 1000))) {
>-			printk(IBM_ERR "failed to schedule the fan watchdog, "
>+			printk(TPACPI_ERR
>+			       "failed to schedule the fan watchdog, "
> 			       "watchdog will not trigger\n");
> 		}
> 	} else
> 		fan_watchdog_active = 0;
> }
> 
>-static int fan_set_level(int level)
>+static void fan_watchdog_fire(struct work_struct *ignored)
> {
>-	if (!fan_control_allowed)
>-		return -EPERM;
>+	int rc;
> 
>-	switch (fan_control_access_mode) {
>-	case TPACPI_FAN_WR_ACPI_SFAN:
>-		if (level >= 0 && level <= 7) {
>-			if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", level))
>-				return -EIO;
>-		} else
>-			return -EINVAL;
>+	if (tpacpi_lifecycle != TPACPI_LIFE_RUNNING)
>+		return;
>+
>+	printk(TPACPI_NOTICE "fan watchdog: enabling fan\n");
>+	rc = fan_set_enable();
>+	if (rc < 0) {
>+		printk(TPACPI_ERR "fan watchdog: error %d while enabling fan, "
>+			"will try again later...\n", -rc);
>+		/* reschedule for later */
>+		fan_watchdog_reset();
>+	}
>+}
>+
>+/*
>+ * SYSFS fan layout: hwmon compatible (device)
>+ *
>+ * pwm*_enable:
>+ * 	0: "disengaged" mode
>+ * 	1: manual mode
>+ * 	2: native EC "auto" mode (recommended, hardware default)
>+ *
>+ * pwm*: set speed in manual mode, ignored otherwise.
>+ * 	0 is level 0; 255 is level 7. Intermediate points done with linear
>+ * 	interpolation.
>+ *
>+ * fan*_input: tachometer reading, RPM
>+ *
>+ *
>+ * SYSFS fan layout: extensions
>+ *
>+ * fan_watchdog (driver):
>+ * 	fan watchdog interval in seconds, 0 disables (default), max 120
>+ */
>+
>+/* sysfs fan pwm1_enable ----------------------------------------------- */
>+static ssize_t fan_pwm1_enable_show(struct device *dev,
>+				    struct device_attribute *attr,
>+				    char *buf)
>+{
>+	int res, mode;
>+	u8 status;
>+
>+	res = fan_get_status_safe(&status);
>+	if (res)
>+		return res;
>+
>+	if (unlikely(tp_features.fan_ctrl_status_undef)) {
>+		if (status != fan_control_initial_status) {
>+			tp_features.fan_ctrl_status_undef = 0;
>+		} else {
>+			/* Return most likely status. In fact, it
>+			 * might be the only possible status */
>+			status = TP_EC_FAN_AUTO;
>+		}
>+	}
>+
>+	if (status & TP_EC_FAN_FULLSPEED) {
>+		mode = 0;
>+	} else if (status & TP_EC_FAN_AUTO) {
>+		mode = 2;
>+	} else
>+		mode = 1;
>+
>+	return snprintf(buf, PAGE_SIZE, "%d\n", mode);
>+}
>+
>+static ssize_t fan_pwm1_enable_store(struct device *dev,
>+				     struct device_attribute *attr,
>+				     const char *buf, size_t count)
>+{
>+	unsigned long t;
>+	int res, level;
>+
>+	if (parse_strtoul(buf, 2, &t))
>+		return -EINVAL;
>+
>+	switch (t) {
>+	case 0:
>+		level = TP_EC_FAN_FULLSPEED;
> 		break;
>+	case 1:
>+		level = TPACPI_FAN_LAST_LEVEL;
>+		break;
>+	case 2:
>+		level = TP_EC_FAN_AUTO;
>+		break;
>+	case 3:
>+		/* reserved for software-controlled auto mode */
>+		return -ENOSYS;
>+	default:
>+		return -EINVAL;
>+	}
> 
>-	case TPACPI_FAN_WR_ACPI_FANS:
>-	case TPACPI_FAN_WR_TPEC:
>-		if ((level != TP_EC_FAN_AUTO) &&
>-		    (level != TP_EC_FAN_FULLSPEED) &&
>-		    ((level < 0) || (level > 7)))
>-			return -EINVAL;
>+	res = fan_set_level_safe(level);
>+	if (res == -ENXIO)
>+		return -EINVAL;
>+	else if (res < 0)
>+		return res;
>+
>+	fan_watchdog_reset();
>+
>+	return count;
>+}
>+
>+static struct device_attribute dev_attr_fan_pwm1_enable =
>+	__ATTR(pwm1_enable, S_IWUSR | S_IRUGO,
>+		fan_pwm1_enable_show, fan_pwm1_enable_store);
> 
>-		/* safety net should the EC not support AUTO
>-		 * or FULLSPEED mode bits and just ignore them */
>-		if (level & TP_EC_FAN_FULLSPEED)
>-			level |= 7;	/* safety min speed 7 */
>-		else if (level & TP_EC_FAN_FULLSPEED)
>-			level |= 4;	/* safety min speed 4 */
>+/* sysfs fan pwm1 ------------------------------------------------------ */
>+static ssize_t fan_pwm1_show(struct device *dev,
>+			     struct device_attribute *attr,
>+			     char *buf)
>+{
>+	int res;
>+	u8 status;
> 
>-		if (!acpi_ec_write(fan_status_offset, level))
>-			return -EIO;
>-		else
>-			tp_features.fan_ctrl_status_undef = 0;
>-		break;
>+	res = fan_get_status_safe(&status);
>+	if (res)
>+		return res;
> 
>-	default:
>-		return -ENXIO;
>+	if (unlikely(tp_features.fan_ctrl_status_undef)) {
>+		if (status != fan_control_initial_status) {
>+			tp_features.fan_ctrl_status_undef = 0;
>+		} else {
>+			status = TP_EC_FAN_AUTO;
>+		}
> 	}
>-	return 0;
>+
>+	if ((status &
>+	     (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) != 0)
>+		status = fan_control_desired_level;
>+
>+	if (status > 7)
>+		status = 7;
>+
>+	return snprintf(buf, PAGE_SIZE, "%u\n", (status * 255) / 7);
> }
> 
>-static int fan_set_level_safe(int level)
>+static ssize_t fan_pwm1_store(struct device *dev,
>+			      struct device_attribute *attr,
>+			      const char *buf, size_t count)
> {
>+	unsigned long s;
> 	int rc;
>+	u8 status, newlevel;
> 
>-	if (!fan_control_allowed)
>-		return -EPERM;
>+	if (parse_strtoul(buf, 255, &s))
>+		return -EINVAL;
> 
>-	rc = mutex_lock_interruptible(&fan_mutex);
>-	if (rc < 0)
>-		return rc;
>+	/* scale down from 0-255 to 0-7 */
>+	newlevel = (s >> 5) & 0x07;
> 
>-	if (level == TPACPI_FAN_LAST_LEVEL)
>-		level = fan_control_desired_level;
>+	if (mutex_lock_interruptible(&fan_mutex))
>+		return -ERESTARTSYS;
> 
>-	rc = fan_set_level(level);
>-	if (!rc)
>-		fan_update_desired_level(level);
>+	rc = fan_get_status(&status);
>+	if (!rc && (status &
>+		    (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) {
>+		rc = fan_set_level(newlevel);
>+		if (rc == -ENXIO)
>+			rc = -EINVAL;
>+		else if (!rc) {
>+			fan_update_desired_level(newlevel);
>+			fan_watchdog_reset();
>+		}
>+	}
> 
> 	mutex_unlock(&fan_mutex);
>-	return rc;
>+	return (rc)? rc : count;
> }
> 
>-static int fan_set_enable(void)
>+static struct device_attribute dev_attr_fan_pwm1 =
>+	__ATTR(pwm1, S_IWUSR | S_IRUGO,
>+		fan_pwm1_show, fan_pwm1_store);
>+
>+/* sysfs fan fan1_input ------------------------------------------------ */
>+static ssize_t fan_fan1_input_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
> {
>-	u8 s;
>-	int rc;
>+	int res;
>+	unsigned int speed;
> 
>-	if (!fan_control_allowed)
>-		return -EPERM;
>+	res = fan_get_speed(&speed);
>+	if (res < 0)
>+		return res;
> 
>-	rc = mutex_lock_interruptible(&fan_mutex);
>-	if (rc < 0)
>-		return rc;
>+	return snprintf(buf, PAGE_SIZE, "%u\n", speed);
>+}
> 
>-	switch (fan_control_access_mode) {
>-	case TPACPI_FAN_WR_ACPI_FANS:
>-	case TPACPI_FAN_WR_TPEC:
>-		rc = fan_get_status(&s);
>-		if (rc < 0)
>-			break;
>+static struct device_attribute dev_attr_fan_fan1_input =
>+	__ATTR(fan1_input, S_IRUGO,
>+		fan_fan1_input_show, NULL);
> 
>-		/* Don't go out of emergency fan mode */
>-		if (s != 7) {
>-			s &= 0x07;
>-			s |= TP_EC_FAN_AUTO | 4; /* min fan speed 4 */
>-		}
>+/* sysfs fan fan_watchdog (hwmon driver) ------------------------------- */
>+static ssize_t fan_fan_watchdog_show(struct device_driver *drv,
>+				     char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "%u\n", fan_watchdog_maxinterval);
>+}
> 
>-		if (!acpi_ec_write(fan_status_offset, s))
>-			rc = -EIO;
>-		else {
>-			tp_features.fan_ctrl_status_undef = 0;
>-			rc = 0;
>-		}
>-		break;
>+static ssize_t fan_fan_watchdog_store(struct device_driver *drv,
>+				      const char *buf, size_t count)
>+{
>+	unsigned long t;
> 
>-	case TPACPI_FAN_WR_ACPI_SFAN:
>-		rc = fan_get_status(&s);
>-		if (rc < 0)
>-			break;
>+	if (parse_strtoul(buf, 120, &t))
>+		return -EINVAL;
> 
>-		s &= 0x07;
>+	if (!fan_control_allowed)
>+		return -EPERM;
> 
>-		/* Set fan to at least level 4 */
>-		s |= 4;
>+	fan_watchdog_maxinterval = t;
>+	fan_watchdog_reset();
> 
>-		if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", s))
>-			rc= -EIO;
>-		else
>-			rc = 0;
>-		break;
>+	return count;
>+}
> 
>-	default:
>-		rc = -ENXIO;
>-	}
>+static DRIVER_ATTR(fan_watchdog, S_IWUSR | S_IRUGO,
>+		fan_fan_watchdog_show, fan_fan_watchdog_store);
> 
>-	mutex_unlock(&fan_mutex);
>-	return rc;
>-}
>+/* --------------------------------------------------------------------- */
>+static struct attribute *fan_attributes[] = {
>+	&dev_attr_fan_pwm1_enable.attr, &dev_attr_fan_pwm1.attr,
>+	&dev_attr_fan_fan1_input.attr,
>+	NULL
>+};
> 
>-static int fan_set_disable(void)
>+static const struct attribute_group fan_attr_group = {
>+	.attrs = fan_attributes,
>+};
>+
>+static int __init fan_init(struct ibm_init_struct *iibm)
> {
> 	int rc;
> 
>-	if (!fan_control_allowed)
>-		return -EPERM;
>+	vdbg_printk(TPACPI_DBG_INIT, "initializing fan subdriver\n");
> 
>-	rc = mutex_lock_interruptible(&fan_mutex);
>-	if (rc < 0)
>-		return rc;
>+	mutex_init(&fan_mutex);
>+	fan_status_access_mode = TPACPI_FAN_NONE;
>+	fan_control_access_mode = TPACPI_FAN_WR_NONE;
>+	fan_control_commands = 0;
>+	fan_watchdog_maxinterval = 0;
>+	tp_features.fan_ctrl_status_undef = 0;
>+	fan_control_desired_level = 7;
> 
>-	rc = 0;
>-	switch (fan_control_access_mode) {
>-	case TPACPI_FAN_WR_ACPI_FANS:
>-	case TPACPI_FAN_WR_TPEC:
>-		if (!acpi_ec_write(fan_status_offset, 0x00))
>-			rc = -EIO;
>-		else {
>-			fan_control_desired_level = 0;
>-			tp_features.fan_ctrl_status_undef = 0;
>+	TPACPI_ACPIHANDLE_INIT(fans);
>+	TPACPI_ACPIHANDLE_INIT(gfan);
>+	TPACPI_ACPIHANDLE_INIT(sfan);
>+
>+	if (gfan_handle) {
>+		/* 570, 600e/x, 770e, 770x */
>+		fan_status_access_mode = TPACPI_FAN_RD_ACPI_GFAN;
>+	} else {
>+		/* all other ThinkPads: note that even old-style
>+		 * ThinkPad ECs supports the fan control register */
>+		if (likely(acpi_ec_read(fan_status_offset,
>+					&fan_control_initial_status))) {
>+			fan_status_access_mode = TPACPI_FAN_RD_TPEC;
>+
>+			/* In some ThinkPads, neither the EC nor the ACPI
>+			 * DSDT initialize the fan status, and it ends up
>+			 * being set to 0x07 when it *could* be either
>+			 * 0x07 or 0x80.
>+			 *
>+			 * Enable for TP-1Y (T43), TP-78 (R51e),
>+			 * TP-76 (R52), TP-70 (T43, R52), which are known
>+			 * to be buggy. */
>+			if (fan_control_initial_status == 0x07) {
>+				switch (thinkpad_id.ec_model) {
>+				case 0x5931: /* TP-1Y */
>+				case 0x3837: /* TP-78 */
>+				case 0x3637: /* TP-76 */
>+				case 0x3037: /* TP-70 */
>+					printk(TPACPI_NOTICE
>+					       "fan_init: initial fan status "
>+					       "is unknown, assuming it is "
>+					       "in auto mode\n");
>+					tp_features.fan_ctrl_status_undef = 1;
>+					;;
>+				}
>+			}
>+		} else {
>+			printk(TPACPI_ERR
>+			       "ThinkPad ACPI EC access misbehaving, "
>+			       "fan status and control unavailable\n");
>+			return 1;
> 		}
>-		break;
>+	}
> 
>-	case TPACPI_FAN_WR_ACPI_SFAN:
>-		if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", 0x00))
>-			rc = -EIO;
>-		else
>-			fan_control_desired_level = 0;
>-		break;
>+	if (sfan_handle) {
>+		/* 570, 770x-JL */
>+		fan_control_access_mode = TPACPI_FAN_WR_ACPI_SFAN;
>+		fan_control_commands |=
>+		    TPACPI_FAN_CMD_LEVEL | TPACPI_FAN_CMD_ENABLE;
>+	} else {
>+		if (!gfan_handle) {
>+			/* gfan without sfan means no fan control */
>+			/* all other models implement TP EC 0x2f control */
> 
>-	default:
>-		rc = -ENXIO;
>+			if (fans_handle) {
>+				/* X31, X40, X41 */
>+				fan_control_access_mode =
>+				    TPACPI_FAN_WR_ACPI_FANS;
>+				fan_control_commands |=
>+				    TPACPI_FAN_CMD_SPEED |
>+				    TPACPI_FAN_CMD_LEVEL |
>+				    TPACPI_FAN_CMD_ENABLE;
>+			} else {
>+				fan_control_access_mode = TPACPI_FAN_WR_TPEC;
>+				fan_control_commands |=
>+				    TPACPI_FAN_CMD_LEVEL |
>+				    TPACPI_FAN_CMD_ENABLE;
>+			}
>+		}
> 	}
> 
>+	vdbg_printk(TPACPI_DBG_INIT, "fan is %s, modes %d, %d\n",
>+		str_supported(fan_status_access_mode != TPACPI_FAN_NONE ||
>+		  fan_control_access_mode != TPACPI_FAN_WR_NONE),
>+		fan_status_access_mode, fan_control_access_mode);
> 
>-	mutex_unlock(&fan_mutex);
>-	return rc;
>+	/* fan control master switch */
>+	if (!fan_control_allowed) {
>+		fan_control_access_mode = TPACPI_FAN_WR_NONE;
>+		fan_control_commands = 0;
>+		dbg_printk(TPACPI_DBG_INIT,
>+			   "fan control features disabled by parameter\n");
>+	}
>+
>+	/* update fan_control_desired_level */
>+	if (fan_status_access_mode != TPACPI_FAN_NONE)
>+		fan_get_status_safe(NULL);
>+
>+	if (fan_status_access_mode != TPACPI_FAN_NONE ||
>+	    fan_control_access_mode != TPACPI_FAN_WR_NONE) {
>+		rc = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj,
>+					 &fan_attr_group);
>+		if (!(rc < 0))
>+			rc = driver_create_file(&tpacpi_hwmon_pdriver.driver,
>+					&driver_attr_fan_watchdog);
>+		if (rc < 0)
>+			return rc;
>+		return 0;
>+	} else
>+		return 1;
> }
> 
>-static int fan_set_speed(int speed)
>+static void fan_exit(void)
> {
>-	int rc;
>-
>-	if (!fan_control_allowed)
>-		return -EPERM;
>-
>-	rc = mutex_lock_interruptible(&fan_mutex);
>-	if (rc < 0)
>-		return rc;
>-
>-	rc = 0;
>-	switch (fan_control_access_mode) {
>-	case TPACPI_FAN_WR_ACPI_FANS:
>-		if (speed >= 0 && speed <= 65535) {
>-			if (!acpi_evalf(fans_handle, NULL, NULL, "vddd",
>-					speed, speed, speed))
>-				rc = -EIO;
>-		} else
>-			rc = -EINVAL;
>-		break;
>+	vdbg_printk(TPACPI_DBG_EXIT,
>+		    "cancelling any pending fan watchdog tasks\n");
> 
>-	default:
>-		rc = -ENXIO;
>-	}
>+	/* FIXME: can we really do this unconditionally? */
>+	sysfs_remove_group(&tpacpi_sensors_pdev->dev.kobj, &fan_attr_group);
>+	driver_remove_file(&tpacpi_hwmon_pdriver.driver,
>+			   &driver_attr_fan_watchdog);
> 
>-	mutex_unlock(&fan_mutex);
>-	return rc;
>+	cancel_delayed_work(&fan_watchdog_task);
>+	flush_scheduled_work();
> }
> 
> static int fan_read(char *p)
>@@ -3727,7 +5347,8 @@ static int fan_read(char *p)
> 	switch (fan_status_access_mode) {
> 	case TPACPI_FAN_RD_ACPI_GFAN:
> 		/* 570, 600e/x, 770e, 770x */
>-		if ((rc = fan_get_status_safe(&status)) < 0)
>+		rc = fan_get_status_safe(&status);
>+		if (rc < 0)
> 			return rc;
> 
> 		len += sprintf(p + len, "status:\t\t%s\n"
>@@ -3737,7 +5358,8 @@ static int fan_read(char *p)
> 
> 	case TPACPI_FAN_RD_TPEC:
> 		/* all except 570, 600e/x, 770e, 770x */
>-		if ((rc = fan_get_status_safe(&status)) < 0)
>+		rc = fan_get_status_safe(&status);
>+		if (rc < 0)
> 			return rc;
> 
> 		if (unlikely(tp_features.fan_ctrl_status_undef)) {
>@@ -3752,7 +5374,8 @@ static int fan_read(char *p)
> 		len += sprintf(p + len, "status:\t\t%s\n",
> 			       (status != 0) ? "enabled" : "disabled");
> 
>-		if ((rc = fan_get_speed(&speed)) < 0)
>+		rc = fan_get_speed(&speed);
>+		if (rc < 0)
> 			return rc;
> 
> 		len += sprintf(p + len, "speed:\t\t%d\n", speed);
>@@ -3788,8 +5411,8 @@ static int fan_read(char *p)
> 
> 	if (fan_control_commands & TPACPI_FAN_CMD_ENABLE)
> 		len += sprintf(p + len, "commands:\tenable, disable\n"
>-			       "commands:\twatchdog <timeout> (<timeout> is 0 (off), "
>-			       "1-120 (seconds))\n");
>+			       "commands:\twatchdog <timeout> (<timeout> "
>+			       "is 0 (off), 1-120 (seconds))\n");
> 
> 	if (fan_control_commands & TPACPI_FAN_CMD_SPEED)
> 		len += sprintf(p + len, "commands:\tspeed <speed>"
>@@ -3805,13 +5428,14 @@ static int fan_write_cmd_level(const cha
> 	if (strlencmp(cmd, "level auto") == 0)
> 		level = TP_EC_FAN_AUTO;
> 	else if ((strlencmp(cmd, "level disengaged") == 0) |
>-	         (strlencmp(cmd, "level full-speed") == 0))
>+			(strlencmp(cmd, "level full-speed") == 0))
> 		level = TP_EC_FAN_FULLSPEED;
> 	else if (sscanf(cmd, "level %d", &level) != 1)
> 		return 0;
> 
>-	if ((*rc = fan_set_level_safe(level)) == -ENXIO)
>-		printk(IBM_ERR "level command accepted for unsupported "
>+	*rc = fan_set_level_safe(level);
>+	if (*rc == -ENXIO)
>+		printk(TPACPI_ERR "level command accepted for unsupported "
> 		       "access mode %d", fan_control_access_mode);
> 
> 	return 1;
>@@ -3822,8 +5446,9 @@ static int fan_write_cmd_enable(const ch
> 	if (strlencmp(cmd, "enable") != 0)
> 		return 0;
> 
>-	if ((*rc = fan_set_enable()) == -ENXIO)
>-		printk(IBM_ERR "enable command accepted for unsupported "
>+	*rc = fan_set_enable();
>+	if (*rc == -ENXIO)
>+		printk(TPACPI_ERR "enable command accepted for unsupported "
> 		       "access mode %d", fan_control_access_mode);
> 
> 	return 1;
>@@ -3834,8 +5459,9 @@ static int fan_write_cmd_disable(const c
> 	if (strlencmp(cmd, "disable") != 0)
> 		return 0;
> 
>-	if ((*rc = fan_set_disable()) == -ENXIO)
>-		printk(IBM_ERR "disable command accepted for unsupported "
>+	*rc = fan_set_disable();
>+	if (*rc == -ENXIO)
>+		printk(TPACPI_ERR "disable command accepted for unsupported "
> 		       "access mode %d", fan_control_access_mode);
> 
> 	return 1;
>@@ -3851,8 +5477,9 @@ static int fan_write_cmd_speed(const cha
> 	if (sscanf(cmd, "speed %d", &speed) != 1)
> 		return 0;
> 
>-	if ((*rc = fan_set_speed(speed)) == -ENXIO)
>-		printk(IBM_ERR "speed command accepted for unsupported "
>+	*rc = fan_set_speed(speed);
>+	if (*rc == -ENXIO)
>+		printk(TPACPI_ERR "speed command accepted for unsupported "
> 		       "access mode %d", fan_control_access_mode);
> 
> 	return 1;
>@@ -3911,17 +5538,28 @@ static struct ibm_struct fan_driver_data
>  ****************************************************************************
>  ****************************************************************************/
> 
>-/* /proc support */
>-static struct proc_dir_entry *proc_dir = NULL;
>+/* sysfs name ---------------------------------------------------------- */
>+static ssize_t thinkpad_acpi_pdev_name_show(struct device *dev,
>+			   struct device_attribute *attr,
>+			   char *buf)
>+{
>+	return snprintf(buf, PAGE_SIZE, "%s\n", TPACPI_NAME);
>+}
> 
>-/* Subdriver registry */
>-static LIST_HEAD(tpacpi_all_drivers);
>+static struct device_attribute dev_attr_thinkpad_acpi_pdev_name =
>+	__ATTR(name, S_IRUGO, thinkpad_acpi_pdev_name_show, NULL);
>+
>+/* --------------------------------------------------------------------- */
> 
>+/* /proc support */
>+static struct proc_dir_entry *proc_dir;
> 
> /*
>  * Module and infrastructure proble, init and exit handling
>  */
> 
>+static int force_load;
>+
> #ifdef CONFIG_THINKPAD_ACPI_DEBUG
> static const char * __init str_supported(int is_supported)
> {
>@@ -3931,6 +5569,48 @@ static const char * __init str_supported
> }
> #endif /* CONFIG_THINKPAD_ACPI_DEBUG */
> 
>+static void ibm_exit(struct ibm_struct *ibm)
>+{
>+	dbg_printk(TPACPI_DBG_EXIT, "removing %s\n", ibm->name);
>+
>+	list_del_init(&ibm->all_drivers);
>+
>+	if (ibm->flags.acpi_notify_installed) {
>+		dbg_printk(TPACPI_DBG_EXIT,
>+			"%s: acpi_remove_notify_handler\n", ibm->name);
>+		BUG_ON(!ibm->acpi);
>+		acpi_remove_notify_handler(*ibm->acpi->handle,
>+					   ibm->acpi->type,
>+					   dispatch_acpi_notify);
>+		ibm->flags.acpi_notify_installed = 0;
>+		ibm->flags.acpi_notify_installed = 0;
>+	}
>+
>+	if (ibm->flags.proc_created) {
>+		dbg_printk(TPACPI_DBG_EXIT,
>+			"%s: remove_proc_entry\n", ibm->name);
>+		remove_proc_entry(ibm->name, proc_dir);
>+		ibm->flags.proc_created = 0;
>+	}
>+
>+	if (ibm->flags.acpi_driver_registered) {
>+		dbg_printk(TPACPI_DBG_EXIT,
>+			"%s: acpi_bus_unregister_driver\n", ibm->name);
>+		BUG_ON(!ibm->acpi);
>+		acpi_bus_unregister_driver(ibm->acpi->driver);
>+		kfree(ibm->acpi->driver);
>+		ibm->acpi->driver = NULL;
>+		ibm->flags.acpi_driver_registered = 0;
>+	}
>+
>+	if (ibm->flags.init_called && ibm->exit) {
>+		ibm->exit();
>+		ibm->flags.init_called = 0;
>+	}
>+
>+	dbg_printk(TPACPI_DBG_INIT, "finished removing %s\n", ibm->name);
>+}
>+
> static int __init ibm_init(struct ibm_init_struct *iibm)
> {
> 	int ret;
>@@ -3967,7 +5647,7 @@ static int __init ibm_init(struct ibm_in
> 		if (ibm->acpi->notify) {
> 			ret = setup_acpi_notify(ibm);
> 			if (ret == -ENODEV) {
>-				printk(IBM_NOTICE "disabling subdriver %s\n",
>+				printk(TPACPI_NOTICE "disabling subdriver %s\n",
> 					ibm->name);
> 				ret = 0;
> 				goto err_out;
>@@ -3985,7 +5665,7 @@ static int __init ibm_init(struct ibm_in
> 					  S_IFREG | S_IRUGO | S_IWUSR,
> 					  proc_dir);
> 		if (!entry) {
>-			printk(IBM_ERR "unable to create proc entry %s\n",
>+			printk(TPACPI_ERR "unable to create proc entry %s\n",
> 			       ibm->name);
> 			ret = -ENODEV;
> 			goto err_out;
>@@ -4011,57 +5691,32 @@ err_out:
> 	return (ret < 0)? ret : 0;
> }
> 
>-static void ibm_exit(struct ibm_struct *ibm)
>-{
>-	dbg_printk(TPACPI_DBG_EXIT, "removing %s\n", ibm->name);
>-
>-	list_del_init(&ibm->all_drivers);
>-
>-	if (ibm->flags.acpi_notify_installed) {
>-		dbg_printk(TPACPI_DBG_EXIT,
>-			"%s: acpi_remove_notify_handler\n", ibm->name);
>-		BUG_ON(!ibm->acpi);
>-		acpi_remove_notify_handler(*ibm->acpi->handle,
>-					   ibm->acpi->type,
>-					   dispatch_acpi_notify);
>-		ibm->flags.acpi_notify_installed = 0;
>-		ibm->flags.acpi_notify_installed = 0;
>-	}
>-
>-	if (ibm->flags.proc_created) {
>-		dbg_printk(TPACPI_DBG_EXIT,
>-			"%s: remove_proc_entry\n", ibm->name);
>-		remove_proc_entry(ibm->name, proc_dir);
>-		ibm->flags.proc_created = 0;
>-	}
>-
>-	if (ibm->flags.acpi_driver_registered) {
>-		dbg_printk(TPACPI_DBG_EXIT,
>-			"%s: acpi_bus_unregister_driver\n", ibm->name);
>-		BUG_ON(!ibm->acpi);
>-		acpi_bus_unregister_driver(ibm->acpi->driver);
>-		kfree(ibm->acpi->driver);
>-		ibm->acpi->driver = NULL;
>-		ibm->flags.acpi_driver_registered = 0;
>-	}
>-
>-	if (ibm->flags.init_called && ibm->exit) {
>-		ibm->exit();
>-		ibm->flags.init_called = 0;
>-	}
>-
>-	dbg_printk(TPACPI_DBG_INIT, "finished removing %s\n", ibm->name);
>-}
>-
> /* Probing */
> 
>-static char *ibm_thinkpad_ec_found = NULL;
>-
>-static char* __init check_dmi_for_ec(void)
>+static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
> {
> 	struct dmi_device *dev = NULL;
> 	char ec_fw_string[18];
> 
>+	if (!tp)
>+		return;
>+
>+	memset(tp, 0, sizeof(*tp));
>+
>+	if (dmi_name_in_vendors("IBM"))
>+		tp->vendor = PCI_VENDOR_ID_IBM;
>+	else if (dmi_name_in_vendors("LENOVO"))
>+		tp->vendor = PCI_VENDOR_ID_LENOVO;
>+	else
>+		return;
>+
>+	tp->bios_version_str = kstrdup(dmi_get_system_info(DMI_BIOS_VERSION),
>+					GFP_KERNEL);
>+	if (!tp->bios_version_str)
>+		return;
>+	tp->bios_model = tp->bios_version_str[0]
>+			 | (tp->bios_version_str[1] << 8);
>+
> 	/*
> 	 * ThinkPad T23 or newer, A31 or newer, R50e or newer,
> 	 * X32 or newer, all Z series;  Some models must have an
>@@ -4075,10 +5730,20 @@ static char* __init check_dmi_for_ec(voi
> 			   ec_fw_string) == 1) {
> 			ec_fw_string[sizeof(ec_fw_string) - 1] = 0;
> 			ec_fw_string[strcspn(ec_fw_string, " ]")] = 0;
>-			return kstrdup(ec_fw_string, GFP_KERNEL);
>+
>+			tp->ec_version_str = kstrdup(ec_fw_string, GFP_KERNEL);
>+			tp->ec_model = ec_fw_string[0]
>+					| (ec_fw_string[1] << 8);
>+			break;
> 		}
> 	}
>-	return NULL;
>+
>+	tp->model_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_VERSION),
>+					GFP_KERNEL);
>+	if (strnicmp(tp->model_str, "ThinkPad", 8) != 0) {
>+		kfree(tp->model_str);
>+		tp->model_str = NULL;
>+	}
> }
> 
> static int __init probe_for_thinkpad(void)
>@@ -4092,13 +5757,13 @@ static int __init probe_for_thinkpad(voi
> 	 * Non-ancient models have better DMI tagging, but very old models
> 	 * don't.
> 	 */
>-	is_thinkpad = dmi_name_in_vendors("ThinkPad");
>+	is_thinkpad = (thinkpad_id.model_str != NULL);
> 
> 	/* ec is required because many other handles are relative to it */
>-	IBM_ACPIHANDLE_INIT(ec);
>+	TPACPI_ACPIHANDLE_INIT(ec);
> 	if (!ec_handle) {
> 		if (is_thinkpad)
>-			printk(IBM_ERR
>+			printk(TPACPI_ERR
> 				"Not yet supported ThinkPad detected!\n");
> 		return -ENODEV;
> 	}
>@@ -4108,7 +5773,7 @@ static int __init probe_for_thinkpad(voi
> 	 * false positives a damn great deal
> 	 */
> 	if (!is_thinkpad)
>-		is_thinkpad = dmi_name_in_vendors("IBM");
>+		is_thinkpad = (thinkpad_id.vendor == PCI_VENDOR_ID_IBM);
> 
> 	if (!is_thinkpad && !force_load)
> 		return -ENODEV;
>@@ -4197,9 +5862,15 @@ static int __init set_ibm_param(const ch
> 	unsigned int i;
> 	struct ibm_struct *ibm;
> 
>+	if (!kp || !kp->name || !val)
>+		return -EINVAL;
>+
> 	for (i = 0; i < ARRAY_SIZE(ibms_init); i++) {
> 		ibm = ibms_init[i].data;
>-		BUG_ON(ibm == NULL);
>+		WARN_ON(ibm == NULL);
>+
>+		if (!ibm || !ibm->name)
>+			continue;
> 
> 		if (strcmp(ibm->name, kp->name) == 0 && ibm->write) {
> 			if (strlen(val) > sizeof(ibms_init[i].param) - 2)
>@@ -4213,56 +5884,139 @@ static int __init set_ibm_param(const ch
> 	return -EINVAL;
> }
> 
>-static int experimental;
> module_param(experimental, int, 0);
>+MODULE_PARM_DESC(experimental,
>+		 "Enables experimental features when non-zero");
> 
>-static u32 dbg_level;
> module_param_named(debug, dbg_level, uint, 0);
>+MODULE_PARM_DESC(debug, "Sets debug level bit-mask");
> 
>-static int force_load;
>-module_param(force_load, int, 0);
>-
>-static int fan_control_allowed;
>-module_param_named(fan_control, fan_control_allowed, int, 0);
>-
>-#define IBM_PARAM(feature) \
>-	module_param_call(feature, set_ibm_param, NULL, NULL, 0)
>-
>-IBM_PARAM(hotkey);
>-IBM_PARAM(bluetooth);
>-IBM_PARAM(video);
>-IBM_PARAM(light);
>+module_param(force_load, bool, 0);
>+MODULE_PARM_DESC(force_load,
>+		 "Attempts to load the driver even on a "
>+		 "mis-identified ThinkPad when true");
>+
>+module_param_named(fan_control, fan_control_allowed, bool, 0);
>+MODULE_PARM_DESC(fan_control,
>+		 "Enables setting fan parameters features when true");
>+
>+module_param_named(brightness_mode, brightness_mode, int, 0);
>+MODULE_PARM_DESC(brightness_mode,
>+		 "Selects brightness control strategy: "
>+		 "0=auto, 1=EC, 2=CMOS, 3=both");
>+
>+module_param(brightness_enable, uint, 0);
>+MODULE_PARM_DESC(brightness_enable,
>+		 "Enables backlight control when 1, disables when 0");
>+
>+module_param(hotkey_report_mode, uint, 0);
>+MODULE_PARM_DESC(hotkey_report_mode,
>+		 "used for backwards compatibility with userspace, "
>+		 "see documentation");
>+
>+#define TPACPI_PARAM(feature) \
>+	module_param_call(feature, set_ibm_param, NULL, NULL, 0); \
>+	MODULE_PARM_DESC(feature, "Simulates thinkpad-aci procfs command " \
>+			 "at module load, see documentation")
>+
>+TPACPI_PARAM(hotkey);
>+TPACPI_PARAM(bluetooth);
>+TPACPI_PARAM(video);
>+TPACPI_PARAM(light);
> #ifdef CONFIG_THINKPAD_ACPI_DOCK
>-IBM_PARAM(dock);
>+TPACPI_PARAM(dock);
> #endif
> #ifdef CONFIG_THINKPAD_ACPI_BAY
>-IBM_PARAM(bay);
>+TPACPI_PARAM(bay);
> #endif /* CONFIG_THINKPAD_ACPI_BAY */
>-IBM_PARAM(cmos);
>-IBM_PARAM(led);
>-IBM_PARAM(beep);
>-IBM_PARAM(ecdump);
>-IBM_PARAM(brightness);
>-IBM_PARAM(volume);
>-IBM_PARAM(fan);
>+TPACPI_PARAM(cmos);
>+TPACPI_PARAM(led);
>+TPACPI_PARAM(beep);
>+TPACPI_PARAM(ecdump);
>+TPACPI_PARAM(brightness);
>+TPACPI_PARAM(volume);
>+TPACPI_PARAM(fan);
>+
>+static void thinkpad_acpi_module_exit(void)
>+{
>+	struct ibm_struct *ibm, *itmp;
>+
>+	tpacpi_lifecycle = TPACPI_LIFE_EXITING;
>+
>+	list_for_each_entry_safe_reverse(ibm, itmp,
>+					 &tpacpi_all_drivers,
>+					 all_drivers) {
>+		ibm_exit(ibm);
>+	}
>+
>+	dbg_printk(TPACPI_DBG_INIT, "finished subdriver exit path...\n");
>+
>+	if (tpacpi_inputdev) {
>+		if (tp_features.input_device_registered)
>+			input_unregister_device(tpacpi_inputdev);
>+		else
>+			input_free_device(tpacpi_inputdev);
>+	}
>+
>+	if (tpacpi_hwmon)
>+		hwmon_device_unregister(tpacpi_hwmon);
>+
>+	if (tp_features.sensors_pdev_attrs_registered)
>+		device_remove_file(&tpacpi_sensors_pdev->dev,
>+				   &dev_attr_thinkpad_acpi_pdev_name);
>+	if (tpacpi_sensors_pdev)
>+		platform_device_unregister(tpacpi_sensors_pdev);
>+	if (tpacpi_pdev)
>+		platform_device_unregister(tpacpi_pdev);
>+
>+	if (tp_features.sensors_pdrv_attrs_registered)
>+		tpacpi_remove_driver_attributes(&tpacpi_hwmon_pdriver.driver);
>+	if (tp_features.platform_drv_attrs_registered)
>+		tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
>+
>+	if (tp_features.sensors_pdrv_registered)
>+		platform_driver_unregister(&tpacpi_hwmon_pdriver);
>+
>+	if (tp_features.platform_drv_registered)
>+		platform_driver_unregister(&tpacpi_pdriver);
>+
>+	if (proc_dir)
>+		remove_proc_entry(TPACPI_PROC_DIR, acpi_root_dir);
>+
>+	kfree(thinkpad_id.bios_version_str);
>+	kfree(thinkpad_id.ec_version_str);
>+	kfree(thinkpad_id.model_str);
>+}
>+
> 
> static int __init thinkpad_acpi_module_init(void)
> {
> 	int ret, i;
> 
>+	tpacpi_lifecycle = TPACPI_LIFE_INIT;
>+
>+	/* Parameter checking */
>+	if (hotkey_report_mode > 2)
>+		return -EINVAL;
>+
> 	/* Driver-level probe */
>+
>+	get_thinkpad_model_data(&thinkpad_id);
> 	ret = probe_for_thinkpad();
>-	if (ret)
>+	if (ret) {
>+		thinkpad_acpi_module_exit();
> 		return ret;
>+	}
> 
> 	/* Driver initialization */
>-	ibm_thinkpad_ec_found = check_dmi_for_ec();
>-	IBM_ACPIHANDLE_INIT(ecrd);
>-	IBM_ACPIHANDLE_INIT(ecwr);
> 
>-	proc_dir = proc_mkdir(IBM_PROC_DIR, acpi_root_dir);
>+	TPACPI_ACPIHANDLE_INIT(ecrd);
>+	TPACPI_ACPIHANDLE_INIT(ecwr);
>+
>+	proc_dir = proc_mkdir(TPACPI_PROC_DIR, acpi_root_dir);
> 	if (!proc_dir) {
>-		printk(IBM_ERR "unable to create proc dir " IBM_PROC_DIR);
>+		printk(TPACPI_ERR
>+		       "unable to create proc dir " TPACPI_PROC_DIR);
> 		thinkpad_acpi_module_exit();
> 		return -ENODEV;
> 	}
>@@ -4270,36 +6024,92 @@ static int __init thinkpad_acpi_module_i
> 
> 	ret = platform_driver_register(&tpacpi_pdriver);
> 	if (ret) {
>-		printk(IBM_ERR "unable to register platform driver\n");
>+		printk(TPACPI_ERR
>+		       "unable to register main platform driver\n");
> 		thinkpad_acpi_module_exit();
> 		return ret;
> 	}
>+	tp_features.platform_drv_registered = 1;
>+
>+	ret = platform_driver_register(&tpacpi_hwmon_pdriver);
>+	if (ret) {
>+		printk(TPACPI_ERR
>+		       "unable to register hwmon platform driver\n");
>+		thinkpad_acpi_module_exit();
>+		return ret;
>+	}
>+	tp_features.sensors_pdrv_registered = 1;
>+
> 	ret = tpacpi_create_driver_attributes(&tpacpi_pdriver.driver);
>+	if (!ret) {
>+		tp_features.platform_drv_attrs_registered = 1;
>+		ret = tpacpi_create_driver_attributes(
>+					&tpacpi_hwmon_pdriver.driver);
>+	}
> 	if (ret) {
>-		printk(IBM_ERR "unable to create sysfs driver attributes\n");
>+		printk(TPACPI_ERR
>+		       "unable to create sysfs driver attributes\n");
> 		thinkpad_acpi_module_exit();
> 		return ret;
> 	}
>+	tp_features.sensors_pdrv_attrs_registered = 1;
> 
> 
> 	/* Device initialization */
>-	tpacpi_pdev = platform_device_register_simple(IBM_DRVR_NAME, -1,
>+	tpacpi_pdev = platform_device_register_simple(TPACPI_DRVR_NAME, -1,
> 							NULL, 0);
> 	if (IS_ERR(tpacpi_pdev)) {
> 		ret = PTR_ERR(tpacpi_pdev);
> 		tpacpi_pdev = NULL;
>-		printk(IBM_ERR "unable to register platform device\n");
>+		printk(TPACPI_ERR "unable to register platform device\n");
>+		thinkpad_acpi_module_exit();
>+		return ret;
>+	}
>+	tpacpi_sensors_pdev = platform_device_register_simple(
>+						TPACPI_HWMON_DRVR_NAME,
>+						-1, NULL, 0);
>+	if (IS_ERR(tpacpi_sensors_pdev)) {
>+		ret = PTR_ERR(tpacpi_sensors_pdev);
>+		tpacpi_sensors_pdev = NULL;
>+		printk(TPACPI_ERR
>+		       "unable to register hwmon platform device\n");
>+		thinkpad_acpi_module_exit();
>+		return ret;
>+	}
>+	ret = device_create_file(&tpacpi_sensors_pdev->dev,
>+				 &dev_attr_thinkpad_acpi_pdev_name);
>+	if (ret) {
>+		printk(TPACPI_ERR
>+		       "unable to create sysfs hwmon device attributes\n");
> 		thinkpad_acpi_module_exit();
> 		return ret;
> 	}
>-	tpacpi_hwmon = hwmon_device_register(&tpacpi_pdev->dev);
>+	tp_features.sensors_pdev_attrs_registered = 1;
>+	tpacpi_hwmon = hwmon_device_register(&tpacpi_sensors_pdev->dev);
> 	if (IS_ERR(tpacpi_hwmon)) {
> 		ret = PTR_ERR(tpacpi_hwmon);
> 		tpacpi_hwmon = NULL;
>-		printk(IBM_ERR "unable to register hwmon device\n");
>+		printk(TPACPI_ERR "unable to register hwmon device\n");
> 		thinkpad_acpi_module_exit();
> 		return ret;
> 	}
>+	mutex_init(&tpacpi_inputdev_send_mutex);
>+	tpacpi_inputdev = input_allocate_device();
>+	if (!tpacpi_inputdev) {
>+		printk(TPACPI_ERR "unable to allocate input device\n");
>+		thinkpad_acpi_module_exit();
>+		return -ENOMEM;
>+	} else {
>+		/* Prepare input device, but don't register */
>+		tpacpi_inputdev->name = "ThinkPad Extra Buttons";
>+		tpacpi_inputdev->phys = TPACPI_DRVR_NAME "/input0";
>+		tpacpi_inputdev->id.bustype = BUS_HOST;
>+		tpacpi_inputdev->id.vendor = (thinkpad_id.vendor) ?
>+						thinkpad_id.vendor :
>+						PCI_VENDOR_ID_IBM;
>+		tpacpi_inputdev->id.product = TPACPI_HKEY_INPUT_PRODUCT;
>+		tpacpi_inputdev->id.version = TPACPI_HKEY_INPUT_VERSION;
>+	}
> 	for (i = 0; i < ARRAY_SIZE(ibms_init); i++) {
> 		ret = ibm_init(&ibms_init[i]);
> 		if (ret >= 0 && *ibms_init[i].param)
>@@ -4309,36 +6119,49 @@ static int __init thinkpad_acpi_module_i
> 			return ret;
> 		}
> 	}
>+	ret = input_register_device(tpacpi_inputdev);
>+	if (ret < 0) {
>+		printk(TPACPI_ERR "unable to register input device\n");
>+		thinkpad_acpi_module_exit();
>+		return ret;
>+	} else {
>+		tp_features.input_device_registered = 1;
>+	}
> 
>+	tpacpi_lifecycle = TPACPI_LIFE_RUNNING;
> 	return 0;
> }
> 
>-static void thinkpad_acpi_module_exit(void)
>-{
>-	struct ibm_struct *ibm, *itmp;
>-
>-	list_for_each_entry_safe_reverse(ibm, itmp,
>-					 &tpacpi_all_drivers,
>-					 all_drivers) {
>-		ibm_exit(ibm);
>-	}
>-
>-	dbg_printk(TPACPI_DBG_INIT, "finished subdriver exit path...\n");
>-
>-	if (tpacpi_hwmon)
>-		hwmon_device_unregister(tpacpi_hwmon);
>+/* Please remove this in year 2009 */
>+MODULE_ALIAS("ibm_acpi");
> 
>-	if (tpacpi_pdev)
>-		platform_device_unregister(tpacpi_pdev);
>+/*
>+ * DMI matching for module autoloading
>+ *
>+ * See http://thinkwiki.org/wiki/List_of_DMI_IDs
>+ * See http://thinkwiki.org/wiki/BIOS_Upgrade_Downloads
>+ *
>+ * Only models listed in thinkwiki will be supported, so add yours
>+ * if it is not there yet.
>+ */
>+#define IBM_BIOS_MODULE_ALIAS(__type) \
>+	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")
> 
>-	tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
>-	platform_driver_unregister(&tpacpi_pdriver);
>+/* Non-ancient thinkpads */
>+MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
>+MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
> 
>-	if (proc_dir)
>-		remove_proc_entry(IBM_PROC_DIR, acpi_root_dir);
>+/* Ancient thinkpad BIOSes have to be identified by
>+ * BIOS type or model number, and there are far less
>+ * BIOS types than model numbers... */
>+IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]");
>+IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");
>+IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");
> 
>-	kfree(ibm_thinkpad_ec_found);
>-}
>+MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
>+MODULE_DESCRIPTION(TPACPI_DESC);
>+MODULE_VERSION(TPACPI_VERSION);
>+MODULE_LICENSE("GPL");
> 
> module_init(thinkpad_acpi_module_init);
> module_exit(thinkpad_acpi_module_exit);
>Index: linux-2.6.22-SL103_BRANCH/include/linux/pci_ids.h
>===================================================================
>--- linux-2.6.22-SL103_BRANCH.orig/include/linux/pci_ids.h
>+++ linux-2.6.22-SL103_BRANCH/include/linux/pci_ids.h
>@@ -2074,6 +2070,8 @@
> #define PCI_DEVICE_ID_ALTIMA_AC9100	0x03ea
> #define PCI_DEVICE_ID_ALTIMA_AC1003	0x03eb
> 
>+#define PCI_VENDOR_ID_LENOVO		0x17aa
>+
> #define PCI_VENDOR_ID_ARECA		0x17d3
> #define PCI_DEVICE_ID_ARECA_1110	0x1110
> #define PCI_DEVICE_ID_ARECA_1120	0x1120
>Index: linux-2.6.22-SL103_BRANCH/drivers/misc/thinkpad_acpi.h
>===================================================================
>--- linux-2.6.22-SL103_BRANCH.orig/drivers/misc/thinkpad_acpi.h
>+++ /dev/null
>@@ -1,566 +0,0 @@
>-/*
>- *  thinkpad_acpi.h - ThinkPad ACPI Extras
>- *
>- *
>- *  Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
>- *  Copyright (C) 2006-2007 Henrique de Moraes Holschuh <hmh@hmh.eng.br>
>- *
>- *  This program is free software; you can redistribute it and/or modify
>- *  it under the terms of the GNU General Public License as published by
>- *  the Free Software Foundation; either version 2 of the License, or
>- *  (at your option) any later version.
>- *
>- *  This program is distributed in the hope that it will be useful,
>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- *  GNU General Public License for more details.
>- *
>- *  You should have received a copy of the GNU General Public License
>- *  along with this program; if not, write to the Free Software
>- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>- *  02110-1301, USA.
>- */
>-
>-#ifndef __THINKPAD_ACPI_H__
>-#define __THINKPAD_ACPI_H__
>-
>-#include <linux/kernel.h>
>-#include <linux/module.h>
>-#include <linux/init.h>
>-#include <linux/types.h>
>-#include <linux/string.h>
>-#include <linux/list.h>
>-#include <linux/mutex.h>
>-
>-#include <linux/proc_fs.h>
>-#include <linux/sysfs.h>
>-#include <linux/backlight.h>
>-#include <linux/fb.h>
>-#include <linux/platform_device.h>
>-#include <linux/hwmon.h>
>-#include <linux/hwmon-sysfs.h>
>-#include <asm/uaccess.h>
>-
>-#include <linux/dmi.h>
>-#include <linux/jiffies.h>
>-#include <linux/workqueue.h>
>-
>-#include <acpi/acpi_drivers.h>
>-#include <acpi/acnamesp.h>
>-
>-
>-/****************************************************************************
>- * Main driver
>- */
>-
>-#define IBM_NAME "thinkpad"
>-#define IBM_DESC "ThinkPad ACPI Extras"
>-#define IBM_FILE "thinkpad_acpi"
>-#define IBM_URL "http://ibm-acpi.sf.net/"
>-#define IBM_MAIL "ibm-acpi-devel@lists.sourceforge.net"
>-
>-#define IBM_PROC_DIR "ibm"
>-#define IBM_ACPI_EVENT_PREFIX "ibm"
>-#define IBM_DRVR_NAME IBM_FILE
>-
>-#define IBM_LOG IBM_FILE ": "
>-#define IBM_ERR	   KERN_ERR    IBM_LOG
>-#define IBM_NOTICE KERN_NOTICE IBM_LOG
>-#define IBM_INFO   KERN_INFO   IBM_LOG
>-#define IBM_DEBUG  KERN_DEBUG  IBM_LOG
>-
>-#define IBM_MAX_ACPI_ARGS 3
>-
>-/* ThinkPad CMOS commands */
>-#define TP_CMOS_VOLUME_DOWN	0
>-#define TP_CMOS_VOLUME_UP	1
>-#define TP_CMOS_VOLUME_MUTE	2
>-#define TP_CMOS_BRIGHTNESS_UP	4
>-#define TP_CMOS_BRIGHTNESS_DOWN	5
>-
>-#define onoff(status,bit) ((status) & (1 << (bit)) ? "on" : "off")
>-#define enabled(status,bit) ((status) & (1 << (bit)) ? "enabled" : "disabled")
>-#define strlencmp(a,b) (strncmp((a), (b), strlen(b)))
>-
>-/* Debugging */
>-#define TPACPI_DBG_ALL		0xffff
>-#define TPACPI_DBG_ALL		0xffff
>-#define TPACPI_DBG_INIT		0x0001
>-#define TPACPI_DBG_EXIT		0x0002
>-#define dbg_printk(a_dbg_level, format, arg...) \
>-	do { if (dbg_level & a_dbg_level) \
>-		printk(IBM_DEBUG "%s: " format, __func__ , ## arg); } while (0)
>-#ifdef CONFIG_THINKPAD_ACPI_DEBUG
>-#define vdbg_printk(a_dbg_level, format, arg...) \
>-	dbg_printk(a_dbg_level, format, ## arg)
>-static const char *str_supported(int is_supported);
>-#else
>-#define vdbg_printk(a_dbg_level, format, arg...)
>-#endif
>-
>-/* ACPI HIDs */
>-#define IBM_HKEY_HID    "IBM0068"
>-#define IBM_PCI_HID     "PNP0A03"
>-
>-/* ACPI helpers */
>-static int __must_check acpi_evalf(acpi_handle handle,
>-		      void *res, char *method, char *fmt, ...);
>-static int __must_check acpi_ec_read(int i, u8 * p);
>-static int __must_check acpi_ec_write(int i, u8 v);
>-static int __must_check _sta(acpi_handle handle);
>-
>-/* ACPI handles */
>-static acpi_handle root_handle;			/* root namespace */
>-static acpi_handle ec_handle;			/* EC */
>-static acpi_handle ecrd_handle, ecwr_handle;	/* 570 EC access */
>-static acpi_handle cmos_handle, hkey_handle;	/* basic thinkpad handles */
>-
>-static void drv_acpi_handle_init(char *name,
>-		   acpi_handle *handle, acpi_handle parent,
>-		   char **paths, int num_paths, char **path);
>-#define IBM_ACPIHANDLE_INIT(object)						\
>-	drv_acpi_handle_init(#object, &object##_handle, *object##_parent,	\
>-		object##_paths, ARRAY_SIZE(object##_paths), &object##_path)
>-
>-/* ThinkPad ACPI helpers */
>-static int issue_thinkpad_cmos_command(int cmos_cmd);
>-
>-/* procfs support */
>-static struct proc_dir_entry *proc_dir;
>-
>-/* procfs helpers */
>-static int dispatch_procfs_read(char *page, char **start, off_t off,
>-		int count, int *eof, void *data);
>-static int dispatch_procfs_write(struct file *file,
>-		const char __user * userbuf,
>-		unsigned long count, void *data);
>-static char *next_cmd(char **cmds);
>-
>-/* sysfs support */
>-struct attribute_set {
>-	unsigned int members, max_members;
>-	struct attribute_group group;
>-};
>-
>-static struct attribute_set *create_attr_set(unsigned int max_members,
>-						const char* name);
>-#define destroy_attr_set(_set) \
>-	kfree(_set);
>-static int add_to_attr_set(struct attribute_set* s, struct attribute *attr);
>-static int add_many_to_attr_set(struct attribute_set* s,
>-			struct attribute **attr,
>-			unsigned int count);
>-#define register_attr_set_with_sysfs(_attr_set, _kobj) \
>-	sysfs_create_group(_kobj, &_attr_set->group)
>-static void delete_attr_set(struct attribute_set* s, struct kobject *kobj);
>-
>-static int parse_strtoul(const char *buf, unsigned long max,
>-			unsigned long *value);
>-
>-/* Device model */
>-static struct platform_device *tpacpi_pdev;
>-static struct class_device *tpacpi_hwmon;
>-static struct platform_driver tpacpi_pdriver;
>-static int tpacpi_create_driver_attributes(struct device_driver *drv);
>-static void tpacpi_remove_driver_attributes(struct device_driver *drv);
>-
>-/* Module */
>-static int experimental;
>-static u32 dbg_level;
>-static int force_load;
>-static char *ibm_thinkpad_ec_found;
>-
>-static char* check_dmi_for_ec(void);
>-static int thinkpad_acpi_module_init(void);
>-static void thinkpad_acpi_module_exit(void);
>-
>-
>-/****************************************************************************
>- * Subdrivers
>- */
>-
>-struct ibm_struct;
>-
>-struct tp_acpi_drv_struct {
>-	const struct acpi_device_id *hid;
>-	struct acpi_driver *driver;
>-
>-	void (*notify) (struct ibm_struct *, u32);
>-	acpi_handle *handle;
>-	u32 type;
>-	struct acpi_device *device;
>-};
>-
>-struct ibm_struct {
>-	char *name;
>-
>-	int (*read) (char *);
>-	int (*write) (char *);
>-	void (*exit) (void);
>-
>-	struct list_head all_drivers;
>-
>-	struct tp_acpi_drv_struct *acpi;
>-
>-	struct {
>-		u8 acpi_driver_registered:1;
>-		u8 acpi_notify_installed:1;
>-		u8 proc_created:1;
>-		u8 init_called:1;
>-		u8 experimental:1;
>-	} flags;
>-};
>-
>-struct ibm_init_struct {
>-	char param[32];
>-
>-	int (*init) (struct ibm_init_struct *);
>-	struct ibm_struct *data;
>-};
>-
>-static struct {
>-#ifdef CONFIG_THINKPAD_ACPI_BAY
>-	u16 bay_status:1;
>-	u16 bay_eject:1;
>-	u16 bay_status2:1;
>-	u16 bay_eject2:1;
>-#endif
>-	u16 bluetooth:1;
>-	u16 hotkey:1;
>-	u16 hotkey_mask:1;
>-	u16 light:1;
>-	u16 light_status:1;
>-	u16 wan:1;
>-	u16 fan_ctrl_status_undef:1;
>-} tp_features;
>-
>-static struct list_head tpacpi_all_drivers;
>-
>-static struct ibm_init_struct ibms_init[];
>-static int set_ibm_param(const char *val, struct kernel_param *kp);
>-static int ibm_init(struct ibm_init_struct *iibm);
>-static void ibm_exit(struct ibm_struct *ibm);
>-
>-
>-/*
>- * procfs master subdriver
>- */
>-static int thinkpad_acpi_driver_init(struct ibm_init_struct *iibm);
>-static int thinkpad_acpi_driver_read(char *p);
>-
>-
>-/*
>- * Bay subdriver
>- */
>-
>-#ifdef CONFIG_THINKPAD_ACPI_BAY
>-static acpi_handle bay_handle, bay_ej_handle;
>-static acpi_handle bay2_handle, bay2_ej_handle;
>-
>-static int bay_init(struct ibm_init_struct *iibm);
>-static void bay_notify(struct ibm_struct *ibm, u32 event);
>-static int bay_read(char *p);
>-static int bay_write(char *buf);
>-#endif /* CONFIG_THINKPAD_ACPI_BAY */
>-
>-
>-/*
>- * Beep subdriver
>- */
>-
>-static acpi_handle beep_handle;
>-
>-static int beep_read(char *p);
>-static int beep_write(char *buf);
>-
>-
>-/*
>- * Bluetooth subdriver
>- */
>-
>-enum {
>-	/* ACPI GBDC/SBDC bits */
>-	TP_ACPI_BLUETOOTH_HWPRESENT	= 0x01,	/* Bluetooth hw available */
>-	TP_ACPI_BLUETOOTH_RADIOSSW	= 0x02,	/* Bluetooth radio enabled */
>-	TP_ACPI_BLUETOOTH_UNK		= 0x04,	/* unknown function */
>-};
>-
>-static int bluetooth_init(struct ibm_init_struct *iibm);
>-static int bluetooth_get_radiosw(void);
>-static int bluetooth_set_radiosw(int radio_on);
>-static int bluetooth_read(char *p);
>-static int bluetooth_write(char *buf);
>-
>-
>-/*
>- * Brightness (backlight) subdriver
>- */
>-
>-#define TPACPI_BACKLIGHT_DEV_NAME "thinkpad_screen"
>-
>-static struct backlight_device *ibm_backlight_device;
>-static int brightness_offset = 0x31;
>-
>-static int brightness_init(struct ibm_init_struct *iibm);
>-static void brightness_exit(void);
>-static int brightness_get(struct backlight_device *bd);
>-static int brightness_set(int value);
>-static int brightness_update_status(struct backlight_device *bd);
>-static int brightness_read(char *p);
>-static int brightness_write(char *buf);
>-
>-
>-/*
>- * CMOS subdriver
>- */
>-
>-static int cmos_read(char *p);
>-static int cmos_write(char *buf);
>-
>-
>-/*
>- * Dock subdriver
>- */
>-
>-#ifdef CONFIG_THINKPAD_ACPI_DOCK
>-static acpi_handle pci_handle;
>-static acpi_handle dock_handle;
>-
>-static void dock_notify(struct ibm_struct *ibm, u32 event);
>-static int dock_read(char *p);
>-static int dock_write(char *buf);
>-#endif /* CONFIG_THINKPAD_ACPI_DOCK */
>-
>-
>-/*
>- * EC dump subdriver
>- */
>-
>-static int ecdump_read(char *p) ;
>-static int ecdump_write(char *buf);
>-
>-
>-/*
>- * Fan subdriver
>- */
>-
>-enum {					/* Fan control constants */
>-	fan_status_offset = 0x2f,	/* EC register 0x2f */
>-	fan_rpm_offset = 0x84,		/* EC register 0x84: LSB, 0x85 MSB (RPM)
>-					 * 0x84 must be read before 0x85 */
>-
>-	TP_EC_FAN_FULLSPEED = 0x40,	/* EC fan mode: full speed */
>-	TP_EC_FAN_AUTO	    = 0x80,	/* EC fan mode: auto fan control */
>-
>-	TPACPI_FAN_LAST_LEVEL = 0x100,	/* Use cached last-seen fan level */
>-};
>-
>-enum fan_status_access_mode {
>-	TPACPI_FAN_NONE = 0,		/* No fan status or control */
>-	TPACPI_FAN_RD_ACPI_GFAN,	/* Use ACPI GFAN */
>-	TPACPI_FAN_RD_TPEC,		/* Use ACPI EC regs 0x2f, 0x84-0x85 */
>-};
>-
>-enum fan_control_access_mode {
>-	TPACPI_FAN_WR_NONE = 0,		/* No fan control */
>-	TPACPI_FAN_WR_ACPI_SFAN,	/* Use ACPI SFAN */
>-	TPACPI_FAN_WR_TPEC,		/* Use ACPI EC reg 0x2f */
>-	TPACPI_FAN_WR_ACPI_FANS,	/* Use ACPI FANS and EC reg 0x2f */
>-};
>-
>-enum fan_control_commands {
>-	TPACPI_FAN_CMD_SPEED 	= 0x0001,	/* speed command */
>-	TPACPI_FAN_CMD_LEVEL 	= 0x0002,	/* level command  */
>-	TPACPI_FAN_CMD_ENABLE	= 0x0004,	/* enable/disable cmd,
>-						 * and also watchdog cmd */
>-};
>-
>-static int fan_control_allowed;
>-
>-static enum fan_status_access_mode fan_status_access_mode;
>-static enum fan_control_access_mode fan_control_access_mode;
>-static enum fan_control_commands fan_control_commands;
>-static u8 fan_control_initial_status;
>-static u8 fan_control_desired_level;
>-static int fan_watchdog_maxinterval;
>-
>-static struct mutex fan_mutex;
>-
>-static acpi_handle fans_handle, gfan_handle, sfan_handle;
>-
>-static int fan_init(struct ibm_init_struct *iibm);
>-static void fan_exit(void);
>-static int fan_get_status(u8 *status);
>-static int fan_get_status_safe(u8 *status);
>-static int fan_get_speed(unsigned int *speed);
>-static void fan_update_desired_level(u8 status);
>-static void fan_watchdog_fire(struct work_struct *ignored);
>-static void fan_watchdog_reset(void);
>-static int fan_set_level(int level);
>-static int fan_set_level_safe(int level);
>-static int fan_set_enable(void);
>-static int fan_set_disable(void);
>-static int fan_set_speed(int speed);
>-static int fan_read(char *p);
>-static int fan_write(char *buf);
>-static int fan_write_cmd_level(const char *cmd, int *rc);
>-static int fan_write_cmd_enable(const char *cmd, int *rc);
>-static int fan_write_cmd_disable(const char *cmd, int *rc);
>-static int fan_write_cmd_speed(const char *cmd, int *rc);
>-static int fan_write_cmd_watchdog(const char *cmd, int *rc);
>-
>-
>-/*
>- * Hotkey subdriver
>- */
>-
>-static int hotkey_orig_status;
>-static int hotkey_orig_mask;
>-
>-static struct mutex hotkey_mutex;
>-
>-static int hotkey_init(struct ibm_init_struct *iibm);
>-static void hotkey_exit(void);
>-static int hotkey_get(int *status, int *mask);
>-static int hotkey_set(int status, int mask);
>-static void hotkey_notify(struct ibm_struct *ibm, u32 event);
>-static int hotkey_read(char *p);
>-static int hotkey_write(char *buf);
>-
>-
>-/*
>- * LED subdriver
>- */
>-
>-enum led_access_mode {
>-	TPACPI_LED_NONE = 0,
>-	TPACPI_LED_570,	/* 570 */
>-	TPACPI_LED_OLD,	/* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
>-	TPACPI_LED_NEW,	/* all others */
>-};
>-
>-enum {	/* For TPACPI_LED_OLD */
>-	TPACPI_LED_EC_HLCL = 0x0c,	/* EC reg to get led to power on */
>-	TPACPI_LED_EC_HLBL = 0x0d,	/* EC reg to blink a lit led */
>-	TPACPI_LED_EC_HLMS = 0x0e,	/* EC reg to select led to command */
>-};
>-
>-static enum led_access_mode led_supported;
>-static acpi_handle led_handle;
>-
>-static int led_init(struct ibm_init_struct *iibm);
>-static int led_read(char *p);
>-static int led_write(char *buf);
>-
>-/*
>- * Light (thinklight) subdriver
>- */
>-
>-static acpi_handle lght_handle, ledb_handle;
>-
>-static int light_init(struct ibm_init_struct *iibm);
>-static int light_read(char *p);
>-static int light_write(char *buf);
>-
>-
>-/*
>- * Thermal subdriver
>- */
>-
>-enum thermal_access_mode {
>-	TPACPI_THERMAL_NONE = 0,	/* No thermal support */
>-	TPACPI_THERMAL_ACPI_TMP07,	/* Use ACPI TMP0-7 */
>-	TPACPI_THERMAL_ACPI_UPDT,	/* Use ACPI TMP0-7 with UPDT */
>-	TPACPI_THERMAL_TPEC_8,		/* Use ACPI EC regs, 8 sensors */
>-	TPACPI_THERMAL_TPEC_16,		/* Use ACPI EC regs, 16 sensors */
>-};
>-
>-enum { /* TPACPI_THERMAL_TPEC_* */
>-	TP_EC_THERMAL_TMP0 = 0x78,	/* ACPI EC regs TMP 0..7 */
>-	TP_EC_THERMAL_TMP8 = 0xC0,	/* ACPI EC regs TMP 8..15 */
>-	TP_EC_THERMAL_TMP_NA = -128,	/* ACPI EC sensor not available */
>-};
>-
>-#define TPACPI_MAX_THERMAL_SENSORS 16	/* Max thermal sensors supported */
>-struct ibm_thermal_sensors_struct {
>-	s32 temp[TPACPI_MAX_THERMAL_SENSORS];
>-};
>-
>-static enum thermal_access_mode thermal_read_mode;
>-
>-static int thermal_init(struct ibm_init_struct *iibm);
>-static int thermal_get_sensor(int idx, s32 *value);
>-static int thermal_get_sensors(struct ibm_thermal_sensors_struct *s);
>-static int thermal_read(char *p);
>-
>-
>-/*
>- * Video subdriver
>- */
>-
>-enum video_access_mode {
>-	TPACPI_VIDEO_NONE = 0,
>-	TPACPI_VIDEO_570,	/* 570 */
>-	TPACPI_VIDEO_770,	/* 600e/x, 770e, 770x */
>-	TPACPI_VIDEO_NEW,	/* all others */
>-};
>-
>-enum {	/* video status flags, based on VIDEO_570 */
>-	TP_ACPI_VIDEO_S_LCD = 0x01,	/* LCD output enabled */
>-	TP_ACPI_VIDEO_S_CRT = 0x02,	/* CRT output enabled */
>-	TP_ACPI_VIDEO_S_DVI = 0x08,	/* DVI output enabled */
>-};
>-
>-enum {  /* TPACPI_VIDEO_570 constants */
>-	TP_ACPI_VIDEO_570_PHSCMD = 0x87,	/* unknown magic constant :( */
>-	TP_ACPI_VIDEO_570_PHSMASK = 0x03,	/* PHS bits that map to
>-						 * video_status_flags */
>-	TP_ACPI_VIDEO_570_PHS2CMD = 0x8b,	/* unknown magic constant :( */
>-	TP_ACPI_VIDEO_570_PHS2SET = 0x80,	/* unknown magic constant :( */
>-};
>-
>-static enum video_access_mode video_supported;
>-static int video_orig_autosw;
>-static acpi_handle vid_handle, vid2_handle;
>-
>-static int video_init(struct ibm_init_struct *iibm);
>-static void video_exit(void);
>-static int video_outputsw_get(void);
>-static int video_outputsw_set(int status);
>-static int video_autosw_get(void);
>-static int video_autosw_set(int enable);
>-static int video_outputsw_cycle(void);
>-static int video_expand_toggle(void);
>-static int video_read(char *p);
>-static int video_write(char *buf);
>-
>-
>-/*
>- * Volume subdriver
>- */
>-
>-static int volume_offset = 0x30;
>-
>-static int volume_read(char *p);
>-static int volume_write(char *buf);
>-
>-
>-/*
>- * Wan subdriver
>- */
>-
>-enum {
>-	/* ACPI GWAN/SWAN bits */
>-	TP_ACPI_WANCARD_HWPRESENT	= 0x01,	/* Wan hw available */
>-	TP_ACPI_WANCARD_RADIOSSW	= 0x02,	/* Wan radio enabled */
>-	TP_ACPI_WANCARD_UNK		= 0x04,	/* unknown function */
>-};
>-
>-static int wan_init(struct ibm_init_struct *iibm);
>-static int wan_get_radiosw(void);
>-static int wan_set_radiosw(int radio_on);
>-static int wan_read(char *p);
>-static int wan_write(char *buf);
>-
>-
>-#endif /* __THINKPAD_ACPI_H */

Actions: View | Diff

Attachments on bug 308264: 172830 | 197471