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

Commit 643f12db authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

ACPI: thinkpad-acpi: cleanup after rename 



Cleanup documentation, driver strings and other misc stuff, now that the
driver is named "thinkpad-acpi".

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d903ac54

Documentation/thinkpad-acpi.txt

+27 −19
Original line number Diff line number Diff line 
		    IBM ThinkPad ACPI Extras Driver

		     ThinkPad ACPI Extras Driver



                            Version 0.13

                           31 December 2006

                            Version 0.14

                          March 26th, 2007



               Borislav Deianov <borislav@users.sf.net>

	     Henrique de Moraes Holschuh <hmh@hmh.eng.br>

		      http://ibm-acpi.sf.net/





This is a Linux ACPI driver for the IBM ThinkPad laptops. It supports

various features of these laptops which are accessible through the

ACPI framework but not otherwise fully supported by the generic Linux

ACPI drivers.

This is a Linux driver for the IBM and Lenovo ThinkPad laptops. It

supports various features of these laptops which are accessible

through the ACPI and ACPI EC framework, but not otherwise fully

supported by the generic Linux ACPI drivers.



This driver used to be named ibm-acpi until kernel 2.6.21 and release

0.13-20070314.  It used to be in the drivers/acpi tree, but it was

moved to the drivers/misc tree and renamed to thinkpad-acpi for kernel

2.6.22, and release 0.14.





Status
@@ -43,6 +48,8 @@ Please include the following information in your report: 


	- ThinkPad model name

	- a copy of your DSDT, from /proc/acpi/dsdt

	- a copy of the output of dmidecode, with serial numbers

	  and UUIDs masked off

	- which driver features work and which don't

	- the observed behavior of non-working features
@@ -53,8 +60,9 @@ Installation 
------------



If you are compiling this driver as included in the Linux kernel

sources, simply enable the CONFIG_ACPI_IBM option (Power Management /

ACPI / IBM ThinkPad Laptop Extras).

sources, simply enable the CONFIG_THINKPAD_ACPI option, and optionally

enable the CONFIG_THINKPAD_ACPI_BAY option if you want the

thinkpad-specific bay functionality.



Features

--------
@@ -210,7 +218,7 @@ hot plugging of devices in the Linux ACPI framework. If the laptop was 
booted while not in the dock, the following message is shown in the

logs:



	Mar 17 01:42:34 aero kernel: ibm_acpi: dock device not present

	Mar 17 01:42:34 aero kernel: thinkpad_acpi: dock device not present



In this case, no dock-related events are generated but the dock and

undock commands described below still work. They can be executed
@@ -270,7 +278,7 @@ This is due to the current lack of support for hot plugging of devices 
in the Linux ACPI framework. If the laptop was booted without the

UltraBay, the following message is shown in the logs:



	Mar 17 01:42:34 aero kernel: ibm_acpi: bay device not present

	Mar 17 01:42:34 aero kernel: thinkpad_acpi: bay device not present



In this case, no bay-related events are generated but the eject

command described below still works. It can be executed manually or
@@ -637,12 +645,12 @@ range. The fan cannot be stopped or started with this command. 


The ThinkPad's ACPI DSDT code will reprogram the fan on its own when

certain conditions are met.  It will override any fan programming done

through ibm-acpi.

through thinkpad-acpi.



The ibm-acpi kernel driver can be programmed to revert the fan level

to a safe setting if userspace does not issue one of the fan commands:

"enable", "disable", "level" or "watchdog" within a configurable

ammount of time.  To do this, use the "watchdog" command.

The thinkpad-acpi kernel driver can be programmed to revert the fan

level to a safe setting if userspace does not issue one of the fan

commands: "enable", "disable", "level" or "watchdog" within a

configurable ammount of time.  To do this, use the "watchdog" command.



	echo 'watchdog <interval>' > /proc/acpi/ibm/fan
@@ -686,8 +694,8 @@ separating them with commas, for example: 
	echo enable,0xffff > /proc/acpi/ibm/hotkey

	echo lcd_disable,crt_enable > /proc/acpi/ibm/video



Commands can also be specified when loading the ibm_acpi module, for

example:

Commands can also be specified when loading the thinkpad-acpi module,

for example:



	modprobe ibm_acpi hotkey=enable,0xffff video=auto_disable

	modprobe thinkpad_acpi hotkey=enable,0xffff video=auto_disable

drivers/misc/thinkpad_acpi.c

+11 −7
Original line number Diff line number Diff line 
/*

 *  ibm_acpi.c - IBM ThinkPad ACPI Extras

 *  thinkpad_acpi.c - ThinkPad ACPI Extras

 *

 *

 *  Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
@@ -21,10 +21,12 @@ 
 *  02110-1301, USA.

 */



#define IBM_VERSION "0.13"

#define IBM_VERSION "0.14"



/*

 *  Changelog:

 *  2007-03-27  0.14	renamed to thinkpad_acpi and moved to

 *  			drivers/misc.

 *

 *  2006-11-22	0.13	new maintainer

 *  			changelog now lives in git commit history, and will
@@ -318,7 +320,9 @@ static int __init setup_notify(struct ibm_struct *ibm) 
	}



	acpi_driver_data(ibm->device) = ibm;

	sprintf(acpi_device_class(ibm->device), "%s/%s", IBM_NAME, ibm->name);

	sprintf(acpi_device_class(ibm->device), "%s/%s",

		IBM_ACPI_EVENT_PREFIX,

		ibm->name);



	status = acpi_install_notify_handler(*ibm->handle, ibm->type,

					     dispatch_notify, ibm);
@@ -458,7 +462,7 @@ static char *next_cmd(char **cmds) 
 * ibm-acpi init subdriver

 */



static int ibm_acpi_driver_init(void)

static int thinkpad_acpi_driver_init(void)

{

	printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);

	printk(IBM_INFO "%s\n", IBM_URL);
@@ -470,7 +474,7 @@ static int ibm_acpi_driver_init(void) 
	return 0;

}



static int ibm_acpi_driver_read(char *p)

static int thinkpad_acpi_driver_read(char *p)

{

	int len = 0;
@@ -2440,8 +2444,8 @@ static struct proc_dir_entry *proc_dir = NULL; 
static struct ibm_struct ibms[] = {

	{

	 .name = "driver",

	 .init = ibm_acpi_driver_init,

	 .read = ibm_acpi_driver_read,

	 .init = thinkpad_acpi_driver_init,

	 .read = thinkpad_acpi_driver_read,

	 },

	{

	 .name = "hotkey",

drivers/misc/thinkpad_acpi.h

+11 −10
Original line number Diff line number Diff line 
/*

 *  ibm_acpi.h - IBM ThinkPad ACPI Extras

 *  thinkpad_acpi.h - ThinkPad ACPI Extras

 *

 *

 *  Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
@@ -21,8 +21,8 @@ 
 *  02110-1301, USA.

 */



#ifndef __IBM_ACPI_H__

#define __IBM_ACPI_H__

#ifndef __THINKPAD_ACPI_H__

#define __THINKPAD_ACPI_H__



#include <linux/kernel.h>

#include <linux/module.h>
@@ -47,12 +47,13 @@ 
 * Main driver

 */



#define IBM_NAME "ibm"

#define IBM_DESC "IBM ThinkPad ACPI Extras"

#define IBM_FILE "ibm_acpi"

#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_DIR IBM_NAME

#define IBM_DIR "ibm"

#define IBM_ACPI_EVENT_PREFIX "ibm"



#define IBM_LOG IBM_FILE ": "

#define IBM_ERR	   KERN_ERR    IBM_LOG
@@ -99,8 +100,8 @@ static void ibm_handle_init(char *name, 


/* procfs support */

static struct proc_dir_entry *proc_dir;

static int ibm_acpi_driver_init(void);

static int ibm_acpi_driver_read(char *p);

static int thinkpad_acpi_driver_init(void);

static int thinkpad_acpi_driver_read(char *p);



/* procfs helpers */

static int dispatch_read(char *page, char **start, off_t off, int count,
@@ -434,4 +435,4 @@ static int wan_read(char *p); 
static int wan_write(char *buf);





#endif /* __IBM_ACPI_H */
 
#endif /* __THINKPAD_ACPI_H */