Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (0c26d7cc) · Commits · e / devices / android_kernel_samsung_universal8895

Documentation/kernel-parameters.txt

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -229,14 +229,6 @@ and is between 256 and 4096 characters. It is defined in the file
	to assume that this machine's pmtimer latches its value		to assume that this machine's pmtimer latches its value
	and always returns good values.		and always returns good values.

	acpi.power_nocheck= [HW,ACPI]
	Format: 1/0 enable/disable the check of power state.
	On some bogus BIOS the _PSC object/_STA object of
	power resource can't return the correct device power
	state. In such case it is unneccessary to check its
	power state again in power transition.
	1 : disable the power state check

	acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode		acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode
	Format: { level \| edge \| high \| low }		Format: { level \| edge \| high \| low }

Documentation/laptops/thinkpad-acpi.txt

+37 −10

Original line number	Original line	Diff line number	Diff line
	@@ -920,7 +920,7 @@ The available commands are:
	echo '<LED number> off' >/proc/acpi/ibm/led		echo '<LED number> off' >/proc/acpi/ibm/led
	echo '<LED number> blink' >/proc/acpi/ibm/led		echo '<LED number> blink' >/proc/acpi/ibm/led

	The <LED number> range is 0 to 7. The set of LEDs that can be		The <LED number> range is 0 to 15. The set of LEDs that can be
	controlled varies from model to model. Here is the common ThinkPad		controlled varies from model to model. Here is the common ThinkPad
	mapping:		mapping:

	@@ -932,6 +932,11 @@ mapping:
	5 - UltraBase battery slot		5 - UltraBase battery slot
	6 - (unknown)		6 - (unknown)
	7 - standby		7 - standby
			8 - dock status 1
			9 - dock status 2
			10, 11 - (unknown)
			12 - thinkvantage
			13, 14, 15 - (unknown)

	All of the above can be turned on and off and can be made to blink.		All of the above can be turned on and off and can be made to blink.

	@@ -940,10 +945,12 @@ sysfs notes:
	The ThinkPad LED sysfs interface is described in detail by the LED class		The ThinkPad LED sysfs interface is described in detail by the LED class
	documentation, in Documentation/leds-class.txt.		documentation, in Documentation/leds-class.txt.

	The leds are named (in LED ID order, from 0 to 7):		The LEDs are named (in LED ID order, from 0 to 12):
	"tpacpi::power", "tpacpi:orange:batt", "tpacpi:green:batt",		"tpacpi::power", "tpacpi:orange:batt", "tpacpi:green:batt",
	"tpacpi::dock_active", "tpacpi::bay_active", "tpacpi::dock_batt",		"tpacpi::dock_active", "tpacpi::bay_active", "tpacpi::dock_batt",
	"tpacpi::unknown_led", "tpacpi::standby".		"tpacpi::unknown_led", "tpacpi::standby", "tpacpi::dock_status1",
			"tpacpi::dock_status2", "tpacpi::unknown_led2", "tpacpi::unknown_led3",
			"tpacpi::thinkvantage".

	Due to limitations in the sysfs LED class, if the status of the LED		Due to limitations in the sysfs LED class, if the status of the LED
	indicators cannot be read due to an error, thinkpad-acpi will report it as		indicators cannot be read due to an error, thinkpad-acpi will report it as
	@@ -958,6 +965,12 @@ ThinkPad indicator LED should blink in hardware accelerated mode, use the
	"timer" trigger, and leave the delay_on and delay_off parameters set to		"timer" trigger, and leave the delay_on and delay_off parameters set to
	zero (to request hardware acceleration autodetection).		zero (to request hardware acceleration autodetection).

			LEDs that are known not to exist in a given ThinkPad model are not
			made available through the sysfs interface. If you have a dock and you
			notice there are LEDs listed for your ThinkPad that do not exist (and
			are not in the dock), or if you notice that there are missing LEDs,
			a report to ibm-acpi-devel@lists.sourceforge.net is appreciated.


	ACPI sounds -- /proc/acpi/ibm/beep		ACPI sounds -- /proc/acpi/ibm/beep
	----------------------------------		----------------------------------
	@@ -1156,17 +1169,19 @@ may not be distinct. Later Lenovo models that implement the ACPI
	display backlight brightness control methods have 16 levels, ranging		display backlight brightness control methods have 16 levels, ranging
	from 0 to 15.		from 0 to 15.

	There are two interfaces to the firmware for direct brightness control,		For IBM ThinkPads, there are two interfaces to the firmware for direct
	EC and UCMS (or CMOS). To select which one should be used, use the		brightness control, EC and UCMS (or CMOS). To select which one should be
	brightness_mode module parameter: brightness_mode=1 selects EC mode,		used, use the brightness_mode module parameter: brightness_mode=1 selects
	brightness_mode=2 selects UCMS mode, brightness_mode=3 selects EC		EC mode, brightness_mode=2 selects UCMS mode, brightness_mode=3 selects EC
	mode with NVRAM backing (so that brightness changes are remembered		mode with NVRAM backing (so that brightness changes are remembered across
	across shutdown/reboot).		shutdown/reboot).

	The driver tries to select which interface to use from a table of		The driver tries to select which interface to use from a table of
	defaults for each ThinkPad model. If it makes a wrong choice, please		defaults for each ThinkPad model. If it makes a wrong choice, please
	report this as a bug, so that we can fix it.		report this as a bug, so that we can fix it.

			Lenovo ThinkPads only support brightness_mode=2 (UCMS).

	When display backlight brightness controls are available through the		When display backlight brightness controls are available through the
	standard ACPI interface, it is best to use it instead of this direct		standard ACPI interface, it is best to use it instead of this direct
	ThinkPad-specific interface. The driver will disable its native		ThinkPad-specific interface. The driver will disable its native
	@@ -1254,7 +1269,7 @@ Fan control and monitoring: fan speed, fan enable/disable

	procfs: /proc/acpi/ibm/fan		procfs: /proc/acpi/ibm/fan
	sysfs device attributes: (hwmon "thinkpad") fan1_input, pwm1,		sysfs device attributes: (hwmon "thinkpad") fan1_input, pwm1,
	pwm1_enable		pwm1_enable, fan2_input
	sysfs hwmon driver attributes: fan_watchdog		sysfs hwmon driver attributes: fan_watchdog

	NOTE NOTE NOTE: fan control operations are disabled by default for		NOTE NOTE NOTE: fan control operations are disabled by default for
	@@ -1267,6 +1282,9 @@ from the hardware registers of the embedded controller. This is known
	to work on later R, T, X and Z series ThinkPads but may show a bogus		to work on later R, T, X and Z series ThinkPads but may show a bogus
	value on other models.		value on other models.

			Some Lenovo ThinkPads support a secondary fan. This fan cannot be
			controlled separately, it shares the main fan control.

	Fan levels:		Fan levels:

	Most ThinkPad fans work in "levels" at the firmware interface. Level 0		Most ThinkPad fans work in "levels" at the firmware interface. Level 0
	@@ -1397,6 +1415,11 @@ hwmon device attribute fan1_input:
	which can take up to two minutes. May return rubbish on older		which can take up to two minutes. May return rubbish on older
	ThinkPads.		ThinkPads.

			hwmon device attribute fan2_input:
			Fan tachometer reading, in RPM, for the secondary fan.
			Available only on some ThinkPads. If the secondary fan is
			not installed, will always read 0.

	hwmon driver attribute fan_watchdog:		hwmon driver attribute fan_watchdog:
	Fan safety watchdog timer interval, in seconds. Minimum is		Fan safety watchdog timer interval, in seconds. Minimum is
	1 second, maximum is 120 seconds. 0 disables the watchdog.		1 second, maximum is 120 seconds. 0 disables the watchdog.
	@@ -1555,3 +1578,7 @@ Sysfs interface changelog:
	0x020300: hotkey enable/disable support removed, attributes		0x020300: hotkey enable/disable support removed, attributes
	hotkey_bios_enabled and hotkey_enable deprecated and		hotkey_bios_enabled and hotkey_enable deprecated and
	marked for removal.		marked for removal.

			0x020400: Marker for 16 LEDs support. Also, LEDs that are known
			to not exist in a given model are not registered with
			the LED sysfs class anymore.

MAINTAINERS

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -230,6 +230,13 @@ L: linux-acenic@sunsite.dk
	S: Maintained		S: Maintained
	F: drivers/net/acenic*		F: drivers/net/acenic*

			ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
			P: Peter Feuerer
			M: peter@piie.net
			W: http://piie.net/?section=acerhdf
			S: Maintained
			F: drivers/platform/x86/acerhdf.c

	ACER WMI LAPTOP EXTRAS		ACER WMI LAPTOP EXTRAS
	P: Carlos Corbacho		P: Carlos Corbacho
	M: carlos@strangeworlds.co.uk		M: carlos@strangeworlds.co.uk
	@@ -913,8 +920,7 @@ M: corentincj@iksaif.net
	P: Karol Kozimor		P: Karol Kozimor
	M: sziwan@users.sourceforge.net		M: sziwan@users.sourceforge.net
	L: acpi4asus-user@lists.sourceforge.net		L: acpi4asus-user@lists.sourceforge.net
	W: http://sourceforge.net/projects/acpi4asus		W: http://acpi4asus.sf.net
	W: http://xf.iksaif.net/acpi4asus
	S: Maintained		S: Maintained
	F: arch/x86/kernel/acpi/boot.c		F: arch/x86/kernel/acpi/boot.c
	F: drivers/platform/x86/asus_acpi.c		F: drivers/platform/x86/asus_acpi.c
	@@ -930,8 +936,7 @@ ASUS LAPTOP EXTRAS DRIVER
	P: Corentin Chary		P: Corentin Chary
	M: corentincj@iksaif.net		M: corentincj@iksaif.net
	L: acpi4asus-user@lists.sourceforge.net		L: acpi4asus-user@lists.sourceforge.net
	W: http://sourceforge.net/projects/acpi4asus		W: http://acpi4asus.sf.net
	W: http://xf.iksaif.net/acpi4asus
	S: Maintained		S: Maintained
	F: drivers/platform/x86/asus-laptop.c		F: drivers/platform/x86/asus-laptop.c

	@@ -2110,7 +2115,7 @@ EEEPC LAPTOP EXTRAS DRIVER
	P: Corentin Chary		P: Corentin Chary
	M: corentincj@iksaif.net		M: corentincj@iksaif.net
	L: acpi4asus-user@lists.sourceforge.net		L: acpi4asus-user@lists.sourceforge.net
	W: http://sourceforge.net/projects/acpi4asus		W: http://acpi4asus.sf.net
	S: Maintained		S: Maintained
	F: drivers/platform/x86/eeepc-laptop.c		F: drivers/platform/x86/eeepc-laptop.c

arch/ia64/kernel/acpi-processor.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -71,3 +71,15 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
	}		}

	EXPORT_SYMBOL(arch_acpi_processor_init_pdc);		EXPORT_SYMBOL(arch_acpi_processor_init_pdc);

			void arch_acpi_processor_cleanup_pdc(struct acpi_processor *pr)
			{
			if (pr->pdc) {
			kfree(pr->pdc->pointer->buffer.pointer);
			kfree(pr->pdc->pointer);
			kfree(pr->pdc);
			pr->pdc = NULL;
			}
			}

			EXPORT_SYMBOL(arch_acpi_processor_cleanup_pdc);

arch/x86/include/asm/acpi.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -144,6 +144,7 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)

	#else /* !CONFIG_ACPI */		#else /* !CONFIG_ACPI */

			#define acpi_disabled 1
	#define acpi_lapic 0		#define acpi_lapic 0
	#define acpi_ioapic 0		#define acpi_ioapic 0
	static inline void acpi_noirq_set(void) { }		static inline void acpi_noirq_set(void) { }