Commit c4ec2071 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (41 commits)
  ACPICA: hw: Don't carry spinlock over suspend
  ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write}
  ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle
  ACPI: clean up acpi_enter_sleep_state_prep
  Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish
  ACPI: suppress uninitialized var warning
  cpuidle: consolidate 2.6.22 cpuidle branch into one patch
  ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs
  ACPI: AC: Add sysfs interface
  ACPI: SBS: Add sysfs alarm
  ACPI: SBS: Add ACPI_PROCFS around procfs handling code.
  ACPI: SBS: Add support for power_supply class (and sysfs)
  ACPI: SBS: Make SBS reads table-driven.
  ACPI: SBS: Simplify data structures in SBS
  ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002)
  ACPI: EC: Add new query handler to list head.
  ACPI: Add acpi_bus_generate_event4() function
  ACPI: Battery: add sysfs alarm
  ACPI: Battery: Add sysfs support
  ACPI: Battery: Misc clean-ups, no functional changes
  ...

Fix up conflicts in drivers/misc/thinkpad_acpi.[ch] manually
parents ec262681 00a2b433

Documentation/thinkpad-acpi.txt

+19 −6
Original line number Diff line number Diff line
@@ -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

--------------
@@ -766,7 +771,7 @@ Temperature sensors 
-------------------



procfs: /proc/acpi/ibm/thermal

sysfs device attributes: (hwmon) temp*_input

sysfs device attributes: (hwmon "thinkpad") temp*_input



Most ThinkPads include six or more separate temperature sensors but only

expose the CPU temperature through the standard ACPI methods.  This
@@ -989,7 +994,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"
@@ -1131,7 +1138,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.
@@ -1233,3 +1240,9 @@ Sysfs interface changelog: 
		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.

arch/i386/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,8 @@ endif # APM 


source "arch/x86/kernel/cpu/cpufreq/Kconfig"



source "drivers/cpuidle/Kconfig"



endmenu



menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"

arch/x86_64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -725,6 +725,8 @@ source "drivers/acpi/Kconfig" 


source "arch/x86/kernel/cpufreq/Kconfig"



source "drivers/cpuidle/Kconfig"



endmenu



menu "Bus options (PCI etc.)"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ obj-$(CONFIG_MCA) += mca/ 
obj-$(CONFIG_EISA)		+= eisa/

obj-$(CONFIG_LGUEST_GUEST)	+= lguest/

obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_CPU_IDLE)		+= cpuidle/

obj-$(CONFIG_MMC)		+= mmc/

obj-$(CONFIG_NEW_LEDS)		+= leds/

obj-$(CONFIG_INFINIBAND)	+= infiniband/

drivers/acpi/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ config ACPI_PROC_EVENT 


config ACPI_AC

	tristate "AC Adapter"

	depends on X86

	depends on X86 && POWER_SUPPLY

	default y

	help

	  This driver adds support for the AC Adapter object, which indicates
@@ -97,7 +97,7 @@ config ACPI_AC 


config ACPI_BATTERY

	tristate "Battery"

	depends on X86

	depends on X86 && POWER_SUPPLY

	default y

	help

	  This driver adds support for battery information through
@@ -117,6 +117,7 @@ config ACPI_BUTTON 
config ACPI_VIDEO

	tristate "Video"

	depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL

	depends on INPUT

	help

	  This driver implement the ACPI Extensions For Display Adapters

	  for integrated graphics devices on motherboard, as specified in
@@ -349,12 +350,11 @@ config ACPI_HOTPLUG_MEMORY 
		$>modprobe acpi_memhotplug 



config ACPI_SBS

	tristate "Smart Battery System (EXPERIMENTAL)"

	tristate "Smart Battery System"

	depends on X86

	depends on EXPERIMENTAL

	depends on POWER_SUPPLY

	help

	  This driver adds support for the Smart Battery System.

	  A "Smart Battery" is quite old and quite rare compared

	  to today's ACPI "Control Method" battery.

	  This driver adds support for the Smart Battery System, another

	  type of access to battery information, found on some laptops.



endif	# ACPI

CRA Git | Maintained and supported by SUSTech CRA and CCSE